aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets/tab-widgets/TabDiveInformation.ui
diff options
context:
space:
mode:
authorGravatar willemferguson <willemferguson@zoology.up.ac.za>2019-11-19 12:27:18 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-01-06 07:00:34 +0900
commitebabbfb457184ea4d9e939ad8501986c35699264 (patch)
tree6401f0659631c5101df5996c8af0393ea78b5d9e /desktop-widgets/tab-widgets/TabDiveInformation.ui
parent732d5a9fbd2b7d72610604a1b065ebbd9ea55960 (diff)
downloadsubsurface-ebabbfb457184ea4d9e939ad8501986c35699264.tar.gz
desktop UI: create the UI components for editing the salinity.
The user may modify the salinity by selecting a water type from the combobox. The new datum does not replace the existing salinity value but is stored in a separate variable within the dive structure. If the dc-based salinity is overwritten, there is an exclamation mark next to the modified salinity value to indicate that the salinity has been overwritten. The dc-derived salinity can always be recovered by selecting the "use dc" option in the combobox. Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets/tab-widgets/TabDiveInformation.ui')
-rw-r--r--desktop-widgets/tab-widgets/TabDiveInformation.ui17
1 files changed, 9 insertions, 8 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.ui b/desktop-widgets/tab-widgets/TabDiveInformation.ui
index 5a81d7395..2990e6dfc 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.ui
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.ui
@@ -445,15 +445,17 @@
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="diveInfoWaterDensityLayout">
-
<item>
- <widget class="QLabel" name="waterTypeText">
- <property name="text">
- <string>EN13319</string>
- </property>
- </widget>
+ <widget class="QLabel" name="waterTypeText">
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="waterTypeCombo"/>
+ </item>
+ <item>
+ <widget class="QLabel" name="salinityOverWrittenIcon">
+ </widget>
</item>
-
<item>
<widget class="QLabel" name="salinityText">
<property name="alignment">
@@ -461,7 +463,6 @@
</property>
</widget>
</item>
-
</layout>
</widget>
</item>