Select highlighted channel on clicking the blinking tray icon in all cases

This was partially broken for KDEified Quassel.

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index 076ba2d..4e13796 100644 (file)
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -33,7 +33,10 @@
 #include "qtui.h"
 #include "systemtray.h"
 
-KNotificationBackend::KNotificationBackend(QObject *parent) : AbstractNotificationBackend(parent) {
+KNotificationBackend::KNotificationBackend(QObject *parent)
+: AbstractNotificationBackend(parent),
+  _lastNotificationId(0)
+{
   connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
                                             SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
 }
@@ -59,14 +62,27 @@ void KNotificationBackend::notify(const Notification &n) {
   connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
   connect(notification, SIGNAL(closed()), SLOT(notificationClosed()));
   notification->setActions(QStringList("View"));
-  _notificationIds[notification] = n.notificationId;
+  _notificationIds[notification] = _lastNotificationId = n.notificationId;
 
   QtUi::mainWindow()->systemTray()->setAlert(true);
 }
 
+void KNotificationBackend::removeNotificationById(uint notificationId) {
+  QHash<KNotification *, uint>::iterator i = _notificationIds.begin();
+  while(i != _notificationIds.end()) {
+    if(i.value() == notificationId)
+      i = _notificationIds.erase(i);
+    else
+      ++i;
+  }
+  if(_lastNotificationId == notificationId)
+    _lastNotificationId = 0;
+}
+
 void KNotificationBackend::close(uint notificationId) {
-  Q_UNUSED(notificationId);
-  QtUi::mainWindow()->systemTray()->setAlert(false);
+  removeNotificationById(notificationId);
+  if(!_notificationIds.count())
+    QtUi::mainWindow()->systemTray()->setAlert(false);
 }
 
 void KNotificationBackend::notificationActivated() {
@@ -79,19 +95,13 @@ void KNotificationBackend::notificationActivated() {
 }
 
 void KNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
-  if(reason == QSystemTrayIcon::Trigger && _notificationIds.count() > 0) {
-    notificationActivated(_notificationIds.values().at(0)); // we choose a random one for now
+  if(reason == QSystemTrayIcon::Trigger && _lastNotificationId > 0) {
+    notificationActivated(_lastNotificationId); // most recent one
   }
 }
 
 void KNotificationBackend::notificationActivated(uint notificationId) {
-  QHash<KNotification *, uint>::iterator i = _notificationIds.begin();
-  while(i != _notificationIds.end()) {
-    if(i.value() == notificationId)
-      i = _notificationIds.erase(i);
-    else
-      ++i;
-  }
+  removeNotificationById(notificationId);
 
   QtUi::mainWindow()->systemTray()->setInhibitActivation();
   emit activated(notificationId);
@@ -102,9 +112,9 @@ void KNotificationBackend::notificationActivated(uint notificationId) {
 }
 
 void KNotificationBackend::notificationClosed() {
-  KNotification *n = qobject_cast<KNotification *>(sender());
-  if(n && _notificationIds.contains(n))
-    _notificationIds.remove(n);
+  //KNotification *n = qobject_cast<KNotification *>(sender());
+  //if(n && _notificationIds.contains(n))
+  //  _notificationIds.remove(n);
 }
 
 SettingsPage *KNotificationBackend::createConfigWidget() const {

diff --git a/src/qtui/knotificationbackend.h b/src/qtui/knotificationbackend.h
index 5c93ed5..d846417 100644 (file)
--- a/src/qtui/knotificationbackend.h
+++ b/src/qtui/knotificationbackend.h
@@ -48,7 +48,10 @@ private slots:
 private:
   class ConfigWidget;
 
+  void removeNotificationById(uint id);
+
   QHash<KNotification *, uint> _notificationIds;
+  uint _lastNotificationId;
 };
 
 class KNotificationBackend::ConfigWidget : public SettingsPage {