From 8888fa6dcb23f50f754b00bf256f67963517776f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 8 Jan 2024 07:43:40 -0500
Subject: [PATCH] Move Interface prefs to top of General pane

Now that light/dark mode is there, it should be prominent.
---
 .../preferences/preferences_general.xhtml     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_general.xhtml b/chrome/content/zotero/preferences/preferences_general.xhtml
index 0c697ddfe4..496da87197 100644
--- a/chrome/content/zotero/preferences/preferences_general.xhtml
+++ b/chrome/content/zotero/preferences/preferences_general.xhtml
@@ -24,6 +24,28 @@
 -->
 <vbox id="zotero-prefpane-general" onload="Zotero_Preferences.General.init()">
 	<vbox class="main-section">
+		<groupbox>
+			<label><html:h2>&zotero.preferences.interface;</html:h2></label>
+		
+			<hbox align="center">
+				<label data-l10n-id="preferences-color-scheme"/>
+				<radiogroup orient="horizontal" id="color-scheme" preference="browser.theme.toolbar-theme">
+					<radio data-l10n-id="preferences-color-scheme-auto" value="2"/>
+					<radio data-l10n-id="preferences-color-scheme-light" value="1"/>
+					<radio data-l10n-id="preferences-color-scheme-dark" value="0"/>
+				</radiogroup>
+			</hbox>
+		
+			<hbox align="center">
+				<label value="&zotero.bibliography.locale.label;"/>
+				<menulist id="locale-menu"
+						onblur="if (!Zotero.isMac) Zotero_Preferences.General.onLocaleChange()"
+						native="true">
+					<menupopup onpopuphidden="Zotero_Preferences.General.onLocaleChange()"/>
+				</menulist>
+			</hbox>
+		</groupbox>
+		
 		<groupbox id="zotero-prefpane-file-handling-groupbox">
 			<label><html:h2>&zotero.preferences.fileHandling;</html:h2></label>
 			
@@ -195,27 +217,4 @@
 			<checkbox label="&zotero.preferences.groups.tags;" preference="extensions.zotero.groups.copyTags" native="true"/>
 		</vbox>
 	</groupbox>
-	
-	<groupbox>
-		<label><html:h2>&zotero.preferences.interface;</html:h2></label>
-	
-		<hbox align="center">
-			<label data-l10n-id="preferences-color-scheme"/>
-			<radiogroup orient="horizontal" id="color-scheme" preference="browser.theme.toolbar-theme">
-				<radio data-l10n-id="preferences-color-scheme-auto" value="2"/>
-				<radio data-l10n-id="preferences-color-scheme-light" value="1"/>
-				<radio data-l10n-id="preferences-color-scheme-dark" value="0"/>
-			</radiogroup>
-		</hbox>
-	
-		<hbox align="center">
-			<label value="&zotero.bibliography.locale.label;"/>
-			<menulist id="locale-menu"
-					onblur="if (!Zotero.isMac) Zotero_Preferences.General.onLocaleChange()"
-					native="true">
-				<menupopup onpopuphidden="Zotero_Preferences.General.onLocaleChange()"/>
-			</menulist>
-		</hbox>
-	</groupbox>
-
 </vbox>