X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=6b67b2028a9b0c56d6804b46344020ec238ca173;hb=5941801a1a5a61dc6d3e409ba33ab413adc9005f;hp=35dd2dd70c0c16fee481f756293c65da472ec21a;hpb=fadb064c526843a7f6f6e4532372eee009fa3c3b;p=quassel.git

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index 35dd2dd7..6b67b202 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-08 by the Quassel Project                          *
+*   Copyright (C) 2005-09 by the Quassel Project                          *
 *   devel@quassel-irc.org                                                 *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -28,8 +28,11 @@
 #include "mainwin.h"
 #include "networkmodel.h"
 #include "qtui.h"
+#include "systemtray.h"
 
-SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) : AbstractNotificationBackend(parent) {
+SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
+  : AbstractNotificationBackend(parent), _activeId(0)
+{
   NotificationSettings notificationSettings;
   _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
   _animate = notificationSettings.value("Systray/Animate", true).toBool();
@@ -37,13 +40,7 @@ SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent) : Abstra
   notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &)));
   notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &)));
 
-  _configWidget = new ConfigWidget();
-  _iconActive = false;
-  connect(&_animationTimer, SIGNAL(timeout()), SLOT(blink()));
-}
-
-SystrayNotificationBackend::~SystrayNotificationBackend() {
-  delete _configWidget;
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated()));
 }
 
 void SystrayNotificationBackend::notify(const Notification &notification) {
@@ -55,12 +52,11 @@ void SystrayNotificationBackend::notify(const Notification &notification) {
   */
   _notifications.clear();
   _notifications.append(notification);
-  if(_showBubble) {
+  if(_showBubble)
     showBubble();
-  }
-  if(_animate) {
-    startAnimation();
-  }
+
+  if(_animate)
+    QtUi::mainWindow()->systemTray()->setAlert(true);
 }
 
 void SystrayNotificationBackend::close(uint notificationId) {
@@ -72,7 +68,7 @@ void SystrayNotificationBackend::close(uint notificationId) {
   */
   _notifications.clear();
   closeBubble();
-  stopAnimation();
+  QtUi::mainWindow()->systemTray()->setAlert(false);
 }
 
 void SystrayNotificationBackend::showBubble() {
@@ -80,45 +76,33 @@ void SystrayNotificationBackend::showBubble() {
   // for now, we just show the last message
   if(_notifications.isEmpty()) return;
   Notification n = _notifications.takeLast();
+  _activeId = n.notificationId;
   QString title = Client::networkModel()->networkName(n.bufferId) + " - " + Client::networkModel()->bufferName(n.bufferId);
   QString message = QString("<%1> %2").arg(n.sender, n.message);
-  QtUi::mainWindow()->systemTrayIcon()->showMessage(title, message);
+  QtUi::mainWindow()->systemTray()->showMessage(title, message);
 }
 
 void SystrayNotificationBackend::closeBubble() {
-  // there really seems to be no decent way to close the bubble...
-  // in addition, windows ignores the timeout -_-
-#ifndef Q_WS_WIN
-  QtUi::mainWindow()->systemTrayIcon()->showMessage("", "", QSystemTrayIcon::NoIcon, 1);
+  // there really seems to be no sane way to close the bubble... :(
+#ifdef Q_WS_X11
+  QtUi::mainWindow()->systemTray()->showMessage("", "", QSystemTrayIcon::NoIcon, 1);
 #endif
 }
 
-void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {
-  _showBubble = v.toBool();
+void SystrayNotificationBackend::notificationActivated() {
+  emit activated(_activeId);
 }
 
-void SystrayNotificationBackend::startAnimation() {
-  if(!_animationTimer.isActive())
-    _animationTimer.start(500);
-}
-
-void SystrayNotificationBackend::stopAnimation() {
-  _animationTimer.stop();
-  QtUi::mainWindow()->systemTrayIcon()->setIcon(Icon("quassel"));
-  _iconActive = false;
-}
-
-void SystrayNotificationBackend::blink() {
-  QtUi::mainWindow()->systemTrayIcon()->setIcon(_iconActive ? Icon("quassel") : Icon("quassel_newmessage"));
-  _iconActive = !_iconActive;
+void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {
+  _showBubble = v.toBool();
 }
 
 void SystrayNotificationBackend::animateChanged(const QVariant &v) {
   _animate = v.toBool();
 }
 
-SettingsPage *SystrayNotificationBackend::configWidget() const {
-  return _configWidget;
+SettingsPage *SystrayNotificationBackend::createConfigWidget() const {
+  return new ConfigWidget();
 }
 
 /***************************************************************************/