From ed18c0816103a2e1f6a43e8e5b673a6a6ba05be2 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sun, 4 Jan 2015 12:58:11 -0600
Subject: [PATCH] Improve settings tab layout

Use horizontal layouts for the settings lines so that text (Resolution,
Screen Mode, Run Install Wizard) does not go under other widgets or exceed
size of (install wizard) button.

Added a colon after Resolution and Screen Mode.
Changed 'FullScreen' option to 'Full Screen'.
---
 mainwindow.ui | 400 +++++++++++++++++++++++++-------------------------
 1 file changed, 204 insertions(+), 196 deletions(-)

diff --git a/mainwindow.ui b/mainwindow.ui
index 7623440..cd105df 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -137,220 +137,228 @@ QTabWidget::tab-bar{
      <attribute name="title">
       <string>Settings</string>
      </attribute>
-     <widget class="QComboBox" name="cbResolution">
-      <property name="geometry">
-       <rect>
-        <x>90</x>
-        <y>10</y>
-        <width>141</width>
-        <height>24</height>
-       </rect>
-      </property>
-      <item>
-       <property name="text">
-        <string>Native</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Custom</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>320x240</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>400x300</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>512x384</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>640x480</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>800x600</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>960x720</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1024x768</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1152x864</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1280x1024</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1600x1200</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>2048x1536</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>856x480(16:9)</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1280x720(16:9)</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1920x1080(16:9)</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>1280x800(16:10)</string>
-       </property>
-      </item>
-     </widget>
-     <widget class="QSpinBox" name="sbHeight">
-      <property name="geometry">
-       <rect>
-        <x>350</x>
-        <y>10</y>
-        <width>61</width>
-        <height>25</height>
-       </rect>
-      </property>
-      <property name="maximum">
-       <number>100000</number>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="rbWin">
-      <property name="geometry">
-       <rect>
-        <x>200</x>
-        <y>40</y>
-        <width>121</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Windowed</string>
-      </property>
-     </widget>
-     <widget class="QSpinBox" name="sbWidth">
-      <property name="geometry">
-       <rect>
-        <x>260</x>
-        <y>10</y>
-        <width>61</width>
-        <height>25</height>
-       </rect>
-      </property>
-      <property name="maximum">
-       <number>100000</number>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_6">
+     <widget class="QWidget" name="horizontalLayoutWidget">
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>10</y>
-        <width>81</width>
-        <height>21</height>
+        <y>40</y>
+        <width>441</width>
+        <height>31</height>
        </rect>
       </property>
-      <property name="text">
-       <string>Resolution</string>
-      </property>
+      <layout class="QHBoxLayout" name="screenModeLayout">
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Screen Mode:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="rbFull">
+         <property name="text">
+          <string>Full Screen</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="rbWin">
+         <property name="text">
+          <string>Windowed</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </widget>
-     <widget class="QLabel" name="label_2">
+     <widget class="QWidget" name="horizontalLayoutWidget_2">
       <property name="geometry">
        <rect>
         <x>10</x>
-        <y>34</y>
-        <width>111</width>
-        <height>31</height>
+        <y>0</y>
+        <width>441</width>
+        <height>41</height>
        </rect>
       </property>
-      <property name="text">
-       <string>Screen Mode</string>
-      </property>
+      <layout class="QHBoxLayout" name="resolutionLayout">
+       <item>
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Resolution:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="cbResolution">
+         <item>
+          <property name="text">
+           <string>Native</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Custom</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>320x240</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>400x300</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>512x384</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>640x480</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>800x600</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>960x720</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1024x768</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1152x864</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1280x1024</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1600x1200</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>2048x1536</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>856x480(16:9)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1280x720(16:9)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1920x1080(16:9)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>1280x800(16:10)</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>W</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="sbWidth">
+         <property name="maximum">
+          <number>100000</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>H</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSpinBox" name="sbHeight">
+         <property name="maximum">
+          <number>100000</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
-     <widget class="QLabel" name="label_3">
-      <property name="geometry">
-       <rect>
-        <x>240</x>
-        <y>10</y>
-        <width>16</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>W</string>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="rbFull">
-      <property name="geometry">
-       <rect>
-        <x>90</x>
-        <y>40</y>
-        <width>111</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>FullScreen</string>
-      </property>
-      <property name="checked">
-       <bool>true</bool>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_4">
-      <property name="geometry">
-       <rect>
-        <x>330</x>
-        <y>10</y>
-        <width>16</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>H</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="btnRunInstallWizard">
+     <widget class="QWidget" name="horizontalLayoutWidget_3">
       <property name="geometry">
        <rect>
         <x>10</x>
         <y>70</y>
-        <width>101</width>
-        <height>23</height>
+        <width>441</width>
+        <height>41</height>
        </rect>
       </property>
-      <property name="text">
-       <string>Run Install Wizard</string>
-      </property>
+      <layout class="QHBoxLayout" name="installWizardLayout">
+       <item>
+        <widget class="QPushButton" name="btnRunInstallWizard">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Run Install Wizard</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </widget>
     </widget>
     <widget class="QWidget" name="tabRend2">