/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This file is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "systemtray.h"
+
#include <QApplication>
#include <QMenu>
-#include "systemtray.h"
-
#include "action.h"
#include "actioncollection.h"
#include "client.h"
+#include "icon.h"
#include "qtui.h"
-#ifdef HAVE_KDE4
-# include <KMenu>
-# include <KWindowInfo>
-# include <KWindowSystem>
-#endif
-
-SystemTray::SystemTray(QWidget *parent)
- : QObject(parent),
- _associatedWidget(parent)
+SystemTray::SystemTray(QWidget* parent)
+ : QObject(parent)
+ , _associatedWidget(parent)
{
Q_ASSERT(parent);
- NotificationSettings{}.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
- UiStyleSettings{}.initAndNotify("Icons/InvertTray", this, SLOT(invertTrayIconChanged(QVariant)), false);
+ NotificationSettings{}.initAndNotify("Systray/ChangeColor", this, &SystemTray::enableChangeColorChanged, true);
+ NotificationSettings{}.initAndNotify("Systray/Animate", this, &SystemTray::enableBlinkChanged, false);
+ UiStyleSettings{}.initAndNotify("Icons/InvertTray", this, &SystemTray::invertTrayIconChanged, false);
- ActionCollection *coll = QtUi::actionCollection("General");
- _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore()));
+ ActionCollection* coll = QtUi::actionCollection("General");
+ _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, &SystemTray::minimizeRestore);
-#ifdef HAVE_KDE4
- KMenu *kmenu;
- _trayMenu = kmenu = new KMenu();
- kmenu->addTitle(_activeIcon, "Quassel IRC");
-#else
_trayMenu = new QMenu(associatedWidget());
-#endif
-
_trayMenu->setTitle("Quassel IRC");
-
-#ifndef HAVE_KDE4
_trayMenu->setAttribute(Qt::WA_Hover);
-#endif
_trayMenu->addAction(coll->action("ConnectCore"));
_trayMenu->addAction(coll->action("DisconnectCore"));
_trayMenu->addSeparator();
_trayMenu->addAction(_minimizeRestoreAction);
_trayMenu->addAction(coll->action("Quit"));
- connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
+ connect(_trayMenu, &QMenu::aboutToShow, this, &SystemTray::trayMenuAboutToShow);
- connect(QtUi::instance(), SIGNAL(iconThemeRefreshed()), this, SIGNAL(iconsChanged()));
-}
+ 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
+QWidget* SystemTray::associatedWidget() const
{
return _associatedWidget;
}
-
bool SystemTray::isSystemTrayAvailable() const
{
return false;
}
-
bool SystemTray::isVisible() const
{
return _isVisible;
}
-
void SystemTray::setVisible(bool visible)
{
if (visible != _isVisible) {
}
}
-
SystemTray::Mode SystemTray::mode() const
{
return _mode;
}
-
void SystemTray::setMode(Mode mode)
{
if (mode != _mode) {
_mode = mode;
-#ifdef HAVE_KDE4
- if (_trayMenu) {
- if (mode == Mode::Legacy) {
- _trayMenu->setWindowFlags(Qt::Popup);
- }
- else {
- _trayMenu->setWindowFlags(Qt::Window);
- }
- }
-#endif
emit modeChanged(mode);
}
}
-
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;
return name;
}
+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());
+ }
+}
+
+QString SystemTray::currentAttentionIconName() const
+{
+ 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::onBlinkTimeout()
+{
+ _blinkState = !_blinkState;
+ emit currentIconNameChanged();
+}
-QMenu *SystemTray::trayMenu() const
+QMenu* SystemTray::trayMenu() const
{
return _trayMenu;
}
-
void SystemTray::trayMenuAboutToShow()
{
if (GraphicalUi::isMainWidgetVisible())
_minimizeRestoreAction->setText(tr("&Restore"));
}
-
-bool SystemTray::animationEnabled() const
+void SystemTray::enableChangeColorChanged(const QVariant& v)
{
- return _animationEnabled;
+ if (v.toBool()) {
+ _attentionBehavior = AttentionBehavior::ChangeColor;
+ }
+ else {
+ if (_attentionBehavior == AttentionBehavior::ChangeColor) {
+ _attentionBehavior = AttentionBehavior::DoNothing;
+ }
+ }
+ emit currentIconNameChanged();
}
-
-void SystemTray::enableAnimationChanged(const QVariant &v)
+void SystemTray::enableBlinkChanged(const QVariant& v)
{
- _animationEnabled = v.toBool();
- emit animationEnabledChanged(v.toBool());
+ if (v.toBool()) {
+ _attentionBehavior = AttentionBehavior::Blink;
+ }
+ else {
+ if (_attentionBehavior == AttentionBehavior::Blink) {
+ _attentionBehavior = AttentionBehavior::DoNothing;
+ }
+ }
+ emit currentIconNameChanged();
}
-
-void SystemTray::invertTrayIconChanged(const QVariant &v)
+void SystemTray::invertTrayIconChanged(const QVariant& v)
{
_trayIconInverted = v.toBool();
emit iconsChanged();
}
-
QString SystemTray::toolTipTitle() const
{
return _toolTipTitle;
}
-
QString SystemTray::toolTipSubTitle() const
{
return _toolTipSubTitle;
}
-
-void SystemTray::setToolTip(const QString &title, const QString &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)
+void SystemTray::showMessage(const QString& title, const QString& message, MessageIcon icon, int millisecondsTimeoutHint, uint id)
{
Q_UNUSED(title)
Q_UNUSED(message)
Q_UNUSED(id)
}
-
void SystemTray::closeMessage(uint notificationId)
{
Q_UNUSED(notificationId)
}
-
void SystemTray::activate(SystemTray::ActivationReason reason)
{
emit activated(reason);
}
-
void SystemTray::minimizeRestore()
{
GraphicalUi::toggleMainWidget();