X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=2731da26a7f5087e9ac6143f0967ffea6b4a5367;hp=6f2ba0f0d315f1293925d9092151d21d37c392e8;hb=328b48e6fbd78d6158eb55296c0843fc5a41bcfa;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 6f2ba0f0..2731da26 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-09 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        *
@@ -18,46 +18,124 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QStringList>
+
 #include "settings.h"
 
+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;
+// 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::init() {
-  curProfile = QObject::tr("Default");
+void Settings::notify(const QString &key, QObject *receiver, const char *slot) {
+  QObject::connect(notifier(normalizedKey(group, key)), SIGNAL(valueChanged(const QVariant &)),
+		   receiver, slot);
 }
-/*
-Settings::~Settings() {
-  qDebug() << "destructing";
 
+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::setProfile(const QString &profile) {
-  curProfile = profile;
+QStringList Settings::allLocalKeys() {
+  create_qsettings;
+  s.beginGroup(group);
+  QStringList res = s.allKeys();
+  s.endGroup();
+  return res;
 }
 
-void Settings::setGuiValue(const QString &key, const QVariant &value) {
-  QSettings s;
-  //s.setValue("GUI/Default/BufferStates/QuakeNet/#quassel/voicedExpanded", true);
-  //QString k = QString("GUI/%1/%2").arg(curProfile).arg(key);
-  s.setValue(QString("GUI/%1/%2").arg(curProfile).arg(key), value);
+QStringList Settings::localChildKeys(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.childKeys();
+  s.endGroup();
+  return res;
 }
 
-QVariant Settings::guiValue(const QString &key, const QVariant &defaultValue) {
-  QSettings s;
-  return s.value(QString("GUI/%1/%2").arg(curProfile).arg(key), defaultValue);
+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;
 }
 
-void Settings::setCoreValue(const QString &user, const QString &key, const QVariant &value) {
-  QSettings s;
-  s.setValue(QString("Core/%1/%2").arg(user).arg(key), value);
+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);
+  }
 }
 
-QVariant Settings::coreValue(const QString &user, const QString &key, const QVariant &defaultValue) {
-  QSettings s;
-  return s.value(QString("Core/%1/%2").arg(user).arg(key), defaultValue);
+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);
 }
 
-QString Settings::curProfile;
+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);
+}