X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=7e38a6a0fd7b1e04dd6dd13b38b1de3acd19407a;hb=5941a9d24333401874e051c349b391e2bcac0e0d;hp=9d2078be2599f8c7d8f8b06bc398827e6990e00a;hpb=ea5b220601473213689ef9bad6611ec74b776aa5;p=quassel.git

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 9d2078be..7e38a6a0 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -18,15 +18,10 @@
  *   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>
@@ -34,13 +29,20 @@
 #  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);
 
     ActionCollection *coll = QtUi::actionCollection("General");
@@ -49,7 +51,7 @@ SystemTray::SystemTray(QWidget *parent)
 #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
@@ -69,6 +71,10 @@ SystemTray::SystemTray(QWidget *parent)
     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()));
 }
 
 
@@ -141,6 +147,16 @@ 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();
     }
 }
 
@@ -168,6 +184,32 @@ QString SystemTray::iconName(State state) const
 }
 
 
+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;
@@ -176,10 +218,19 @@ bool SystemTray::isAlerted() const
 
 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();
 }
 
 
@@ -198,16 +249,31 @@ void SystemTray::trayMenuAboutToShow()
 }
 
 
-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();
 }