Make disabling the tray icon animation work again

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

diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp
index da15475..dc2e65c 100644 (file)
--- a/src/qtui/statusnotifieritem.cpp
+++ b/src/qtui/statusnotifieritem.cpp
@@ -26,44 +26,55 @@
 #include "statusnotifieritem.h"
 #include "statusnotifieritemdbus.h"
 
+#include <QApplication>
 #include <QMenu>
 #include <QMouseEvent>
+#include <QTextDocument>
 
 const int StatusNotifierItem::_protocolVersion = 0;
 
 StatusNotifierItem::StatusNotifierItem(QWidget *parent)
   : StatusNotifierItemParent(parent),
   _statusNotifierItemDBus(0),
-  _statusNotifierWatcher(0)
+  _statusNotifierWatcher(0),
+  _notificationsClient(0),
+  _notificationsClientSupportsMarkup(true),
+  _lastNotificationsDBusId(0)
 {
 
 }
 
 StatusNotifierItem::~StatusNotifierItem() {
   delete _statusNotifierWatcher;
-
 }
 
 void StatusNotifierItem::init() {
-// workaround until we handle the tray menu more sanely
-#ifdef QT_NO_SYSTEMTRAYICON
-  setTrayMenu(new QMenu(associatedWidget()));
-#endif
-
-  trayMenu()->installEventFilter(this);
-
   qDBusRegisterMetaType<DBusImageStruct>();
   qDBusRegisterMetaType<DBusImageVector>();
   qDBusRegisterMetaType<DBusToolTipStruct>();
 
   _statusNotifierItemDBus = new StatusNotifierItemDBus(this);
+  connect(this, SIGNAL(toolTipChanged(QString,QString)), _statusNotifierItemDBus, SIGNAL(NewToolTip()));
+  connect(this, SIGNAL(animationEnabledChanged(bool)), _statusNotifierItemDBus, SIGNAL(NewAttentionIcon()));
 
   connect(QDBusConnection::sessionBus().interface(), SIGNAL(serviceOwnerChanged(QString,QString,QString)),
                                                      SLOT(serviceChange(QString,QString,QString)));
 
   setMode(StatusNotifier);
 
+  _notificationsClient = new org::freedesktop::Notifications("org.freedesktop.Notifications", "/org/freedesktop/Notifications",
+                                                             QDBusConnection::sessionBus(), this);
+
+  connect(_notificationsClient, SIGNAL(NotificationClosed(uint,uint)), SLOT(notificationClosed(uint,uint)));
+  connect(_notificationsClient, SIGNAL(ActionInvoked(uint,QString)), SLOT(notificationInvoked(uint,QString)));
+
+  if(_notificationsClient->isValid()) {
+    QStringList desktopCapabilities = _notificationsClient->GetCapabilities();
+    _notificationsClientSupportsMarkup = desktopCapabilities.contains("body-markup");
+  }
+
   StatusNotifierItemParent::init();
+  trayMenu()->installEventFilter(this);
 }
 
 void StatusNotifierItem::registerToDaemon() {
@@ -78,7 +89,7 @@ void StatusNotifierItem::registerToDaemon() {
     _statusNotifierWatcher->RegisterStatusNotifierItem(_statusNotifierItemDBus->service());
 
   } else {
-    qDebug() << "StatusNotifierWatcher not reachable!";
+    //qDebug() << "StatusNotifierWatcher not reachable!";
     setMode(Legacy);
   }
 }
@@ -150,7 +161,10 @@ QString StatusNotifierItem::iconName() const {
 }
 
 QString StatusNotifierItem::attentionIconName() const {
-  return QString("quassel_message");
+  if(animationEnabled())
+    return QString("quassel_message");
+  else
+    return QString("quassel");
 }
 
 QString StatusNotifierItem::toolTipIconName() const {
@@ -165,13 +179,59 @@ void StatusNotifierItem::activated(const QPoint &pos) {
 bool StatusNotifierItem::eventFilter(QObject *watched, QEvent *event) {
   if(mode() == StatusNotifier) {
     //FIXME: ugly ugly workaround to weird QMenu's focus problems
+#ifdef HAVE_KDE
     if(watched == trayMenu() &&
        (event->type() == QEvent::WindowDeactivate || (event->type() == QEvent::MouseButtonRelease && static_cast<QMouseEvent*>(event)->button() == Qt::LeftButton))) {
       // put at the back of event queue to let the action activate anyways
       QTimer::singleShot(0, trayMenu(), SLOT(hide()));
     }
+#else
+    if(watched == trayMenu() && event->type() == QEvent::HoverLeave) {
+      trayMenu()->hide();
+    }
+#endif
   }
   return StatusNotifierItemParent::eventFilter(watched, event);
 }
 
+void StatusNotifierItem::showMessage(const QString &title, const QString &message_, SystemTray::MessageIcon icon, int timeout, uint notificationId) {
+  QString message = message_;
+  if(_notificationsClient->isValid()) {
+    if(_notificationsClientSupportsMarkup)
+      message = Qt::escape(message);
+
+    QStringList actions = QStringList() << "activate" << "View";
+
+    // we always queue notifications right now
+    QDBusReply<uint> reply = _notificationsClient->Notify(title, 0, "quassel", title, message, actions, QVariantMap(), timeout);
+    if(reply.isValid()) {
+      uint dbusid = reply.value();
+      _notificationsIdMap.insert(dbusid, notificationId);
+      _lastNotificationsDBusId = dbusid;
+    }
+  } else
+    StatusNotifierItemParent::showMessage(title, message, icon, timeout, notificationId);
+}
+
+void StatusNotifierItem::closeMessage(uint notificationId) {
+  foreach(uint dbusid, _notificationsIdMap.keys()) {
+    if(_notificationsIdMap.value(dbusid) == notificationId) {
+      _notificationsIdMap.remove(dbusid);
+      _notificationsClient->CloseNotification(dbusid);
+    }
+  }
+  _lastNotificationsDBusId = 0;
+}
+
+void StatusNotifierItem::notificationClosed(uint dbusid, uint reason) {
+  Q_UNUSED(reason)
+  _lastNotificationsDBusId = 0;
+  emit messageClosed(_notificationsIdMap.take(dbusid));
+}
+
+void StatusNotifierItem::notificationInvoked(uint dbusid, const QString &action) {
+  Q_UNUSED(action)
+  emit messageClicked(_notificationsIdMap.value(dbusid, 0));
+}
+
 #endif