/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include <QApplication>
-Action::Action(QObject *parent)
-#ifdef HAVE_KDE
- : KAction(parent)
-#else
+Action::Action(QObject* parent)
: QWidgetAction(parent)
-#endif
{
- init();
+ setProperty("isShortcutConfigurable", true);
+ connect(this, &QAction::triggered, this, &Action::slotTriggered);
}
-
-Action::Action(const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-#ifdef HAVE_KDE
- : KAction(parent)
-#else
- : QWidgetAction(parent)
-#endif
+Action::Action(const QString& text, QObject* parent, const QKeySequence& shortcut)
+ : Action(parent)
{
- init();
setText(text);
setShortcut(shortcut);
- if (receiver && slot)
- connect(this, SIGNAL(triggered()), receiver, slot);
}
-
-Action::Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver, const char *slot, const QKeySequence &shortcut)
-#ifdef HAVE_KDE
- : KAction(parent)
-#else
- : QWidgetAction(parent)
-#endif
+Action::Action(const QIcon& icon, const QString& text, QObject* parent, const QKeySequence& shortcut)
+ : Action(text, parent, shortcut)
{
- init();
setIcon(icon);
- setText(text);
- setShortcut(shortcut);
- if (receiver && slot)
- connect(this, SIGNAL(triggered()), receiver, slot);
-}
-
-
-#ifdef HAVE_KDE
-void Action::init() {}
-#else
-void Action::init()
-{
- connect(this, SIGNAL(triggered(bool)), this, SLOT(slotTriggered()));
-
- setProperty("isShortcutConfigurable", true);
}
-
void Action::slotTriggered()
{
emit triggered(QApplication::mouseButtons(), QApplication::keyboardModifiers());
}
-
bool Action::isShortcutConfigurable() const
{
return property("isShortcutConfigurable").toBool();
}
-
void Action::setShortcutConfigurable(bool b)
{
setProperty("isShortcutConfigurable", b);
}
-
QKeySequence Action::shortcut(ShortcutTypes type) const
{
Q_ASSERT(type);
- if (type == DefaultShortcut)
- return property("defaultShortcut").value<QKeySequence>();
+ if (type == DefaultShortcut) {
+ auto sequence = property("defaultShortcuts").value<QList<QKeySequence>>();
+ return sequence.isEmpty() ? QKeySequence() : sequence.first();
+ }
- if (shortcuts().count()) return shortcuts().value(0);
- return QKeySequence();
+ return shortcuts().isEmpty() ? QKeySequence() : shortcuts().first();
}
-
-void Action::setShortcut(const QShortcut &shortcut, ShortcutTypes type)
+void Action::setShortcut(const QShortcut& shortcut, ShortcutTypes type)
{
setShortcut(shortcut.key(), type);
}
-
-void Action::setShortcut(const QKeySequence &key, ShortcutTypes type)
+void Action::setShortcut(const QKeySequence& key, ShortcutTypes type)
{
Q_ASSERT(type);
- if (type & DefaultShortcut)
- setProperty("defaultShortcut", key);
-
+ if (type & DefaultShortcut) {
+ setProperty("defaultShortcuts", QVariant::fromValue(QList<QKeySequence>() << key));
+ }
if (type & ActiveShortcut)
QAction::setShortcut(key);
}
-
-
-#endif /* HAVE_KDE */