Make all CoreAccountSettingsPage config accessible via CoreAccountSettings

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 6f9961f..55df8c4 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -76,6 +76,22 @@ void CoreAccountSettings::setAutoConnectAccount(AccountId account) {
   setLocalValue("AutoConnectAccount", account.toInt());
 }
 
+bool CoreAccountSettings::autoConnectOnStartup() {
+  return localValue("AutoConnectOnStartup", false).toBool();
+}
+
+void CoreAccountSettings::setAutoConnectOnStartup(bool b) {
+  setLocalValue("AutoConnectOnStartup", b);
+}
+
+bool CoreAccountSettings::autoConnectToFixedAccount() {
+  return localValue("AutoConnectToFixedAccount", false).toBool();
+}
+
+void CoreAccountSettings::setAutoConnectToFixedAccount(bool b) {
+  setLocalValue("AutoConnectToFixedAccount", b);
+}
+
 void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap &data) {
   QString base = QString::number(id.toInt());
   foreach(const QString &key, data.keys()) {

diff --git a/src/client/clientsettings.h b/src/client/clientsettings.h
index 3ae810e..bf24410 100644 (file)
--- a/src/client/clientsettings.h
+++ b/src/client/clientsettings.h
@@ -59,6 +59,10 @@ public:
   void setLastAccount(AccountId);
   AccountId autoConnectAccount();
   void setAutoConnectAccount(AccountId);
+  bool autoConnectOnStartup();
+  void setAutoConnectOnStartup(bool);
+  bool autoConnectToFixedAccount();
+  void setAutoConnectToFixedAccount(bool);
 
   void storeAccountData(AccountId id, const QVariantMap &data);
   QVariantMap retrieveAccountData(AccountId);

diff --git a/src/qtui/settingspages/coreaccountsettingspage.cpp b/src/qtui/settingspages/coreaccountsettingspage.cpp
index cd488a3..72ac209 100644 (file)
--- a/src/qtui/settingspages/coreaccountsettingspage.cpp
+++ b/src/qtui/settingspages/coreaccountsettingspage.cpp
@@ -67,7 +67,7 @@ QVariant CoreAccountSettingsPage::loadAutoWidgetValue(const QString &widgetName)
   if(widgetName == "autoConnectAccount") {
     CoreAccountSettings s;
     AccountId id = s.autoConnectAccount();
-    if(id <= 0)
+    if(!id.isValid())
       return QVariant();
     ui.autoConnectAccount->setCurrentIndex(model()->accountIndex(id).row());
     return id.toInt();