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

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 4baded89..8ad7aa3c 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-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,74 +15,82 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef QTUI_H
 #define QTUI_H
 
-#include "quasselui.h"
+#include "graphicalui.h"
 
 #include "abstractnotificationbackend.h"
+#include "qtuistyle.h"
 
-class ActionCollection;
 class MainWin;
 class MessageModel;
 class QtUiMessageProcessor;
-class QtUiStyle;
 
 //! This class encapsulates Quassel's Qt-based GUI.
 /** 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 {
-  Q_OBJECT
+class QtUi : public GraphicalUi
+{
+    Q_OBJECT
 
 public:
-  QtUi();
-  ~QtUi();
-
-  MessageModel *createMessageModel(QObject *parent);
-  AbstractMessageProcessor *createMessageProcessor(QObject *parent);
-
-  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 */
-
-  static void registerNotificationBackend(AbstractNotificationBackend *);
-  static void unregisterNotificationBackend(AbstractNotificationBackend *);
-  static void unregisterAllNotificationBackends();
-  static const QList<AbstractNotificationBackend *> &notificationBackends();
-  static uint invokeNotification(BufferId bufId, const QString &sender, const QString &text);
-  static void closeNotification(uint notificationId);
-  static void closeNotifications(BufferId bufferId = BufferId());
-  static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
+    QtUi();
+    ~QtUi();
+
+    MessageModel *createMessageModel(QObject *parent);
+    AbstractMessageProcessor *createMessageProcessor(QObject *parent);
+
+    inline static QtUi *instance();
+    inline static QtUiStyle *style();
+    inline static MainWin *mainWindow();
+
+    static bool haveSystemTray();
+
+    /* Notifications */
+
+    static void registerNotificationBackend(AbstractNotificationBackend *);
+    static void unregisterNotificationBackend(AbstractNotificationBackend *);
+    static void unregisterAllNotificationBackends();
+    static const QList<AbstractNotificationBackend *> &notificationBackends();
+    static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
 
 public slots:
-  void init();
+    virtual void init();
+
+    uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
+    void closeNotification(uint notificationId);
+    void closeNotifications(BufferId bufferId = BufferId());
 
 protected slots:
-  void connectedToCore();
-  void disconnectedFromCore();
+    void connectedToCore();
+    void disconnectedFromCore();
+    void notificationActivated(uint notificationId);
+    void bufferMarkedAsRead(BufferId);
+
+protected:
+    virtual void minimizeRestore(bool show);
+    virtual bool isHidingMainWidgetAllowed() const;
+
+private slots:
+    void useSystemTrayChanged(const QVariant &);
 
 private:
-  static MainWin *_mainWin;
-  static QHash<QString, ActionCollection *> _actionCollections;
-  static QtUiStyle *_style;
-  static QList<AbstractNotificationBackend *> _notificationBackends;
-  static QList<AbstractNotificationBackend::Notification> _notifications;
+    static QtUi *_instance;
+    static MainWin *_mainWin;
+    static QList<AbstractNotificationBackend *> _notificationBackends;
+    static QList<AbstractNotificationBackend::Notification> _notifications;
+
+    bool _useSystemTray;
 };
 
-QtUiStyle *QtUi::style() { return _style; }
+
+QtUi *QtUi::instance() { return _instance ? _instance : new QtUi(); }
+QtUiStyle *QtUi::style() { return qobject_cast<QtUiStyle *>(uiStyle()); }
 MainWin *QtUi::mainWindow() { return _mainWin; }
 
 #endif