From d5f97b84f3a600c50a553828a127f502edce1b30 Mon Sep 17 00:00:00 2001
From: Ian Farrell <ianfarrell47@gmail.com>
Date: Sat, 9 Dec 2023 17:35:18 -0500
Subject: [PATCH 1/2] Reorder XML .ui files to correct tab orders

Reordered XML .ui files to correct tab orders throughout libfm-qt.

There may be one or two .ui files that require <tabstops>, and/or changes
to prevent StandardButtons causing incorrect ordering.

Affected files:
- app-chooser-dialog.ui
- edit-bookmarks.ui
- file-operation-dialog.ui
- file-props.ui
- filedialog.ui
- filesearch.ui
- mount-operation-password.ui
- rename-dialog.ui
---
 src/app-chooser-dialog.ui       |  34 ++++----
 src/edit-bookmarks.ui           |  14 ++--
 src/file-operation-dialog.ui    |  48 +++++------
 src/file-props.ui               | 138 ++++++++++++++++----------------
 src/filedialog.ui               |  20 ++---
 src/filesearch.ui               |  54 ++++++-------
 src/mount-operation-password.ui |  34 ++++----
 src/rename-dialog.ui            |  36 ++++-----
 8 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/src/app-chooser-dialog.ui b/src/app-chooser-dialog.ui
index ef1ebee6..a21f7b43 100644
--- a/src/app-chooser-dialog.ui
+++ b/src/app-chooser-dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>432</width>
-    <height>387</height>
+    <height>447</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -56,16 +56,6 @@
        <item row="1" column="0" colspan="2">
         <widget class="QLineEdit" name="cmdLine"/>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>Application name:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="appName"/>
-       </item>
        <item row="2" column="0" colspan="2">
         <widget class="QLabel" name="label_5">
          <property name="text">
@@ -82,16 +72,16 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="2">
-        <widget class="QCheckBox" name="keepTermOpen">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Keep terminal window open after command execution</string>
+          <string>Application name:</string>
          </property>
         </widget>
        </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="appName"/>
+       </item>
        <item row="4" column="0" colspan="2">
         <widget class="QCheckBox" name="useTerminal">
          <property name="text">
@@ -99,6 +89,16 @@
          </property>
         </widget>
        </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QCheckBox" name="keepTermOpen">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Keep terminal window open after command execution</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
diff --git a/src/edit-bookmarks.ui b/src/edit-bookmarks.ui
index 8d989e65..d0ff9c1d 100644
--- a/src/edit-bookmarks.ui
+++ b/src/edit-bookmarks.ui
@@ -14,6 +14,13 @@
    <string>Edit Bookmarks</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Use drag and drop to reorder the items</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0">
     <widget class="QTreeWidget" name="treeWidget">
      <property name="acceptDrops">
@@ -96,13 +103,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Use drag and drop to reorder the items</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/file-operation-dialog.ui b/src/file-operation-dialog.ui
index 47f8c675..d0a3606f 100644
--- a/src/file-operation-dialog.ui
+++ b/src/file-operation-dialog.ui
@@ -26,6 +26,16 @@
      <property name="fieldGrowthPolicy">
       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
      </property>
+     <item row="0" column="0" colspan="2">
+      <widget class="QListWidget" name="sourceFiles">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="destLabel">
        <property name="text">
@@ -83,6 +93,20 @@
        </property>
       </widget>
      </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Files processed:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLabel" name="filesProcessed">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
      <item row="5" column="0">
       <widget class="QLabel" name="label_5">
        <property name="sizePolicy">
@@ -109,30 +133,6 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="0" colspan="2">
-      <widget class="QListWidget" name="sourceFiles">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Files processed:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLabel" name="filesProcessed">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item row="2" column="0" colspan="2">
diff --git a/src/file-props.ui b/src/file-props.ui
index 20d4354d..b5d30a48 100644
--- a/src/file-props.ui
+++ b/src/file-props.ui
@@ -100,6 +100,32 @@
          </property>
         </widget>
        </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="targetLabel">
+         <property name="text">
+          <string>Link target:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLabel" name="target">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="textInteractionFlags">
+          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
@@ -146,6 +172,23 @@
          </property>
         </widget>
        </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="openWithLabel">
+         <property name="text">
+          <string>Open With:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="Fm::AppChooserComboBox" name="openWith">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
        <item row="6" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">
@@ -215,49 +258,6 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="targetLabel">
-         <property name="text">
-          <string>Link target:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QLabel" name="target">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="openWithLabel">
-         <property name="text">
-          <string>Open With:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <widget class="Fm::AppChooserComboBox" name="openWith">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
        <item row="9" column="0">
         <widget class="QLabel" name="label_12">
          <property name="text">
@@ -391,6 +391,13 @@
          <property name="verticalSpacing">
           <number>5</number>
          </property>
+         <item row="0" column="0" rowspan="2" alignment="Qt::AlignVCenter">
+          <widget class="QLabel" name="deviceLabel">
+           <property name="text">
+            <string>Device Usage:</string>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="1">
           <widget class="QProgressBar" name="progressBar">
            <property name="value">
@@ -408,13 +415,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0" rowspan="2" alignment="Qt::AlignVCenter">
-          <widget class="QLabel" name="deviceLabel">
-           <property name="text">
-            <string>Device Usage:</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>
@@ -445,14 +445,8 @@
           <property name="verticalSpacing">
            <number>6</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="owner"/>
-          </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="ownerGroup"/>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_9">
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_8">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -460,12 +454,15 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Group:</string>
+             <string>Owner:</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_8">
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="owner"/>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_9">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -473,10 +470,13 @@
              </sizepolicy>
             </property>
             <property name="text">
-             <string>Owner:</string>
+             <string>Group:</string>
             </property>
            </widget>
           </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="ownerGroup"/>
+          </item>
          </layout>
         </widget>
        </item>
@@ -736,6 +736,13 @@
                 </item>
                </layout>
               </item>
+              <item row="0" column="1" rowspan="3">
+               <widget class="Line" name="line">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+               </widget>
+              </item>
               <item row="0" column="2">
                <widget class="QCheckBox" name="checkBox_10">
                 <property name="text">
@@ -757,13 +764,6 @@
                 </property>
                </widget>
               </item>
-              <item row="0" column="1" rowspan="3">
-               <widget class="Line" name="line">
-                <property name="orientation">
-                 <enum>Qt::Vertical</enum>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
            </widget>
diff --git a/src/filedialog.ui b/src/filedialog.ui
index 40fe6a2e..222f2149 100644
--- a/src/filedialog.ui
+++ b/src/filedialog.ui
@@ -69,16 +69,6 @@
      <item row="0" column="1">
       <widget class="QLineEdit" name="fileName"/>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="fileTypeLabel">
-       <property name="text">
-        <string>File type:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="fileTypeCombo"/>
-     </item>
      <item row="0" column="2" rowspan="2">
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
@@ -89,6 +79,16 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="fileTypeLabel">
+       <property name="text">
+        <string>File type:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="fileTypeCombo"/>
+     </item>
     </layout>
    </item>
   </layout>
diff --git a/src/filesearch.ui b/src/filesearch.ui
index a90456a5..501f6bbf 100644
--- a/src/filesearch.ui
+++ b/src/filesearch.ui
@@ -275,17 +275,10 @@
          <layout class="QFormLayout" name="formLayout">
           <item row="0" column="0">
            <layout class="QGridLayout" name="gridLayout_2">
-            <item row="1" column="0">
-             <widget class="QCheckBox" name="smallerThan">
+            <item row="0" column="0">
+             <widget class="QCheckBox" name="largerThan">
               <property name="text">
-               <string>Smaller than:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="2">
-             <widget class="QSpinBox" name="maxSize">
-              <property name="enabled">
-               <bool>false</bool>
+               <string>Larger than:</string>
               </property>
              </widget>
             </item>
@@ -296,13 +289,6 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="0">
-             <widget class="QCheckBox" name="largerThan">
-              <property name="text">
-               <string>Larger than:</string>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="3">
              <widget class="QComboBox" name="minSizeUnit">
               <property name="enabled">
@@ -333,6 +319,20 @@
               </item>
              </widget>
             </item>
+            <item row="1" column="0">
+             <widget class="QCheckBox" name="smallerThan">
+              <property name="text">
+               <string>Smaller than:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="2">
+             <widget class="QSpinBox" name="maxSize">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
             <item row="1" column="3">
              <widget class="QComboBox" name="maxSizeUnit">
               <property name="enabled">
@@ -386,6 +386,16 @@
               </property>
              </widget>
             </item>
+            <item row="2" column="1">
+             <widget class="QDateEdit" name="maxTime">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="calendarPopup">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
             <item row="3" column="0">
              <widget class="QCheckBox" name="laterThan">
               <property name="text">
@@ -403,16 +413,6 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QDateEdit" name="maxTime">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="calendarPopup">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
          </layout>
diff --git a/src/mount-operation-password.ui b/src/mount-operation-password.ui
index c10f82c6..d674c5d9 100644
--- a/src/mount-operation-password.ui
+++ b/src/mount-operation-password.ui
@@ -64,9 +64,6 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="username"/>
-     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
@@ -83,13 +80,22 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="password">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="username"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="domainLabel">
+       <property name="text">
+        <string>&amp;Domain:</string>
+       </property>
+       <property name="buddy">
+        <cstring>domain</cstring>
        </property>
       </widget>
      </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="domain"/>
+     </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
@@ -106,19 +112,13 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="domainLabel">
-       <property name="text">
-        <string>&amp;Domain:</string>
-       </property>
-       <property name="buddy">
-        <cstring>domain</cstring>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="password">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="domain"/>
-     </item>
     </layout>
    </item>
    <item>
diff --git a/src/rename-dialog.ui b/src/rename-dialog.ui
index e89b1f45..866efb4c 100644
--- a/src/rename-dialog.ui
+++ b/src/rename-dialog.ui
@@ -57,15 +57,8 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="2">
-      <widget class="QLabel" name="srcLabel">
-       <property name="text">
-        <string>with the following file?</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLabel" name="srcInfo">
+     <item row="0" column="1">
+      <widget class="QLabel" name="destInfo">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -73,33 +66,40 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string notr="true">src file info</string>
+        <string notr="true">dest file info</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="destInfo">
+     <item row="1" column="0" colspan="2">
+      <widget class="QLabel" name="srcLabel">
+       <property name="text">
+        <string>with the following file?</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="srcIcon">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
-        <string notr="true">dest file info</string>
+        <string notr="true">src</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="srcIcon">
+     <item row="2" column="1">
+      <widget class="QLabel" name="srcInfo">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
-        <string notr="true">src</string>
+        <string notr="true">src file info</string>
        </property>
       </widget>
      </item>

From df91f40df3d8766592dc1a275b5fc2d4dd9a0143 Mon Sep 17 00:00:00 2001
From: Ian Farrell <ianfarrell47@gmail.com>
Date: Sat, 9 Dec 2023 17:46:42 -0500
Subject: [PATCH 2/2] Fix accidental Qt Designer change

---
 src/app-chooser-dialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app-chooser-dialog.ui b/src/app-chooser-dialog.ui
index a21f7b43..ce8f5448 100644
--- a/src/app-chooser-dialog.ui
+++ b/src/app-chooser-dialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>432</width>
-    <height>447</height>
+    <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">