X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Factioncollection.cpp;h=af5c9241928525b20a0063f15cba3969d8de620b;hp=b752cfb748960630f59ca804e628511600d9132e;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/uisupport/actioncollection.cpp b/src/uisupport/actioncollection.cpp
index b752cfb7..af5c9241 100644
--- a/src/uisupport/actioncollection.cpp
+++ b/src/uisupport/actioncollection.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,218 +15,271 @@
  *   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.         *
  ***************************************************************************
  * Parts of this implementation are based on KDE's KActionCollection.      *
  ***************************************************************************/
 
-#ifndef HAVE_KDE
-
 #include <QAction>
 #include <QDebug>
+#include <QMetaMethod>
 
 #include "actioncollection.h"
 
 #include "action.h"
+#include "uisettings.h"
 
-ActionCollection::ActionCollection(QObject *parent) : QObject(parent) {
-  _connectTriggered = _connectHovered = false;
+void ActionCollection::addActions(const std::vector<std::pair<QString, Action *>> &actions)
+{
+    for (auto &&p : actions) {
+        addAction(p.first, p.second);
+    }
 }
 
-ActionCollection::~ActionCollection() {
 
-}
+#ifndef HAVE_KDE
 
-void ActionCollection::clear() {
-  _actionByName.clear();
-  qDeleteAll(_actions);
-  _actions.clear();
+int ActionCollection::count() const
+{
+    return actions().count();
 }
 
-QAction *ActionCollection::action(const QString &name) const {
-  return _actionByName.value(name, 0);
+
+bool ActionCollection::isEmpty() const
+{
+    return actions().count();
 }
 
-QList<QAction *> ActionCollection::actions() const {
-  return _actions;
+void ActionCollection::clear()
+{
+    _actionByName.clear();
+    qDeleteAll(_actions);
+    _actions.clear();
 }
 
-Action *ActionCollection::addAction(const QString &name, Action *action) {
-  QAction *act = addAction(name, static_cast<QAction *>(action));
-  Q_UNUSED(act);
-  Q_ASSERT(act == action);
-  return action;
+
+QAction *ActionCollection::action(const QString &name) const
+{
+    return _actionByName.value(name, 0);
 }
 
-Action *ActionCollection::addAction(const QString &name, const QObject *receiver, const char *member) {
-  Action *a = new Action(this);
-  if(receiver && member)
-    connect(a, SIGNAL(triggered(bool)), receiver, member);
-  return addAction(name, a);
+
+QList<QAction *> ActionCollection::actions() const
+{
+    return _actions;
 }
 
-QAction *ActionCollection::addAction(const QString &name, QAction *action) {
-  if(!action)
-    return action;
+QAction *ActionCollection::addAction(const QString &name, QAction *action)
+{
+    if (!action)
+        return action;
+
+    const QString origName = action->objectName();
+    QString indexName = name;
+
+    if (indexName.isEmpty())
+        indexName = action->objectName();
+    else
+        action->setObjectName(indexName);
+    if (indexName.isEmpty())
+        indexName = indexName.sprintf("unnamed-%p", (void *)action);
+
+    // do we already have this action?
+    if (_actionByName.value(indexName, 0) == action)
+        return action;
+    // or maybe another action under this name?
+    if (QAction *oldAction = _actionByName.value(indexName))
+        takeAction(oldAction);
+
+    // do we already have this action under a different name?
+    int oldIndex = _actions.indexOf(action);
+    if (oldIndex != -1) {
+        _actionByName.remove(origName);
+        _actions.removeAt(oldIndex);
+    }
+
+    // add action
+    _actionByName.insert(indexName, action);
+    _actions.append(action);
 
-  const QString origName = action->objectName();
-  QString indexName = name;
+    foreach(QWidget *widget, _associatedWidgets) {
+        widget->addAction(action);
+    }
 
-  if(indexName.isEmpty())
-    indexName = action->objectName();
-  else
-    action->setObjectName(indexName);
-  if(indexName.isEmpty())
-    indexName = indexName.sprintf("unnamed-%p", (void *)action);
+    connect(action, &QObject::destroyed, this, &ActionCollection::actionDestroyed);
+    if (_connectHovered)
+        connect(action, &QAction::hovered, this, &ActionCollection::slotActionHovered);
+    if (_connectTriggered)
+        connect(action, &QAction::triggered, this, &ActionCollection::slotActionTriggered);
 
-  // do we already have this action?
-  if(_actionByName.value(indexName, 0) == action)
+    emit inserted(action);
     return action;
-  // or maybe another action under this name?
-  if(QAction *oldAction = _actionByName.value(indexName))
-    takeAction(oldAction);
+}
 
-  // do we already have this action under a different name?
-  int oldIndex = _actions.indexOf(action);
-  if(oldIndex != -1) {
-    _actionByName.remove(origName);
-    _actions.removeAt(oldIndex);
-  }
 
-  // add action
-  _actionByName.insert(indexName, action);
-  _actions.append(action);
+void ActionCollection::removeAction(QAction *action)
+{
+    delete takeAction(action);
+}
 
-  foreach(QWidget *widget, _associatedWidgets) {
-    widget->addAction(action);
-  }
 
-  connect(action, SIGNAL(destroyed(QObject *)), SLOT(actionDestroyed(QObject *)));
-  if(_connectHovered)
-    connect(action, SIGNAL(hovered()), SLOT(slotActionHovered()));
-  if(_connectTriggered)
-    connect(action, SIGNAL(triggered(bool)), SLOT(slotActionTriggered()));
+QAction *ActionCollection::takeAction(QAction *action)
+{
+    if (!unlistAction(action))
+        return nullptr;
 
-  emit inserted(action);
-  return action;
-}
+    foreach(QWidget *widget, _associatedWidgets) {
+        widget->removeAction(action);
+    }
 
-void ActionCollection::removeAction(QAction *action) {
-  delete takeAction(action);
+    action->disconnect(this);
+    return action;
 }
 
-QAction *ActionCollection::takeAction(QAction *action) {
-  if(!unlistAction(action))
-    return 0;
 
-  foreach(QWidget *widget, _associatedWidgets) {
-    widget->removeAction(action);
-  }
+void ActionCollection::readSettings()
+{
+    ShortcutSettings s;
+    QStringList savedShortcuts = s.savedShortcuts();
 
-  action->disconnect(this);
-  return action;
+    foreach(const QString &name, _actionByName.keys()) {
+        if (!savedShortcuts.contains(name))
+            continue;
+        auto *action = qobject_cast<Action *>(_actionByName.value(name));
+        if (action)
+            action->setShortcut(s.loadShortcut(name), Action::ActiveShortcut);
+    }
 }
 
-void ActionCollection::readSettings() {
 
+void ActionCollection::writeSettings() const
+{
+    ShortcutSettings s;
+    foreach(const QString &name, _actionByName.keys()) {
+        auto *action = qobject_cast<Action *>(_actionByName.value(name));
+        if (!action)
+            continue;
+        if (!action->isShortcutConfigurable())
+            continue;
+        if (action->shortcut(Action::ActiveShortcut) == action->shortcut(Action::DefaultShortcut))
+            continue;
+        s.saveShortcut(name, action->shortcut(Action::ActiveShortcut));
+    }
 }
 
-void ActionCollection::writeSettings() const {
-
 
+void ActionCollection::slotActionTriggered()
+{
+    auto *action = qobject_cast<QAction *>(sender());
+    if (action)
+        emit actionTriggered(action);
 }
 
-void ActionCollection::slotActionTriggered() {
-  QAction *action = qobject_cast<QAction *>(sender());
-  if(action)
-    emit actionTriggered(action);
-}
 
-void ActionCollection::slotActionHovered() {
-  QAction *action = qobject_cast<QAction *>(sender());
-  if(action)
-    emit actionHovered(action);
+void ActionCollection::slotActionHovered()
+{
+    auto *action = qobject_cast<QAction *>(sender());
+    if (action)
+        emit actionHovered(action);
 }
 
-void ActionCollection::actionDestroyed(QObject *obj) {
-  // remember that this is not an QAction anymore at this point
-  QAction *action = static_cast<QAction *>(obj);
 
-  unlistAction(action);
-}
+void ActionCollection::actionDestroyed(QObject *obj)
+{
+    // remember that this is not an QAction anymore at this point
+    auto *action = static_cast<QAction *>(obj);
 
-void ActionCollection::connectNotify(const char *signal) {
-  if(_connectHovered && _connectTriggered)
-    return;
+    unlistAction(action);
+}
 
-  if(QMetaObject::normalizedSignature(SIGNAL(actionHovered(QAction*))) == signal) {
-    if(!_connectHovered) {
-      _connectHovered = true;
-      foreach (QAction* action, actions())
-        connect(action, SIGNAL(hovered()), SLOT(slotActionHovered()));
+void ActionCollection::connectNotify(const QMetaMethod &signal)
+{
+    if (_connectHovered && _connectTriggered)
+        return;
+
+    if (QMetaMethod::fromSignal(&ActionCollection::actionHovered) == signal) {
+        if (!_connectHovered) {
+            _connectHovered = true;
+            foreach(QAction* action, actions())
+            connect(action, &QAction::hovered, this, &ActionCollection::slotActionHovered);
+        }
     }
-  } else if(QMetaObject::normalizedSignature(SIGNAL(actionTriggered(QAction*))) == signal) {
-    if(!_connectTriggered) {
-      _connectTriggered = true;
-      foreach (QAction* action, actions())
-        connect(action, SIGNAL(triggered(bool)), SLOT(slotActionTriggered()));
+    else if (QMetaMethod::fromSignal(&ActionCollection::actionTriggered) == signal) {
+        if (!_connectTriggered) {
+            _connectTriggered = true;
+            foreach(QAction* action, actions())
+            connect(action, &QAction::triggered, this, &ActionCollection::slotActionTriggered);
+        }
     }
-  }
 
-  QObject::connectNotify(signal);
+    QObject::connectNotify(signal);
 }
 
-void ActionCollection::associateWidget(QWidget *widget) const {
-  foreach(QAction *action, actions()) {
-    if(!widget->actions().contains(action))
-      widget->addAction(action);
-  }
+
+void ActionCollection::associateWidget(QWidget *widget) const
+{
+    foreach(QAction *action, actions()) {
+        if (!widget->actions().contains(action))
+            widget->addAction(action);
+    }
 }
 
-void ActionCollection::addAssociatedWidget(QWidget *widget) {
-  if(!_associatedWidgets.contains(widget)) {
-    widget->addActions(actions());
-    _associatedWidgets.append(widget);
-    connect(widget, SIGNAL(destroyed(QObject *)), SLOT(associatedWidgetDestroyed(QObject *)));
-  }
+
+void ActionCollection::addAssociatedWidget(QWidget *widget)
+{
+    if (!_associatedWidgets.contains(widget)) {
+        widget->addActions(actions());
+        _associatedWidgets.append(widget);
+        connect(widget, &QObject::destroyed, this, &ActionCollection::associatedWidgetDestroyed);
+    }
 }
 
-void ActionCollection::removeAssociatedWidget(QWidget *widget) {
-  foreach(QAction *action, actions())
+
+void ActionCollection::removeAssociatedWidget(QWidget *widget)
+{
+    foreach(QAction *action, actions())
     widget->removeAction(action);
-  _associatedWidgets.removeAll(widget);
-  disconnect(widget, SIGNAL(destroyed(QObject *)), this, SLOT(associatedWidgetDestroyed(QObject *)));
+    _associatedWidgets.removeAll(widget);
+    disconnect(widget, &QObject::destroyed, this, &ActionCollection::associatedWidgetDestroyed);
 }
 
-QList<QWidget *> ActionCollection::associatedWidgets() const {
-  return _associatedWidgets;
+
+QList<QWidget *> ActionCollection::associatedWidgets() const
+{
+    return _associatedWidgets;
 }
 
-void ActionCollection::clearAssociatedWidgets() {
-  foreach(QWidget *widget, _associatedWidgets)
+
+void ActionCollection::clearAssociatedWidgets()
+{
+    foreach(QWidget *widget, _associatedWidgets)
     foreach(QAction *action, actions())
-      widget->removeAction(action);
+    widget->removeAction(action);
 
-  _associatedWidgets.clear();
+    _associatedWidgets.clear();
 }
 
-void ActionCollection::associatedWidgetDestroyed(QObject *obj) {
-  _associatedWidgets.removeAll(static_cast<QWidget *>(obj));
+
+void ActionCollection::associatedWidgetDestroyed(QObject *obj)
+{
+    _associatedWidgets.removeAll(static_cast<QWidget *>(obj));
 }
 
-bool ActionCollection::unlistAction(QAction *action) {
-  // This might be called with a partly destroyed QAction!
 
-  int index = _actions.indexOf(action);
-  if(index == -1) return false;
+bool ActionCollection::unlistAction(QAction *action)
+{
+    // This might be called with a partly destroyed QAction!
+
+    int index = _actions.indexOf(action);
+    if (index == -1) return false;
 
-  QString name = action->objectName();
-  _actionByName.remove(name);
-  _actions.removeAt(index);
+    QString name = action->objectName();
+    _actionByName.remove(name);
+    _actions.removeAt(index);
 
-  // TODO: remove from ActionCategory if we ever get that
+    // TODO: remove from ActionCategory if we ever get that
 
-  return true;
+    return true;
 }
 
 #endif /* HAVE_KDE */