StatusNotifierItem ("D-Bus tray icon") improvements

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

diff --git a/src/qtui/statusnotifieritem.h b/src/qtui/statusnotifieritem.h
index 2efbefd..ab2d218 100644 (file)
--- a/src/qtui/statusnotifieritem.h
+++ b/src/qtui/statusnotifieritem.h
@@ -26,6 +26,7 @@
 
 #ifdef HAVE_DBUS
 
+#include "notificationsclient.h"
 #include "systemtray.h"
 #include "statusnotifierwatcher.h"
 
@@ -45,8 +46,14 @@ public:
   explicit StatusNotifierItem(QWidget *parent);
   virtual ~StatusNotifierItem();
 
+  virtual bool isSystemTrayAvailable() const;
+  virtual bool isVisible() const;
+
 public slots:
   virtual void setState(State state);
+  virtual void setVisible(bool visible);
+  virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
+  virtual void closeMessage(uint notificationId);
 
 protected:
   virtual void init();
@@ -56,21 +63,34 @@ protected:
   QString iconName() const;
   QString attentionIconName() const;
   QString toolTipIconName() const;
+  QString iconThemePath() const;
+  QString menuObjectPath() const;
 
   virtual bool eventFilter(QObject *watched, QEvent *event);
 
 private slots:
   void activated(const QPoint &pos);
   void serviceChange(const QString& name, const QString& oldOwner, const QString& newOwner);
+  void checkForRegisteredHosts();
+
+  void notificationClosed(uint id, uint reason);
+  void notificationInvoked(uint id, const QString &action);
 
 private:
   void registerToDaemon();
 
   static const int _protocolVersion;
+  static const QString _statusNotifierWatcherServiceName;
   StatusNotifierItemDBus *_statusNotifierItemDBus;
 
   org::kde::StatusNotifierWatcher *_statusNotifierWatcher;
-  //org::freedesktop::Notifications *_notificationsClient;
+  org::freedesktop::Notifications *_notificationsClient;
+  bool _notificationsClientSupportsMarkup;
+  quint32 _lastNotificationsDBusId;
+  QHash<uint, uint> _notificationsIdMap; ///< Maps our own notification ID to the D-Bus one
+
+  QString _iconThemePath;
+  QString _menuObjectPath;
 
   friend class StatusNotifierItemDBus;
 };