X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=7c2c81aa7af52c573322b96545a5f7363d70c100;hp=b57fd995944f3a6e7e31db0e8215465f0a2da732;hb=f04db2cb802b1296ca739c823495930c71d3b4ab;hpb=e7d1bc1fa02e1233f140e4b04d99ab8f4685bce5

diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index b57fd995..7c2c81aa 100644
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2013 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 file is free software; you can redistribute it and/or modify     *
+ *   it under the terms of the GNU Library General Public License (LGPL)   *
+ *   as published by the Free Software Foundation; either version 2 of the *
+ *   License, or (at your option) any later version.                       *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,120 +15,178 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
 #include "legacysystemtray.h"
+#include "mainwin.h"
 #include "qtui.h"
 
-LegacySystemTray::LegacySystemTray(QObject *parent)
-  : SystemTray(parent),
-  _blinkState(false),
-  _isVisible(true)
+LegacySystemTray::LegacySystemTray(QWidget *parent)
+    : SystemTray(parent),
+    _blinkState(false),
+    _lastMessageId(0)
 {
 #ifndef HAVE_KDE
-  _trayIcon = new QSystemTrayIcon(QtUi::mainWindow());
+    _trayIcon = new QSystemTrayIcon(associatedWidget());
 #else
-  _trayIcon = new KSystemTrayIcon(QtUi::mainWindow());
-  // We don't want to trigger a minimize if a highlight is pending, so we brutally remove the internal connection for that
-  disconnect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-                 _trayIcon, SLOT(activateOrHide(QSystemTrayIcon::ActivationReason)));
+    _trayIcon = new KSystemTrayIcon(associatedWidget());
+    // We don't want to trigger a minimize if a highlight is pending, so we brutally remove the internal connection for that
+    disconnect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+        _trayIcon, SLOT(activateOrHide(QSystemTrayIcon::ActivationReason)));
 #endif
 #ifndef Q_WS_MAC
-  connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-                     SLOT(on_activated(QSystemTrayIcon::ActivationReason)));
+    connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+        SLOT(on_activated(QSystemTrayIcon::ActivationReason)));
 #endif
-  connect(_trayIcon, SIGNAL(messageClicked()),
-                     SIGNAL(messageClicked()));
+    connect(_trayIcon, SIGNAL(messageClicked()),
+        SLOT(on_messageClicked()));
 
-  setTrayMenu(_trayIcon->contextMenu());
-  _trayIcon->setContextMenu(trayMenu());
+    _blinkTimer.setInterval(500);
+    _blinkTimer.setSingleShot(false);
+    connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout()));
 
-  _blinkTimer.setInterval(500);
-  _blinkTimer.setSingleShot(false);
-  connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout()));
+    connect(this, SIGNAL(toolTipChanged(QString, QString)), SLOT(syncLegacyIcon()));
 }
 
-void LegacySystemTray::init() {
-  if(mode() == Invalid) // derived class hasn't set a mode itself
-    setMode(Legacy);
+
+void LegacySystemTray::init()
+{
+    if (mode() == Invalid) // derived class hasn't set a mode itself
+        setMode(Legacy);
+
+    SystemTray::init();
+
+    _trayIcon->setContextMenu(trayMenu());
 }
 
-void LegacySystemTray::syncLegacyIcon() {
-  _trayIcon->setIcon(stateIcon());
-  _trayIcon->setToolTip(toolTipTitle());
+
+void LegacySystemTray::syncLegacyIcon()
+{
+    _trayIcon->setIcon(stateIcon());
+
+#if defined Q_WS_MAC || defined Q_WS_WIN
+    QString tooltip = QString("%1").arg(toolTipTitle());
+    if (!toolTipSubTitle().isEmpty())
+        tooltip += QString("\n%1").arg(toolTipSubTitle());
+#else
+    QString tooltip = QString("<b>%1</b>").arg(toolTipTitle());
+    if (!toolTipSubTitle().isEmpty())
+        tooltip += QString("<br>%1").arg(toolTipSubTitle());
+#endif
+
+    _trayIcon->setToolTip(tooltip);
 }
 
-void LegacySystemTray::setVisible(bool visible) {
-  _isVisible = visible;
-  if(mode() == Legacy) {
-    if(visible)
-      _trayIcon->show();
-    else
-      _trayIcon->hide();
-  }
+
+void LegacySystemTray::setVisible(bool visible)
+{
+    SystemTray::setVisible(visible);
+    if (mode() == Legacy) {
+        if (shouldBeVisible())
+            _trayIcon->show();
+        else
+            _trayIcon->hide();
+    }
 }
 
-void LegacySystemTray::setMode(Mode mode_) {
-  SystemTray::setMode(mode_);
-
-  if(mode() == Legacy) {
-    syncLegacyIcon();
-    if(_isVisible)
-      _trayIcon->show();
-    if(state() == NeedsAttention)
-      _blinkTimer.start();
-  } else {
-    _trayIcon->hide();
-    _blinkTimer.stop();
-  }
+
+bool LegacySystemTray::isVisible() const
+{
+    if (mode() == Legacy) {
+        return _trayIcon->isVisible();
+    }
+    return SystemTray::isVisible();
 }
 
-void LegacySystemTray::setState(State state_) {
-  State oldstate = state();
-  SystemTray::setState(state_);
-  if(oldstate != state()) {
-    if(state() == NeedsAttention && mode() == Legacy)
-      _blinkTimer.start();
+
+void LegacySystemTray::setMode(Mode mode_)
+{
+    if (mode_ == mode())
+        return;
+
+    SystemTray::setMode(mode_);
+
+    if (mode() == Legacy) {
+        syncLegacyIcon();
+        if (shouldBeVisible())
+            _trayIcon->show();
+        else
+            _trayIcon->hide();
+        if (state() == NeedsAttention)
+            _blinkTimer.start();
+    }
     else {
-      _blinkTimer.stop();
-      _blinkState = false;
+        _trayIcon->hide();
+        _blinkTimer.stop();
     }
-  }
-  if(mode() == Legacy)
-    _trayIcon->setIcon(stateIcon());
 }
 
-Icon LegacySystemTray::stateIcon() const {
-  if(mode() == Legacy && state() == NeedsAttention && !_blinkState)
-    return SystemTray::stateIcon(Active);
-  return SystemTray::stateIcon();
+
+void LegacySystemTray::setState(State state_)
+{
+    State oldstate = state();
+    SystemTray::setState(state_);
+    if (oldstate != state()) {
+        if (state() == NeedsAttention && mode() == Legacy && animationEnabled())
+            _blinkTimer.start();
+        else {
+            _blinkTimer.stop();
+            _blinkState = false;
+        }
+    }
+    if (mode() == Legacy)
+        _trayIcon->setIcon(stateIcon());
 }
 
-void LegacySystemTray::on_blinkTimeout() {
-  _blinkState = !_blinkState;
-  _trayIcon->setIcon(stateIcon());
+
+Icon LegacySystemTray::stateIcon() const
+{
+    if (mode() == Legacy && state() == NeedsAttention && !_blinkState)
+        return SystemTray::stateIcon(Active);
+    return SystemTray::stateIcon();
 }
 
-void LegacySystemTray::on_activated(QSystemTrayIcon::ActivationReason reason) {
-  emit activated((ActivationReason)reason);
 
-  if(reason == QSystemTrayIcon::Trigger && !isActivationInhibited()) {
+void LegacySystemTray::on_blinkTimeout()
+{
+    _blinkState = !_blinkState;
+    _trayIcon->setIcon(stateIcon());
+}
 
-#  ifdef HAVE_KDE
-     // the slot is private, but meh, who cares :)
-     QMetaObject::invokeMethod(_trayIcon, "activateOrHide", Q_ARG(QSystemTrayIcon::ActivationReason, QSystemTrayIcon::Trigger));
-#  else
-     QtUi::mainWindow()->toggleMinimizedToTray();
-#  endif
 
-  }
+void LegacySystemTray::on_activated(QSystemTrayIcon::ActivationReason reason)
+{
+    activate((SystemTray::ActivationReason)reason);
 }
 
-void LegacySystemTray::showMessage(const QString &title, const QString &message, SystemTray::MessageIcon icon, int millisecondsTimeoutHint) {
-  _trayIcon->showMessage(title, message, (QSystemTrayIcon::MessageIcon)icon, millisecondsTimeoutHint);
+
+void LegacySystemTray::on_messageClicked()
+{
+    emit messageClicked(_lastMessageId);
 }
 
+
+void LegacySystemTray::showMessage(const QString &title, const QString &message, SystemTray::MessageIcon icon, int msTimeout, uint id)
+{
+    // fancy stuff later: show messages in order
+    // for now, we just show the last message
+    _lastMessageId = id;
+    _trayIcon->showMessage(title, message, (QSystemTrayIcon::MessageIcon)icon, msTimeout);
+}
+
+
+void LegacySystemTray::closeMessage(uint notificationId)
+{
+    Q_UNUSED(notificationId)
+
+    // there really seems to be no sane way to close the bubble... :(
+#ifdef Q_WS_X11
+    showMessage("", "", NoIcon, 1);
+#endif
+}
+
+
 #endif /* QT_NO_SYSTEMTRAYICON */