X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtui.h;h=1e2144c2eeef69fc92f2c46cce7ad7f52daf9db6;hb=34cbd014160c25232e6f407ba6dcd0fe92ae7c17;hp=1fe1114c0c31dcc3ad9264f5af70d65e64c48810;hpb=ed2415135359b4f8a3f75f2634e028500c08c1fe;p=quassel.git

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 1fe1114c..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,15 +45,10 @@ public:
   MessageModel *createMessageModel(QObject *parent);
   AbstractMessageProcessor *createMessageProcessor(QObject *parent);
 
+  inline static QtUi *instance();
   inline static QtUiStyle *style();
   inline static MainWin *mainWindow();
 
-  //! Access the global ActionCollection.
-  /** This ActionCollection is associated with the main window, i.e. it contains global
-   *  actions (and thus, shortcuts). Widgets providing application-wide shortcuts should
-   *  create appropriate Action objects using QtUi::actionCollection()->add\<Action\>().
-   */
-  inline static ActionCollection *actionCollection();
 
   /* Notifications */
 
@@ -67,21 +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 ActionCollection *_actionCollection;
+  static QPointer<QtUi> _instance;
+  static QPointer<MainWin> _mainWin;
   static QtUiStyle *_style;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _notifications;
 };
 
-ActionCollection *QtUi::actionCollection() { return _actionCollection; }
+QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); }
 QtUiStyle *QtUi::style() { return _style; }
 MainWin *QtUi::mainWindow() { return _mainWin; }