Restructure preferences dialog so it fits on smaller screens again

Designer is such a pain to work with. Once I ended up editing the .ui file
by hand for the hard stuff and then just use designer to get it
consistently formated. Such a disappointment.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 179 insertions, 153 deletions

diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index bbbb058a6..a8ee076a5 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>814</width>
-    <height>830</height>
+    <height>726</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -163,7 +163,7 @@
         </sizepolicy>
        </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>5</number>
        </property>
        <widget class="QWidget" name="defaults_page">
         <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -275,7 +275,7 @@
               <item>
                <widget class="QRadioButton" name="localDefaultFile">
                 <property name="text">
-                 <string>Local default file</string>
+                 <string>&amp;Local default file</string>
                 </property>
                 <attribute name="buttonGroup">
                  <string notr="true">defaultFileGroup</string>
@@ -429,95 +429,6 @@
           </widget>
          </item>
          <item>
-          <widget class="QGroupBox" name="cloudStorageGroupBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>129</height>
-            </size>
-           </property>
-           <property name="title">
-            <string>Subsurface cloud storage</string>
-           </property>
-           <widget class="QWidget" name="layoutWidget">
-            <property name="geometry">
-             <rect>
-              <x>12</x>
-              <y>37</y>
-              <width>641</width>
-              <height>83</height>
-             </rect>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_3" rowstretch="1,1,1" columnstretch="1,1,0">
-             <property name="sizeConstraint">
-              <enum>QLayout::SetMaximumSize</enum>
-             </property>
-             <item row="0" column="0">
-              <widget class="QLabel" name="label_16b">
-               <property name="toolTip">
-                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
-               </property>
-               <property name="text">
-                <string>Email address</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QLabel" name="label_16c">
-               <property name="text">
-                <string>Password</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLineEdit" name="cloud_storage_email">
-               <property name="toolTip">
-                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QLineEdit" name="cloud_storage_password"/>
-             </item>
-             <item row="2" column="1">
-              <widget class="QCheckBox" name="save_password_local">
-               <property name="text">
-                <string>Save Password locally?</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QLabel" name="cloud_storage_pin_label">
-               <property name="text">
-                <string>Verification PIN</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="2">
-              <widget class="QLineEdit" name="cloud_storage_pin">
-               <property name="toolTip">
-                <string extracomment="One time verification PIN for Subsurface cloud storage infrastructure"/>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QCheckBox" name="cloud_background_sync">
-               <property name="text">
-                <string>Sync to cloud in the background?</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </widget>
-         </item>
-         <item>
           <widget class="QGroupBox" name="groupBox_8">
            <property name="title">
             <string>Subsurface web service</string>
@@ -738,7 +649,7 @@
             <item row="2" column="1">
              <widget class="QRadioButton" name="liter">
               <property name="text">
-               <string>liter</string>
+               <string>&amp;liter</string>
               </property>
               <attribute name="buttonGroup">
                <string notr="true">buttonGroup_3</string>
@@ -1182,6 +1093,19 @@
            </layout>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_5">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="language_page">
@@ -1263,13 +1187,16 @@
             <string>Proxy</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_21">
-              <property name="text">
-               <string>Proxy type</string>
+            <item row="1" column="2">
+             <widget class="QLabel" name="label_23">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
               </property>
-              <property name="alignment">
-               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              <property name="text">
+               <string>Port</string>
               </property>
              </widget>
             </item>
@@ -1283,29 +1210,30 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
-             <widget class="QLineEdit" name="proxyHost">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                <horstretch>2</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+            <item row="2" column="1">
+             <widget class="QCheckBox" name="proxyAuthRequired">
+              <property name="layoutDirection">
+               <enum>Qt::LeftToRight</enum>
               </property>
-              <property name="maxLength">
-               <number>64</number>
+              <property name="text">
+               <string>Requires authentication</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="2">
-             <widget class="QLabel" name="label_23">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_21">
+              <property name="text">
+               <string>Proxy type</string>
               </property>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_24">
               <property name="text">
-               <string>Port</string>
+               <string>Username</string>
               </property>
              </widget>
             </item>
@@ -1325,16 +1253,6 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
-             <widget class="QCheckBox" name="proxyAuthRequired">
-              <property name="layoutDirection">
-               <enum>Qt::LeftToRight</enum>
-              </property>
-              <property name="text">
-               <string>Requires authentication</string>
-              </property>
-             </widget>
-            </item>
             <item row="3" column="1">
              <widget class="QLineEdit" name="proxyUsername">
               <property name="sizePolicy">
@@ -1348,10 +1266,23 @@
               </property>
              </widget>
             </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_24">
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="proxyHost">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>2</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maxLength">
+               <number>64</number>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_25">
               <property name="text">
-               <string>Username</string>
+               <string>Password</string>
               </property>
              </widget>
             </item>
@@ -1371,29 +1302,111 @@
               </property>
              </widget>
             </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_25">
-              <property name="text">
-               <string>Password</string>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="0">
-             <spacer name="verticalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
            </layout>
           </widget>
          </item>
+         <item>
+          <widget class="QGroupBox" name="cloudStorageGroupBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>129</height>
+            </size>
+           </property>
+           <property name="title">
+            <string>Subsurface cloud storage</string>
+           </property>
+           <widget class="QWidget" name="layoutWidget">
+            <property name="geometry">
+             <rect>
+              <x>12</x>
+              <y>37</y>
+              <width>641</width>
+              <height>83</height>
+             </rect>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_3" rowstretch="1,1,1" columnstretch="1,1,0">
+             <property name="sizeConstraint">
+              <enum>QLayout::SetMaximumSize</enum>
+             </property>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_16b">
+               <property name="toolTip">
+                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
+               </property>
+               <property name="text">
+                <string>Email address</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="label_16c">
+               <property name="text">
+                <string>Password</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QLineEdit" name="cloud_storage_email">
+               <property name="toolTip">
+                <string extracomment="Email address used for the Subsurface cloud storage infrastructure"/>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="cloud_storage_password"/>
+             </item>
+             <item row="2" column="1">
+              <widget class="QCheckBox" name="save_password_local">
+               <property name="text">
+                <string>Save Password locally?</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QLabel" name="cloud_storage_pin_label">
+               <property name="text">
+                <string>Verification PIN</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="2">
+              <widget class="QLineEdit" name="cloud_storage_pin">
+               <property name="toolTip">
+                <string extracomment="One time verification PIN for Subsurface cloud storage infrastructure"/>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QCheckBox" name="cloud_background_sync">
+               <property name="text">
+                <string>Sync to cloud in the background?</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="facebook_page">
@@ -1437,6 +1450,19 @@
            </widget>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </widget>
@@ -1795,14 +1821,14 @@
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="defaultFileGroup"/>
   <buttongroup name="buttonGroup_2"/>
+  <buttongroup name="defaultFileGroup"/>
   <buttongroup name="verticalSpeed"/>
-  <buttongroup name="buttonGroup_3"/>
-  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_5"/>
+  <buttongroup name="buttonGroup_3"/>
+  <buttongroup name="buttonGroup_6"/>
   <buttongroup name="buttonGroup_7"/>
+  <buttongroup name="buttonGroup"/>
   <buttongroup name="buttonGroup_4"/>
-  <buttongroup name="buttonGroup_6"/>
  </buttongroups>
 </ui>