Fix tab order in preferences dialog (Qt client)

diff --git a/qt/prefs-dialog.ui b/qt/prefs-dialog.ui
index 47de509bd571eefbd555328802ec72120a159258..d71563dfadc4f2c2e1a94596083d689da313d3f4 100644 (file)
--- a/qt/prefs-dialog.ui
+++ b/qt/prefs-dialog.ui
@@ -132,13 +132,20 @@
          <property name="leftMargin">
           <number>18</number>
          </property>
-         <item row="2" column="0">
-          <widget class="QLabel" name="altDownloadSpeedLimitLabel">
+         <item row="0" column="0" colspan="2">
+          <widget class="QLabel" name="altSpeedLimitsSectionDescriptionLabel">
            <property name="text">
-            <string>Do&amp;wnload:</string>
+            <string>&lt;small&gt;Override normal speed limits manually or at scheduled times&lt;/small&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="altUploadSpeedLimitLabel">
+           <property name="text">
+            <string>U&amp;pload:</string>
            </property>
            <property name="buddy">
-            <cstring>altDownloadSpeedLimitSpin</cstring>
+            <cstring>altUploadSpeedLimitSpin</cstring>
            </property>
           </widget>
          </item>
@@ -152,10 +159,13 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0" colspan="2">
-          <widget class="QLabel" name="altSpeedLimitsSectionDescriptionLabel">
+         <item row="2" column="0">
+          <widget class="QLabel" name="altDownloadSpeedLimitLabel">
            <property name="text">
-            <string>&lt;small&gt;Override normal speed limits manually or at scheduled times&lt;/small&gt;</string>
+            <string>Do&amp;wnload:</string>
+           </property>
+           <property name="buddy">
+            <cstring>altDownloadSpeedLimitSpin</cstring>
            </property>
           </widget>
          </item>
@@ -169,6 +179,16 @@
            </property>
           </widget>
          </item>
+         <item row="3" column="0">
+          <widget class="QCheckBox" name="altSpeedLimitScheduleCheck">
+           <property name="text">
+            <string>&amp;Scheduled times:</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
          <item row="3" column="1">
           <layout class="QHBoxLayout" name="altSpeedLimitScheduleLayout">
            <item>
@@ -203,26 +223,6 @@
            </item>
           </layout>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="altUploadSpeedLimitLabel">
-           <property name="text">
-            <string>U&amp;pload:</string>
-           </property>
-           <property name="buddy">
-            <cstring>altUploadSpeedLimitSpin</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QCheckBox" name="altSpeedLimitScheduleCheck">
-           <property name="text">
-            <string>&amp;Scheduled times:</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="0">
           <widget class="QLabel" name="altSpeedLimitDaysLabel">
            <property name="text">
@@ -273,27 +273,33 @@
          <property name="leftMargin">
           <number>18</number>
          </property>
-         <item row="1" column="0" colspan="2">
-          <widget class="QCheckBox" name="showTorrentOptionsDialogCheck">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="watchDirCheck">
            <property name="text">
-            <string>Show the Torrent Options &amp;dialog</string>
+            <string>Automatically add .torrent files &amp;from:</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
-         <item row="3" column="0" colspan="2">
-          <widget class="QCheckBox" name="trashTorrentFileCheck">
-           <property name="text">
-            <string>Mo&amp;ve the .torrent file to the trash</string>
+         <item row="0" column="1">
+          <widget class="QToolButton" name="watchDirButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="watchDirCheck">
+         <item row="1" column="0" colspan="2">
+          <widget class="QCheckBox" name="showTorrentOptionsDialogCheck">
            <property name="text">
-            <string>Automatically add .torrent files &amp;from:</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
+            <string>Show the Torrent Options &amp;dialog</string>
            </property>
           </widget>
          </item>
@@ -304,6 +310,13 @@
            </property>
           </widget>
          </item>
+         <item row="3" column="0" colspan="2">
+          <widget class="QCheckBox" name="trashTorrentFileCheck">
+           <property name="text">
+            <string>Mo&amp;ve the .torrent file to the trash</string>
+           </property>
+          </widget>
+         </item>
          <item row="4" column="0">
           <widget class="QLabel" name="downloadDirLabel">
            <property name="text">
@@ -327,19 +340,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QToolButton" name="watchDirButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextBesideIcon</enum>
-           </property>
-          </widget>
-         </item>
          <item row="5" column="1">
           <widget class="FreespaceLabel" name="downloadDirFreeSpaceLabel">
            <property name="text">
@@ -453,6 +453,16 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="incompleteDirCheck">
+           <property name="text">
+            <string>Keep &amp;incomplete files in:</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="1">
           <widget class="QToolButton" name="incompleteDirButton">
            <property name="sizePolicy">
@@ -466,16 +476,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="incompleteDirCheck">
-           <property name="text">
-            <string>Keep &amp;incomplete files in:</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item row="2" column="0">
           <widget class="QCheckBox" name="completionScriptCheck">
            <property name="text">
@@ -665,9 +665,26 @@
          <property name="leftMargin">
           <number>18</number>
          </property>
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="blocklistCheck">
+           <property name="text">
+            <string>Enable &amp;blocklist:</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="1" colspan="2">
           <widget class="QLineEdit" name="blocklistEdit"/>
          </item>
+         <item row="1" column="0" colspan="2">
+          <widget class="QLabel" name="blocklistStatusLabel">
+           <property name="text">
+            <string notr="true">...</string>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="2">
           <widget class="QPushButton" name="updateBlocklistButton">
            <property name="text">
@@ -678,16 +695,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="blocklistCheck">
-           <property name="text">
-            <string>Enable &amp;blocklist:</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
          <item row="2" column="0" colspan="3">
           <widget class="QCheckBox" name="autoUpdateBlocklistCheck">
            <property name="text">
@@ -695,13 +702,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QLabel" name="blocklistStatusLabel">
-           <property name="text">
-            <string notr="true">...</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -739,23 +739,6 @@
          <property name="leftMargin">
           <number>18</number>
          </property>
-         <item row="1" column="2">
-          <widget class="QPushButton" name="testPeerPortButton">
-           <property name="text">
-            <string>Te&amp;st Port</string>
-           </property>
-           <property name="autoDefault">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0" colspan="3">
-          <widget class="QCheckBox" name="randomPeerPortCheck">
-           <property name="text">
-            <string>Pick a &amp;random port every time Transmission is started</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="peerPortLabel">
            <property name="text">
@@ -783,6 +766,23 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="2">
+          <widget class="QPushButton" name="testPeerPortButton">
+           <property name="text">
+            <string>Te&amp;st Port</string>
+           </property>
+           <property name="autoDefault">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0" colspan="3">
+          <widget class="QCheckBox" name="randomPeerPortCheck">
+           <property name="text">
+            <string>Pick a &amp;random port every time Transmission is started</string>
+           </property>
+          </widget>
+         </item>
          <item row="3" column="0" colspan="3">
           <widget class="QCheckBox" name="enablePortForwardingCheck">
            <property name="text">
@@ -1084,20 +1084,10 @@
          <property name="leftMargin">
           <number>18</number>
          </property>
-         <item row="3" column="0">
-          <widget class="QLabel" name="rpcUsernameLabel">
-           <property name="text">
-            <string>&amp;Username:</string>
-           </property>
-           <property name="buddy">
-            <cstring>rpcUsernameEdit</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0" colspan="3">
-          <widget class="QCheckBox" name="enableRpcWhitelistCheck">
+         <item row="0" column="0" colspan="2">
+          <widget class="QCheckBox" name="enableRpcCheck">
            <property name="text">
-            <string>Only allow these IP a&amp;ddresses:</string>
+            <string>Allow &amp;remote access</string>
            </property>
            <property name="checked">
             <bool>true</bool>
@@ -1114,6 +1104,16 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="rpcPortLabel">
+           <property name="text">
+            <string>HTTP &amp;port:</string>
+           </property>
+           <property name="buddy">
+            <cstring>rpcPortSpin</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="1" colspan="2">
           <widget class="QSpinBox" name="rpcPortSpin">
            <property name="minimum">
@@ -1134,29 +1134,29 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="rpcPasswordLabel">
+         <item row="3" column="0">
+          <widget class="QLabel" name="rpcUsernameLabel">
            <property name="text">
-            <string>Pass&amp;word:</string>
+            <string>&amp;Username:</string>
            </property>
            <property name="buddy">
-            <cstring>rpcPasswordEdit</cstring>
+            <cstring>rpcUsernameEdit</cstring>
            </property>
           </widget>
          </item>
-         <item row="0" column="0" colspan="2">
-          <widget class="QCheckBox" name="enableRpcCheck">
+         <item row="3" column="1" colspan="2">
+          <widget class="QLineEdit" name="rpcUsernameEdit"/>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="rpcPasswordLabel">
            <property name="text">
-            <string>Allow &amp;remote access</string>
+            <string>Pass&amp;word:</string>
            </property>
-           <property name="checked">
-            <bool>true</bool>
+           <property name="buddy">
+            <cstring>rpcPasswordEdit</cstring>
            </property>
           </widget>
          </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QLineEdit" name="rpcUsernameEdit"/>
-         </item>
          <item row="4" column="1" colspan="2">
           <widget class="QLineEdit" name="rpcPasswordEdit">
            <property name="echoMode">
@@ -1164,13 +1164,13 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="rpcPortLabel">
+         <item row="5" column="0" colspan="3">
+          <widget class="QCheckBox" name="enableRpcWhitelistCheck">
            <property name="text">
-            <string>HTTP &amp;port:</string>
+            <string>Only allow these IP a&amp;ddresses:</string>
            </property>
-           <property name="buddy">
-            <cstring>rpcPortSpin</cstring>
+           <property name="checked">
+            <bool>true</bool>
            </property>
           </widget>
          </item>