X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsettings.cpp;h=0b77903755340e2df7657ead8495d86c3f5ea4cc;hp=42c26cd5f6ffab387cc3107e6fb0488ddbb2f539;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=0f87a72d470196f5781053927d9b91e52cc363f2

diff --git a/src/client/clientsettings.cpp b/src/client/clientsettings.cpp
index 42c26cd5..0b779037 100644
--- a/src/client/clientsettings.cpp
+++ b/src/client/clientsettings.cpp
@@ -176,72 +176,76 @@ void CoreAccountSettings::clearAccounts() {
 }
 
 /***********************************************************************************************/
-// NotificationSettings:
+// CoreConnectionSettings:
 
-NotificationSettings::NotificationSettings() : ClientSettings("Notification") {
-}
+CoreConnectionSettings::CoreConnectionSettings() : ClientSettings("CoreConnection") {}
 
-void NotificationSettings::setHighlightList(const QVariantList &highlightList) {
-  setLocalValue("Highlights/CustomList", highlightList);
+void CoreConnectionSettings::setNetworkDetectionMode(NetworkDetectionMode mode) {
+  setLocalValue("NetworkDetectionMode", mode);
 }
 
-QVariantList NotificationSettings::highlightList() {
-  return localValue("Highlights/CustomList").toList();
+CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettings::networkDetectionMode() {
+#ifdef HAVE_KDE
+  NetworkDetectionMode def = UseSolid;
+#else
+  NetworkDetectionMode def = UsePingTimeout;
+#endif
+  return (NetworkDetectionMode)localValue("NetworkDetectionMode", def).toInt();
 }
 
-void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
-  setLocalValue("Highlights/HighlightNick", highlightNickType);
+void CoreConnectionSettings::setAutoReconnect(bool autoReconnect) {
+  setLocalValue("AutoReconnect", autoReconnect);
 }
 
-NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
-  return (NotificationSettings::HighlightNickType) localValue("Highlights/HighlightNick", CurrentNick).toInt();
+bool CoreConnectionSettings::autoReconnect() {
+  return localValue("AutoReconnect", true).toBool();
 }
 
-void NotificationSettings::setNicksCaseSensitive(bool cs) {
-  setLocalValue("Highlights/NicksCaseSensitive", cs);
+void CoreConnectionSettings::setPingTimeoutInterval(int interval) {
+  setLocalValue("PingTimeoutInterval", interval);
 }
 
-bool NotificationSettings::nicksCaseSensitive() {
-  return localValue("Highlights/NicksCaseSensitive", false).toBool();
+int CoreConnectionSettings::pingTimeoutInterval() {
+  return localValue("PingTimeoutInterval", 60).toInt();
 }
 
+void CoreConnectionSettings::setReconnectInterval(int interval) {
+  setLocalValue("ReconnectInterval", interval);
+}
 
-// ========================================
-//  KnownHostsSettings
-// ========================================
-KnownHostsSettings::KnownHostsSettings()
-  : ClientSettings("KnownHosts")
-{
+int CoreConnectionSettings::reconnectInterval() {
+  return localValue("ReconnectInterval", 60).toInt();
 }
 
-QByteArray KnownHostsSettings::knownDigest(const QHostAddress &address) {
-  return localValue(address.toString(), QByteArray()).toByteArray();
+/***********************************************************************************************/
+// NotificationSettings:
+
+NotificationSettings::NotificationSettings() : ClientSettings("Notification") {
 }
 
-void KnownHostsSettings::saveKnownHost(const QHostAddress &address, const QByteArray &certDigest) {
-  setLocalValue(address.toString(), certDigest);
+void NotificationSettings::setHighlightList(const QVariantList &highlightList) {
+  setLocalValue("Highlights/CustomList", highlightList);
 }
 
-bool KnownHostsSettings::isKnownHost(const QHostAddress &address, const QByteArray &certDigest) {
-  return certDigest == localValue(address.toString(), QByteArray()).toByteArray();
+QVariantList NotificationSettings::highlightList() {
+  return localValue("Highlights/CustomList").toList();
 }
 
-#ifdef HAVE_SSL
-QByteArray KnownHostsSettings::knownDigest(const QSslSocket *socket) {
-  return knownDigest(socket->peerAddress());
+void NotificationSettings::setHighlightNick(NotificationSettings::HighlightNickType highlightNickType) {
+  setLocalValue("Highlights/HighlightNick", highlightNickType);
 }
 
-void KnownHostsSettings::saveKnownHost(const QSslSocket *socket) {
-  Q_ASSERT(socket);
-  saveKnownHost(socket->peerAddress(), socket->peerCertificate().digest());
+NotificationSettings::HighlightNickType NotificationSettings::highlightNick() {
+  return (NotificationSettings::HighlightNickType) localValue("Highlights/HighlightNick", CurrentNick).toInt();
 }
 
-bool KnownHostsSettings::isKnownHost(const QSslSocket *socket) {
-  Q_ASSERT(socket);
-  return isKnownHost(socket->peerAddress(), socket->peerCertificate().digest());
+void NotificationSettings::setNicksCaseSensitive(bool cs) {
+  setLocalValue("Highlights/NicksCaseSensitive", cs);
 }
-#endif
 
+bool NotificationSettings::nicksCaseSensitive() {
+  return localValue("Highlights/NicksCaseSensitive", false).toBool();
+}
 
 // ========================================
 //  TabCompletionSettings