[Basket-devel] [PATCH 1/5] Use KSystemTrayIcon instead of our custom SystemTray.

[Kelvie W. <ke...@ie...>]

This will have to be re-added later -- it isn't a huge deal right now.
SystemTray has lost all of its convenience *Event functions that were
given to it back when it was a QWidget, and will now have to be dispatched
from its QObject::event() function manually.

It would probably be wise to just revert this commit when that time comes.
---
 src/CMakeLists.txt |    2 +-
 src/bnpview.cpp    |    2 +-
 src/global.cpp     |    2 +-
 src/global.h       |    4 ++--
 src/mainwindow.cpp |    2 +-
 src/settings.h     |    3 ++-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b671bf4..1c04eda 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,7 +41,7 @@ set(basketcommon_LIB_SRCS
     colorpicker.cpp
     basketlistview.cpp
     debugwindow.cpp
-    systemtray.cpp
+#    systemtray.cpp
     aboutdata.cpp
     basketstatusbar.cpp
     clickablelabel.cpp
diff --git a/src/bnpview.cpp b/src/bnpview.cpp
index 610fc6e..273cef0 100644
--- a/src/bnpview.cpp
+++ b/src/bnpview.cpp
@@ -180,7 +180,7 @@ void BNPView::lateInit()
 	Settings::saveConfig();
 
 	/* System tray icon */
-	Global::systemTray = new SystemTray(Global::mainWindow());
+	Global::systemTray = new KSystemTrayIcon(Global::mainWindow());
 	connect( Global::systemTray, SIGNAL(showPart()), this, SIGNAL(showPart()) );
 	if (Settings::useSystray())
 		Global::systemTray->show();
diff --git a/src/global.cpp b/src/global.cpp
index 28f66a2..b6651b5 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -38,7 +38,7 @@ QString            Global::s_customSavesFolder = "";
 LikeBack          *Global::likeBack            = 0L;
 DebugWindow       *Global::debugWindow         = 0L;
 BackgroundManager *Global::backgroundManager   = 0L;
-SystemTray        *Global::systemTray          = 0L;
+KSystemTrayIcon *Global::systemTray          = 0L;
 BNPView           *Global::bnpView             = 0L;
 KSharedConfig::Ptr Global::basketConfig;
 AboutData          Global::basketAbout;
diff --git a/src/global.h b/src/global.h
index 8b30543..d3299ac 100644
--- a/src/global.h
+++ b/src/global.h
@@ -27,7 +27,7 @@
 class LikeBack;
 class DebugWindow;
 class BackgroundManager;
-class SystemTray;
+class KSystemTrayIcon;
 class BNPView;
 class KMainWindow;
 class KAboutData;
@@ -46,7 +46,7 @@ class Global
 	static LikeBack          *likeBack;
 	static DebugWindow       *debugWindow;
 	static BackgroundManager *backgroundManager;
-	static SystemTray        *systemTray;
+	static KSystemTrayIcon   *systemTray;
 	static BNPView           *bnpView;
 	static KSharedConfig::Ptr basketConfig;
 	static AboutData          basketAbout;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 35a35a3..8f44db9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -91,7 +91,6 @@
 #include "regiongrabber.h"
 #include "password.h"
 #include "bnpview.h"
-#include "systemtray.h"
 #include "clickablelabel.h"
 #include "basketstatusbar.h"
 #include <ksettings/dialog.h>
@@ -100,6 +99,7 @@
 #include <KShortcutsDialog>
 #include <KActionCollection>
 #include <KToggleAction>
+#include <KSystemTrayIcon>
 
 /** Container */
 
diff --git a/src/settings.h b/src/settings.h
index 166187c..ae9babb 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -36,9 +36,10 @@
 #include <kmainwindow.h>
 #include <qdatetime.h>
 
+#include <KSystemTrayIcon>
+
 #include "global.h"
 #include "bnpview.h"
-#include "systemtray.h"
 
 class Q3GroupBox;
 class Q3ButtonGroup;
-- 
1.5.5.GIT