X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=40cd2ed8f756fd6567420f9f440896675263b074;hb=d1aa795013aaebe5ca57353d6077b0007b489832;hp=0c6a1e3609cc277527e6d4c55f3ce3f3f7532152;hpb=5ba28fb36a747bd9a2c05a58f0533d1e38c2a0de;p=quassel.git
diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index 0c6a1e36..40cd2ed8 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-2018 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,141 +15,131 @@
* 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 "icon.h"
#include "mainwin.h"
#include "qtui.h"
LegacySystemTray::LegacySystemTray(QWidget *parent)
- : SystemTray(parent),
- _blinkState(false),
- _isVisible(true),
- _lastMessageId(0)
+ : SystemTray(parent)
{
-#ifndef HAVE_KDE
- _trayIcon = new QSystemTrayIcon(associatedWidget());
+#ifndef HAVE_KDE4
+ _trayIcon = new QSystemTrayIcon(associatedWidget());
#else
- _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)));
+ _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)));
+#ifndef Q_OS_MAC
+ connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
+ SLOT(onActivated(QSystemTrayIcon::ActivationReason)));
#endif
- connect(_trayIcon, SIGNAL(messageClicked()),
- SLOT(on_messageClicked()));
-
- _blinkTimer.setInterval(500);
- _blinkTimer.setSingleShot(false);
- connect(&_blinkTimer, SIGNAL(timeout()), SLOT(on_blinkTimeout()));
+ connect(_trayIcon, SIGNAL(messageClicked()),
+ SLOT(onMessageClicked()));
- connect(this, SIGNAL(toolTipChanged(QString,QString)), SLOT(syncLegacyIcon()));
-}
+ _trayIcon->setContextMenu(trayMenu());
+ _trayIcon->setVisible(false);
-void LegacySystemTray::init() {
- if(mode() == Invalid) // derived class hasn't set a mode itself
- setMode(Legacy);
+ setMode(Mode::Legacy);
- SystemTray::init();
+ connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(onVisibilityChanged(bool)));
+ connect(this, SIGNAL(modeChanged(Mode)), this, SLOT(onModeChanged(Mode)));
+ connect(this, SIGNAL(toolTipChanged(QString, QString)), SLOT(updateToolTip()));
+ connect(this, SIGNAL(iconsChanged()), this, SLOT(updateIcon()));
+ connect(this, SIGNAL(currentIconNameChanged()), this, SLOT(updateIcon()));
- _trayIcon->setContextMenu(trayMenu());
+ updateIcon();
+ updateToolTip();
}
-void LegacySystemTray::syncLegacyIcon() {
- _trayIcon->setIcon(stateIcon());
- QString tooltip = QString("%1").arg(toolTipTitle());
- if(!toolTipSubTitle().isEmpty())
- tooltip += QString("
%1").arg(toolTipSubTitle());
- _trayIcon->setToolTip(tooltip);
+bool LegacySystemTray::isSystemTrayAvailable() const
+{
+ return mode() == Mode::Legacy
+ ? QSystemTrayIcon::isSystemTrayAvailable()
+ : SystemTray::isSystemTrayAvailable();
}
-void LegacySystemTray::setVisible(bool visible) {
- _isVisible = visible;
- if(mode() == Legacy) {
- if(visible)
- _trayIcon->show();
- else
- _trayIcon->hide();
- }
-}
-bool LegacySystemTray::isVisible() const {
- if(mode() == Legacy) {
- return _trayIcon->isVisible();
- }
- return false;
+void LegacySystemTray::onVisibilityChanged(bool isVisible)
+{
+ if (mode() == Legacy) {
+ _trayIcon->setVisible(isVisible);
+ }
}
-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();
- }
-}
-void LegacySystemTray::setState(State state_) {
- State oldstate = state();
- SystemTray::setState(state_);
- if(oldstate != state()) {
- if(state() == NeedsAttention && mode() == Legacy)
- _blinkTimer.start();
+void LegacySystemTray::onModeChanged(Mode mode)
+{
+ if (mode == Mode::Legacy) {
+ _trayIcon->setVisible(isVisible());
+ }
else {
- _blinkTimer.stop();
- _blinkState = false;
+ _trayIcon->hide();
}
- }
- 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::updateIcon()
+{
+ QString iconName = (state() == NeedsAttention) ? currentAttentionIconName() : currentIconName();
+ _trayIcon->setIcon(icon::get(iconName, QString{":/icons/hicolor/24x24/status/%1.svg"}.arg(iconName)));
}
-void LegacySystemTray::on_blinkTimeout() {
- _blinkState = !_blinkState;
- _trayIcon->setIcon(stateIcon());
+
+void LegacySystemTray::updateToolTip()
+{
+#if defined Q_OS_MAC || defined Q_OS_WIN
+ QString tooltip = QString("%1").arg(toolTipTitle());
+ if (!toolTipSubTitle().isEmpty())
+ tooltip += QString("\n%1").arg(toolTipSubTitle());
+#else
+ QString tooltip = QString("%1").arg(toolTipTitle());
+ if (!toolTipSubTitle().isEmpty())
+ tooltip += QString("
%1").arg(toolTipSubTitle());
+#endif
+
+ _trayIcon->setToolTip(tooltip);
}
-void LegacySystemTray::on_activated(QSystemTrayIcon::ActivationReason reason) {
- activate((SystemTray::ActivationReason)reason);
+
+void LegacySystemTray::onActivated(QSystemTrayIcon::ActivationReason reason)
+{
+ activate((SystemTray::ActivationReason)reason);
}
-void LegacySystemTray::on_messageClicked() {
- emit messageClicked(_lastMessageId);
+
+void LegacySystemTray::onMessageClicked()
+{
+ 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::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... :(
+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);
+ showMessage("", "", NoIcon, 1);
#endif
}
+
#endif /* QT_NO_SYSTEMTRAYICON */