X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=e82af91a1b6e8f887b3f97c9ff275f86e5d72202;hp=3d9d74bef9c99b83f7edd9ac127d94cef0adb4fd;hb=9fb25d34cfc4dee02159b112c72e018c6e26e63f;hpb=8118229704229c33e151b3c707c8beaa0c077a86

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index 3d9d74be..e82af91a 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -31,7 +31,7 @@
 #include "systemtray.h"
 
 SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
-  : AbstractNotificationBackend(parent)
+  : AbstractNotificationBackend(parent), _activeId(0)
 {
   NotificationSettings notificationSettings;
   _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
@@ -40,10 +40,15 @@ SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
   notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &)));
   notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &)));
 
-  connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), this, SIGNAL(activated()));
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated()));
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+                                            SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
 }
 
 void SystrayNotificationBackend::notify(const Notification &notification) {
+  if(notification.type != Highlight && notification.type != PrivMsg)
+    return;
+
   /* fancy stuff to be implemented later: show notifications in order
   _notifications.append(notification);
   if(_showBubble && _notifications.count() == 1) {
@@ -67,6 +72,7 @@ void SystrayNotificationBackend::close(uint notificationId) {
   if(_notifications.isEmpty()) {
   */
   _notifications.clear();
+  _activeId = 0;
   closeBubble();
   QtUi::mainWindow()->systemTray()->setAlert(false);
 }
@@ -74,8 +80,10 @@ void SystrayNotificationBackend::close(uint notificationId) {
 void SystrayNotificationBackend::showBubble() {
   // fancy stuff later: show messages in order
   // for now, we just show the last message
-  if(_notifications.isEmpty()) return;
+  if(_notifications.isEmpty())
+    return;
   Notification n = _notifications.takeLast();
+  _activeId = n.notificationId;
   QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId);
   QString message = QString("<%1> %2").arg(n.sender, n.message);
   QtUi::mainWindow()->systemTray()->showMessage(title, message);
@@ -88,6 +96,19 @@ void SystrayNotificationBackend::closeBubble() {
 #endif
 }
 
+void SystrayNotificationBackend::notificationActivated() {
+  if(QtUi::mainWindow()->systemTray()->isAlerted()) {
+    QtUi::mainWindow()->systemTray()->setInhibitActivation();
+    emit activated(_activeId);
+  }
+}
+
+void SystrayNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
+  if(reason == QSystemTrayIcon::Trigger) {
+    notificationActivated();
+  }
+}
+
 void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {
   _showBubble = v.toBool();
 }