From 81d5d82b7bfb1a7a1cfe44b8d33befe9b31a2099 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 10 Aug 2016 13:27:03 -0300 Subject: Settings update: Clean up save user id local So, prefs.save_userid_local is being set outside of a preferences set (it's set to true and false while loading the files via xml or git) and because of that I had to bypass a few method calls. When something triggers a preferences change, the application will be notified that the preferences changed, thing that I couldn't do while reading the xml or git because that should be local-only. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/preferences/preferences_network.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index 7d89d4496..5d7f70665 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -4,7 +4,7 @@ #include "subsurfacewebservices.h" #include "core/prefs-macros.h" #include "core/cloudstorage.h" - +#include "core/subsurface-qt/SettingsObjectWrapper.h" #include #include @@ -29,8 +29,6 @@ PreferencesNetwork::~PreferencesNetwork() void PreferencesNetwork::refreshSettings() { - QSettings s; - ui->proxyHost->setText(prefs.proxy_host); ui->proxyPort->setValue(prefs.proxy_port); ui->proxyAuthRequired->setChecked(prefs.proxy_auth); @@ -42,17 +40,19 @@ void PreferencesNetwork::refreshSettings() ui->save_password_local->setChecked(prefs.save_password_local); ui->cloud_background_sync->setChecked(prefs.cloud_background_sync); ui->save_uid_local->setChecked(prefs.save_userid_local); - ui->default_uid->setText(s.value("subsurface_webservice_uid").toString().toUpper()); - + ui->default_uid->setText(QString(prefs.userid).toUpper()); cloudPinNeeded(); } void PreferencesNetwork::syncSettings() { - QSettings s; - s.setValue("subsurface_webservice_uid", ui->default_uid->text().toUpper()); - set_save_userid_local(ui->save_uid_local->checkState()); + auto cloud = SettingsObjectWrapper::instance()->cloud_storage; + auto proxy = SettingsObjectWrapper::instance()->proxy; + + cloud->setUserId(ui->default_uid->text().toUpper()); + cloud->setSaveUserIdLocal(ui->save_uid_local->checkState()); + QSettings s; s.beginGroup("Network"); s.setValue("proxy_type", ui->proxyType->itemData(ui->proxyType->currentIndex()).toInt()); s.setValue("proxy_host", ui->proxyHost->text()); -- cgit v1.2.3-70-g09d2