Hi, here are two patches, the first fixed a typo of Tomaz’, the second greys out labels of settings not in use.
Best Robert
From 28bebc9abcd440f69f9bce87e218bcca4d2afff0 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" <[email protected]> Date: Wed, 2 Nov 2016 09:54:09 +0100 Subject: [PATCH 1/2] Actually turn on the vpmb radio button in VPM-B mode To: [email protected] this fixes a typo. Signed-off-by: Robert C. Helling <[email protected]> --- desktop-widgets/preferences/preferences_graph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp index 132db81..c236728 100644 --- a/desktop-widgets/preferences/preferences_graph.cpp +++ b/desktop-widgets/preferences/preferences_graph.cpp @@ -30,7 +30,7 @@ void PreferencesGraph::refreshSettings() ui->vpmb->setChecked(false); } else { ui->buehlmann->setChecked(false); - ui->vpmb->setChecked(false); + ui->vpmb->setChecked(true); } ui->gflow->setValue(prefs.gflow); -- 2.8.4 (Apple Git-73)
From b874ce30c1ddada89a819ec8b439eb767393a43d Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" <[email protected]> Date: Wed, 2 Nov 2016 10:00:51 +0100 Subject: [PATCH 2/2] Also grey out labels when not relevant for current deco mode To: [email protected] Signed-off-by: Robert C. Helling <[email protected]> --- desktop-widgets/preferences/preferences_graph.cpp | 3 +++ desktop-widgets/preferences/preferences_graph.ui | 30 +++++++++++------------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp index c236728..062f30a 100644 --- a/desktop-widgets/preferences/preferences_graph.cpp +++ b/desktop-widgets/preferences/preferences_graph.cpp @@ -88,8 +88,11 @@ void PreferencesGraph::on_buehlmann_toggled(bool buehlmann) { ui->gfhigh->setEnabled(buehlmann); ui->gflow->setEnabled(buehlmann); + ui->label_GFhigh->setEnabled(buehlmann); + ui->label_GFlow->setEnabled(buehlmann); ui->gf_low_at_maxdepth->setEnabled(buehlmann); ui->vpmb_conservatism->setEnabled(!buehlmann); + ui->label_VPMB->setEnabled(!buehlmann); } #undef DANGER_GF diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui index 4c41ec6..ee31c20 100644 --- a/desktop-widgets/preferences/preferences_graph.ui +++ b/desktop-widgets/preferences/preferences_graph.ui @@ -6,15 +6,15 @@ <rect> <x>0</x> <y>0</y> - <width>505</width> - <height>575</height> + <width>650</width> + <height>578</height> </rect> </property> <property name="windowTitle"> <string>Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> - <item> // Gas pressure options + <item> <widget class="QGroupBox" name="groupBox_4"> <property name="title"> <string>Gas pressure display setup</string> @@ -130,14 +130,14 @@ </property> </widget> </item> - <item row="5" column="1" colspan="2"> // row was 8 + <item row="5" column="1" colspan="2"> <widget class="QCheckBox" name="show_ccr_setpoint"> <property name="text"> <string>Show setpoints when viewing pOâ</string> </property> </widget> </item> - <item row="6" column="1" colspan="2"> // row was 9 + <item row="6" column="1" colspan="2"> <widget class="QCheckBox" name="show_ccr_sensors"> <property name="text"> <string>Show individual Oâ sensor values when viewing pOâ</string> @@ -147,7 +147,7 @@ </layout> </widget> </item> - <item> // Ceiling options + <item> <widget class="QGroupBox" name="groupBox_5"> <property name="title"> <string>Ceiling display setup</string> @@ -181,11 +181,11 @@ </widget> </item> <item row="2" column="1"> - <widget class="QLabel" name="label_21"> + <widget class="QLabel" name="label_VPMB"> <property name="text"> <string>VPM-B Conservatism</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> @@ -214,11 +214,11 @@ </widget> </item> <item row="3" column="3"> - <widget class="QLabel" name="label_20"> + <widget class="QLabel" name="label_GFhigh"> <property name="text"> <string>GFHigh</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> @@ -234,11 +234,11 @@ </widget> </item> <item row="3" column="1"> - <widget class="QLabel" name="label_19"> + <widget class="QLabel" name="label_GFlow"> <property name="text"> <string>GFLow</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> @@ -272,7 +272,7 @@ <property name="text"> <string>Metabolic rate (â Oâ/min)</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> @@ -289,7 +289,7 @@ <property name="text"> <string>Dilution ratio</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignCenter</set> </property> </widget> @@ -307,7 +307,7 @@ </layout> </widget> </item> - <item> // Misc group + <item> <widget class="QGroupBox" name="groupBox_6"> <property name="title"> <string>Misc</string> -- 2.8.4 (Apple Git-73)
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
