[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/sysadmin/shaman/shaman
From:       Dario Freddi <drf () kde ! org>
Date:       2009-12-10 15:24:53
Message-ID: 1260458693.415387.8262.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1061076 by dafre:

Removing the system tray

Signed-off-by: Dario Freddi <drf@kde.org>

 M  +0 -1      CMakeLists.txt  
 M  +0 -18     src/MainWindow.cpp  
 M  +0 -2      src/MainWindow.h  
 D             src/SystemTray.cpp  
 D             src/SystemTray.h  
 M  +0 -3      src/shaman.kcfg  


--- trunk/playground/sysadmin/shaman/shaman/CMakeLists.txt #1061075:1061076
@@ -4,7 +4,6 @@
     src/main.cpp
     src/MainWindow.cpp
     src/ConfigDialog.cpp
-    src/SystemTray.cpp
     src/QueueSerializer.cpp
     src/processqueue/ProcessQueueHandler.cpp
     src/processqueue/ProcessQueueDialog.cpp
--- trunk/playground/sysadmin/shaman/shaman/src/MainWindow.cpp #1061075:1061076
@@ -11,7 +11,6 @@
 #include "MainWindow.h"
 
 #include "ConfigDialog.h"
-#include "SystemTray.h"
 
 #include "settings.h"
 
@@ -151,14 +150,6 @@
 
     createGUI();
 
-    // System Tray
-    if (Settings::systrayEnabled()) {
-        m_tray = new SystemTray(this);
-        m_tray.data()->setState(m_shaman->core()->backend()->state());
-        connect(m_shaman->core()->backend(), SIGNAL(stateChanged(Shaman::Backend::State)),
-                m_tray.data(), SLOT(setState(Shaman::Backend::State)));
-    }
-
     // restore position, size and visibility
     move(Settings::mainPosition());
     setAutoSaveSettings();
@@ -222,15 +213,6 @@
 
 void MainWindow::settingsChanged()
 {
-    if (m_tray.isNull() && Settings::systrayEnabled()) {
-        m_tray = new SystemTray(this);
-        m_tray.data()->setState(m_shaman->core()->backend()->state());
-        connect(m_shaman->core()->backend(), SIGNAL(stateChanged(Shaman::Backend::State)),
-                m_tray.data(), SLOT(setState(Shaman::Backend::State)));
-    }
-    else if (!m_tray.isNull() && !Settings::systrayEnabled()) {
-        m_tray.data()->deleteLater();
-    }
     emit configChanged();
 }
 
--- trunk/playground/sysadmin/shaman/shaman/src/MainWindow.h #1061075:1061076
@@ -21,7 +21,6 @@
 class QWidget;
 class KToggleAction;
 class ConfigDialog;
-class SystemTray;
 class KAboutApplicationDialog;
 
 namespace Shaman
@@ -70,7 +69,6 @@
 
     private:
         Shaman::Base *m_shaman;
-        QPointer<SystemTray> m_tray;
         ConfigDialog * m_configDialog;
         KToggleAction *m_menubarAction;
         QMainWindow *m_trickWindow;
--- trunk/playground/sysadmin/shaman/shaman/src/shaman.kcfg #1061075:1061076
@@ -12,9 +12,6 @@
     <entry name="MainState" type="Int">
       <default>0</default>
     </entry>
-    <entry name="SystrayEnabled" type="Bool">
-      <default>true</default>
-    </entry>
     <entry name="SaveQueueOnExit" type="Bool">
       <default>true</default>
     </entry>
[prev in list] [next in list] [prev in thread] [next in thread]