X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=eda4c62299cf29cd0a40293ac26e693c524c36f8;hp=4f0618541067bcb551e0c61bf1985154f5fa4810;hb=e49189fdfac6eadbe0f4a5f46dc43c1585e847f6;hpb=44b22c4419f478a20f6324f9f3a700a2dec56302

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 4f061854..eda4c622 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,62 +15,149 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QSettings>
 #include <QStringList>
-#include <QDebug>
 
 #include "settings.h"
 
-Settings::Settings(QString g) : QObject(), group(g) {
+const int VERSION = 1;
+
+QHash<QString, QVariant> Settings::settingsCache;
+QHash<QString, SettingsChangeNotifier *> Settings::settingsChangeNotifier;
+
+#ifdef Q_WS_MAC
+#  define create_qsettings QSettings s(QCoreApplication::organizationDomain(), appName)
+#else
+#  define create_qsettings QSettings s(fileName(), format())
+#endif
+
+// Settings::Settings(QString group_, QString appName_)
+//   : group(group_),
+//     appName(appName_)
+// {
+
+// /* we need to call the constructor immediately in order to set the path...
+// #ifndef Q_WS_QWS
+//   QSettings(QCoreApplication::organizationName(), applicationName);
+// #else
+//   // FIXME sandboxDir() is not currently working correctly...
+//   //if(Qtopia::sandboxDir().isEmpty()) QSettings();
+//   //else QSettings(Qtopia::sandboxDir() + "/etc/QuasselIRC.conf", QSettings::NativeFormat);
+//   // ...so we have to use a workaround:
+//   QString appPath = QCoreApplication::applicationFilePath();
+//   if(appPath.startsWith(Qtopia::packagePath())) {
+//     QString sandboxPath = appPath.left(Qtopia::packagePath().length() + 32);
+//     QSettings(sandboxPath + "/etc/QuasselIRC.conf", QSettings::IniFormat);
+//     qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
+//   } else {
+//     QSettings(QCoreApplication::organizationName(), applicationName);
+//   }
+// #endif
+// */
+// }
+
+void Settings::notify(const QString &key, QObject *receiver, const char *slot)
+{
+    QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
+        receiver, slot);
+}
 
 
+void Settings::initAndNotify(const QString &key, QObject *receiver, const char *slot, const QVariant &defaultValue)
+{
+    notify(key, receiver, slot);
+    emit notifier(normalizedKey(group, key))->valueChanged(localValue(key, defaultValue));
 }
 
-Settings::~Settings() {
 
+uint Settings::version()
+{
+    // we don't cache this value, and we ignore the group
+    create_qsettings;
+    uint ver = s.value("Config/Version", 0).toUInt();
+    if (!ver) {
+        // No version, so create one
+        s.setValue("Config/Version", VERSION);
+        return VERSION;
+    }
+    return ver;
 }
 
-void Settings::setGroup(QString g) {
-  group = g;
 
+QStringList Settings::allLocalKeys()
+{
+    create_qsettings;
+    s.beginGroup(group);
+    QStringList res = s.allKeys();
+    s.endGroup();
+    return res;
 }
 
-QStringList Settings::allLocalKeys() {
-  QSettings s;
-  s.beginGroup(group);
-  return s.allKeys();
-}
 
-QStringList Settings::localChildKeys() {
-  QSettings s;
-  s.beginGroup(group);
-  return s.childKeys();
-}
+QStringList Settings::localChildKeys(const QString &rootkey)
+{
+    QString g;
+    if (rootkey.isEmpty())
+        g = group;
+    else
+        g = QString("%1/%2").arg(group, rootkey);
 
-QStringList Settings::localChildGroups() {
-  QSettings s;
-  s.beginGroup(group);
-  return s.childGroups();
+    create_qsettings;
+    s.beginGroup(g);
+    QStringList res = s.childKeys();
+    s.endGroup();
+    return res;
 }
 
-void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  QSettings s;
-  s.beginGroup(group);
-  s.setValue(key, data);
+
+QStringList Settings::localChildGroups(const QString &rootkey)
+{
+    QString g;
+    if (rootkey.isEmpty())
+        g = group;
+    else
+        g = QString("%1/%2").arg(group, rootkey);
+
+    create_qsettings;
+    s.beginGroup(g);
+    QStringList res = s.childGroups();
+    s.endGroup();
+    return res;
 }
 
-QVariant Settings::localValue(const QString &key, const QVariant &def) {
-  QSettings s;
-  s.beginGroup(group);
-  return s.value(key, def);
+
+void Settings::setLocalValue(const QString &key, const QVariant &data)
+{
+    QString normKey = normalizedKey(group, key);
+    create_qsettings;
+    s.setValue(normKey, data);
+    setCacheValue(normKey, data);
+    if (hasNotifier(normKey)) {
+        emit notifier(normKey)->valueChanged(data);
+    }
 }
 
-void Settings::removeLocalKey(const QString &key) {
-  QSettings s;
-  s.beginGroup(group);
-  s.remove(key);
+
+const QVariant &Settings::localValue(const QString &key, const QVariant &def)
+{
+    QString normKey = normalizedKey(group, key);
+    if (!isCached(normKey)) {
+        create_qsettings;
+        setCacheValue(normKey, s.value(normKey, def));
+    }
+    return cacheValue(normKey);
 }
 
+
+void Settings::removeLocalKey(const QString &key)
+{
+    create_qsettings;
+    s.beginGroup(group);
+    s.remove(key);
+    s.endGroup();
+    QString normKey = normalizedKey(group, key);
+    if (isCached(normKey))
+        settingsCache.remove(normKey);
+}