* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <QApplication>
-#include <QMenu>
-
#include "systemtray.h"
-#include "action.h"
-#include "actioncollection.h"
-#include "client.h"
-#include "qtui.h"
+#include <QApplication>
+#include <QMenu>
#ifdef HAVE_KDE4
# include <KMenu>
# include <KWindowSystem>
#endif
+#include "action.h"
+#include "actioncollection.h"
+#include "client.h"
+#include "icon.h"
+#include "qtui.h"
+
SystemTray::SystemTray(QWidget *parent)
: QObject(parent),
_associatedWidget(parent)
{
Q_ASSERT(parent);
- NotificationSettings{}.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
+ 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);
-}
-
-
-SystemTray::~SystemTray()
-{
- _trayMenu->deleteLater();
-}
-
-void SystemTray::init()
-{
ActionCollection *coll = QtUi::actionCollection("General");
_minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore()));
#ifdef HAVE_KDE4
KMenu *kmenu;
_trayMenu = kmenu = new KMenu();
- kmenu->addTitle(_activeIcon, "Quassel IRC");
+ kmenu->addTitle(icon::get(iconName(State::Active)), "Quassel IRC");
#else
_trayMenu = new QMenu(associatedWidget());
#endif
_trayMenu->addSeparator();
_trayMenu->addAction(_minimizeRestoreAction);
_trayMenu->addAction(coll->action("Quit"));
-
connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
+
+ connect(QtUi::instance(), SIGNAL(iconThemeRefreshed()), this, SIGNAL(iconsChanged()));
+
+ _blinkTimer.setInterval(1000);
+ _blinkTimer.setSingleShot(false);
+ connect(&_blinkTimer, SIGNAL(timeout()), SLOT(onBlinkTimeout()));
}
-QWidget *SystemTray::associatedWidget() const
+SystemTray::~SystemTray()
{
- return _associatedWidget;
+ _trayMenu->deleteLater();
}
-bool SystemTray::isSystemTrayAvailable() const
+QWidget *SystemTray::associatedWidget() const
{
- return false;
+ return _associatedWidget;
}
-bool SystemTray::isVisible() const
+bool SystemTray::isSystemTrayAvailable() const
{
return false;
}
-bool SystemTray::shouldBeVisible() const
+bool SystemTray::isVisible() const
{
- return _shouldBeVisible;
+ return _isVisible;
}
void SystemTray::setVisible(bool visible)
{
- _shouldBeVisible = visible;
+ if (visible != _isVisible) {
+ _isVisible = visible;
+ emit visibilityChanged(visible);
+ }
}
}
-void SystemTray::setMode(Mode mode_)
+void SystemTray::setMode(Mode mode)
{
- if (mode_ != _mode) {
- _mode = mode_;
+ if (mode != _mode) {
+ _mode = mode;
#ifdef HAVE_KDE4
if (_trayMenu) {
- if (_mode == Legacy) {
+ if (mode == Mode::Legacy) {
_trayMenu->setWindowFlags(Qt::Popup);
}
else {
}
}
#endif
+ emit modeChanged(mode);
}
}
{
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::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();
}
}
-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)
{
_trayIconInverted = v.toBool();
+ emit iconsChanged();
}