- type = "PrivMsgFocused"; break;
- }
-
- QString message = QString("<b><%1></b> %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);
- 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);
+ type = "PrivMsgFocused"; break;
+ }
+
+#if QT_VERSION < 0x050000
+ QString message = QString("<b><%1></b> %2").arg(n.sender, Qt::escape(n.message));
+#else
+ QString message = QString("<b><%1></b> %2").arg(n.sender, n.message.toHtmlEscaped());
+#endif
+ KNotification *notification = KNotification::event(type, message, QIcon::fromTheme("dialog-information").pixmap(48), QtUi::mainWindow(),
+ KNotification::RaiseWidgetOnActivation
+ |KNotification::CloseWhenWidgetActivated
+ |KNotification::CloseOnTimeout);
+ connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
+ notification->setActions(QStringList("View"));
+ notification->setProperty("notificationId", n.notificationId);
+
+ _notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
+
+ updateToolTip();
+ QtUi::mainWindow()->systemTray()->setAlert(true);
+}
+
+
+void KNotificationBackend::removeNotificationById(uint notificationId)
+{
+ QList<QPair<uint, QPointer<KNotification> > >::iterator i = _notifications.begin();
+ while (i != _notifications.end()) {
+ if (i->first == notificationId) {
+ if (i->second)
+ i->second->close();
+ i = _notifications.erase(i);
+ }
+ else
+ ++i;
+ }
+ updateToolTip();
+}
+
+
+void KNotificationBackend::close(uint notificationId)
+{
+ removeNotificationById(notificationId);
+ //if(!_notifications.count()) // FIXME make configurable
+ QtUi::mainWindow()->systemTray()->setAlert(false);