{
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);
ActionCollection *coll = QtUi::actionCollection("General");
#ifdef HAVE_KDE4
KMenu *kmenu;
_trayMenu = kmenu = new KMenu();
- kmenu->addTitle(_activeIcon, "Quassel IRC");
+ kmenu->addTitle(QIcon::fromTheme(iconName(State::Active)), "Quassel IRC");
#else
_trayMenu = new QMenu(associatedWidget());
#endif
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()));
}
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();
}