X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=4a68dd64114e5e1bffcb2b7915b766e2e36622c3;hp=679a4b182770007553d425c752314ec2f0bcb605;hb=39dffd095bb5dbca49199d2173438c7f90c4e6fa;hpb=f788ce32deb5df0351488c908fd5bacd25d7b6cf;ds=sidebyside

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 679a4b18..4a68dd64 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -42,17 +42,7 @@ SystemTray::SystemTray(QWidget *parent)
 
     NotificationSettings{}.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
     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()));
 
@@ -81,33 +71,36 @@ void SystemTray::init()
 }
 
 
-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);
+    }
 }
 
 
@@ -117,13 +110,13 @@ SystemTray::Mode SystemTray::mode() const
 }
 
 
-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 {
@@ -131,6 +124,7 @@ void SystemTray::setMode(Mode mode_)
             }
         }
 #endif
+        emit modeChanged(mode);
     }
 }
 
@@ -145,6 +139,7 @@ void SystemTray::setState(State state)
 {
     if (_state != state) {
         _state = state;
+        emit stateChanged(state);
     }
 }