Switch over to CoreConnection

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

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 02a8c9c..6f9961f 100644 (file)
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,8 +20,16 @@
 
 #include <QStringList>
 
-#include "client.h"
+
 #include "clientsettings.h"
+
+#include <QHostAddress>
+#ifdef HAVE_SSL
+#include <QSslSocket>
+#endif
+
+
+#include "client.h"
 #include "quassel.h"
 
 ClientSettings::ClientSettings(QString g) : Settings(g, Quassel::buildInfo().clientApplicationName) {
@@ -32,15 +40,22 @@ ClientSettings::~ClientSettings() {
 
 /***********************************************************************************************/
 
-CoreAccountSettings::CoreAccountSettings(const QString &subgroup) : ClientSettings("CoreAccounts") {
-  _subgroup = subgroup;
+CoreAccountSettings::CoreAccountSettings(const QString &subgroup)
+  : ClientSettings("CoreAccounts"),
+    _subgroup(subgroup)
+{
+}
+
+void CoreAccountSettings::notify(const QString &key, QObject *receiver, const char *slot) {
+  ClientSettings::notify(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), receiver, slot);
 }
 
 QList<AccountId> CoreAccountSettings::knownAccounts() {
   QList<AccountId> ids;
-  foreach(QString key, localChildGroups()) {
+  foreach(const QString &key, localChildGroups()) {
     AccountId acc = key.toInt();
-    if(acc.isValid()) ids << acc;
+    if(acc.isValid())
+      ids << acc;
   }
   return ids;
 }
@@ -62,21 +77,56 @@ void CoreAccountSettings::setAutoConnectAccount(AccountId account) {
 }
 
 void CoreAccountSettings::storeAccountData(AccountId id, const QVariantMap &data) {
-  setLocalValue(QString("%1/Connection").arg(id.toInt()), data);
+  QString base = QString::number(id.toInt());
+  foreach(const QString &key, data.keys()) {
+    setLocalValue(base + "/" + key, data.value(key));
+  }
+
+  // FIXME Migration from 0.5 -> 0.6
+  removeLocalKey(QString("%1/Connection").arg(base));
 }
 
 QVariantMap CoreAccountSettings::retrieveAccountData(AccountId id) {
-  return localValue(QString("%1/Connection").arg(id.toInt()), QVariant()).toMap();
+  QVariantMap map;
+  QString base = QString::number(id.toInt());
+  foreach(const QString &key, localChildKeys(base)) {
+    map[key] = localValue(base + "/" + key);
+  }
+
+  // FIXME Migration from 0.5 -> 0.6
+  if(!map.contains("Uuid") && map.contains("Connection")) {
+    QVariantMap oldmap = map.value("Connection").toMap();
+    map["AccountName"] = oldmap.value("AccountName");
+    map["HostName"] = oldmap.value("Host");
+    map["Port"] = oldmap.value("Port");
+    map["User"] = oldmap.value("User");
+    map["Password"] = oldmap.value("Password");
+    map["StorePassword"] = oldmap.value("RememberPasswd");
+    map["UseSSL"] = oldmap.value("useSsl");
+    map["UseProxy"] = oldmap.value("useProxy");
+    map["ProxyHostName"] = oldmap.value("proxyHost");
+    map["ProxyPort"] = oldmap.value("proxyPort");
+    map["ProxyUser"] = oldmap.value("proxyUser");
+    map["ProxyPassword"] = oldmap.value("proxyPassword");
+    map["ProxyType"] = oldmap.value("proxyType");
+
+    map["AccountId"] = id.toInt();
+    map["Uuid"] = QUuid::createUuid().toString();
+  }
+
+  return map;
 }
 
 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);
+  if(!Client::currentCoreAccount().isValid())
+    return;
+  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);
+  if(!Client::currentCoreAccount().isValid())
+    return QVariant();
+  return localValue(QString("%1/%2/%3").arg(Client::currentCoreAccount().accountId().toInt()).arg(_subgroup).arg(key), def);
 }
 
 void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId> &keyMap) {
@@ -84,18 +134,18 @@ void CoreAccountSettings::setJumpKeyMap(const QHash<int, BufferId> &keyMap) {
   QHash<int, BufferId>::const_iterator mapIter = keyMap.constBegin();
   while(mapIter != keyMap.constEnd()) {
     variants[QString::number(mapIter.key())] = qVariantFromValue(mapIter.value());
-    mapIter++;
+    ++mapIter;
   }
-  setLocalValue("JumpKeyMap", variants);
+  setAccountValue("JumpKeyMap", variants);
 }
 
 QHash<int, BufferId> CoreAccountSettings::jumpKeyMap() {
   QHash<int, BufferId> keyMap;
-  QVariantMap variants = localValue("JumpKeyMap", QVariant()).toMap();
+  QVariantMap variants = accountValue("JumpKeyMap", QVariant()).toMap();
   QVariantMap::const_iterator mapIter = variants.constBegin();
   while(mapIter != variants.constEnd()) {
     keyMap[mapIter.key().toInt()] = mapIter.value().value<BufferId>();
-    mapIter++;
+    ++mapIter;
   }
   return keyMap;
 }
@@ -134,3 +184,96 @@ void NotificationSettings::setNicksCaseSensitive(bool cs) {
 bool NotificationSettings::nicksCaseSensitive() {
   return localValue("Highlights/NicksCaseSensitive", false).toBool();
 }
+
+
+// ========================================
+//  KnownHostsSettings
+// ========================================
+KnownHostsSettings::KnownHostsSettings()
+  : ClientSettings("KnownHosts")
+{
+}
+
+QByteArray KnownHostsSettings::knownDigest(const QHostAddress &address) {
+  return localValue(address.toString(), QByteArray()).toByteArray();
+}
+
+void KnownHostsSettings::saveKnownHost(const QHostAddress &address, const QByteArray &certDigest) {
+  setLocalValue(address.toString(), certDigest);
+}
+
+bool KnownHostsSettings::isKnownHost(const QHostAddress &address, const QByteArray &certDigest) {
+  return certDigest == localValue(address.toString(), QByteArray()).toByteArray();
+}
+
+#ifdef HAVE_SSL
+QByteArray KnownHostsSettings::knownDigest(const QSslSocket *socket) {
+  return knownDigest(socket->peerAddress());
+}
+
+void KnownHostsSettings::saveKnownHost(const QSslSocket *socket) {
+  Q_ASSERT(socket);
+  saveKnownHost(socket->peerAddress(), socket->peerCertificate().digest());
+}
+
+bool KnownHostsSettings::isKnownHost(const QSslSocket *socket) {
+  Q_ASSERT(socket);
+  return isKnownHost(socket->peerAddress(), socket->peerCertificate().digest());
+}
+#endif
+
+
+// ========================================
+//  TabCompletionSettings
+// ========================================
+
+TabCompletionSettings::TabCompletionSettings() : ClientSettings("TabCompletion") {
+}
+
+void TabCompletionSettings::setCompletionSuffix(const QString &suffix) {
+  setLocalValue("CompletionSuffix", suffix);
+}
+
+QString TabCompletionSettings::completionSuffix() {
+  return localValue("CompletionSuffix", ": ").toString();
+}
+
+void TabCompletionSettings::setSortMode(SortMode mode) {
+  setLocalValue("SortMode", mode);
+}
+
+TabCompletionSettings::SortMode TabCompletionSettings::sortMode() {
+  return static_cast<SortMode>(localValue("SortMode"), LastActivity);
+}
+
+void TabCompletionSettings::setCaseSensitivity(Qt::CaseSensitivity cs) {
+  setLocalValue("CaseSensitivity", cs);
+}
+
+Qt::CaseSensitivity TabCompletionSettings::caseSensitivity() {
+  return (Qt::CaseSensitivity)localValue("CaseSensitivity", Qt::CaseInsensitive).toInt();
+}
+
+void TabCompletionSettings::setUseLastSpokenTo(bool use) {
+  setLocalValue("UseLastSpokenTo", use);
+}
+
+bool TabCompletionSettings::useLastSpokenTo() {
+  return localValue("UseLastSpokenTo", false).toBool();
+}
+
+// ========================================
+//  ItemViewSettings
+// ========================================
+
+ItemViewSettings::ItemViewSettings(const QString &group) : ClientSettings(group) {
+
+}
+
+bool ItemViewSettings::displayTopicInTooltip() {
+  return localValue("DisplayTopicInTooltip", false).toBool();
+}
+
+bool ItemViewSettings::mouseWheelChangesBuffer() {
+  return localValue("MouseWheelChangesBuffer", false).toBool();
+}