From 732d5a9fbd2b7d72610604a1b065ebbd9ea55960 Mon Sep 17 00:00:00 2001 From: willemferguson Date: Tue, 19 Nov 2019 11:52:33 +0200 Subject: 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 Signed-off-by: Dirk Hohndel --- desktop-widgets/preferences/preferences_defaults.cpp | 1 + desktop-widgets/preferences/preferences_log.cpp | 2 ++ desktop-widgets/preferences/preferences_log.ui | 7 +++++++ 3 files changed, 10 insertions(+) (limited to 'desktop-widgets') 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 @@ -129,6 +129,13 @@ + + + + In the Information tab, allow editing of water salinity + + + -- cgit v1.2.3-70-g09d2