actuall bugs fixed with this. :)
From 96f35379c3bde95bed2cd97ad196f688cbd21126 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Fri, 28 Oct 2016 11:43:26 +0200 Subject: [PATCH 1/4] Remember to look for the Group
Signed-off-by: Tomaz Canabrava <[email protected]> --- core/subsurface-qt/SettingsObjectWrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 0e8c8ee..7298f90 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1655,7 +1655,7 @@ void UnitsSettings::setUnitSystem(const QString& value) return; QSettings s; - + s.beginGroup(group); s.setValue("unit_system", value); if (value == QStringLiteral("metric")) { -- 2.10.1
From dad62c49a20a1d40aedcce01ce4b6bf35d462161 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Fri, 28 Oct 2016 11:51:13 +0200 Subject: [PATCH 2/4] Fix default file behavior tests. Signed-off-by: Tomaz Canabrava <[email protected]> --- core/subsurface-qt/SettingsObjectWrapper.cpp | 1 + tests/testpreferences.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 7298f90..7626bef 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1744,6 +1744,7 @@ void GeneralSettingsObjectWrapper::setDefaultFileBehavior(short value) QSettings s; s.beginGroup(group); s.setValue("default_file_behavior", value); + prefs.default_file_behavior = value; if (prefs.default_file_behavior == UNDEFINED_DEFAULT_FILE) { // undefined, so check if there's a filename set and diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp index 7ba2562..862ba61 100644 --- a/tests/testpreferences.cpp +++ b/tests/testpreferences.cpp @@ -451,9 +451,8 @@ void TestPreferences::testPreferences() auto general = pref->general_settings; general->setDefaultFilename ("filename"); general->setDefaultCylinder ("cylinder_2"); - //TODOl: Change this to a enum. + //TODOl: Change this to a enum. // This is 'undefined', it will need to figure out later between no_file or use_deault file. general->setDefaultFileBehavior (0); - general->setDefaultSetPoint (0); general->setO2Consumption (0); general->setPscrRatio (0); @@ -461,7 +460,7 @@ void TestPreferences::testPreferences() TEST(general->defaultFilename(), QStringLiteral("filename")); TEST(general->defaultCylinder(), QStringLiteral("cylinder_2")); - TEST(general->defaultFileBehavior(), (short)0); + TEST(general->defaultFileBehavior(), (short) LOCAL_DEFAULT_FILE); // since we have a default file, here it returns TEST(general->defaultSetPoint(), 0); TEST(general->o2Consumption(), 0); TEST(general->pscrRatio(), 0); @@ -470,7 +469,7 @@ void TestPreferences::testPreferences() general->setDefaultFilename ("no_file_name"); general->setDefaultCylinder ("cylinder_1"); //TODOl: Change this to a enum. - general->setDefaultFileBehavior (1); + general->setDefaultFileBehavior (CLOUD_DEFAULT_FILE); general->setDefaultSetPoint (1); general->setO2Consumption (1); @@ -479,7 +478,7 @@ void TestPreferences::testPreferences() TEST(general->defaultFilename(), QStringLiteral("no_file_name")); TEST(general->defaultCylinder(), QStringLiteral("cylinder_1")); - TEST(general->defaultFileBehavior(), (short) 1); + TEST(general->defaultFileBehavior(), (short) CLOUD_DEFAULT_FILE); TEST(general->defaultSetPoint(), 1); TEST(general->o2Consumption(), 1); TEST(general->pscrRatio(), 1); -- 2.10.1
From e43135ec1bde3cd016e95319927bf7a0aa4a89f1 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Fri, 28 Oct 2016 11:57:41 +0200 Subject: [PATCH 3/4] Load system Language Signed-off-by: Tomaz Canabrava <[email protected]> --- core/subsurface-qt/SettingsObjectWrapper.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 7626bef..538ad88 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -1864,6 +1864,7 @@ void DisplaySettingsObjectWrapper::setDisplayInvalidDives(short value) return; QSettings s; + s.beginGroup(group); s.setValue("displayinvalid", value); prefs.display_invalid_dives = value; emit displayInvalidDivesChanged(value); @@ -2291,6 +2292,10 @@ void SettingsObjectWrapper::load() prefs.update_manager.last_version_used = copy_string(qPrintable(s.value("LastVersionUsed").toString())); prefs.update_manager.next_check = copy_string(qPrintable(s.value("NextCheck").toString())); s.endGroup(); + + s.beginGroup("Language"); + prefs.locale.lang_locale = copy_string(qPrintable(s.value("UiLangLocale").toString())); + s.endGroup(); } void SettingsObjectWrapper::sync() -- 2.10.1
From 6b3858fb734a1f3805eedc388e45118de178f10a Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Fri, 28 Oct 2016 12:01:09 +0200 Subject: [PATCH 4/4] Correctly load the language based prefs. Signed-off-by: Tomaz Canabrava <[email protected]> --- core/subsurface-qt/SettingsObjectWrapper.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 538ad88..0cd0568 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -2295,6 +2295,9 @@ void SettingsObjectWrapper::load() s.beginGroup("Language"); prefs.locale.lang_locale = copy_string(qPrintable(s.value("UiLangLocale").toString())); + prefs.time_format = copy_string(qPrintable(s.value("time_format").toString())); + prefs.date_format = copy_string(qPrintable(s.value("date_format").toString())); + prefs.date_format_short = copy_string(qPrintable(s.value("date_format_short").toString())); s.endGroup(); } -- 2.10.1
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
