diff options
author | Robert C. Helling <helling@atdotde.de> | 2015-01-11 00:01:15 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-01-10 17:27:25 -0800 |
commit | e219bc70f863eaaa9b81ba5abc240975a128c904 (patch) | |
tree | 682d6d981929420bbabd0021e02db3006c72d96f /qt-ui/preferences.ui | |
parent | bfe05b43407c419a32548af20f40e2b9e3bca045 (diff) | |
download | subsurface-e219bc70f863eaaa9b81ba5abc240975a128c904.tar.gz |
Refactor dctype -> divemode
... and repair a failed rebase (sorry).
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/preferences.ui')
-rw-r--r-- | qt-ui/preferences.ui | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index 65075b062..2572990fa 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>924</width> - <height>742</height> + <width>940</width> + <height>756</height> </rect> </property> <property name="windowTitle"> @@ -748,14 +748,14 @@ <string>Misc</string> </property> <layout class="QFormLayout" name="formLayout_3"> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="label_19"> <property name="text"> <string>GFLow</string> </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QSpinBox" name="gflow"> <property name="minimum"> <number>1</number> @@ -765,14 +765,14 @@ </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QLabel" name="label_20"> <property name="text"> <string>GFHigh</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QSpinBox" name="gfhigh"> <property name="minimum"> <number>1</number> @@ -782,28 +782,21 @@ </property> </widget> </item> - <item row="3" column="0" colspan="2"> + <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="3" column="0" colspan="2"> - <widget class="QCheckBox" name="show_ccr_setpoint"> - <property name="text"> - <string>CCR: Show setpoints when viewing pO₂</string> - </property> - </widget> - </item> - <item row="4" column="0"> + <item row="6" column="0"> <widget class="QLabel" name="label_26"> <property name="text"> <string>Default CCR set-point</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="6" column="1"> <widget class="QDoubleSpinBox" name="defaultSetpoint"> <property name="suffix"> <string>bar</string> @@ -819,6 +812,13 @@ </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> </layout> </widget> </item> @@ -1413,11 +1413,11 @@ </connections> <buttongroups> <buttongroup name="verticalSpeed"/> + <buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup_2"/> <buttongroup name="buttonGroup_3"/> <buttongroup name="buttonGroup_4"/> <buttongroup name="buttonGroup_5"/> - <buttongroup name="buttonGroup"/> <buttongroup name="buttonGroup_6"/> </buttongroups> </ui> |