X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=1c97d4f5df4c2cea6a30d865d005270bc160ba36;hp=219a9817cb5f509e17eccd219912fc426191f994;hb=d76bb125c8dd275095409edd3426700a98d89f3a;hpb=6848967a5071f48f2cd742b548dd97d8525733df

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index 219a9817..1c97d4f5 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  *
@@ -18,6 +18,8 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
+#ifndef QT_NO_SYSTEMTRAYICON
+
 #include "systraynotificationbackend.h"
 
 #include <QtGui>
@@ -28,8 +30,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)
+{
   NotificationSettings notificationSettings;
   _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
   _animate = notificationSettings.value("Systray/Animate", true).toBool();
@@ -37,87 +42,80 @@ 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()));
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+                                            SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
 }
 
 void SystrayNotificationBackend::notify(const Notification &notification) {
-  /* 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) {
+  if(_showBubble)
     showBubble();
-  }
-  if(_animate) {
-    startAnimation();
-  }
+
+  if(_animate)
+    QtUi::mainWindow()->systemTray()->setAlert(true);
 }
 
 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();
-  stopAnimation();
+
+  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();
+  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()->systemTrayIcon()->showMessage(title, message);
+  QtUi::mainWindow()->systemTray()->showMessage(title, message);
 }
 
 void SystrayNotificationBackend::closeBubble() {
   // there really seems to be no sane way to close the bubble... :(
 #ifdef Q_WS_X11
-  QtUi::mainWindow()->systemTrayIcon()->showMessage("", "", QSystemTrayIcon::NoIcon, 1);
+  QtUi::mainWindow()->systemTray()->showMessage("", "", QSystemTrayIcon::NoIcon, 1);
 #endif
 }
 
-void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {
-  _showBubble = v.toBool();
-}
-
-void SystrayNotificationBackend::startAnimation() {
-  if(!_animationTimer.isActive())
-    _animationTimer.start(500);
+void SystrayNotificationBackend::notificationActivated() {
+  if(QtUi::mainWindow()->systemTray()->isAlerted()) {
+    QtUi::mainWindow()->systemTray()->setInhibitActivation();
+    uint id = _notifications.count()? _notifications.last().notificationId : 0;
+    emit activated(id);
+  }
 }
 
-void SystrayNotificationBackend::stopAnimation() {
-  _animationTimer.stop();
-  QtUi::mainWindow()->systemTrayIcon()->setIcon(Icon("quassel"));
-  _iconActive = false;
+void SystrayNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
+  if(reason == QSystemTrayIcon::Trigger) {
+    notificationActivated();
+  }
 }
 
-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();
 }
 
 /***************************************************************************/
@@ -167,3 +165,5 @@ void SystrayNotificationBackend::ConfigWidget::save() {
   s.setValue("Systray/ShowBubble", _showBubbleBox->isChecked());
   load();
 }
+
+#endif /* QT_NO_SYSTEMTRAYICON */