X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=b6652962201c2e2cf0b5f23797f340790b8f9dde;hp=e82af91a1b6e8f887b3f97c9ff275f86e5d72202;hb=1d9dfeff6b2531ff99e0d12669b3a1dae393e768;hpb=e543fd403c4315d8569ea09d868b6fface37b207

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index e82af91a..b6652962 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -31,7 +31,7 @@
 #include "systemtray.h"
 
 SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
-  : AbstractNotificationBackend(parent), _activeId(0)
+  : AbstractNotificationBackend(parent)
 {
   NotificationSettings notificationSettings;
   _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
@@ -49,13 +49,6 @@ 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) {
-    showBubble();
-  }
-  */
-  _notifications.clear();
   _notifications.append(notification);
   if(_showBubble)
     showBubble();
@@ -65,16 +58,18 @@ void SystrayNotificationBackend::notify(const Notification &notification) {
 }
 
 void SystrayNotificationBackend::close(uint notificationId) {
-  Q_UNUSED(notificationId);
-  /* fancy stuff to be implemented later
-  int idx = _notifications.indexOf(notificationId);
-
-  if(_notifications.isEmpty()) {
-  */
-  _notifications.clear();
-  _activeId = 0;
+  QList<Notification>::iterator i = _notifications.begin();
+  while(i != _notifications.end()) {
+    if(i->notificationId == notificationId)
+      i = _notifications.erase(i);
+    else
+      ++i;
+  }
+
   closeBubble();
-  QtUi::mainWindow()->systemTray()->setAlert(false);
+
+  if(!_notifications.count())
+    QtUi::mainWindow()->systemTray()->setAlert(false);
 }
 
 void SystrayNotificationBackend::showBubble() {
@@ -82,8 +77,7 @@ void SystrayNotificationBackend::showBubble() {
   // for now, we just show the last message
   if(_notifications.isEmpty())
     return;
-  Notification n = _notifications.takeLast();
-  _activeId = n.notificationId;
+  Notification n = _notifications.last();
   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);
@@ -99,7 +93,8 @@ void SystrayNotificationBackend::closeBubble() {
 void SystrayNotificationBackend::notificationActivated() {
   if(QtUi::mainWindow()->systemTray()->isAlerted()) {
     QtUi::mainWindow()->systemTray()->setInhibitActivation();
-    emit activated(_activeId);
+    uint id = _notifications.count()? _notifications.last().notificationId : 0;
+    emit activated(id);
   }
 }