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>

1 files changed, 4 insertions, 0 deletions

diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.h b/desktop-widgets/tab-widgets/TabDiveInformation.h
index e851fe2d3..0ff142f76 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.h
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.h
@@ -28,12 +28,16 @@ private slots:
 	void on_chill_valueChanged(int value);
 	void on_airtemp_editingFinished();
 	void on_watertemp_editingFinished();
+	void on_waterTypeCombo_activated(int index);
 private:
 	Ui::TabDiveInformation *ui;
 	void updateProfile();
 	void updateSalinity();
+	int updateSalinityComboIndex(int salinity);
+	void checkDcSalinityOverWritten();
 	void updateWhen();
 	int pressTypeIndex;
+	void updateWaterTypeWidget();
 	void updateTextBox(int event);
 	void updateMode(struct dive *d);
 	void divesEdited(int);