X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fknotificationbackend.cpp;h=6cc25a6ac3c0f31fa09725ee6ef6a3a258af7b8f;hp=24974e0f6fd61d557e1009b6611590c003f5ad05;hb=2ed35d8a6322e49ab604472a7af59592cf36ae12;hpb=231d30c66b4f52d239deb608f77a0ceb8034fbe9

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index 24974e0f..6cc25a6a 100644
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -1,43 +1,44 @@
 /***************************************************************************
-*   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.             *
-***************************************************************************/
-
-#include <QVBoxLayout>
+ *   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 <KNotification>
 #include <KNotifyConfigWidget>
 #include <QTextDocument>
+#include <QVBoxLayout>
 
 #include "knotificationbackend.h"
 
 #include "client.h"
 #include "icon.h"
 #include "iconloader.h"
+#include "mainwin.h"
 #include "networkmodel.h"
 #include "qtui.h"
-#include "systemtray.h"
 
 KNotificationBackend::KNotificationBackend(QObject *parent)
 : AbstractNotificationBackend(parent)
 {
-  connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-                                            SLOT(notificationActivated(QSystemTrayIcon::ActivationReason)));
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
+                                            SLOT(notificationActivated(SystemTray::ActivationReason)));
+
+  updateToolTip();
 }
 
 void KNotificationBackend::notify(const Notification &n) {
@@ -64,6 +65,7 @@ void KNotificationBackend::notify(const Notification &n) {
 
   _notifications.append(qMakePair(n.notificationId, QPointer<KNotification>(notification)));
 
+  updateToolTip();
   QtUi::mainWindow()->systemTray()->setAlert(true);
 }
 
@@ -77,11 +79,12 @@ void KNotificationBackend::removeNotificationById(uint notificationId) {
     } else
       ++i;
   }
+  updateToolTip();
 }
 
 void KNotificationBackend::close(uint notificationId) {
   removeNotificationById(notificationId);
-  if(!_notifications.count())
+  //if(!_notifications.count()) // FIXME make configurable
     QtUi::mainWindow()->systemTray()->setAlert(false);
 }
 
@@ -94,16 +97,22 @@ void KNotificationBackend::notificationActivated() {
   notificationActivated(id);
 }
 
-void KNotificationBackend::notificationActivated(QSystemTrayIcon::ActivationReason reason) {
-  if(reason == QSystemTrayIcon::Trigger && _notifications.count()) {
-    notificationActivated(_notifications.first().first); // oldest one
+void KNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
+  if(reason == SystemTray::Trigger) {
+    if( _notifications.count())
+      notificationActivated(_notifications.first().first); // oldest one
+    else
+      GraphicalUi::toggleMainWidget();
   }
 }
 
 void KNotificationBackend::notificationActivated(uint notificationId) {
-  QtUi::mainWindow()->systemTray()->setInhibitActivation();
   emit activated(notificationId);
+}
 
+void KNotificationBackend::updateToolTip() {
+  QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
+                                               _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString());
 }
 
 SettingsPage *KNotificationBackend::createConfigWidget() const {