[PATCH] Restructure preferences UI
Joakim Bygdell
j.bygdell at gmail.com
Sat Oct 3 08:44:07 PDT 2015
Change the layout of the UI for improved clarity.
Fixes #922
Signed-off-by: Joakim Bygdell <j.bygdell at gmail.com>
---
qt-ui/preferences.ui | 544 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 398 insertions(+), 146 deletions(-)
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 403e521..c612e36 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -19,7 +19,16 @@
</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -164,7 +173,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>5</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="defaults_page">
<property name="sizePolicy">
@@ -177,7 +186,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -186,7 +204,16 @@
<string>Lists and tables</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11">
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -224,7 +251,16 @@
<property name="verticalSpacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item row="0" column="0">
@@ -328,7 +364,16 @@
<property name="verticalSpacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item row="0" column="0">
@@ -354,7 +399,16 @@
<string>Animations</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -393,7 +447,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -432,7 +495,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -733,7 +805,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -879,137 +960,263 @@
</item>
<item>
<widget class="QGroupBox" name="groupBox_5">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="title">
<string>Misc</string>
</property>
- <layout class="QFormLayout" name="formLayout_3">
- <item row="1" column="0">
- <widget class="QLabel" name="label_19">
- <property name="text">
- <string>GFLow</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="gflow">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>150</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_20">
- <property name="text">
- <string>GFHigh</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="gfhigh">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="maximum">
- <number>150</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QCheckBox" name="gf_low_at_maxdepth">
- <property name="text">
- <string>GFLow at max depth</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QCheckBox" name="show_ccr_setpoint">
- <property name="text">
- <string>CCR: show setpoints when viewing pO₂</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QCheckBox" name="show_ccr_sensors">
- <property name="text">
- <string>CCR: show individual O₂ sensor values when viewing pO₂</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0">
- <widget class="QLabel" name="label_26">
- <property name="text">
- <string>Default CCR set-point for dive planning</string>
- </property>
- </widget>
- </item>
- <item row="7" column="1">
- <widget class="QDoubleSpinBox" name="defaultSetpoint">
- <property name="suffix">
- <string>bar</string>
- </property>
- <property name="decimals">
- <number>2</number>
- </property>
- <property name="maximum">
- <double>10.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QLabel" name="pSCR">
- <property name="text">
- <string>pSCR O₂ metabolism rate</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0">
- <widget class="QLabel" name="label_28">
- <property name="text">
- <string>pSCR ratio</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QDoubleSpinBox" name="psro2rate">
- <property name="suffix">
- <string>ℓ/min</string>
- </property>
- <property name="decimals">
- <number>3</number>
- </property>
- </widget>
- </item>
- <item row="9" column="1">
- <widget class="QSpinBox" name="pscrfactor">
- <property name="suffix">
- <string/>
- </property>
- <property name="prefix">
- <string>1:</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
+ <property name="flat">
+ <bool>false</bool>
</property>
- </spacer>
+ <widget class="QGroupBox" name="groupBox_13">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>20</y>
+ <width>220</width>
+ <height>121</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>GF defaults</string>
+ </property>
+ <widget class="QLabel" name="label_19">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>50</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>GFLow</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_20">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>50</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>GFHigh</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="gflow">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>30</y>
+ <width>51</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>150</number>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="gfhigh">
+ <property name="geometry">
+ <rect>
+ <x>140</x>
+ <y>60</y>
+ <width>51</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>150</number>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="gf_low_at_maxdepth">
+ <property name="geometry">
+ <rect>
+ <x>9</x>
+ <y>90</y>
+ <width>150</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>GFLow at max depth</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_14">
+ <property name="geometry">
+ <rect>
+ <x>400</x>
+ <y>20</y>
+ <width>444</width>
+ <height>121</height>
+ </rect>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="title">
+ <string>CCR defaults</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ <widget class="QCheckBox" name="show_ccr_setpoint">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>270</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>CCR: show setpoints when viewing pO₂</string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" name="show_ccr_sensors">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>379</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>CCR: show individual O₂ sensor values when viewing pO₂</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_26">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>90</y>
+ <width>242</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Default CCR set-point for dive planning</string>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="defaultSetpoint">
+ <property name="geometry">
+ <rect>
+ <x>340</x>
+ <y>90</y>
+ <width>100</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="suffix">
+ <string>bar</string>
+ </property>
+ <property name="decimals">
+ <number>2</number>
+ </property>
+ <property name="maximum">
+ <double>10.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_15">
+ <property name="geometry">
+ <rect>
+ <x>400</x>
+ <y>150</y>
+ <width>444</width>
+ <height>91</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>pSCr defaults</string>
+ </property>
+ <widget class="QLabel" name="label_28">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>30</y>
+ <width>68</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>pSCR ratio</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="pSCR">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>60</y>
+ <width>159</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>pSCR O₂ metabolism rate</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox" name="pscrfactor">
+ <property name="geometry">
+ <rect>
+ <x>340</x>
+ <y>30</y>
+ <width>101</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="suffix">
+ <string/>
+ </property>
+ <property name="prefix">
+ <string>1:</string>
+ </property>
+ </widget>
+ <widget class="QDoubleSpinBox" name="psro2rate">
+ <property name="geometry">
+ <rect>
+ <x>340</x>
+ <y>60</y>
+ <width>100</width>
+ <height>20</height>
+ </rect>
+ </property>
+ <property name="suffix">
+ <string>ℓ/min</string>
+ </property>
+ <property name="decimals">
+ <number>2</number>
+ </property>
+ </widget>
+ </widget>
+ </widget>
</item>
</layout>
</widget>
@@ -1027,7 +1234,16 @@
<property name="sizeConstraint">
<enum>QLayout::SetNoConstraint</enum>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -1111,7 +1327,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -1333,7 +1558,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -1382,7 +1616,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -1429,7 +1672,16 @@
<property name="spacing">
<number>5</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
<number>5</number>
</property>
<item>
@@ -1892,14 +2144,14 @@
</connection>
</connections>
<buttongroups>
+ <buttongroup name="buttonGroup_5"/>
+ <buttongroup name="buttonGroup_6"/>
+ <buttongroup name="defaultFileGroup"/>
+ <buttongroup name="buttonGroup_7"/>
<buttongroup name="verticalSpeed"/>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup_3"/>
<buttongroup name="buttonGroup_4"/>
- <buttongroup name="defaultFileGroup"/>
- <buttongroup name="buttonGroup_5"/>
- <buttongroup name="buttonGroup_6"/>
- <buttongroup name="buttonGroup_7"/>
<buttongroup name="buttonGroup"/>
</buttongroups>
</ui>
--
2.3.8 (Apple Git-58)
More information about the subsurface
mailing list