X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fuisettings.cpp;h=1d8a99ab07965e78239e9d231e633b3f47afedfc;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hp=ca68c49a4980e80ced70bde4bc358b1bd6807097;hpb=64bc0567e3fe373ab996a23ed690ec5631bb417f;p=quassel.git

diff --git a/src/uisupport/uisettings.cpp b/src/uisupport/uisettings.cpp
index ca68c49a..1d8a99ab 100644
--- a/src/uisupport/uisettings.cpp
+++ b/src/uisupport/uisettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,112 +15,220 @@
  *   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 "uisettings.h"
 
-UiSettings::UiSettings(const QString &group)
-  : ClientSettings(group)
+#include <utility>
+
+#include "action.h"
+#include "actioncollection.h"
+
+UiSettings::UiSettings(QString group)
+    : ClientSettings(std::move(group))
+{
+}
+
+
+void UiSettings::setValue(const QString &key, const QVariant &data)
 {
+    setLocalValue(key, data);
+}
+
+
+QVariant UiSettings::value(const QString &key, const QVariant &def) const
+{
+    return localValue(key, def);
+}
+
+
+bool UiSettings::valueExists(const QString &key) const
+{
+    return localKeyExists(key);
+}
+
+
+void UiSettings::remove(const QString &key)
+{
+    removeLocalKey(key);
 }
 
 /**************************************************************************/
 
-UiStyleSettings::UiStyleSettings() : UiSettings("UiStyle") {}
-UiStyleSettings::UiStyleSettings(const QString &subGroup) : UiSettings(QString("UiStyle/%1").arg(subGroup))
+UiStyleSettings::UiStyleSettings()
+    : UiSettings("UiStyle")
 {
 }
 
-void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, QTextCharFormat format) {
-  setLocalValue(QString("Format/%1").arg(ftype), format);
+
+UiStyleSettings::UiStyleSettings(const QString &subGroup)
+    : UiSettings(QString("UiStyle/%1").arg(subGroup))
+{
 }
 
-QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) {
-  return localValue(QString("Format/%1").arg(ftype), QTextFormat()).value<QTextFormat>().toCharFormat();
+
+void UiStyleSettings::setCustomFormat(UiStyle::FormatType ftype, const QTextCharFormat &format)
+{
+    setLocalValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), format);
+}
+
+
+QTextCharFormat UiStyleSettings::customFormat(UiStyle::FormatType ftype) const
+{
+    return localValue(QString("Format/%1").arg(static_cast<quint32>(ftype)), QTextFormat()).value<QTextFormat>().toCharFormat();
 }
 
-void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype) {
-  removeLocalKey(QString("Format/%1").arg(ftype));
+
+void UiStyleSettings::removeCustomFormat(UiStyle::FormatType ftype)
+{
+    removeLocalKey(QString("Format/%1").arg(static_cast<quint32>(ftype)));
 }
 
-QList<UiStyle::FormatType> UiStyleSettings::availableFormats() {
-  QList<UiStyle::FormatType> formats;
-  QStringList list = localChildKeys("Format");
-  foreach(QString type, list) {
-    formats << (UiStyle::FormatType)type.toInt();
-  }
-  return formats;
+
+QList<UiStyle::FormatType> UiStyleSettings::availableFormats() const
+{
+    QList<UiStyle::FormatType> formats;
+    QStringList list = localChildKeys("Format");
+    foreach(QString type, list) {
+        formats << (UiStyle::FormatType)type.toInt();
+    }
+    return formats;
 }
 
+
 /**************************************************************************
  * SessionSettings
  **************************************************************************/
 
-SessionSettings::SessionSettings(const QString & sessionId, const QString & group)
-: UiSettings(group), _sessionId(sessionId)
+SessionSettings::SessionSettings(QString sessionId, QString group)
+    : UiSettings(std::move(group))
+    , _sessionId(std::move(sessionId))
+{
+}
+
+
+void SessionSettings::setValue(const QString &key, const QVariant &data)
+{
+    setLocalValue(QString("%1/%2").arg(_sessionId, key), data);
+}
+
+
+QVariant SessionSettings::value(const QString &key, const QVariant &def) const
+{
+    return localValue(QString("%1/%2").arg(_sessionId, key), def);
+}
+
+
+void SessionSettings::removeKey(const QString &key)
 {
+    removeLocalKey(QString("%1/%2").arg(_sessionId, key));
+}
+
 
+void SessionSettings::cleanup()
+{
+    QStringList sessions = localChildGroups();
+    QString str;
+    SessionSettings s(sessionId());
+    foreach(str, sessions) {
+        // load session and check age
+        s.setSessionId(str);
+        if (s.sessionAge() > 3) {
+            s.removeSession();
+        }
+    }
 }
 
-void SessionSettings::setValue(const QString &key, const QVariant &data) {
-  setLocalValue(QString("%1/%2").arg(_sessionId, key), data);
+
+QString SessionSettings::sessionId() const
+{
+    return _sessionId;
 }
 
-QVariant SessionSettings::value(const QString &key, const QVariant &def) {
-  return localValue(QString("%1/%2").arg(_sessionId, key), def);
+
+void SessionSettings::setSessionId(QString sessionId)
+{
+    _sessionId = std::move(sessionId);
 }
 
-void SessionSettings::removeKey(const QString &key) {
-  removeLocalKey(QString("%1/%2").arg(_sessionId, key));
+
+int SessionSettings::sessionAge()
+{
+    QVariant val = localValue(QString("%1/_sessionAge").arg(_sessionId), 0);
+    bool b = false;
+    int i = val.toInt(&b);
+    if (b) {
+        return i;
+    }
+    else {
+        // no int saved, delete session
+        //qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
+        removeSession();
+    }
+    return 10;
 }
 
-void SessionSettings::cleanup() {
-  QStringList sessions = localChildGroups();
-  QString str;
-  SessionSettings s(sessionId());
-  foreach(str, sessions) {
-    // load session and check age
-    s.setSessionId(str);
-    if(s.sessionAge() > 3) {
-      s.removeSession();
+
+void SessionSettings::removeSession()
+{
+    QStringList keys = localChildKeys(sessionId());
+    foreach(QString k, keys) {
+        removeKey(k);
     }
-  }
 }
 
-int SessionSettings::sessionAge() {
-  QVariant val = localValue(QString("%1/_sessionAge").arg(_sessionId), 0);
-  bool b = false;
-  int i = val.toInt(&b);
-  if(b) {
-    return i;
-  } else {
-    // no int saved, delete session
-    //qDebug() << QString("deleting invalid session %1 (invalid session age found)").arg(_sessionId);
-    removeSession();
-  }
-  return 10;
+
+void SessionSettings::setSessionAge(int age)
+{
+    setValue(QString("_sessionAge"), age);
 }
 
-void SessionSettings::removeSession() {
-  QStringList keys = localChildKeys(sessionId());
-  foreach(QString k, keys) {
-    removeKey(k);
-  }
+
+void SessionSettings::sessionAging()
+{
+    QStringList sessions = localChildGroups();
+    QString str;
+    SessionSettings s(sessionId());
+    foreach(str, sessions) {
+        // load session and check age
+        s.setSessionId(str);
+        s.setSessionAge(s.sessionAge()+1);
+    }
+}
+
+
+/**************************************************************************
+ * ShortcutSettings
+ **************************************************************************/
+
+ShortcutSettings::ShortcutSettings()
+    : UiSettings("Shortcuts")
+{
+}
+
+
+void ShortcutSettings::clear()
+{
+    for (auto &&key : allLocalKeys()) {
+        removeLocalKey(key);
+    }
 }
 
-void SessionSettings::setSessionAge(int age) {
-  setValue(QString("_sessionAge"),age);
+
+QStringList ShortcutSettings::savedShortcuts() const
+{
+    return localChildKeys();
 }
 
-void SessionSettings::sessionAging() {
-  QStringList sessions = localChildGroups();
-  QString str;
-  SessionSettings s(sessionId());
-  foreach(str, sessions) {
-    // load session and check age
-    s.setSessionId(str);
-    s.setSessionAge(s.sessionAge()+1);
-  }
+
+QKeySequence ShortcutSettings::loadShortcut(const QString &name) const
+{
+    return localValue(name, QKeySequence()).value<QKeySequence>();
 }
 
+
+void ShortcutSettings::saveShortcut(const QString &name, const QKeySequence &seq)
+{
+    setLocalValue(name, seq);
+}