Make disabling the tray icon animation work again

[quassel.git] / src / qtui / systemtray.cpp

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 139c968..7fb36ce 100644 (file)
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -81,6 +81,9 @@ void SystemTray::init() {
   _trayMenu->addAction(coll->action("Quit"));
 
   connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
   _trayMenu->addAction(coll->action("Quit"));
 
   connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));

+
+  NotificationSettings notificationSettings;
+  notificationSettings.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);

 }
 
 void SystemTray::trayMenuAboutToShow() {
 }
 
 void SystemTray::trayMenuAboutToShow() {


@@ -144,11 +147,12 @@ void SystemTray::setToolTip(const QString &title, const QString &subtitle) {
   emit toolTipChanged(title, subtitle);
 }
 
   emit toolTipChanged(title, subtitle);
 }
 

-void SystemTray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint) {
+void SystemTray::showMessage(const QString &title, const QString &message, MessageIcon icon, int millisecondsTimeoutHint, uint id) {

   Q_UNUSED(title)
   Q_UNUSED(message)
   Q_UNUSED(icon)
   Q_UNUSED(millisecondsTimeoutHint)
   Q_UNUSED(title)
   Q_UNUSED(message)
   Q_UNUSED(icon)
   Q_UNUSED(millisecondsTimeoutHint)

+  Q_UNUSED(id)

 }
 
 void SystemTray::activate(SystemTray::ActivationReason reason) {
 }
 
 void SystemTray::activate(SystemTray::ActivationReason reason) {


@@ -158,3 +162,8 @@ void SystemTray::activate(SystemTray::ActivationReason reason) {
 void SystemTray::minimizeRestore() {
   GraphicalUi::toggleMainWidget();
 }
 void SystemTray::minimizeRestore() {
   GraphicalUi::toggleMainWidget();
 }

+
+void SystemTray::enableAnimationChanged(const QVariant &v) {
+  _animationEnabled = v.toBool();
+  emit animationEnabledChanged(v.toBool());
+}