diff options
author | willemferguson <willemferguson@zoology.up.ac.za> | 2019-11-19 11:52:33 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-01-06 07:00:34 +0900 |
commit | 732d5a9fbd2b7d72610604a1b065ebbd9ea55960 (patch) | |
tree | 70e1dc0a231970cf646e595536adc14a375b775b /core/settings | |
parent | 95a0a0f5a6038d5a73775e2060e29d09d0953d7e (diff) | |
download | subsurface-732d5a9fbd2b7d72610604a1b065ebbd9ea55960.tar.gz |
desktop UI: add preference for making salinity editable
Create a checkbox in the Preferences: General screen that enables or disables
editing of the salinity data. This preference is saved with all the other
preferences.
Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/settings')
-rw-r--r-- | core/settings/qPrefLog.cpp | 3 | ||||
-rw-r--r-- | core/settings/qPrefLog.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/settings/qPrefLog.cpp b/core/settings/qPrefLog.cpp index c35abe252..97d400e3c 100644 --- a/core/settings/qPrefLog.cpp +++ b/core/settings/qPrefLog.cpp @@ -16,6 +16,7 @@ void qPrefLog::loadSync(bool doSync) disk_default_file_behavior(doSync); disk_use_default_file(doSync); disk_extraEnvironmentalDefault(doSync); + disk_salinityEditDefault(doSync); disk_show_average_depth(doSync); } @@ -54,5 +55,7 @@ HANDLE_PREFERENCE_BOOL(Log, "extraEnvironmentalDefault", extraEnvironmentalDefau HANDLE_PREFERENCE_BOOL(Log, "use_default_file", use_default_file); +HANDLE_PREFERENCE_BOOL(Log, "salinityEditDefault", salinityEditDefault); + HANDLE_PREFERENCE_BOOL(Log, "show_average_depth", show_average_depth); diff --git a/core/settings/qPrefLog.h b/core/settings/qPrefLog.h index ee40bc9e7..943e43e80 100644 --- a/core/settings/qPrefLog.h +++ b/core/settings/qPrefLog.h @@ -11,9 +11,9 @@ class qPrefLog : public QObject { Q_PROPERTY(enum def_file_behavior default_file_behavior READ default_file_behavior WRITE set_default_file_behavior NOTIFY default_file_behaviorChanged) Q_PROPERTY(bool use_default_file READ use_default_file WRITE set_use_default_file NOTIFY use_default_fileChanged) Q_PROPERTY(bool extraEnvironmentalDefault READ extraEnvironmentalDefault WRITE set_extraEnvironmentalDefault NOTIFY extraEnvironmentalDefaultChanged); + Q_PROPERTY(bool salinityEditDefault READ salinityEditDefault WRITE set_salinityEditDefault NOTIFY salinityEditDefaultChanged); Q_PROPERTY(bool show_average_depth READ show_average_depth WRITE set_show_average_depth NOTIFY show_average_depthChanged) - public: static qPrefLog *instance(); @@ -27,6 +27,7 @@ public: static enum def_file_behavior default_file_behavior() { return prefs.default_file_behavior; } static bool use_default_file() { return prefs.use_default_file; } static bool extraEnvironmentalDefault() { return prefs.extraEnvironmentalDefault; } + static bool salinityEditDefault() { return prefs.salinityEditDefault; } static bool show_average_depth() { return prefs.show_average_depth; } public slots: @@ -34,6 +35,7 @@ public slots: static void set_default_file_behavior(enum def_file_behavior value); static void set_use_default_file(bool value); static void set_extraEnvironmentalDefault(bool value); + static void set_salinityEditDefault(bool value); static void set_show_average_depth(bool value); signals: @@ -41,6 +43,7 @@ signals: void default_file_behaviorChanged(enum def_file_behavior value); void use_default_fileChanged(bool value); void extraEnvironmentalDefaultChanged(bool value); + void salinityEditDefaultChanged(bool value); void show_average_depthChanged(bool value); private: @@ -50,6 +53,7 @@ private: static void disk_default_file_behavior(bool doSync); static void disk_use_default_file(bool doSync); static void disk_extraEnvironmentalDefault(bool doSync); + static void disk_salinityEditDefault(bool doSync); static void disk_show_average_depth(bool doSync); }; |