X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=c85e7bf22df7c4f1b8ed3a7e47da1b24ac441497;hp=54c60247887c643add841fb996277f5fa25a8bba;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=46888b395628f1023916a571762c07e72bc7f73c diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 54c60247..c85e7bf2 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This file is free software; you can redistribute it and/or modify * @@ -18,34 +18,47 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "systemtray.h" + #include #include -#include "systemtray.h" - #include "action.h" #include "actioncollection.h" #include "client.h" +#include "icon.h" #include "qtui.h" -#ifdef HAVE_KDE4 -# include -# include -# include -#endif - SystemTray::SystemTray(QWidget *parent) : QObject(parent), - _mode(Invalid), - _state(Passive), - _shouldBeVisible(true), - _passiveIcon(QIcon::fromTheme("inactive-quassel", QIcon(":/icons/inactive-quassel.png"))), - _activeIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png"))), - _needsAttentionIcon(QIcon::fromTheme("message-quassel", QIcon(":/icons/message-quassel.png"))), - _trayMenu(0), _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); } @@ -61,106 +74,199 @@ QWidget *SystemTray::associatedWidget() const } -void SystemTray::init() +bool SystemTray::isSystemTrayAvailable() const { - ActionCollection *coll = QtUi::actionCollection("General"); - _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore())); + return false; +} -#ifdef HAVE_KDE4 - KMenu *kmenu; - _trayMenu = kmenu = new KMenu(); - kmenu->addTitle(_activeIcon, "Quassel IRC"); -#else - _trayMenu = new QMenu(associatedWidget()); -#endif - _trayMenu->setTitle("Quassel IRC"); +bool SystemTray::isVisible() const +{ + return _isVisible; +} -#ifndef HAVE_KDE4 - _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")); +void SystemTray::setVisible(bool visible) +{ + if (visible != _isVisible) { + _isVisible = visible; + emit visibilityChanged(visible); + } +} - connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow())); - NotificationSettings notificationSettings; - notificationSettings.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true); +SystemTray::Mode SystemTray::mode() const +{ + return _mode; } -void SystemTray::trayMenuAboutToShow() +void SystemTray::setMode(Mode mode) { - if (GraphicalUi::isMainWidgetVisible()) - _minimizeRestoreAction->setText(tr("&Minimize")); - else - _minimizeRestoreAction->setText(tr("&Restore")); + if (mode != _mode) { + _mode = mode; + emit modeChanged(mode); + } +} + + +SystemTray::State SystemTray::state() const +{ + return _state; } -void SystemTray::setMode(Mode mode_) +void SystemTray::setState(State state) { - if (mode_ != _mode) { - _mode = mode_; -#ifdef HAVE_KDE4 - if (_trayMenu) { - if (_mode == Legacy) { - _trayMenu->setWindowFlags(Qt::Popup); - } - else { - _trayMenu->setWindowFlags(Qt::Window); - } + if (_state != state) { + _state = state; + emit stateChanged(state); + + if (state == NeedsAttention && _attentionBehavior == AttentionBehavior::Blink) { + _blinkTimer.start(); + _blinkState = true; + } + else { + _blinkTimer.stop(); + _blinkState = false; } -#endif + emit currentIconNameChanged(); } } -QIcon SystemTray::stateIcon() const +QString SystemTray::iconName(State state) const { - return stateIcon(state()); + 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"; + } + + return name; } -QIcon SystemTray::stateIcon(State state) const +QString SystemTray::currentIconName() const { - switch (state) { - case Passive: - return _passiveIcon; - case Active: - return _activeIcon; - case NeedsAttention: - return _needsAttentionIcon; + 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()); } - return QIcon(); } -void SystemTray::setState(State state) +QString SystemTray::currentAttentionIconName() const { - if (_state != state) { - _state = state; + if (state() == State::NeedsAttention && _attentionBehavior == AttentionBehavior::Blink && !_blinkState) { + return iconName(State::Active); } + return iconName(State::NeedsAttention); +} + + +bool SystemTray::isAlerted() const +{ + return state() == State::NeedsAttention; } void SystemTray::setAlert(bool alerted) { - if (alerted) + if (alerted) { setState(NeedsAttention); - else + } + else { setState(Client::isConnected() ? Active : Passive); + } } -void SystemTray::setVisible(bool visible) +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")); +} + + +void SystemTray::enableChangeColorChanged(const QVariant &v) { - _shouldBeVisible = visible; + if (v.toBool()) { + _attentionBehavior = AttentionBehavior::ChangeColor; + } + else { + if (_attentionBehavior == AttentionBehavior::ChangeColor) { + _attentionBehavior = AttentionBehavior::DoNothing; + } + } + emit currentIconNameChanged(); +} + + +void SystemTray::enableBlinkChanged(const QVariant &v) +{ + if (v.toBool()) { + _attentionBehavior = AttentionBehavior::Blink; + } + else { + if (_attentionBehavior == AttentionBehavior::Blink) { + _attentionBehavior = AttentionBehavior::DoNothing; + } + } + emit currentIconNameChanged(); +} + + +void SystemTray::invertTrayIconChanged(const QVariant &v) +{ + _trayIconInverted = v.toBool(); + emit iconsChanged(); +} + + +QString SystemTray::toolTipTitle() const +{ + return _toolTipTitle; +} + + +QString SystemTray::toolTipSubTitle() const +{ + return _toolTipSubTitle; } @@ -182,20 +288,19 @@ void SystemTray::showMessage(const QString &title, const QString &message, Messa } -void SystemTray::activate(SystemTray::ActivationReason reason) +void SystemTray::closeMessage(uint notificationId) { - emit activated(reason); + Q_UNUSED(notificationId) } -void SystemTray::minimizeRestore() +void SystemTray::activate(SystemTray::ActivationReason reason) { - GraphicalUi::toggleMainWidget(); + emit activated(reason); } -void SystemTray::enableAnimationChanged(const QVariant &v) +void SystemTray::minimizeRestore() { - _animationEnabled = v.toBool(); - emit animationEnabledChanged(v.toBool()); + GraphicalUi::toggleMainWidget(); }