BufferViewOverlay now correctly respects filtering of buffer types

[quassel.git] / src / qtui / qtui.h

diff --git a/src/qtui/qtui.h b/src/qtui/qtui.h
index 7ef22e0..437cc15 100644 (file)
--- a/src/qtui/qtui.h
+++ b/src/qtui/qtui.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,12 +24,11 @@
 #include "graphicalui.h"
 
 #include "abstractnotificationbackend.h"
-#include "mainwin.h"
+#include "qtuistyle.h"
 
 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
@@ -49,35 +48,47 @@ public:
   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 uint invokeNotification(BufferId bufId, AbstractNotificationBackend::NotificationType type, const QString &sender, const QString &text);
-  static void closeNotification(uint notificationId);
-  static void closeNotifications(BufferId bufferId = BufferId());
   static const QList<AbstractNotificationBackend::Notification> &activeNotifications();
 
 public slots:
   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 notificationActivated(uint notificationId);
+  void bufferMarkedAsRead(BufferId);
+
+protected:
+  virtual void minimizeRestore(bool show);
+  virtual bool isHidingMainWidgetAllowed() const;
+
+private slots:
+  void useSystemTrayChanged(const QVariant &);
 
 private:
-  static QPointer<QtUi> _instance;
-  static QPointer<MainWin> _mainWin;
-  static QtUiStyle *_style;
+  static QtUi *_instance;
+  static MainWin *_mainWin;
   static QList<AbstractNotificationBackend *> _notificationBackends;
   static QList<AbstractNotificationBackend::Notification> _notifications;
+
+  bool _useSystemTray;
 };
 
-QtUi *QtUi::instance() { return _instance ? _instance.data() : new QtUi(); }
-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