From 12b1897478fc4348b90586858bcb0ac4b85a51fc Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 30 Sep 2022 04:22:48 -0400
Subject: [PATCH] Swap "Split Vertically" and "Split Horizontally" in PDF
 reader

---
 chrome/content/zotero/reader.xul                | 12 ++++++------
 chrome/content/zotero/standalone/standalone.xul | 14 +++++++-------
 chrome/content/zotero/xpcom/reader.js           | 14 +++++++-------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/chrome/content/zotero/reader.xul b/chrome/content/zotero/reader.xul
index 67f6d4f50e..e59010eaf9 100644
--- a/chrome/content/zotero/reader.xul
+++ b/chrome/content/zotero/reader.xul
@@ -164,18 +164,18 @@
 					oncommand="menuCmd('zoomPageHeight')"
 				/>
 				<menuseparator class="menu-type-reader"/>
+				<menuitem
+						id="view-menuitem-split-horizontally"
+						type="checkbox"
+						label="aaa &zotero.pdfReader.splitHorizontally;"
+						oncommand="menuCmd('splitHorizontally')"
+				/>
 				<menuitem
 						id="view-menuitem-split-vertically"
 						type="checkbox"
 						label="&zotero.pdfReader.splitVertically;"
 						oncommand="menuCmd('splitVertically')"
 				/>
-				<menuitem
-						id="view-menuitem-split-horizontally"
-						type="checkbox"
-						label="&zotero.pdfReader.splitHorizontally;"
-						oncommand="menuCmd('splitHorizontally')"
-				/>
 			</menupopup>
 		</menu>
 		<menu
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index 3241ef3c6c..e26a76c07f 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -337,13 +337,6 @@
 								oncommand="ZoteroStandalone.onReaderCmd('zoomPageHeight')"
 							/>
 							<menuseparator class="menu-type-reader"/>
-							<menuitem
-								id="view-menuitem-split-vertically"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.splitVertically;"
-								oncommand="ZoteroStandalone.onReaderCmd('splitVertically')"
-							/>
 							<menuitem
 								id="view-menuitem-split-horizontally"
 								class="menu-type-reader"
@@ -351,6 +344,13 @@
 								label="&zotero.pdfReader.splitHorizontally;"
 								oncommand="ZoteroStandalone.onReaderCmd('splitHorizontally')"
 							/>
+							<menuitem
+								id="view-menuitem-split-vertically"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.splitVertically;"
+								oncommand="ZoteroStandalone.onReaderCmd('splitVertically')"
+							/>
 							<menuseparator class="menu-type-reader"/>
 
 							<menu id="layout-menu" label="&layout.label;">
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index e13cd4b923..7b3354d2ae 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -698,13 +698,6 @@ class ReaderInstance {
 		popup.appendChild(menuitem);
 		// Separator
 		popup.appendChild(this._window.document.createElement('menuseparator'));
-		// Split Vertically
-		menuitem = this._window.document.createElement('menuitem');
-		menuitem.setAttribute('label', Zotero.getString('pdfReader.splitVertically'));
-		menuitem.setAttribute('type', 'checkbox');
-		menuitem.setAttribute('checked', this.isSplitVerticallyActive());
-		menuitem.addEventListener('command', () => this._splitVertically());
-		popup.appendChild(menuitem);
 		// Split Horizontally
 		menuitem = this._window.document.createElement('menuitem');
 		menuitem.setAttribute('label', Zotero.getString('pdfReader.splitHorizontally'));
@@ -712,6 +705,13 @@ class ReaderInstance {
 		menuitem.setAttribute('checked', this.isSplitHorizontallyActive());
 		menuitem.addEventListener('command', () => this._splitHorizontally());
 		popup.appendChild(menuitem);
+		// Split Vertically
+		menuitem = this._window.document.createElement('menuitem');
+		menuitem.setAttribute('label', Zotero.getString('pdfReader.splitVertically'));
+		menuitem.setAttribute('type', 'checkbox');
+		menuitem.setAttribute('checked', this.isSplitVerticallyActive());
+		menuitem.addEventListener('command', () => this._splitVertically());
+		popup.appendChild(menuitem);
 		// Separator
 		popup.appendChild(this._window.document.createElement('menuseparator'));
 		// Next page