Fixes #682 - Core crashes on client connection

[quassel.git] / src / uisupport / graphicalui.h

diff --git a/src/uisupport/graphicalui.h b/src/uisupport/graphicalui.h
index 55dfd06..392075e 100644 (file)
--- a/src/uisupport/graphicalui.h
+++ b/src/uisupport/graphicalui.h
@@ -23,7 +23,9 @@
 
 #include "abstractui.h"
 
+class ActionCollection;
 class ContextMenuActionProvider;
+class ToolBarActionProvider;
 
 class GraphicalUi : public AbstractUi {
   Q_OBJECT
@@ -31,13 +33,29 @@ class GraphicalUi : public AbstractUi {
 public:
   GraphicalUi(QObject *parent = 0);
 
+  //! Access global ActionCollections.
+  /** These ActionCollections are associated with the main window, i.e. they contain global
+  *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
+  *  create appropriate Action objects using GraphicalUi::actionCollection(cat)->add\<Action\>().
+  *  @param category The category (default: "General")
+  */
+  static ActionCollection *actionCollection(const QString &category = "General");
+
   inline static ContextMenuActionProvider *contextMenuActionProvider();
+  inline static ToolBarActionProvider *toolBarActionProvider();
 
 protected:
+  //! This is the widget we associate global actions with, typically the main window
+  void setMainWidget(QWidget *);
+
   void setContextMenuActionProvider(ContextMenuActionProvider *);
+  void setToolBarActionProvider(ToolBarActionProvider *);
 
 private:
+  static QWidget *_mainWidget;
+  static QHash<QString, ActionCollection *> _actionCollections;
   static ContextMenuActionProvider *_contextMenuActionProvider;
+  static ToolBarActionProvider *_toolBarActionProvider;
 
 };
 
@@ -45,4 +63,8 @@ ContextMenuActionProvider *GraphicalUi::contextMenuActionProvider() {
   return _contextMenuActionProvider;
 }
 
+ToolBarActionProvider *GraphicalUi::toolBarActionProvider() {
+  return _toolBarActionProvider;
+}
+
 #endif