aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2016-11-02 10:00:51 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-11-02 05:06:20 -0700
commitc25ca184ec4c60f93bdec98c0f6c1b3113cf1f8d (patch)
tree2b5dd0e5c12e78587633eaf800578fc3c8daf327
parentf01033f6a06351dca2b59316905fa40102f2c065 (diff)
downloadsubsurface-c25ca184ec4c60f93bdec98c0f6c1b3113cf1f8d.tar.gz
Also grey out labels when not relevant for current deco mode
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--desktop-widgets/preferences/preferences_graph.cpp3
-rw-r--r--desktop-widgets/preferences/preferences_graph.ui30
2 files changed, 18 insertions, 15 deletions
diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp
index c236728a6..062f30a6f 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 a0117170f..3e175b985 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>
@@ -127,14 +127,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>
@@ -144,7 +144,7 @@
</layout>
</widget>
</item>
- <item> // Ceiling options
+ <item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Ceiling display setup</string>
@@ -178,11 +178,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>
@@ -211,11 +211,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>
@@ -231,11 +231,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>
@@ -269,7 +269,7 @@
<property name="text">
<string>Metabolic rate (ℓ O₂/min)</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
@@ -286,7 +286,7 @@
<property name="text">
<string>Dilution ratio</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
@@ -304,7 +304,7 @@
</layout>
</widget>
</item>
- <item> // Misc group
+ <item>
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>Misc</string>