X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=a45166593c461c6edd903dfa67ce9bf5336d4451;hp=545c22dd9c062e8b466a972a390d6cf46dfec877;hb=d452877910888c25d40590b5fff57eb8197ca9b0;hpb=9ea27e456f4163c37118f6dc34188809fc37d6d9

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index 545c22dd..a4516659 100644
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -1,22 +1,22 @@
 /***************************************************************************
-*   Copyright (C) 2005-09 by the Quassel Project                          *
-*   devel@quassel-irc.org                                                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) version 3.                                           *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
-***************************************************************************/
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   devel@quassel-irc.org                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) version 3.                                           *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
 
 #include "systraynotificationbackend.h"
 
@@ -31,7 +31,7 @@
 #include "systemtray.h"
 
 SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
-  : AbstractNotificationBackend(parent), _activeId(0)
+  : AbstractNotificationBackend(parent)
 {
   NotificationSettings notificationSettings;
   _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
@@ -40,6 +40,8 @@ SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
   notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &)));
   notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &)));
 
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
+                                            SLOT(notificationActivated(SystemTray::ActivationReason)));
   connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated()));
 }
 
@@ -47,13 +49,6 @@ void SystrayNotificationBackend::notify(const Notification &notification) {
   if(notification.type != Highlight && notification.type != PrivMsg)
     return;
 
-  /* fancy stuff to be implemented later: show notifications in order
-  _notifications.append(notification);
-  if(_showBubble && _notifications.count() == 1) {
-    showBubble();
-  }
-  */
-  _notifications.clear();
   _notifications.append(notification);
   if(_showBubble)
     showBubble();
@@ -63,23 +58,26 @@ void SystrayNotificationBackend::notify(const Notification &notification) {
 }
 
 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);
@@ -88,12 +86,22 @@ void SystrayNotificationBackend::showBubble() {
 void SystrayNotificationBackend::closeBubble() {
   // there really seems to be no sane way to close the bubble... :(
 #ifdef Q_WS_X11
-  QtUi::mainWindow()->systemTray()->showMessage("", "", QSystemTrayIcon::NoIcon, 1);
+  QtUi::mainWindow()->systemTray()->showMessage("", "", SystemTray::NoIcon, 1);
 #endif
 }
 
 void SystrayNotificationBackend::notificationActivated() {
-  emit activated(_activeId);
+  if(QtUi::mainWindow()->systemTray()->isAlerted() && !QtUi::mainWindow()->systemTray()->isActivationInhibited()) {
+    QtUi::mainWindow()->systemTray()->setInhibitActivation();
+    uint id = _notifications.count()? _notifications.last().notificationId : 0;
+    emit activated(id);
+  }
+}
+
+void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
+  if(reason == SystemTray::Trigger) {
+    notificationActivated();
+  }
 }
 
 void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {