X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=3d43e0a55e19833f6a932808102ca58b2ece43bb;hp=77144c7b0d60132a4b57aff9299f7cacef2ee64e;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=0ac9ce4d7cf768d13993d6aa1d6b791c4149a843

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 77144c7b..3d43e0a5 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-07 by the Quassel IRC Team                         *
  *   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        *
@@ -19,45 +19,81 @@
  ***************************************************************************/
 
 #include <QSettings>
+#include <QStringList>
+#include <QDebug>
+
+#ifdef Q_WS_QWS
+#include <Qtopia>
+#include <QCoreApplication>
+#endif
 
 #include "settings.h"
 
-Settings *settings;
+Settings::Settings(QString g) : group(g) {
 
-void Settings::init() {
-  curProfile = QObject::tr("Default");
+#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);
+    qDebug() << sandboxPath + "/etc/QuasselIRC.conf";
+  } else {
+    QSettings();
+  }
+#endif
 }
-/*
+
 Settings::~Settings() {
-  qDebug() << "destructing";
 
 }
-*/
 
-void Settings::setProfile(const QString &profile) {
-  curProfile = profile;
+void Settings::setGroup(QString g) {
+  group = g;
+
+}
+
+QStringList Settings::allLocalKeys() {
+  beginGroup(group);
+  QStringList res = allKeys();
+  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() {
+  beginGroup(group);
+  QStringList res = childKeys();
+  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() {
+  beginGroup(group);
+  QStringList res = childGroups();
+  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) {
+  beginGroup(group);
+  setValue(key, data);
+  endGroup();
 }
 
-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);
+QVariant Settings::localValue(const QString &key, const QVariant &def) {
+  beginGroup(group);
+  QVariant res = value(key, def);
+  endGroup();
+  return res;
 }
 
-QString Settings::curProfile;
+void Settings::removeLocalKey(const QString &key) {
+  beginGroup(group);
+  remove(key);
+  endGroup();
+}