Also show error messages in the status bar

[quassel.git] / src / client / clientsettings.cpp

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 664ee4c..55df8c4 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -47,7 +47,7 @@ CoreAccountSettings::CoreAccountSettings(const QString &subgroup)
 }
 
 void CoreAccountSettings::notify(const QString &key, QObject *receiver, const char *slot) {
-  ClientSettings::notify(QString("%1/%2/%3").arg(Client::currentCoreAccount().toInt()).arg(_subgroup).arg(key), receiver, slot);
+  ClientSettings::notify(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), receiver, slot);
 }
 
 QList<AccountId> CoreAccountSettings::knownAccounts() {
@@ -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()) {
@@ -120,13 +136,13 @@ QVariantMap CoreAccountSettings::retrieveAccountData(AccountId id) {
 void CoreAccountSettings::setAccountValue(const QString &key, const QVariant &value) {
   if(!Client::currentCoreAccount().isValid())
     return;
-  setLocalValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().toInt()).arg(_subgroup).arg(key), value);
+  setLocalValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), value);
 }
 
 QVariant CoreAccountSettings::accountValue(const QString &key, const QVariant &def) {
   if(!Client::currentCoreAccount().isValid())
     return QVariant();
-  return localValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().toInt()).arg(_subgroup).arg(key), def);
+  return localValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), def);
 }
 
 void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId> &keyMap) {