X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=83fb8fb3406ad487f26fabab6384554d4fc65826;hp=b5ca9167ca4e70c6a19d28603fb6c6ad425743e1;hb=eaba93b703ba5bca4edf09f4c076a00b529115cd;hpb=ec17201104f75eafaddccc174de8709b42b15ccb

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index b5ca9167..83fb8fb3 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-08 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        *
@@ -24,78 +24,105 @@
 
 #ifdef Q_WS_QWS
 #include <Qtopia>
-#include <QCoreApplication>
 #endif
 
 #include "settings.h"
 
-Settings::Settings(QString g) : group(g) {
+QHash<QString, QHash<QString, QVariant> > Settings::settingsCache;
+QHash<QString, QHash<QString, SettingsChangeNotifier *> > Settings::settingsChangeNotifier;
 
-#ifndef Q_WS_QWS
-  QSettings();
-#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);
-  } else {
-    QSettings();
-  }
-  */
-  QSettings();
-#endif
-}
-
-Settings::~Settings() {
-
-}
+// Settings::Settings(QString group_, QString appName_)
+//   : group(group_),
+//     appName(appName_)
+// {
 
-void Settings::setGroup(QString g) {
-  group = g;
+// /* 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(group, key), SIGNAL(valueChanged(const QVariant &)),
+		   receiver, slot);
 }
 
 QStringList Settings::allLocalKeys() {
-  beginGroup(group);
-  QStringList res = allKeys();
-  endGroup();
+  QSettings s(org(), appName);
+  s.beginGroup(group);
+  QStringList res = s.allKeys();
+  s.endGroup();
   return res;
 }
 
-QStringList Settings::localChildKeys() {
-  beginGroup(group);
-  QStringList res = childKeys();
-  endGroup();
+QStringList Settings::localChildKeys(const QString &rootkey) {
+  QString g;
+  if(rootkey.isEmpty())
+    g = group;
+  else
+    g = QString("%1/%2").arg(group, rootkey);
+
+  QSettings s(org(), appName);
+  s.beginGroup(g);
+  QStringList res = s.childKeys();
+  s.endGroup();
   return res;
 }
 
-QStringList Settings::localChildGroups() {
-  beginGroup(group);
-  QStringList res = childGroups();
-  endGroup();
+QStringList Settings::localChildGroups(const QString &rootkey) {
+  QString g;
+  if(rootkey.isEmpty())
+    g = group;
+  else
+    g = QString("%1/%2").arg(group, rootkey);
+
+  QSettings s(org(), appName);
+  s.beginGroup(g);
+  QStringList res = s.childGroups();
+  s.endGroup();
   return res;
 }
 
 void Settings::setLocalValue(const QString &key, const QVariant &data) {
-  beginGroup(group);
-  setValue(key, data);
-  endGroup();
+  QSettings s(org(), appName);
+  s.beginGroup(group);
+  s.setValue(key, data);
+  s.endGroup();
+  setCacheValue(group, key, data);
+  if(hasNotifier(group, key)) {
+    emit notifier(group, key)->valueChanged(data);
+  }
 }
 
-QVariant Settings::localValue(const QString &key, const QVariant &def) {
-  beginGroup(group);
-  QVariant res = value(key, def);
-  endGroup();
-  return res;
+const QVariant &Settings::localValue(const QString &key, const QVariant &def) {
+  if(!isCached(group, key)) {
+    QSettings s(org(), appName);
+    s.beginGroup(group);
+    setCacheValue(group, key, s.value(key, def));
+    s.endGroup();
+  }
+  return cacheValue(group, key);
 }
 
 void Settings::removeLocalKey(const QString &key) {
-  beginGroup(group);
-  remove(key);
-  endGroup();
+  QSettings s(org(), appName);
+  s.beginGroup(group);
+  s.remove(key);
+  s.endGroup();
+  if(isCached(group, key))
+    settingsCache[group].remove(key);
 }