This was partially broken for KDEified Quassel.
#include "qtui.h"
#include "systemtray.h"
#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)));
}
connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
}
connect(notification, SIGNAL(activated(uint)), SLOT(notificationActivated()));
connect(notification, SIGNAL(closed()), SLOT(notificationClosed()));
notification->setActions(QStringList("View"));
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);
}
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) {
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() {
}
void KNotificationBackend::notificationActivated() {
}
void KNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
}
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) {
}
}
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);
QtUi::mainWindow()->systemTray()->setInhibitActivation();
emit activated(notificationId);
}
void KNotificationBackend::notificationClosed() {
}
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 {
}
SettingsPage *KNotificationBackend::createConfigWidget() const {
private:
class ConfigWidget;
private:
class ConfigWidget;
+ void removeNotificationById(uint id);
+
QHash<KNotification *, uint> _notificationIds;
QHash<KNotification *, uint> _notificationIds;
+ uint _lastNotificationId;
};
class KNotificationBackend::ConfigWidget : public SettingsPage {
};
class KNotificationBackend::ConfigWidget : public SettingsPage {