Rework tray icon activation behavior yet again
[quassel.git] / src / qtui / systemtray.cpp
index 8c34655..6b2b33c 100644 (file)
@@ -1,61 +1,65 @@
 /***************************************************************************
-*   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.             *
-***************************************************************************/
-
-#ifndef QT_NO_SYSTEMTRAYICON
-
+ *   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 <QMenu>
 
 #include "systemtray.h"
 
 #include "actioncollection.h"
+#include "client.h"
 #include "iconloader.h"
 #include "qtui.h"
-#include "qtuisettings.h"
 
-SystemTray::SystemTray(QObject *parent)
+#ifdef HAVE_KDE
+#  include <KWindowInfo>
+#  include <KWindowSystem>
+#endif
+
+SystemTray::SystemTray(QWidget *parent)
 : QObject(parent),
-  _state(Inactive),
-  _alert(false),
-  _inhibitActivation(false),
-  _currentIdx(0)
+  _mode(Invalid),
+  _state(Passive),
+  _passiveIcon(DesktopIcon("quassel_inactive")),
+  _activeIcon(DesktopIcon("quassel")),
+  _needsAttentionIcon(DesktopIcon("quassel_message")),
+  _trayMenu(0),
+  _associatedWidget(parent)
 {
-  loadAnimations();
-  _currentIdx = _idxOffEnd;
+  Q_ASSERT(parent);
+}
 
-#ifndef HAVE_KDE
-  _trayIcon = new QSystemTrayIcon(_phases.at(_currentIdx), QtUi::mainWindow());
-#else
-  _trayIcon = new KSystemTrayIcon(_phases.at(_currentIdx), 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)));
-#endif
+SystemTray::~SystemTray() {
+  _trayMenu->deleteLater();
+}
 
-  _animationTimer.setInterval(150);
-  _animationTimer.setSingleShot(false);
-  connect(&_animationTimer, SIGNAL(timeout()), SLOT(nextPhase()));
+QWidget *SystemTray::associatedWidget() const {
+  return _associatedWidget;
+}
 
-  ActionCollection *coll = QtUi::actionCollection("General");
-  _trayMenu = _trayIcon->contextMenu();
-  if (!_trayMenu)
+void SystemTray::setTrayMenu(QMenu *menu) {
+  if(menu)
+    _trayMenu = menu;
+  else
     _trayMenu = new QMenu();
+
+  ActionCollection *coll = QtUi::actionCollection("General");
+
   _trayMenu->addAction(coll->action("ConnectCore"));
   _trayMenu->addAction(coll->action("DisconnectCore"));
   _trayMenu->addAction(coll->action("CoreInfo"));
@@ -63,137 +67,65 @@ SystemTray::SystemTray(QObject *parent)
   _trayMenu->addSeparator();
   _trayMenu->addAction(coll->action("Quit"));
 #endif /* HAVE_KDE */
-
-  _trayIcon->setContextMenu(_trayMenu);
-
-  QtUiSettings s;
-  if(s.value("UseSystemTrayIcon", QVariant(true)).toBool()) {
-    _trayIcon->show();
-  }
-
-  qApp->installEventFilter(this);
-
-#ifndef Q_WS_MAC
-  connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), SLOT(on_activated(QSystemTrayIcon::ActivationReason)));
-#endif
-  connect(_trayIcon, SIGNAL(messageClicked()), SIGNAL(messageClicked()));
 }
 
-SystemTray::~SystemTray() {
-  _trayMenu->deleteLater();
+void SystemTray::setMode(Mode mode_) {
+  if(mode_ != _mode) {
+    _mode = mode_;
+    if(_mode == Legacy) {
+      _trayMenu->setWindowFlags(Qt::Popup);
+    } else {
+      _trayMenu->setWindowFlags(Qt::Window);
+    }
+  }
 }
 
-void SystemTray::loadAnimations() {
-// system tray icon size
-#ifdef Q_WS_WIN
-  const int size = 16;
-#elif defined Q_WS_MAC
-  const int size = 128;
-#else
-  const int size = 22;
-#endif
-
-  _phases.clear();
-
-#ifdef HAVE_KDE
-  KIconLoader *loader = KIconLoader::global();
-#else
-  IconLoader *loader = IconLoader::global();
-#endif
-
-  _idxOffStart = 0;
-  QString fadeOffName("quassel_tray-fade-off-%1");
-  for(int i = 2; i <= 10; i++)
-    _phases.append(loader->loadIcon(fadeOffName.arg(i), IconLoader::Panel, size));
-  _idxOffEnd = _idxOnStart = _phases.count() - 1;
-
-  QString fadeOnName("quassel_tray-fade-on-%1");
-  for(int i = 2; i <= 15; i++)
-    _phases.append(loader->loadIcon(fadeOnName.arg(i), IconLoader::Panel, size));
-  _idxOnEnd = _idxAlertStart = _phases.count() - 1;
-
-  QString alertName("quassel_tray-alert-%1");
-  for(int i = 1; i <= 10; i++)
-    _phases.append(loader->loadIcon(alertName.arg(i), IconLoader::Panel, size));
+Icon SystemTray::stateIcon() const {
+  return stateIcon(state());
 }
 
-void SystemTray::nextPhase() {
-  if(_currentIdx == _idxOnEnd && !_alert && _state == Inactive)
-    _currentIdx = _idxOffStart; // skip alert phases
-
-  else if(++_currentIdx >= _phases.count()) {
-    if(_alert)
-      _currentIdx = _idxAlertStart;
-    else
-      if(_state == Active)
-        _currentIdx = _idxOnEnd;
-      else
-        _currentIdx = _idxOffStart;
+Icon SystemTray::stateIcon(State state) const {
+  switch(state) {
+  case Passive:
+    return _passiveIcon;
+  case Active:
+    return _activeIcon;
+  case NeedsAttention:
+    return _needsAttentionIcon;
   }
-
-  _trayIcon->setIcon(_phases.at(_currentIdx));
-
-  if(_alert)
-    return;
-
-  if((_state == Active && _currentIdx == _idxOnEnd) || (_state == Inactive && _currentIdx == _idxOffEnd))
-    _animationTimer.stop();
+  return Icon();
 }
 
 void SystemTray::setState(State state) {
   if(_state != state) {
     _state = state;
-    if(state == Inactive && _alert)
-      _alert = false;
-    if(!_animationTimer.isActive())
-      _animationTimer.start();
-  }
-}
-
-void SystemTray::setAlert(bool alert) {
-  if(_alert != alert) {
-    _alert = alert;
-    if(!_animationTimer.isActive())
-      _animationTimer.start();
   }
 }
 
-void SystemTray::setIconVisible(bool visible) {
-  if(visible)
-    _trayIcon->show();
+void SystemTray::setAlert(bool alerted) {
+  if(alerted)
+    setState(NeedsAttention);
   else
-    _trayIcon->hide();
+    setState(Client::isConnected() ? Active : Passive);
 }
 
-void SystemTray::setToolTip(const QString &tip) {
-  _trayIcon->setToolTip(tip);
+void SystemTray::setVisible(bool visible) {
+  Q_UNUSED(visible)
 }
 
-void SystemTray::showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon icon, int millisecondsTimeoutHint) {
-  _trayIcon->showMessage(title, message, icon, millisecondsTimeoutHint);
+void SystemTray::setToolTip(const QString &title, const QString &subtitle) {
+  _toolTipTitle = title;
+  _toolTipSubTitle = subtitle;
+  emit toolTipChanged(title, subtitle);
 }
 
-bool SystemTray::eventFilter(QObject *obj, QEvent *event) {
-  Q_UNUSED(obj);
-  if(event->type() == QEvent::MouseButtonRelease) {
-    _inhibitActivation = false;
-  }
-  return false;
+void SystemTray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint) {
+  Q_UNUSED(title)
+  Q_UNUSED(message)
+  Q_UNUSED(icon)
+  Q_UNUSED(millisecondsTimeoutHint)
 }
 
-void SystemTray::on_activated(QSystemTrayIcon::ActivationReason reason) {
+void SystemTray::activate(SystemTray::ActivationReason reason) {
   emit activated(reason);
-
-  if(reason == QSystemTrayIcon::Trigger && !_inhibitActivation) {
-
-#  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
-
-  }
 }
-
-#endif /* QT_NO_SYSTEMTRAYICON */