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'.
This commit is contained in:
Zack Middleton 2015-01-04 12:58:11 -06:00
parent 50c8b3be07
commit ed18c08161

View file

@ -137,15 +137,74 @@ QTabWidget::tab-bar{
<attribute name="title">
<string>Settings</string>
</attribute>
<widget class="QComboBox" name="cbResolution">
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>90</x>
<y>10</y>
<width>141</width>
<height>24</height>
<x>10</x>
<y>40</y>
<width>441</width>
<height>31</height>
</rect>
</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="QWidget" name="horizontalLayoutWidget_2">
<property name="geometry">
<rect>
<x>10</x>
<y>0</y>
<width>441</width>
<height>41</height>
</rect>
</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>
@ -232,126 +291,75 @@ QTabWidget::tab-bar{
</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">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>81</width>
<height>21</height>
</rect>
</property>
<property name="text">
<string>Resolution</string>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>10</x>
<y>34</y>
<width>111</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Screen Mode</string>
</property>
</widget>
</item>
<item>
<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>
</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="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">
</item>
<item>
<widget class="QSpinBox" name="sbHeight">
<property name="maximum">
<number>100000</number>
</property>
</widget>
</item>
</layout>
</widget>
<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>
<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">
<attribute name="title">