From eae9a4447dd06cc50b6c204acc96eccd0c7d7921 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Tue, 24 May 2022 00:46:39 -0600
Subject: [PATCH] fx-compat: Mostly fix locateManager

Still many selectors to update in preferences.css, but how we do that
depends on what our <prefwindow>/<prefpane> replacement looks like.
---
 .../zotero-platform/mac/preferences.css       |  7 ++--
 ...{locateManager.xul => locateManager.xhtml} | 39 +++++++------------
 chrome/content/zotero/locateMenu.js           |  2 +-
 chrome/skin/default/zotero/preferences.css    |  2 +-
 4 files changed, 20 insertions(+), 30 deletions(-)
 rename chrome/content/zotero/{locateManager.xul => locateManager.xhtml} (80%)

diff --git a/chrome/content/zotero-platform/mac/preferences.css b/chrome/content/zotero-platform/mac/preferences.css
index e2f6430eb4..41f7eaed3a 100644
--- a/chrome/content/zotero-platform/mac/preferences.css
+++ b/chrome/content/zotero-platform/mac/preferences.css
@@ -114,17 +114,16 @@ groupbox {
 	margin: 6px;
 }
 
-.groupbox-title {
+groupbox > label > h2 {
 	border-bottom: #b5b5b5 1px solid;
 }
 
-.groupbox-body {
-	-moz-appearance: groupbox;
+groupbox > .groupbox-body {
 	padding: 8px 8px 3px;
 	margin: 0;
 }
 
-caption {
+groupbox > label > h2, caption {
 	padding-inline-start: 4px;
 	padding-bottom: 1px;
 	font: caption;
diff --git a/chrome/content/zotero/locateManager.xul b/chrome/content/zotero/locateManager.xhtml
similarity index 80%
rename from chrome/content/zotero/locateManager.xul
rename to chrome/content/zotero/locateManager.xhtml
index dc9fcbc9bc..9f6f68f2c5 100644
--- a/chrome/content/zotero/locateManager.xul
+++ b/chrome/content/zotero/locateManager.xhtml
@@ -42,32 +42,26 @@ To add a new preference:
 		in Zotero.Prefs.observe()
 
 -->
-<prefwindow
+<window
 	id="zotero-locate-manager-prefs"
 	title="&zotero.preferences.title;" onload="init()"
 	windowtype="zotero:pref"
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+	style="display: flex;">
+
+	<script src="include.js"></script>
+	<script src="locateManager.js"></script>
+
+	<groupbox flex="1">
+		<label><html:h2>&zotero.preferences.locate.locateEngineManager;</html:h2></label>
 		
-	<prefpane id="zotero-prefpane-locate"
-						label="&zotero.preferences.prefpane.locate;"
-						image="chrome://zotero/skin/prefs-styles.png"
-						flex="1">
-		<!-- TODO: pic for locate pane -->
-		<!-- TODO: create labels in dtd -->
-		
-		<preferences>
-			<preference id="pref-locate-activeEngines" name="extensions.zotero.locate.activeEngines" type="string"/>
-		</preferences>
-		
-		<groupbox flex="1">
-			<caption label="&zotero.preferences.locate.locateEngineManager;"/>
-			
-			<label id="locate-engine-description" width="45em" style="font-size: 12px"/>
+		<vbox class="groupbox-body" flex="1">
+			<label id="locate-engine-description" style="font-size: 12px; width: 45em;"/>
 			
 			<separator class="thin"/>
 			
-			<hbox class="virtualized-table-container" flex="1" height="100">
+			<hbox class="virtualized-table-container" flex="1" style="min-height: 100px;">
 				<html:div id="locateManager-tree"/>
 			</hbox>
 			
@@ -90,13 +84,10 @@ To add a new preference:
 				&zotero.preferences.locate.addDescription;
 			</label>
 			-->
-		</groupbox>
-	</prefpane>
-	
-	<script src="include.js"></script>
-	<script src="locateManager.js"/>
+		</vbox>
+	</groupbox>
 
 	<script>
 		document.getElementById('locate-engine-description').textContent = Zotero.getString('locate.locateEngineDescription', Zotero.appName);
 	</script>
-</prefwindow>
+</window>
diff --git a/chrome/content/zotero/locateMenu.js b/chrome/content/zotero/locateMenu.js
index c9f9bac5a8..92c7466790 100644
--- a/chrome/content/zotero/locateMenu.js
+++ b/chrome/content/zotero/locateMenu.js
@@ -317,7 +317,7 @@ var Zotero_LocateMenu = new function() {
   	 * Open the locate manager
   	 */
 	function _openLocateEngineManager(event) {
-		window.openDialog('chrome://zotero/content/locateManager.xul',
+		window.openDialog('chrome://zotero/content/locateManager.xhtml',
 			'Zotero Locate Engine Manager',
 			'chrome,centerscreen'
 		);
diff --git a/chrome/skin/default/zotero/preferences.css b/chrome/skin/default/zotero/preferences.css
index def7db86ec..57ecf271e4 100644
--- a/chrome/skin/default/zotero/preferences.css
+++ b/chrome/skin/default/zotero/preferences.css
@@ -3,7 +3,7 @@ prefwindow .chromeclass-toolbar
 	display: -moz-box !important; /* Ignore toolbar collapse button on OS X */
 }
 
-prefwindow {
+window[windowtype="zotero:pref"] {
    min-width: 600px;
 }