From c51cb88c97b156c179dfbbc834bf4de153671c4e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 21 Oct 2022 05:22:37 -0400
Subject: [PATCH] Adjust layout of Quick Copy note format options

Also:

- Hide format options until translators are loaded (since otherwise
  the checkboxes don't have labels and the layout is messed up)
- Remove unnecessary "zotero-" prefix from the new elements
---
 .../zotero/preferences/preferences_export.jsx | 14 +++---
 .../preferences/preferences_export.xhtml      | 43 ++++++++++++-------
 chrome/skin/default/zotero/preferences.css    |  6 +++
 3 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_export.jsx b/chrome/content/zotero/preferences/preferences_export.jsx
index df459fcf8e..066be61030 100644
--- a/chrome/content/zotero/preferences/preferences_export.jsx
+++ b/chrome/content/zotero/preferences/preferences_export.jsx
@@ -83,6 +83,8 @@ Zotero_Preferences.Export = {
 	 * Builds the note Quick Copy drop-down from the current global pref
 	 */
 	populateNoteQuickCopyList: async function () {
+		document.getElementById('noteQuickCopy-format-options').removeAttribute('hidden');
+		
 		// Initialize default format drop-down
 		var format = Zotero.Prefs.get("export.noteQuickCopy.setting");
 		format = Zotero.QuickCopy.unserializeSetting(format);
@@ -196,10 +198,10 @@ Zotero_Preferences.Export = {
 		var format = document.getElementById('zotero-noteQuickCopy-menu').value;
 		format = JSON.parse(format);
 
-		var markdownOptions = document.getElementById('zotero-noteQuickCopy-markdown-options');
-		var htmlOptions = document.getElementById('zotero-noteQuickCopy-html-options');
-		var markdownIncludeAppLinks = document.getElementById("zotero-noteQuickCopy-markdown-includeAppLinks");
-		var htmlIncludeAppLinks = document.getElementById("zotero-noteQuickCopy-html-includeAppLinks");
+		var markdownOptions = document.getElementById('noteQuickCopy-markdown-options');
+		var htmlOptions = document.getElementById('noteQuickCopy-html-options');
+		var markdownIncludeAppLinks = document.getElementById("noteQuickCopy-markdown-includeAppLinks");
+		var htmlIncludeAppLinks = document.getElementById("noteQuickCopy-html-includeAppLinks");
 
 		markdownIncludeAppLinks.label = Zotero.getString('exportOptions.includeAppLinks', Zotero.appName);
 		htmlIncludeAppLinks.label = Zotero.getString('exportOptions.includeAppLinks', Zotero.appName);
@@ -223,8 +225,8 @@ Zotero_Preferences.Export = {
 
 	onUpdateNoteExportOptions() {
 		var menulist = document.getElementById("zotero-noteQuickCopy-menu");
-		var markdownIncludeAppLinks = document.getElementById("zotero-noteQuickCopy-markdown-includeAppLinks");
-		var htmlIncludeAppLinks = document.getElementById("zotero-noteQuickCopy-html-includeAppLinks");
+		var markdownIncludeAppLinks = document.getElementById("noteQuickCopy-markdown-includeAppLinks");
+		var htmlIncludeAppLinks = document.getElementById("noteQuickCopy-html-includeAppLinks");
 
 		for (let i = 0; i < menulist.itemCount; i++) {
 			let item = menulist.getItemAtIndex(i);
diff --git a/chrome/content/zotero/preferences/preferences_export.xhtml b/chrome/content/zotero/preferences/preferences_export.xhtml
index 40a87b243b..b7dd0e9589 100644
--- a/chrome/content/zotero/preferences/preferences_export.xhtml
+++ b/chrome/content/zotero/preferences/preferences_export.xhtml
@@ -54,23 +54,34 @@
 		<label value="&zotero.preferences.quickCopy.noteFormat;" control="zotero-noteQuickCopy-menu"/>
 		<menulist id="zotero-noteQuickCopy-menu" label="&zotero.general.loading;" native="true"/>
 		
-		<vbox id="zotero-noteQuickCopy-markdown-options">
-			<label value="&zotero.preferences.quickCopy.markdown;"/>
-			<vbox style="margin-left: 2em">
-				<checkbox id="zotero-noteQuickCopy-markdown-includeAppLinks"
-						  label="Include App Links"
-						  oncommand="Zotero_Preferences.Export.onUpdateNoteExportOptions()"/>
-			</vbox>
-		</vbox>
+		<table id="noteQuickCopy-format-options"
+				xmlns="http://www.w3.org/1999/xhtml"
+				xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+				hidden="hidden">
+			<tbody id="noteQuickCopy-markdown-options">
+				<tr>
+					<th>
+						<xul:label value="&zotero.preferences.quickCopy.markdown;"/>
+					</th>
+					<td>
+						<xul:checkbox id="noteQuickCopy-markdown-includeAppLinks"
+								oncommand="Zotero_Preferences.Export.onUpdateNoteExportOptions()"/>
+					</td>
+				</tr>
+			</tbody>
 
-		<vbox id="zotero-noteQuickCopy-html-options">
-			<label value="&zotero.preferences.quickCopy.html;"/>
-			<vbox style="margin-left: 2em">
-				<checkbox id="zotero-noteQuickCopy-html-includeAppLinks"
-						  label="Include App Links"
-						  oncommand="Zotero_Preferences.Export.onUpdateNoteExportOptions()"/>
-			</vbox>
-		</vbox>
+			<tbody id="noteQuickCopy-html-options">
+				<tr>
+					<th>
+						<xul:label value="&zotero.preferences.quickCopy.html;"/>
+					</th>
+					<td>
+						<xul:checkbox id="noteQuickCopy-html-includeAppLinks"
+								oncommand="Zotero_Preferences.Export.onUpdateNoteExportOptions()"/>
+					</td>
+				</tr>
+			</tbody>
+		</table>
 		
 		<separator/>
 		
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index ebe35b9d6e..3ee232b4ba 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -414,6 +414,12 @@ description label[class=zotero-text-link], label[class=zotero-text-link]
 	min-height: 1.5em; /* Fix collapse on Windows */
 }
 
+#noteQuickCopy-format-options th {
+	font-weight: normal;
+	text-align: right;
+	max-width: 3.6em;
+}
+
 /*
  * Cite pane
  */