diff options
author | Oliver Schwaneberg <oliver.schwaneberg@gmail.com> | 2018-02-10 23:28:05 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-03-02 08:38:22 -0800 |
commit | 0ca52f868ebe5def65153970061a1d6132ede3be (patch) | |
tree | 95d42be85b3cf4c67206b5b94b40dc07ef1f2446 /desktop-widgets/diveplanner.h | |
parent | afc9dd5f3836e7c9c75eab2435b7bd5e20a71bf9 (diff) | |
download | subsurface-0ca52f868ebe5def65153970061a1d6132ede3be.tar.gz |
Choose water presets from a qcombobox in planner, custom value possible
Add a combo box for water types with defaults for fresh water, sea water
and the EN 13319. All values taken from units.h, where EN 13319 was added
beforehand.
Custom values can be entered through a spinbox.
Also changed "Salinity" in TapDiveInformation.ui to "Water type".
Translation required!
Signed-off-by: Oliver Schwaneberg <oliver.schwaneberg@gmail.com>
Diffstat (limited to 'desktop-widgets/diveplanner.h')
-rw-r--r-- | desktop-widgets/diveplanner.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index 8f42dd21d..b7527f3c1 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -51,13 +51,15 @@ slots: void settingsChanged(); void atmPressureChanged(const int pressure); void heightChanged(const int height); - void salinityChanged(const double salinity); + void waterTypeChanged(const int index); + void customSalinityChanged(double density); void printDecoPlan(); void setSurfacePressure(int surface_pressure); void setSalinity(int salinity); private: Ui::DivePlanner ui; QAbstractButton *replanButton; + void waterTypeUpdateTexts(); }; #include "ui_plannerSettings.h" |