X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fknotificationbackend.cpp;h=24974e0f6fd61d557e1009b6611590c003f5ad05;hb=e472996a053e11d21ffef4a30f7d37461239cdab;hp=f27a9d767021cbd7ac3b5e12c4e0b264a51365d5;hpb=17d5912f299db23a09a78311a5bb3fe5effec5b9;p=quassel.git
diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index f27a9d76..24974e0f 100644
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -33,8 +33,11 @@
#include "qtui.h"
#include "systemtray.h"
-KNotificationBackend::KNotificationBackend(QObject *parent) : AbstractNotificationBackend(parent) {
-
+KNotificationBackend::KNotificationBackend(QObject *parent)
+: AbstractNotificationBackend(parent)
+{
+ connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
}
void KNotificationBackend::notify(const Notification &n) {
@@ -52,33 +55,55 @@ void KNotificationBackend::notify(const Notification &n) {
QString message = QString("<%1> %2").arg(n.sender, Qt::escape(n.message));
KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
- KNotification::Persistent|KNotification::RaiseWidgetOnActivation|KNotification::CloseWhenWidgetActivated);
+ KNotification::RaiseWidgetOnActivation
+ |KNotification::CloseWhenWidgetActivated
+ |KNotification::CloseOnTimeout);
connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
- connect(notification, SIGNAL(closed()), SLOT(notificationClosed()));
notification->setActions(QStringList("View"));
- _notificationIds[notification] = n.notificationId;
+ notification->setProperty("notificationId", n.notificationId);
+
+ _notifications.append(qMakePair(n.notificationId, QPointer(notification)));
QtUi::mainWindow()->systemTray()->setAlert(true);
}
+void KNotificationBackend::removeNotificationById(uint notificationId) {
+ QList > >::iterator i = _notifications.begin();
+ while(i != _notifications.end()) {
+ if(i->first == notificationId) {
+ if(i->second)
+ i->second->close();
+ i = _notifications.erase(i);
+ } else
+ ++i;
+ }
+}
+
void KNotificationBackend::close(uint notificationId) {
- Q_UNUSED(notificationId);
- QtUi::mainWindow()->systemTray()->setAlert(false);
+ removeNotificationById(notificationId);
+ if(!_notifications.count())
+ QtUi::mainWindow()->systemTray()->setAlert(false);
}
void KNotificationBackend::notificationActivated() {
uint id = 0;
KNotification *n = qobject_cast(sender());
- if(n && _notificationIds.contains(n))
- id = _notificationIds.value(n);
+ if(n)
+ id = n->property("notificationId").toUInt();
- emit activated(id);
+ notificationActivated(id);
}
-void KNotificationBackend::notificationClosed() {
- KNotification *n = qobject_cast(sender());
- if(n && _notificationIds.contains(n))
- _notificationIds.remove(n);
+void KNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
+ if(reason == QSystemTrayIcon::Trigger && _notifications.count()) {
+ notificationActivated(_notifications.first().first); // oldest one
+ }
+}
+
+void KNotificationBackend::notificationActivated(uint notificationId) {
+ QtUi::mainWindow()->systemTray()->setInhibitActivation();
+ emit activated(notificationId);
+
}
SettingsPage *KNotificationBackend::createConfigWidget() const {