Make custom highlights work again

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

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 8410350..02a8c9c 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -18,86 +18,119 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "client.h"
-#include "clientsettings.h"
-#include "global.h"
-
 #include <QStringList>
 
-ClientSettings::ClientSettings(QString g) : Settings(g, Global::clientApplicationName) {
-
+#include "client.h"
+#include "clientsettings.h"
+#include "quassel.h"
 
+ClientSettings::ClientSettings(QString g) : Settings(g, Quassel::buildInfo().clientApplicationName) {
 }
 
 ClientSettings::~ClientSettings() {
+}
 
+/***********************************************************************************************/
 
+CoreAccountSettings::CoreAccountSettings(const QString &subgroup) : ClientSettings("CoreAccounts") {
+  _subgroup = subgroup;
 }
 
-QStringList ClientSettings::sessionKeys() {
-  return Client::sessionDataKeys();
+QList<AccountId> CoreAccountSettings::knownAccounts() {
+  QList<AccountId> ids;
+  foreach(QString key, localChildGroups()) {
+    AccountId acc = key.toInt();
+    if(acc.isValid()) ids << acc;
+  }
+  return ids;
 }
 
-void ClientSettings::setSessionValue(const QString &key, const QVariant &data) {
-  Client::storeSessionData(key, data);
+AccountId CoreAccountSettings::lastAccount() {
+  return localValue("LastAccount", 0).toInt();
 }
 
-QVariant ClientSettings::sessionValue(const QString &key, const QVariant &def) {
-  return Client::retrieveSessionData(key, def);
+void CoreAccountSettings::setLastAccount(AccountId account) {
+  setLocalValue("LastAccount", account.toInt());
 }
 
-/***********************************************************************************************/
+AccountId CoreAccountSettings::autoConnectAccount() {
+  return localValue("AutoConnectAccount", 0).toInt();
+}
 
-CoreAccountSettings::CoreAccountSettings() : ClientSettings("CoreAccounts") {
+void CoreAccountSettings::setAutoConnectAccount(AccountId account) {
+  setLocalValue("AutoConnectAccount", account.toInt());
+}
 
+void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap &data) {
+  setLocalValue(QString("%1/Connection").arg(id.toInt()), data);
+}
 
+QVariantMap CoreAccountSettings::retrieveAccountData(AccountId id) {
+  return localValue(QString("%1/Connection").arg(id.toInt()), QVariant()).toMap();
 }
 
-QStringList CoreAccountSettings::knownAccounts() {
-  return localChildKeys("Accounts");
+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);
 }
 
-QString CoreAccountSettings::lastAccount() {
-  return localValue("LastAccount", "").toString();
+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);
 }
 
-void CoreAccountSettings::setLastAccount(const QString &account) {
-  setLocalValue("LastAccount", account);
+void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId> &keyMap) {
+  QVariantMap variants;
+  QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
+  while(mapIter != keyMap.constEnd()) {
+    variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
+    mapIter++;
+  }
+  setLocalValue("JumpKeyMap", variants);
 }
 
-QString CoreAccountSettings::autoConnectAccount() {
-  return localValue("AutoConnectAccount", "").toString();
+QHash<int, BufferId> CoreAccountSettings::jumpKeyMap() {
+  QHash<int, BufferId> keyMap;
+  QVariantMap variants = localValue("JumpKeyMap", QVariant()).toMap();
+  QVariantMap::const_iterator mapIter = variants.constBegin();
+  while(mapIter != variants.constEnd()) {
+    keyMap[mapIter.key().toInt()] = mapIter.value().value<BufferId>();
+    mapIter++;
+  }
+  return keyMap;
 }
 
-void CoreAccountSettings::setAutoConnectAccount(const QString &account) {
-  setLocalValue("AutoConnectAccount", account);
+void CoreAccountSettings::removeAccount(AccountId id) {
+  removeLocalKey(QString("%1").arg(id.toInt()));
 }
 
-void CoreAccountSettings::storeAccount(const QString name, const QVariantMap &data) {
-  setLocalValue(QString("Accounts/%2").arg(name), data);
+
+/***********************************************************************************************/
+// NotificationSettings:
+
+NotificationSettings::NotificationSettings() : ClientSettings("Notification") {
 }
 
-QVariantMap CoreAccountSettings::retrieveAccount(const QString &name) {
-  return localValue(QString("Accounts/%2").arg(name), QVariant()).toMap();
+void NotificationSettings::setHighlightList(const QVariantList &highlightList) {
+  setLocalValue("Highlights/CustomList", highlightList);
 }
 
-void CoreAccountSettings::storeAllAccounts(const QHash<QString, QVariantMap> accounts) {
-  removeLocalKey(QString("Accounts"));
-  foreach(QString name, accounts.keys()) {
-    storeAccount(name, accounts[name]);
-  }
+QVariantList NotificationSettings::highlightList() {
+  return localValue("Highlights/CustomList").toList();
 }
 
-QHash<QString, QVariantMap> CoreAccountSettings::retrieveAllAccounts() {
-  QHash<QString, QVariantMap> accounts;
-  foreach(QString name, knownAccounts()) {
-    accounts[name] = retrieveAccount(name);
-  }
-  return accounts;
+void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
+  setLocalValue("Highlights/HighlightNick", highlightNickType);
 }
 
-void CoreAccountSettings::removeAccount(const QString &account) {
-  removeLocalKey(QString("Accounts/%1").arg(account));
+NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
+  return (NotificationSettings::HighlightNickType) localValue("Highlights/HighlightNick", CurrentNick).toInt();
 }
 
+void NotificationSettings::setNicksCaseSensitive(bool cs) {
+  setLocalValue("Highlights/NicksCaseSensitive", cs);
+}
 
+bool NotificationSettings::nicksCaseSensitive() {
+  return localValue("Highlights/NicksCaseSensitive", false).toBool();
+}