#include "systemtray.h"
SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
- : AbstractNotificationBackend(parent), _activeId(0)
+ : AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
_showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &)));
connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated()));
+ connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
}
void SystrayNotificationBackend::notify(const Notification ¬ification) {
- /* fancy stuff to be implemented later: show notifications in order
- _notifications.append(notification);
- if(_showBubble && _notifications.count() == 1) {
- showBubble();
- }
- */
- _notifications.clear();
+ if(notification.type != Highlight && notification.type != PrivMsg)
+ return;
+
_notifications.append(notification);
if(_showBubble)
showBubble();
}
void SystrayNotificationBackend::close(uint notificationId) {
- Q_UNUSED(notificationId);
- /* fancy stuff to be implemented later
- int idx = _notifications.indexOf(notificationId);
+ QList<Notification>::iterator i = _notifications.begin();
+ while(i != _notifications.end()) {
+ if(i->notificationId == notificationId)
+ i = _notifications.erase(i);
+ else
+ ++i;
+ }
- if(_notifications.isEmpty()) {
- */
- _notifications.clear();
closeBubble();
- QtUi::mainWindow()->systemTray()->setAlert(false);
+
+ if(!_notifications.count())
+ QtUi::mainWindow()->systemTray()->setAlert(false);
}
void SystrayNotificationBackend::showBubble() {
// fancy stuff later: show messages in order
// for now, we just show the last message
- if(_notifications.isEmpty()) return;
- Notification n = _notifications.takeLast();
- _activeId = n.notificationId;
+ if(_notifications.isEmpty())
+ return;
+ Notification n = _notifications.last();
QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId);
QString message = QString("<%1> %2").arg(n.sender, n.message);
QtUi::mainWindow()->systemTray()->showMessage(title, message);
}
void SystrayNotificationBackend::notificationActivated() {
- emit activated(_activeId);
+ if(QtUi::mainWindow()->systemTray()->isAlerted()) {
+ QtUi::mainWindow()->systemTray()->setInhibitActivation();
+ uint id = _notifications.count()? _notifications.last().notificationId : 0;
+ emit activated(id);
+ }
+}
+
+void SystrayNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
+ if(reason == QSystemTrayIcon::Trigger) {
+ notificationActivated();
+ }
}
void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {