From caee5f29cad0b76a7590369129dae3fecc087864 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 6 Aug 2023 23:34:13 -0400
Subject: [PATCH] Update reader prefs

- Move open-in prefs into reader prefs
- Move reader prefs up below File Handling
- Move new strings to Fluent
- Fix clicking on labels to focus open-in drop-downs
- Tweak text
---
 .../preferences/preferences_general.xhtml     | 110 +++++++++---------
 chrome/locale/en-US/zotero/preferences.dtd    |   5 -
 chrome/locale/en-US/zotero/preferences.ftl    |  10 +-
 chrome/skin/default/zotero/preferences.css    |   1 -
 4 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_general.xhtml b/chrome/content/zotero/preferences/preferences_general.xhtml
index a36d6e74ea..4d7e02ab39 100644
--- a/chrome/content/zotero/preferences/preferences_general.xhtml
+++ b/chrome/content/zotero/preferences/preferences_general.xhtml
@@ -48,9 +48,39 @@
 				<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="extensions.zotero.downloadAssociatedFiles" native="true"/>
 				<checkbox label="&zotero.preferences.autoRecognizeFiles;" preference="extensions.zotero.autoRecognizeFiles" native="true"/>
 			</vbox>
+		
+		</groupbox>
+		
+		<groupbox id="zotero-prefpane-file-renaming-groupbox">
+			<label><html:h2 data-l10n-id="preferences-file-renaming-title"/></label>
+			
+			<vbox align="start">
+				<label data-l10n-id="preferences-file-renaming-intro"/>
+				<separator class="thin"/>
+				<checkbox data-l10n-id="preferences-file-renaming-auto-rename-files"
+					preference="extensions.zotero.autoRenameFiles"
+					oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()" native="true"
+				/>
+				<checkbox id="rename-linked-files" class="indented-pref"
+					label="&zotero.preferences.autoRenameFiles.renameLinked;"
+					preference="extensions.zotero.autoRenameFiles.linked"
+					oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()" native="true"
+				/>
+				<button id="file-renaming-button"
+					data-l10n-id="preferences-file-renaming-customize-button"
+					oncommand="Zotero_Preferences.navigateToPane('zotero-subpane-file-renaming')"
+				/>
+				<!-- data-search-strings="
+						preferences-file-renaming-format-title,
+						preferences-file-renaming-format-template" -->
+			</vbox>
+		</groupbox>
+		
+		<groupbox id="zotero-prefpane-reader-groupbox">
+			<label><html:h2 data-l10n-id="preferences-reader-title"/></label>
 			
 			<vbox class="fileHandler-menus">
-				<html:label for="fileHandler-pdf">&zotero.preferences.fileHandler.openPDFsUsing;</html:label>
+				<label control="fileHandler-pdf">&zotero.preferences.fileHandler.openPDFsUsing;</label>
 				<menulist id="fileHandler-pdf" class="fileHandler-menu" native="true">
 					<menupopup>
 						<menuitem class="fileHandler-internal"
@@ -62,7 +92,7 @@
 								oncommand="Zotero_Preferences.General.chooseFileHandler('pdf')"/>
 					</menupopup>
 				</menulist>
-				<html:label for="fileHandler-epub">&zotero.preferences.fileHandler.openEbooksUsing;</html:label>
+				<label data-l10n-id="preferences-reader-open-epubs-using" control="fileHandler-epub"/>
 				<menulist id="fileHandler-epub" class="fileHandler-menu" native="true">
 					<menupopup>
 						<menuitem class="fileHandler-internal"
@@ -74,7 +104,7 @@
 								oncommand="Zotero_Preferences.General.chooseFileHandler('epub')"/>
 					</menupopup>
 				</menulist>
-				<html:label for="fileHandler-snapshot">&zotero.preferences.fileHandler.openSnapshotsUsing;</html:label>
+				<label data-l10n-id="preferences-reader-open-snapshots-using" control="fileHandler-snapshot"/>
 				<menulist id="fileHandler-snapshot" class="fileHandler-menu" native="true">
 					<menupopup>
 						<menuitem class="fileHandler-internal"
@@ -87,34 +117,32 @@
 					</menupopup>
 				</menulist>
 			</vbox>
-			<checkbox id="open-reader-in-new-window" class="indented-pref"
-					label="&zotero.preferences.fileHandler.openReaderInNewWindow;"
-					preference="extensions.zotero.openReaderInNewWindow"
-					native="true"/>
-		</groupbox>
-
-		<groupbox id="zotero-prefpane-file-renaming-groupbox">
-			<label><html:h2 data-l10n-id="preferences-file-renaming-title"/></label>
+			<checkbox id="open-reader-in-new-window"
+				data-l10n-id="preferences-reader-open-in-new-window"
+				class="indented-pref"
+				preference="extensions.zotero.openReaderInNewWindow"
+				native="true"
+			/>
 			
-			<vbox align="start">
-				<label data-l10n-id="preferences-file-renaming-intro"/>
-				<separator class="thin"/>
-				<checkbox data-l10n-id="preferences-file-renaming-auto-rename-files"
-						preference="extensions.zotero.autoRenameFiles"
-						oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()" native="true"/>
-				<checkbox id="rename-linked-files" class="indented-pref"
-						label="&zotero.preferences.autoRenameFiles.renameLinked;"
-						preference="extensions.zotero.autoRenameFiles.linked"
-						oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()" native="true"/>
-				<button id="file-renaming-button"
-					data-l10n-id="preferences-file-renaming-customize-button"
-					oncommand="Zotero_Preferences.navigateToPane('zotero-subpane-file-renaming')"/>
-				<!-- data-search-strings="
-						preferences-file-renaming-format-title,
-						preferences-file-renaming-format-template" -->
-			</vbox>
+			<hbox align="center">
+				<label value="&zotero.preferences.reader.tabsTitle.label;" control="reader-tabs-title"/>
+				<menulist id="reader-tabs-title" preference="extensions.zotero.tabs.title.reader" native="true">
+					<menupopup>
+						<menuitem label="&zotero.preferences.reader.tabsTitle.titleCreatorYear;" value="titleCreatorYear"/>
+						<menuitem label="&zotero.preferences.reader.tabsTitle.creatorYearTitle;" value="creatorYearTitle"/>
+						<menuitem label="&zotero.preferences.reader.tabsTitle.filename;" value="filename"/>
+					</menupopup>
+				</menulist>
+			</hbox>
+	
+			<hbox align="center">
+				<label data-l10n-id="preferences-reader-ebook-font" control="reader-ebook-font-family"/>
+				<menulist id="reader-ebook-font-family" preference="extensions.zotero.reader.ebookFontFamily" native="true">
+					<menupopup/>
+				</menulist>
+			</hbox>
 		</groupbox>
-
+		
 		<groupbox>
 			<label><html:h2>&zotero.preferences.prefpane.locate;</html:h2></label>
 			
@@ -136,7 +164,7 @@
 					preference="extensions.zotero.openURL.resolver"
 				/>
 			</hbox>
-		
+			
 			<hbox align="center">
 				<label value="&zotero.preferences.openurl.version;" control="openURLVersionMenu"/>
 				<menulist id="openURLVersionMenu"
@@ -163,28 +191,6 @@
 		</groupbox>
 	</vbox>
 	
-	<groupbox id="zotero-prefpane-reader-groupbox">
-		<label><html:h2>&zotero.preferences.reader;</html:h2></label>
-		
-		<hbox align="center">
-			<label value="&zotero.preferences.reader.tabsTitle.label;" control="reader-tabs-title"/>
-			<menulist id="reader-tabs-title" preference="extensions.zotero.tabs.title.reader" native="true">
-				<menupopup>
-					<menuitem label="&zotero.preferences.reader.tabsTitle.titleCreatorYear;" value="titleCreatorYear"/>
-					<menuitem label="&zotero.preferences.reader.tabsTitle.creatorYearTitle;" value="creatorYearTitle"/>
-					<menuitem label="&zotero.preferences.reader.tabsTitle.filename;" value="filename"/>
-				</menupopup>
-			</menulist>
-		</hbox>
-
-		<hbox align="center">
-			<label value="&zotero.preferences.reader.ebookFontFamily;" control="reader-ebook-font-family"/>
-			<menulist id="reader-ebook-font-family" preference="extensions.zotero.reader.ebookFontFamily" native="true">
-				<menupopup/>
-			</menulist>
-		</hbox>
-	</groupbox>
-	
 	<groupbox>
 		<label><html:h2>&zotero.preferences.groups;</html:h2></label>
 		
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index ea3590bc8f..8a49675d58 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -17,10 +17,7 @@
 <!ENTITY zotero.preferences.autoRecognizeFiles        "Automatically retrieve metadata for PDFs and ebooks">
 <!ENTITY zotero.preferences.autoRenameFiles.renameLinked  "Rename linked files">
 <!ENTITY zotero.preferences.fileHandler.openPDFsUsing "Open PDFs using">
-<!ENTITY zotero.preferences.fileHandler.openEbooksUsing "Open ebooks using">
-<!ENTITY zotero.preferences.fileHandler.openSnapshotsUsing "Open snapshots using">
 <!ENTITY zotero.preferences.fileHandler.systemDefault "System Default">
-<!ENTITY zotero.preferences.fileHandler.openReaderInNewWindow "Open in new windows instead of tabs">
 
 <!ENTITY zotero.preferences.miscellaneous				"Miscellaneous">
 <!ENTITY zotero.preferences.autoUpdate					"Automatically check for updated translators and styles">
@@ -31,12 +28,10 @@
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPre		"Automatically remove items in the trash deleted more than">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost		"days ago">
 
-<!ENTITY zotero.preferences.reader                             "PDFs, Ebooks, and Snapshots">
 <!ENTITY zotero.preferences.reader.tabsTitle.label             "Show tabs as">
 <!ENTITY zotero.preferences.reader.tabsTitle.creatorYearTitle  "Creator - Year - Title">
 <!ENTITY zotero.preferences.reader.tabsTitle.titleCreatorYear  "Title - Creator - Year">
 <!ENTITY zotero.preferences.reader.tabsTitle.filename          "Filename">
-<!ENTITY zotero.preferences.reader.ebookFontFamily             "Ebook font:">
 
 <!ENTITY zotero.preferences.groups						"Groups">
 <!ENTITY zotero.preferences.groups.whenCopyingInclude	"When copying items between libraries, include:">
diff --git a/chrome/locale/en-US/zotero/preferences.ftl b/chrome/locale/en-US/zotero/preferences.ftl
index f76d1b9dcb..eea9e3fd7b 100644
--- a/chrome/locale/en-US/zotero/preferences.ftl
+++ b/chrome/locale/en-US/zotero/preferences.ftl
@@ -1,7 +1,6 @@
 preferences-window =
     .title = { -app-name } Settings
 
-
 preferences-file-renaming-title = File Renaming
 preferences-file-renaming-intro = { -app-name } automatically renames downloaded files based on the details of the parent item (title, author, etc.). You can choose to rename files added from your computer as well.
 preferences-file-renaming-auto-rename-files =
@@ -14,4 +13,11 @@ preferences-file-renaming-format-instructions = You can customize the filename p
 preferences-file-renaming-format-instructions-example = For example, “{ $example }” in this template will be replaced with the title of the parent item, truncated at 50 characters.
 preferences-file-renaming-format-instructions-more = See the <label data-l10n-name="file-renaming-format-help-link">documentation</label> for more information.
 preferences-file-renaming-format-template = Filename Template:
-preferences-file-renaming-format-preview = Preview:
\ No newline at end of file
+preferences-file-renaming-format-preview = Preview:
+
+preferences-reader-title = Reader
+preferences-reader-open-epubs-using = Open EPUBs using
+preferences-reader-open-snapshots-using = Open snapshots using
+preferences-reader-open-in-new-window =
+    .label = Open files in new windows instead of tabs
+preferences-reader-ebook-font = Ebook font:
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index b7605120f7..4955eed3f9 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -284,7 +284,6 @@ button {
 	align-items: center;
 	justify-content: start;
 	column-gap: 1em;
-	margin-top: 0.5em;
 }
 
 .fileHandler-menu .menulist-icon {