X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=c85e7bf22df7c4f1b8ed3a7e47da1b24ac441497;hp=0bafd5e421150b3f985196f2ed146b6d6e166032;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=732bb803a12b77b55aab33c91381ff9c2998f0e3 diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 0bafd5e4..c85e7bf2 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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,156 +15,292 @@ * 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. * ***************************************************************************/ -#include -#include #include "systemtray.h" +#include +#include + #include "action.h" #include "actioncollection.h" #include "client.h" -#include "iconloader.h" +#include "icon.h" #include "qtui.h" -#ifdef HAVE_KDE -# include -# include -# include -#endif - SystemTray::SystemTray(QWidget *parent) -: QObject(parent), - _mode(Invalid), - _state(Passive), - _shouldBeVisible(true), - _passiveIcon(DesktopIcon("quassel-inactive")), - _activeIcon(DesktopIcon("quassel")), - _needsAttentionIcon(DesktopIcon("quassel-message")), - _trayMenu(0), - _associatedWidget(parent) + : QObject(parent), + _associatedWidget(parent) +{ + Q_ASSERT(parent); + + NotificationSettings{}.initAndNotify("Systray/ChangeColor", this, SLOT(enableChangeColorChanged(QVariant)), true); + NotificationSettings{}.initAndNotify("Systray/Animate", this, SLOT(enableBlinkChanged(QVariant)), false); + UiStyleSettings{}.initAndNotify("Icons/InvertTray", this, SLOT(invertTrayIconChanged(QVariant)), false); + + ActionCollection *coll = QtUi::actionCollection("General"); + _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, &SystemTray::minimizeRestore); + + _trayMenu = new QMenu(associatedWidget()); + _trayMenu->setTitle("Quassel IRC"); + _trayMenu->setAttribute(Qt::WA_Hover); + + _trayMenu->addAction(coll->action("ConnectCore")); + _trayMenu->addAction(coll->action("DisconnectCore")); + _trayMenu->addAction(coll->action("CoreInfo")); + _trayMenu->addSeparator(); + _trayMenu->addAction(_minimizeRestoreAction); + _trayMenu->addAction(coll->action("Quit")); + connect(_trayMenu, &QMenu::aboutToShow, this, &SystemTray::trayMenuAboutToShow); + + connect(QtUi::instance(), &QtUi::iconThemeRefreshed, this, &SystemTray::iconsChanged); + + _blinkTimer.setInterval(1000); + _blinkTimer.setSingleShot(false); + connect(&_blinkTimer, &QTimer::timeout, this, &SystemTray::onBlinkTimeout); +} + + +SystemTray::~SystemTray() +{ + _trayMenu->deleteLater(); +} + + +QWidget *SystemTray::associatedWidget() const +{ + return _associatedWidget; +} + + +bool SystemTray::isSystemTrayAvailable() const +{ + return false; +} + + +bool SystemTray::isVisible() const { - Q_ASSERT(parent); + return _isVisible; } -SystemTray::~SystemTray() { - _trayMenu->deleteLater(); + +void SystemTray::setVisible(bool visible) +{ + if (visible != _isVisible) { + _isVisible = visible; + emit visibilityChanged(visible); + } } -QWidget *SystemTray::associatedWidget() const { - return _associatedWidget; + +SystemTray::Mode SystemTray::mode() const +{ + return _mode; +} + + +void SystemTray::setMode(Mode mode) +{ + if (mode != _mode) { + _mode = mode; + emit modeChanged(mode); + } } -void SystemTray::init() { - ActionCollection *coll = QtUi::actionCollection("General"); - _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore())); -#ifdef HAVE_KDE - KMenu *kmenu; - _trayMenu = kmenu = new KMenu(); - kmenu->addTitle(_activeIcon, "Quassel IRC"); -#else - _trayMenu = new QMenu(associatedWidget()); -#endif +SystemTray::State SystemTray::state() const +{ + return _state; +} + + +void SystemTray::setState(State state) +{ + if (_state != state) { + _state = state; + emit stateChanged(state); + + if (state == NeedsAttention && _attentionBehavior == AttentionBehavior::Blink) { + _blinkTimer.start(); + _blinkState = true; + } + else { + _blinkTimer.stop(); + _blinkState = false; + } + emit currentIconNameChanged(); + } +} + + +QString SystemTray::iconName(State state) const +{ + QString name; + switch (state) { + case State::Passive: + name = "inactive-quassel-tray"; + break; + case State::Active: + name = "active-quassel-tray"; + break; + case State::NeedsAttention: + name = "message-quassel-tray"; + break; + } + + if (_trayIconInverted) { + name += "-inverted"; + } - _trayMenu->setTitle("Quassel IRC"); + return name; +} -#ifndef HAVE_KDE - _trayMenu->setAttribute(Qt::WA_Hover); -#endif - _trayMenu->addAction(coll->action("ConnectCore")); - _trayMenu->addAction(coll->action("DisconnectCore")); - _trayMenu->addAction(coll->action("CoreInfo")); - _trayMenu->addSeparator(); - _trayMenu->addAction(_minimizeRestoreAction); - _trayMenu->addAction(coll->action("Quit")); +QString SystemTray::currentIconName() const +{ + if (state() == State::NeedsAttention) { + if (_attentionBehavior == AttentionBehavior::ChangeColor) { + return iconName(State::NeedsAttention); + } + if (_attentionBehavior == AttentionBehavior::Blink && _blinkState) { + return iconName(State::NeedsAttention); + } + return iconName(State::Active); + } + else { + return iconName(state()); + } +} - connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow())); - NotificationSettings notificationSettings; - notificationSettings.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true); +QString SystemTray::currentAttentionIconName() const +{ + if (state() == State::NeedsAttention && _attentionBehavior == AttentionBehavior::Blink && !_blinkState) { + return iconName(State::Active); + } + return iconName(State::NeedsAttention); } -void SystemTray::trayMenuAboutToShow() { - if(GraphicalUi::isMainWidgetVisible()) - _minimizeRestoreAction->setText(tr("&Minimize")); - else - _minimizeRestoreAction->setText(tr("&Restore")); + +bool SystemTray::isAlerted() const +{ + return state() == State::NeedsAttention; } -void SystemTray::setMode(Mode mode_) { - if(mode_ != _mode) { - _mode = mode_; -#ifdef HAVE_KDE - if(_trayMenu) { - if(_mode == Legacy) { - _trayMenu->setWindowFlags(Qt::Popup); - } else { - _trayMenu->setWindowFlags(Qt::Window); - } + +void SystemTray::setAlert(bool alerted) +{ + if (alerted) { + setState(NeedsAttention); } -#endif - } + else { + setState(Client::isConnected() ? Active : Passive); + } +} + + +void SystemTray::onBlinkTimeout() +{ + _blinkState = !_blinkState; + emit currentIconNameChanged(); +} + + +QMenu *SystemTray::trayMenu() const +{ + return _trayMenu; +} + + +void SystemTray::trayMenuAboutToShow() +{ + if (GraphicalUi::isMainWidgetVisible()) + _minimizeRestoreAction->setText(tr("&Minimize")); + else + _minimizeRestoreAction->setText(tr("&Restore")); } -Icon SystemTray::stateIcon() const { - return stateIcon(state()); + +void SystemTray::enableChangeColorChanged(const QVariant &v) +{ + if (v.toBool()) { + _attentionBehavior = AttentionBehavior::ChangeColor; + } + else { + if (_attentionBehavior == AttentionBehavior::ChangeColor) { + _attentionBehavior = AttentionBehavior::DoNothing; + } + } + emit currentIconNameChanged(); } -Icon SystemTray::stateIcon(State state) const { - switch(state) { - case Passive: - return _passiveIcon; - case Active: - return _activeIcon; - case NeedsAttention: - return _needsAttentionIcon; - } - return Icon(); + +void SystemTray::enableBlinkChanged(const QVariant &v) +{ + if (v.toBool()) { + _attentionBehavior = AttentionBehavior::Blink; + } + else { + if (_attentionBehavior == AttentionBehavior::Blink) { + _attentionBehavior = AttentionBehavior::DoNothing; + } + } + emit currentIconNameChanged(); } -void SystemTray::setState(State state) { - if(_state != state) { - _state = state; - } + +void SystemTray::invertTrayIconChanged(const QVariant &v) +{ + _trayIconInverted = v.toBool(); + emit iconsChanged(); } -void SystemTray::setAlert(bool alerted) { - if(alerted) - setState(NeedsAttention); - else - setState(Client::isConnected() ? Active : Passive); + +QString SystemTray::toolTipTitle() const +{ + return _toolTipTitle; } -void SystemTray::setVisible(bool visible) { - _shouldBeVisible = visible; + +QString SystemTray::toolTipSubTitle() const +{ + return _toolTipSubTitle; } -void SystemTray::setToolTip(const QString &title, const QString &subtitle) { - _toolTipTitle = title; - _toolTipSubTitle = subtitle; - emit toolTipChanged(title, subtitle); + +void SystemTray::setToolTip(const QString &title, const QString &subtitle) +{ + _toolTipTitle = title; + _toolTipSubTitle = subtitle; + emit toolTipChanged(title, subtitle); } -void SystemTray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint, uint id) { - Q_UNUSED(title) - Q_UNUSED(message) - Q_UNUSED(icon) - Q_UNUSED(millisecondsTimeoutHint) - Q_UNUSED(id) + +void SystemTray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint, uint id) +{ + Q_UNUSED(title) + Q_UNUSED(message) + Q_UNUSED(icon) + Q_UNUSED(millisecondsTimeoutHint) + Q_UNUSED(id) } -void SystemTray::activate(SystemTray::ActivationReason reason) { - emit activated(reason); + +void SystemTray::closeMessage(uint notificationId) +{ + Q_UNUSED(notificationId) } -void SystemTray::minimizeRestore() { - GraphicalUi::toggleMainWidget(); + +void SystemTray::activate(SystemTray::ActivationReason reason) +{ + emit activated(reason); } -void SystemTray::enableAnimationChanged(const QVariant &v) { - _animationEnabled = v.toBool(); - emit animationEnabledChanged(v.toBool()); + +void SystemTray::minimizeRestore() +{ + GraphicalUi::toggleMainWidget(); }