X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=1e2144c2eeef69fc92f2c46cce7ad7f52daf9db6;hb=a7cd976ca45c83fdc2c0ba1142443bc72157a2ee;hp=4baded8985efcc69ebdd016c75e710e5b98949ec;hpb=4775cbfc0dde54bad2a483a51409f392187a20f3;p=quassel.git

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 4baded89..1e2144c2 100644
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.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  *
@@ -21,11 +21,11 @@
 #ifndef QTUI_H
 #define QTUI_H
 
-#include "quasselui.h"
+#include "graphicalui.h"
 
 #include "abstractnotificationbackend.h"
+#include "mainwin.h"
 
-class ActionCollection;
 class MainWin;
 class MessageModel;
 class QtUiMessageProcessor;
@@ -35,7 +35,7 @@ class QtUiStyle;
 /** This is basically a wrapper around MainWin, which is necessary because we cannot derive MainWin
  *  from both QMainWindow and AbstractUi (because of multiple inheritance of QObject).
  */
-class QtUi : public AbstractUi {
+class QtUi : public GraphicalUi {
   Q_OBJECT
 
 public:
@@ -45,16 +45,10 @@ public:
   MessageModel *createMessageModel(QObject *parent);
   AbstractMessageProcessor *createMessageProcessor(QObject *parent);
 
+  inline static QtUi *instance();
   inline static QtUiStyle *style();
   inline static MainWin *mainWindow();
 
-  //! 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 QtUi::actionCollection(cat)->add\<Action\>().
-   *  @param category The category (default: "General")
-   */
-  static ActionCollection *actionCollection(const QString &category = "General");
 
   /* Notifications */
 
@@ -68,20 +62,22 @@ public:
   static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
 
 public slots:
-  void init();
+  virtual void init();
 
 protected slots:
   void connectedToCore();
   void disconnectedFromCore();
+  void notificationActivated();
 
 private:
-  static MainWin *_mainWin;
-  static QHash<QString, ActionCollection *> _actionCollections;
+  static QPointer<QtUi> _instance;
+  static QPointer<MainWin> _mainWin;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _notifications;
 };
 
+QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); }
 QtUiStyle *QtUi::style() { return _style; }
 MainWin *QtUi::mainWindow() { return _mainWin; }