Make disabling the tray icon animation work again

[quassel.git] / src / qtui / systraynotificationbackend.cpp

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index a451665..82d9f96 100644 (file)
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -18,9 +18,12 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "systraynotificationbackend.h"
+#include <QApplication>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QVBoxLayout>
 
-#include <QtGui>
+#include "systraynotificationbackend.h"
 
 #include "client.h"
 #include "clientsettings.h"
@@ -31,30 +34,37 @@
 #include "systemtray.h"
 
 SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
-  : AbstractNotificationBackend(parent)
+  : AbstractNotificationBackend(parent),
+  _blockActivation(false)
 {
   NotificationSettings notificationSettings;
-  _showBubble = notificationSettings.value("Systray/ShowBubble", true).toBool();
-  _animate = notificationSettings.value("Systray/Animate", true).toBool();
-
-  notificationSettings.notify("Systray/ShowBubble", this, SLOT(showBubbleChanged(const QVariant &)));
-  notificationSettings.notify("Systray/Animate", this, SLOT(animateChanged(const QVariant &)));
+  notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true);
+  notificationSettings.initAndNotify("Systray/Animate", this, SLOT(animateChanged(QVariant)), true);
 
+  connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked(uint)), SLOT(notificationActivated(uint)));
   connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
                                             SLOT(notificationActivated(SystemTray::ActivationReason)));
-  connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked()), SLOT(notificationActivated()));
+
+  QApplication::instance()->installEventFilter(this);
+
+  updateToolTip();
 }
 
-void SystrayNotificationBackend::notify(const Notification &notification) {
-  if(notification.type != Highlight && notification.type != PrivMsg)
+void SystrayNotificationBackend::notify(const Notification &n) {
+  if(n.type != Highlight && n.type != PrivMsg)
     return;
 
-  _notifications.append(notification);
-  if(_showBubble)
-    showBubble();
+  _notifications.append(n);
+  if(_showBubble) {
+    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, SystemTray::Information, 10000, n.notificationId);
+  }
 
   if(_animate)
     QtUi::mainWindow()->systemTray()->setAlert(true);
+
+  updateToolTip();
 }
 
 void SystrayNotificationBackend::close(uint notificationId) {
@@ -66,42 +76,38 @@ void SystrayNotificationBackend::close(uint notificationId) {
       ++i;
   }
 
-  closeBubble();
+  QtUi::mainWindow()->systemTray()->closeMessage(notificationId);
 
   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.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::closeBubble() {
-  // there really seems to be no sane way to close the bubble... :(
-#ifdef Q_WS_X11
-  QtUi::mainWindow()->systemTray()->showMessage("", "", SystemTray::NoIcon, 1);
-#endif
+  updateToolTip();
 }
 
-void SystrayNotificationBackend::notificationActivated() {
-  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(uint notificationId) {
+  if(!_blockActivation) {
+    if(QtUi::mainWindow()->systemTray()->isAlerted()) {
+      _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal
+      if(!notificationId)
+        notificationId = _notifications.count()? _notifications.last().notificationId : 0;
+      emit activated(notificationId);
+    } else
+      GraphicalUi::toggleMainWidget();
   }
 }
 
 void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason) {
   if(reason == SystemTray::Trigger) {
-    notificationActivated();
+    notificationActivated(0);
+  }
+}
+
+// moving the mouse or releasing the button means that we're not dealing with a double activation
+bool SystrayNotificationBackend::eventFilter(QObject *obj, QEvent *event) {
+  if(event->type() == QEvent::MouseMove || event->type() == QEvent::MouseButtonRelease) {
+    _blockActivation = false;
   }
+  return AbstractNotificationBackend::eventFilter(obj, event);
 }
 
 void SystrayNotificationBackend::showBubbleChanged(const QVariant &v) {
@@ -112,6 +118,11 @@ void SystrayNotificationBackend::animateChanged(const QVariant &v) {
   _animate = v.toBool();
 }
 
+void SystrayNotificationBackend::updateToolTip() {
+  QtUi::mainWindow()->systemTray()->setToolTip("Quassel IRC",
+                                               _notifications.count()? tr("%n pending highlights", "", _notifications.count()) : QString());
+}
+
 SettingsPage *SystrayNotificationBackend::createConfigWidget() const {
   return new ConfigWidget();
 }