qtui: Refactor the system tray implementations

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

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 679a4b1..4a68dd6 100644 (file)
--- 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);
 
     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()));
 
     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;
 }
 
 
 {
     return false;
 }
 
 

-bool SystemTray::shouldBeVisible() const
+bool SystemTray::isVisible() const

 {
 {

-    return _shouldBeVisible;
+    return _isVisible;

 }
 
 
 void SystemTray::setVisible(bool visible)
 {
 }
 
 
 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) {
 #ifdef HAVE_KDE4
         if (_trayMenu) {

-            if (_mode == Legacy) {
+            if (mode == Mode::Legacy) {

                 _trayMenu->setWindowFlags(Qt::Popup);
             }
             else {
                 _trayMenu->setWindowFlags(Qt::Popup);
             }
             else {


@@ -131,6 +124,7 @@ void SystemTray::setMode(Mode mode_)
             }
         }
 #endif
             }
         }
 #endif

+        emit modeChanged(mode);

     }
 }
 
     }
 }
 


@@ -145,6 +139,7 @@ void SystemTray::setState(State state)
 {
     if (_state != state) {
         _state = state;
 {
     if (_state != state) {
         _state = state;

+        emit stateChanged(state);

     }
 }
 
     }
 }