X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Faction.h;h=bbf00d2a412a9e3ff4be955745a06a5188a9217c;hp=8748ae9a1a18ad6482ffedaaf6ac6e14a5128f74;hb=328b48e6fbd78d6158eb55296c0843fc5a41bcfa;hpb=850f5ae9b96c609f70cdb565bb19054131487714

diff --git a/src/uisupport/action.h b/src/uisupport/action.h
index 8748ae9a..bbf00d2a 100644
--- a/src/uisupport/action.h
+++ b/src/uisupport/action.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -16,17 +16,26 @@
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************
+ * Parts of this API have been shamelessly stolen from KDE's kaction.h     *
  ***************************************************************************/
 
 #ifndef ACTION_H_
 #define ACTION_H_
 
+#ifndef HAVE_KDE
+
+#include <QShortcut>
 #include <QWidgetAction>
 
+/// A specialized QWidgetAction, enhanced by some KDE features
+/** This declares/implements a subset of KAction's API (notably we've left out global shortcuts
+ *  for now), which should make it easy to plug in KDE support later on.
+ */
 class Action : public QWidgetAction {
   Q_OBJECT
 
-  Q_PROPERTY(QShortcut shortcut READ shortcut WRITE setShortcut)
+  Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
   Q_PROPERTY(bool shortcutConfigurable READ isShortcutConfigurable WRITE setShortcutConfigurable)
   Q_FLAGS(ShortcutType)
 
@@ -38,13 +47,42 @@ class Action : public QWidgetAction {
     Q_DECLARE_FLAGS(ShortcutTypes, ShortcutType)
 
     explicit Action(QObject *parent);
-    Action(const QString &text, QObject *parent);
-    Action(const QIcon &icon, const QString &text, QObject *parent);
+    Action(const QString &text, QObject *parent, const QObject *receiver = 0, const char *slot = 0, const QKeySequence &shortcut = 0);
+    Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver = 0, const char *slot = 0, const QKeySequence &shortcut = 0);
+
+    QKeySequence shortcut(ShortcutTypes types = ActiveShortcut) const;
+    void setShortcut(const QShortcut &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
+    void setShortcut(const QKeySequence &shortcut, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
+
+    bool isShortcutConfigurable() const;
+    void setShortcutConfigurable(bool configurable);
+
+  signals:
+    void triggered(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
+
+  private:
+    void init();
+
+  private slots:
+    void slotTriggered();
+};
 
-    QShortcut shortcut(ShortcutTypes types = ActiveShortcut) const;
-    void setShortcut(const QShortcut &shortcut, ShortcutTypes type = ActiveShortcut);
-    void setShortcut(const QKeySequence &shortcut, ShortcutTypes type = ActiveShortcut);
+Q_DECLARE_OPERATORS_FOR_FLAGS(Action::ShortcutTypes)
+
+#else /* HAVE_KDE */
+#include <KAction>
+
+class Action : public KAction {
+  Q_OBJECT
+
+  public:
+    explicit Action(QObject *parent);
+    Action(const QString &text, QObject *parent, const QObject *receiver = 0, const char *slot = 0, const QKeySequence &shortcut = 0);
+    Action(const QIcon &icon, const QString &text, QObject *parent, const QObject *receiver = 0, const char *slot = 0, const QKeySequence &shortcut = 0);
 
+  private:
+    void init();
 };
+#endif
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(ShortcutTypes)
+#endif