}
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() {
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;
}
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) {
- 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["Internal"] = oldmap.value("InternalAccount");
+
+ 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) {
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;
}
+void CoreAccountSettings::setBufferViewOverlay(const QSet<int> &viewIds) {
+ QVariantList variants;
+ foreach(int viewId, viewIds) {
+ variants << qVariantFromValue(viewId);
+ }
+ setAccountValue("BufferViewOverlay", variants);
+}
+
+QSet<int> CoreAccountSettings::bufferViewOverlay() {
+ QSet<int> viewIds;
+ QVariantList variants = accountValue("BufferViewOverlay").toList();
+ QVariantList::const_iterator iter = variants.constBegin();
+ for(QVariantList::const_iterator iter = variants.constBegin(); iter != variants.constEnd(); iter++) {
+ viewIds << iter->toInt();
+ }
+ return viewIds;
+}
+
void CoreAccountSettings::removeAccount(AccountId id) {
removeLocalKey(QString("%1").arg(id.toInt()));
}
+void CoreAccountSettings::clearAccounts() {
+ foreach(const QString &key, localChildGroups())
+ removeLocalKey(key);
+}
/***********************************************************************************************/
-// 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
return localValue("CompletionSuffix", ": ").toString();
}
+void TabCompletionSettings::setAddSpaceMidSentence(bool space) {
+ setLocalValue("AddSpaceMidSentence", space);
+}
+
+bool TabCompletionSettings::addSpaceMidSentence() {
+ return localValue("AddSpaceMidSentence", false).toBool();
+}
+
void TabCompletionSettings::setSortMode(SortMode mode) {
setLocalValue("SortMode", mode);
}
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();
+}
projects / quassel.git / blobdiff