X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fknotificationbackend.cpp;h=8cc58a9a0a0c3ab5bac69b9b8d03efa200f68992;hb=f3834efcf968a7f38c77ec34876ef011a46f944c;hp=64bdfdc30aa867678ea7cbf836d3572b52bf7161;hpb=8118229704229c33e151b3c707c8beaa0c077a86;p=quassel.git

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index 64bdfdc3..8cc58a9a 100644
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -22,6 +22,7 @@
 
 #include <KNotification>
 #include <KNotifyConfigWidget>
+#include <QTextDocument>
 
 #include "knotificationbackend.h"
 
@@ -37,11 +38,14 @@ KNotificationBackend::KNotificationBackend(QObject *parent) : AbstractNotificati
 }
 
 void KNotificationBackend::notify(const Notification &n) {
-  //QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId);
-  QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, n.message);
+  QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, Qt::escape(n.message));
   KNotification *notification = KNotification::event("Highlight", message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
                                 KNotification::Persistent|KNotification::RaiseWidgetOnActivation|KNotification::CloseWhenWidgetActivated);
-  connect(notification, SIGNAL(activated()), SLOT(notificationActivated()));
+  connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
+  connect(notification, SIGNAL(closed()), SLOT(notificationClosed()));
+  notification->setActions(QStringList("View"));
+  _notificationIds[notification] = n.notificationId;
+
   QtUi::mainWindow()->systemTray()->setAlert(true);
 }
 
@@ -51,7 +55,18 @@ void KNotificationBackend::close(uint notificationId) {
 }
 
 void KNotificationBackend::notificationActivated() {
-  emit activated();
+  uint id = 0;
+  KNotification *n = qobject_cast<KNotification *>(sender());
+  if(n && _notificationIds.contains(n))
+    id = _notificationIds.value(n);
+
+  emit activated(id);
+}
+
+void KNotificationBackend::notificationClosed() {
+  KNotification *n = qobject_cast<KNotification *>(sender());
+  if(n && _notificationIds.contains(n))
+    _notificationIds.remove(n);
 }
 
 SettingsPage *KNotificationBackend::createConfigWidget() const {