summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar willemferguson <willemferguson@zoology.up.ac.za>2019-11-19 11:52:33 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-01-06 07:00:34 +0900
commit732d5a9fbd2b7d72610604a1b065ebbd9ea55960 (patch)
tree70e1dc0a231970cf646e595536adc14a375b775b /desktop-widgets
parent95a0a0f5a6038d5a73775e2060e29d09d0953d7e (diff)
downloadsubsurface-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 'desktop-widgets')
-rw-r--r--desktop-widgets/preferences/preferences_defaults.cpp1
-rw-r--r--desktop-widgets/preferences/preferences_log.cpp2
-rw-r--r--desktop-widgets/preferences/preferences_log.ui7
3 files changed, 10 insertions, 0 deletions
diff --git a/desktop-widgets/preferences/preferences_defaults.cpp b/desktop-widgets/preferences/preferences_defaults.cpp
index 98e33a2ff..ca1b51acb 100644
--- a/desktop-widgets/preferences/preferences_defaults.cpp
+++ b/desktop-widgets/preferences/preferences_defaults.cpp
@@ -27,6 +27,7 @@ void PreferencesDefaults::refreshSettings()
ui->font->setCurrentFont(qPrefDisplay::divelist_font());
ui->fontsize->setValue(qPrefDisplay::font_size());
ui->velocitySlider->setValue(qPrefDisplay::animation_speed());
+
}
void PreferencesDefaults::syncSettings()
diff --git a/desktop-widgets/preferences/preferences_log.cpp b/desktop-widgets/preferences/preferences_log.cpp
index 9025945e3..d9f33e6c7 100644
--- a/desktop-widgets/preferences/preferences_log.cpp
+++ b/desktop-widgets/preferences/preferences_log.cpp
@@ -70,6 +70,7 @@ void PreferencesLog::refreshSettings()
ui->show_average_depth->setChecked(prefs.show_average_depth);
ui->displayinvalid->setChecked(qPrefDisplay::display_invalid_dives());
ui->extraEnvironmentalDefault->setChecked(prefs.extraEnvironmentalDefault);
+ ui->salinityEditDefault->setChecked(prefs.salinityEditDefault);
}
void PreferencesLog::syncSettings()
@@ -87,4 +88,5 @@ void PreferencesLog::syncSettings()
qPrefLog::set_show_average_depth(ui->show_average_depth->isChecked());
qPrefDisplay::set_display_invalid_dives(ui->displayinvalid->isChecked());
qPrefLog::set_extraEnvironmentalDefault(ui->extraEnvironmentalDefault->isChecked());
+ qPrefLog::set_salinityEditDefault(ui->salinityEditDefault->isChecked());
}
diff --git a/desktop-widgets/preferences/preferences_log.ui b/desktop-widgets/preferences/preferences_log.ui
index 9d1214b92..1a5e33caf 100644
--- a/desktop-widgets/preferences/preferences_log.ui
+++ b/desktop-widgets/preferences/preferences_log.ui
@@ -130,6 +130,13 @@
</item>
<item>
+ <widget class="QCheckBox" name="salinityEditDefault">
+ <property name="text">
+ <string>In the Information tab, allow editing of water salinity</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>