Fix movie loading

29 files changed, 38 insertions, 492 deletions

diff --git a/tdenetworkmanager/pics/hi16-action-nm_stage01_connecting.mng b/tdenetworkmanager/pics/hi16-action-nm_stage01_connecting.mng
index 2605a88..6414aa4 100644
--- a/tdenetworkmanager/pics/hi16-action-nm_stage01_connecting.mng
+++ b/tdenetworkmanager/pics/hi16-action-nm_stage01_connecting.mng
diff --git a/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting.mng b/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting.mng
index 8e25a71..270e946 100644
--- a/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting.mng
+++ b/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting.mng
diff --git a/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting_vpn.mng b/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting_vpn.mng
index 951b284..103ca43 100644
--- a/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi16-action-nm_stage02_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting.mng b/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting.mng
index b39ffe6..cf8c0d0 100644
--- a/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting.mng
+++ b/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting.mng
diff --git a/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting_vpn.mng b/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting_vpn.mng
index 6c6ebd4..07b37a3 100644
--- a/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi16-action-nm_stage03_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi32-action-nm_stage01_connecting.mng b/tdenetworkmanager/pics/hi32-action-nm_stage01_connecting.mng
index d0979e7..75a27cd 100644
--- a/tdenetworkmanager/pics/hi32-action-nm_stage01_connecting.mng
+++ b/tdenetworkmanager/pics/hi32-action-nm_stage01_connecting.mng
diff --git a/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting.mng b/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting.mng
index c05519e..4effbdb 100644
--- a/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting.mng
+++ b/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting.mng
diff --git a/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting_vpn.mng b/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting_vpn.mng
index 1d97851..aa305c8 100644
--- a/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi32-action-nm_stage02_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting.mng b/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting.mng
index ab08fc3..cb92447 100644
--- a/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting.mng
+++ b/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting.mng
diff --git a/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting_vpn.mng b/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting_vpn.mng
index 0469b43..4eaaa57 100644
--- a/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi32-action-nm_stage03_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi48-action-nm_stage01_connecting.mng b/tdenetworkmanager/pics/hi48-action-nm_stage01_connecting.mng
index f0b8332..eca51d7 100644
--- a/tdenetworkmanager/pics/hi48-action-nm_stage01_connecting.mng
+++ b/tdenetworkmanager/pics/hi48-action-nm_stage01_connecting.mng
diff --git a/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting.mng b/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting.mng
index e616d5c..1260aff 100644
--- a/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting.mng
+++ b/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting.mng
diff --git a/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting_vpn.mng b/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting_vpn.mng
index fc6f635..fd50353 100644
--- a/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi48-action-nm_stage02_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting.mng b/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting.mng
index e5f32d2..0f1964f 100644
--- a/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting.mng
+++ b/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting.mng
diff --git a/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting_vpn.mng b/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting_vpn.mng
index 4d4aa90..a9873e9 100644
--- a/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi48-action-nm_stage03_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi64-action-nm_stage01_connecting.mng b/tdenetworkmanager/pics/hi64-action-nm_stage01_connecting.mng
index 77bae45..4bd4608 100644
--- a/tdenetworkmanager/pics/hi64-action-nm_stage01_connecting.mng
+++ b/tdenetworkmanager/pics/hi64-action-nm_stage01_connecting.mng
diff --git a/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting.mng b/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting.mng
index 0732be6..addba20 100644
--- a/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting.mng
+++ b/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting.mng
diff --git a/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting_vpn.mng b/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting_vpn.mng
index 1d33054..c70dc0e 100644
--- a/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi64-action-nm_stage02_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting.mng b/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting.mng
index 261c198..6be0854 100644
--- a/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting.mng
+++ b/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting.mng
diff --git a/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting_vpn.mng b/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting_vpn.mng
index 881745b..d208ab3 100644
--- a/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting_vpn.mng
+++ b/tdenetworkmanager/pics/hi64-action-nm_stage03_connecting_vpn.mng
diff --git a/tdenetworkmanager/pics/updatemovies.sh b/tdenetworkmanager/pics/updatemovies.sh
index 3bd7d39..3078714 100755
--- a/tdenetworkmanager/pics/updatemovies.sh
+++ b/tdenetworkmanager/pics/updatemovies.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-convert -dispose Background hi22-action-nm_stage01_connecting.mng -resize 16x16 hi16-action-nm_stage01_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting.mng -resize 16x16 hi16-action-nm_stage02_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting_vpn.mng -resize 16x16 hi16-action-nm_stage02_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage03_connecting.mng -resize 16x16 hi16-action-nm_stage03_connecting.mng
-convert -dispose Background hi22-action-nm_stage03_connecting_vpn.mng -resize 16x16 hi16-action-nm_stage03_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage01_connecting.mng -resize 32x32 hi32-action-nm_stage01_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting.mng -resize 32x32 hi32-action-nm_stage02_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting_vpn.mng -resize 32x32 hi32-action-nm_stage02_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage03_connecting.mng -resize 32x32 hi32-action-nm_stage03_connecting.mng
-convert -dispose Background hi22-action-nm_stage03_connecting_vpn.mng -resize 32x32 hi32-action-nm_stage03_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage01_connecting.mng -resize 48x48 hi48-action-nm_stage01_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting.mng -resize 48x48 hi48-action-nm_stage02_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting_vpn.mng -resize 48x48 hi48-action-nm_stage02_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage03_connecting.mng -resize 48x48 hi48-action-nm_stage03_connecting.mng
-convert -dispose Background hi22-action-nm_stage03_connecting_vpn.mng -resize 48x48 hi48-action-nm_stage03_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage01_connecting.mng -resize 64x64 hi64-action-nm_stage01_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting.mng -resize 64x64 hi64-action-nm_stage02_connecting.mng
-convert -dispose Background hi22-action-nm_stage02_connecting_vpn.mng -resize 64x64 hi64-action-nm_stage02_connecting_vpn.mng
-convert -dispose Background hi22-action-nm_stage03_connecting.mng -resize 64x64 hi64-action-nm_stage03_connecting.mng
-convert -dispose Background hi22-action-nm_stage03_connecting_vpn.mng -resize 64x64 hi64-action-nm_stage03_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage01_connecting.mng -resize 16x16 hi16-action-nm_stage01_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting.mng -resize 16x16 hi16-action-nm_stage02_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting_vpn.mng -resize 16x16 hi16-action-nm_stage02_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting.mng -resize 16x16 hi16-action-nm_stage03_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting_vpn.mng -resize 16x16 hi16-action-nm_stage03_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage01_connecting.mng -resize 32x32 hi32-action-nm_stage01_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting.mng -resize 32x32 hi32-action-nm_stage02_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting_vpn.mng -resize 32x32 hi32-action-nm_stage02_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting.mng -resize 32x32 hi32-action-nm_stage03_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting_vpn.mng -resize 32x32 hi32-action-nm_stage03_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage01_connecting.mng -resize 48x48 hi48-action-nm_stage01_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting.mng -resize 48x48 hi48-action-nm_stage02_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting_vpn.mng -resize 48x48 hi48-action-nm_stage02_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting.mng -resize 48x48 hi48-action-nm_stage03_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting_vpn.mng -resize 48x48 hi48-action-nm_stage03_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage01_connecting.mng -resize 64x64 hi64-action-nm_stage01_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting.mng -resize 64x64 hi64-action-nm_stage02_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage02_connecting_vpn.mng -resize 64x64 hi64-action-nm_stage02_connecting_vpn.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting.mng -resize 64x64 hi64-action-nm_stage03_connecting.mng
+convert -dispose Previous -delay 10 hi22-action-nm_stage03_connecting_vpn.mng -resize 64x64 hi64-action-nm_stage03_connecting_vpn.mng
diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index ac862e2..3d82ad4 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -51,7 +51,7 @@ tde_add_tdeinit_executable( tdenetworkmanager AUTOMOC
     connection_editor.ui
     vpnauthentication.ui main.cpp tdenetman.cpp tdenetman-tray.cpp
     #tdenetman-vpn_plugin.cpp
-    tdenetman-cellular_device_tray.cpp tdenetman-device_tray.cpp
+    tdenetman-cellular_device_tray.cpp #tdenetman-device_tray.cpp
     tdenetman-wired_device_tray.cpp tdenetman-wireless_device_tray.cpp
     tdenetman-wireless_menuitem.cpp tdenetman-menuitem.cpp
     tdenetman-menu_subhead.cpp
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
index 8f5a857..1c2e6ef 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.h
@@ -25,7 +25,10 @@
 #ifndef KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
 #define KNETWORKMANAGER_CONNECTION_SETTING_WIRELESS_SECURITY_WIDGET_H
 
-/* ui autogenerated headers */
+// tqt headers
+#include <tqtimer.h>
+
+// ui autogenerated headers
 #include "connection_setting_wireless_security.h"
 #include "connection_setting_wireless_security_eap.h"
 #include "connection_setting_wireless_security_phase2.h"
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
index 80f4f5b..536b4ef 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
@@ -27,6 +27,8 @@
 #include <tqlineedit.h>
 #include <tqlayout.h>
 #include <tqlistview.h>
+#include <tqtimer.h>
+#include <tqcheckbox.h>
 
 #include <klistview.h>
 #include <klineedit.h>
diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp
index ede0e9f..5c4cdb4 100644
--- a/tdenetworkmanager/src/devicetraycomponent.cpp
+++ b/tdenetworkmanager/src/devicetraycomponent.cpp
@@ -64,7 +64,7 @@ TQString DeviceTrayComponent::tooltipForConnState(TDENetworkConnectionStatus::TD
 }
 
 DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent, const char * name )
-    : TrayComponent(parent, name), m_device(device)
+    : TrayComponent(parent, name), m_tray(dynamic_cast<Tray*>(parent)), m_device(device)
 {
 	TDEHardwareDevices* hwdevices = KGlobal::hardwareDevices();
 
@@ -154,7 +154,12 @@ TQMovie DeviceTrayComponent::movieForState(TDENetworkConnectionStatus::TDENetwor
 	if (movieForConnState(state) != "") {
 		TQString moviePath = movieForConnState(state);
 		if (moviePath != "") {
-			return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel));
+			if (m_tray) {
+				return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel, m_tray->width()));
+			}
+			else {
+				return TQMovie(KGlobal::iconLoader()->moviePath(moviePath, KIcon::Panel));
+			}
 		}
 		else {
 			return TQMovie();
diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
index 316790c..3ee4a13 100644
--- a/tdenetworkmanager/src/devicetraycomponent.h
+++ b/tdenetworkmanager/src/devicetraycomponent.h
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
+#include "tdenetman-tray.h"
 #include "traycomponent.h"
 
 class TDENetworkDevice;
@@ -68,6 +69,9 @@ class DeviceTrayComponent : public TrayComponent
 		TQString movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state);
 		TQString tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state);
 
+	protected:
+		Tray* m_tray;
+
 	private:
 		TQString m_device;
 		TQMap<TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString> m_movies;
diff --git a/tdenetworkmanager/src/tdenetman-device_tray.cpp b/tdenetworkmanager/src/tdenetman-device_tray.cpp
deleted file mode 100644
index 6b2d3aa..0000000
--- a/tdenetworkmanager/src/tdenetman-device_tray.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/***************************************************************************
- *
- * tdenetman-device_tray.cpp - A NetworkManager frontend for TDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa       <hschaa@suse.de>, <helmut.schaa@gmx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- **************************************************************************/
-
-class WirelessDialog;
-
-// TQt includes
-#include <tqevent.h>
-#include <tqvbox.h>
-#include <tqlayout.h>
-#include <tqpushbutton.h>
-#include <tqbitmap.h>
-#include <tqimage.h>
-#include <tqpixmap.h>
-#include <tqpixmapcache.h>
-#include <tqpainter.h>
-#include <tqstyle.h>
-#include <tqtimer.h>
-
-// TDE includes
-#include <dcopclient.h>
-#include <kdebug.h>
-#include <kdialogbase.h>
-#include <knotifyclient.h>
-#include <knotifydialog.h>
-#include <kiconeffect.h>
-#include <klocale.h>
-#include <kstdguiitem.h>
-#include <khelpmenu.h>
-#include <kprocess.h>
-#include <kiconloader.h>
-#include <kconfig.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
-#include <tdehardwaredevices.h>
-#include <tdenetworkconnections.h>
-
-// TDENM includes
-#include "tdenetman-device_tray.h"
-#include "tdenetman-menu_subhead.h"
-#include "tdenetman-connection_settings_dialog.h"
-
-using namespace ConnectionSettings;
-
-class DeviceTrayPrivate
-{
-	public:
-
-		DeviceTrayPrivate()
-			: dev(NULL)
-		{
-			tooltips[TDENetworkConnectionStatus::Invalid] = i18n("Unknown");
-			tooltips[TDENetworkConnectionStatus::LinkUnavailable] = i18n("Down");
-			tooltips[TDENetworkConnectionStatus::UnManaged] = i18n("Unmanaged");
-			tooltips[TDENetworkConnectionStatus::Disconnected] = i18n("Disconnected");
-			tooltips[TDENetworkConnectionStatus::EstablishingLink] = i18n("Preparing");
-			tooltips[TDENetworkConnectionStatus::ConfiguringProtocols] = i18n("Configuration");
-			tooltips[TDENetworkConnectionStatus::NeedAuthorization] = i18n("Awaiting authentication");
-			tooltips[TDENetworkConnectionStatus::VerifyingProtocols] = i18n("IP configuration");
-			tooltips[TDENetworkConnectionStatus::Connected] = i18n("Activated");
-			tooltips[TDENetworkConnectionStatus::Failed] = i18n("Failed");
-		}
-
-		~DeviceTrayPrivate() {}
-
-		TDENetworkDevice* dev;
-		TQMap<TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQMovie>  movies;
-		TQMap<TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQPixmap> pixmaps;
-		TQMap<TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString> tooltips;
-
-		TQPixmap pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state);
-		TQMovie movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state);
-		TQString tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state);
-};
-
-TQPixmap DeviceTrayPrivate::pixmapForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
-	TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
-	while (flag != 0) {
-		if (state & flag) {
-			if (pixmaps.contains(flag)) {
-				return pixmaps[flag];
-			}
-		}
-		flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
-	}
-	return TQPixmap();
-}
-
-TQMovie DeviceTrayPrivate::movieForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
-	TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
-	while (flag != 0) {
-		if (state & flag) {
-			if (movies.contains(flag)) {
-				return movies[flag];
-			}
-		}
-		flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
-	}
-	return TQMovie();
-}
-
-TQString DeviceTrayPrivate::tooltipForConnState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state) {
-	TDENetworkConnectionStatus::TDENetworkConnectionStatus flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)0x80000000;
-	while (flag != 0) {
-		if (state & flag) {
-			if (tooltips.contains(flag)) {
-				return tooltips[flag];
-			}
-		}
-		flag = (TDENetworkConnectionStatus::TDENetworkConnectionStatus)((TQ_UINT32)flag >> 1);
-	}
-	return TQString::null;
-}
-
-TDENetworkDevice* DeviceTray::getDevice() const
-{
-	return d->dev;
-}
-
-TQString DeviceTray::getTooltipText()
-{
-
-	TDENetworkConnectionManager* deviceConnMan = d->dev->connectionManager();
-	TDENetworkConnectionStatus::TDENetworkConnectionStatus state = deviceConnMan->deviceInformation().statusFlags;
-	TQString tooltip = TQString();
-
-	if (!d->tooltipForConnState(state).isEmpty()) {
-		tooltip += i18n("State: %1").arg(d->tooltipForConnState(state));
-	}
-
-	return tooltip;
-}
-
-void DeviceTray::enterEvent (TQEvent* /*e*/)
-{
-	// show tooltip
-	TQToolTip::remove (this);
-	TQString tooltip = getTooltipText();
-
-	if (!tooltip.isEmpty()) {
-		TQToolTip::add (this, tooltip);
-	}
-}
-
-
-void DeviceTray::setPixmap(const TQPixmap& pixmap)
-{
-	/*
-  int oldPixmapWidth = pixmap.size().width();
-	int oldPixmapHeight = pixmap.size().height();
-
-	// we want to show the interface name
-	TQString iface = d->dev->getInterface();
-
-	// grab a font
-	TQFont   iface_font = KGlobalSettings::generalFont();
-//	iface_font.setBold(true);
-
-	// resize the font to fit the icon's size
-	float fontSize = iface_font.pointSizeFloat();
-	TQFontMetrics qfm(iface_font);
-	int height = qfm.height();
-	int width = qfm.width(iface);
-	float factor = 1.0f;
-	float factor2 = 1.0f;
-
-	if (height > (oldPixmapHeight / 2.0f))
-		factor = float(oldPixmapHeight / 2.0f) / float(height);
-
-	if (width > (oldPixmapWidth / 1.1f))
-		factor2 = float(oldPixmapWidth / 1.1f) / float(width);
-
-	fontSize *= (factor2 < factor) ? factor2 : factor;
-
-	iface_font.setPointSizeFloat( fontSize);
-
-	// draw the text to a bitmap and put is as an overlay on top of the pixmap
-	TQPixmap iface_pixmap(oldPixmapWidth, oldPixmapHeight);
-	iface_pixmap.fill(TQt::white);
-	TQPainter p(&iface_pixmap);
-	p.setFont(iface_font);
-	p.setPen(TQt::blue);
-	p.drawText(iface_pixmap.rect(), TQt::AlignHCenter | TQt::AlignBottom, iface);
-	iface_pixmap.setMask(iface_pixmap.createHeuristicMask());
-	TQImage iface_image = iface_pixmap.convertToImage();
-
-	TQImage pixmap_with_overlay = pixmap.convertToImage();
-	KIconEffect::overlay(pixmap_with_overlay, iface_image);
-
-	TQPixmap new_pixmap;
-	new_pixmap.convertFromImage(pixmap_with_overlay);
-	// call base-class setPixmap
-	KSystemTray::setPixmap(new_pixmap);
-*/
-	KSystemTray::setPixmap(pixmap);
-}
-
-void DeviceTray::contextMenuAboutToShow (KPopupMenu* menu)
-{
-	menu->clear();
-
-	// insert title
-	menu->insertTitle (SmallIcon ("tdenetworkmanager",  TQIconSet::Automatic), "TDENetworkManager", -1, -1);
-
-	// let the specific device_tray add its items
-	addMenuItems(menu);
-
-	// quit
-	menu->insertSeparator ();
-	KAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit));
-	if (quitAction) {
-		quitAction->plug (menu);
-	}
-}
-
-void DeviceTray::resizeEvent ( TQResizeEvent * )
-{
-	// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
-	loadIcons();
-	updateTrayIcon(m_currentIconState);
-}
-
-void DeviceTray::setPixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state, TQMovie movie)
-{
-	d->movies[state] = movie;
-	slotUpdateDeviceState();
-}
-
-void DeviceTray::setPixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state, TQPixmap pixmap)
-{
-	d->pixmaps[state] = pixmap;
-	slotUpdateDeviceState();
-}
-
-void DeviceTray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
-{
-	// stop the old movie to avoid unnecessary wakups
-	if (movie()) {
-		movie()->pause();
-	}
-
-	if (!d->movieForConnState(state).isNull()) {
-		if (m_currentIconState != state) {
-			// Clear the icon pixmap as the movie may be a different size
-			TQPixmap nullPixmap;
-			setPixmap(nullPixmap);
-		}
-
-		// animation desired
-		int frame = -1;
-		if (movie()) {
-			frame = movie()->frameNumber();
-		}
-
-		// set the movie
-		setMovie(d->movieForConnState(state));
-
-		// start at the same frame as the movie before
-		if (frame > 0)
-			movie()->step(frame);
-
-		// start the animation
-		movie()->unpause();
-	}
-	else if (!d->pixmapForConnState(state).isNull()) {
-		setPixmap(d->pixmapForConnState(state));
-	}
-	else {
-		setPixmap(loadSizedIcon("TDENetworkManager", width()));
-	}
-
-	m_currentIconState = state;
-}
-
-void DeviceTray::updateActions(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
-{
-	// allow device deactivation only when device is activated
-	KAction* deactivate = actionCollection()->action("deactivate_device");
-	if (deactivate)
-		deactivate->setEnabled( (state & TDENetworkConnectionStatus::Connected ||
-		                         state & TDENetworkConnectionStatus::VerifyingProtocols ||
-		                         state & TDENetworkConnectionStatus::EstablishingLink ||
-		                         state & TDENetworkConnectionStatus::ConfiguringProtocols ||
-		                         state & TDENetworkConnectionStatus::NeedAuthorization) );
-}
-
-void DeviceTray::updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
-{
-	if (!(state & TDENetworkConnectionStatus::Connected)) {
-		return;
-	}
-}
-
-void DeviceTray::slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus state)
-{
-	updateTrayIcon(state);
-	updateActions(state);
-	updateActiveConnection(state);
-}
-
-void DeviceTray::slotUpdateDeviceState()
-{
-	TDENetworkConnectionManager* deviceConnMan = d->dev->connectionManager();
-	slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags);
-}
-
-void DeviceTray::loadIcons() {
-	d->pixmaps[TDENetworkConnectionStatus::Invalid] = loadSizedIcon("nm_no_connection", width());
-	d->pixmaps[TDENetworkConnectionStatus::UnManaged] = loadSizedIcon("nm_no_connection", width());
-	d->pixmaps[TDENetworkConnectionStatus::LinkUnavailable] = loadSizedIcon("nm_no_connection", width());
-	d->pixmaps[TDENetworkConnectionStatus::Disconnected] = loadSizedIcon("nm_no_connection", width());
-
-	d->movies[TDENetworkConnectionStatus::EstablishingLink] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage01_connecting", KIcon::Panel));
-	d->movies[TDENetworkConnectionStatus::EstablishingLink].pause();
-
-	d->movies[TDENetworkConnectionStatus::ConfiguringProtocols] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage02_connecting", KIcon::Panel));
-	d->movies[TDENetworkConnectionStatus::ConfiguringProtocols].pause();
-
-	d->movies[TDENetworkConnectionStatus::VerifyingProtocols] = TQMovie( KGlobal::iconLoader()->moviePath("nm_stage03_connecting", KIcon::Panel));
-	d->movies[TDENetworkConnectionStatus::VerifyingProtocols].pause();
-
-	d->movies[TDENetworkConnectionStatus::NeedAuthorization] = d->movies[TDENetworkConnectionStatus::ConfiguringProtocols];
-	d->movies[TDENetworkConnectionStatus::NeedAuthorization].pause();
-
-	d->pixmaps[TDENetworkConnectionStatus::Connected] = loadSizedIcon("ok", width());
-
-	d->pixmaps[TDENetworkConnectionStatus::Failed] = loadSizedIcon("nm_no_connection", width());
-}
-
-DeviceTray::DeviceTray (TDENetworkDevice* dev) : KSystemTray ()
-{
-	d = new DeviceTrayPrivate();
-	d->dev = dev;
-
-	m_currentIconState = TDENetworkConnectionStatus::Invalid;
-	loadIcons();
-
-	// get notified when the device state changes
-	connect(dev, TQT_SIGNAL(StateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus)));
-
-	setMouseTracking (true);
-
-	// defer the initial call to slotUpdateDeviceState as it will crash tdenm when called directly from here
-	// virtual method calls are not allowed in constructor
-	TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateDeviceState()));
-
-	// Actions used for plugging into the menu
-	new KAction (i18n ("Deactivate connection..."),
-					     SmallIcon ("no",  TQIconSet::Automatic), 0,
-					     dev, TQT_SLOT (slotDeactivate()), actionCollection (), "deactivate_device");
-}
-
-DeviceTray::~DeviceTray ()
-{
-	delete d;
-}
-
-
-#include "tdenetman-device_tray.moc"
diff --git a/tdenetworkmanager/src/tdenetman-device_tray.h b/tdenetworkmanager/src/tdenetman-device_tray.h
deleted file mode 100644
index 809174b..0000000
--- a/tdenetworkmanager/src/tdenetman-device_tray.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
- *
- * tdenetman-device_tray.h - A NetworkManager frontend for TDE
- *
- * Copyright (C) 2005, 2006 Novell, Inc.
- *
- * Author: Helmut Schaa    <hschaa@suse.de>, <helmut.schaa@gmx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- **************************************************************************/
-
-#ifndef KNETWORKMANAGER_DEVICE_TRAY_H
-#define KNETWORKMANAGER_DEVICE_TRAY_H
-
-#include <tqmap.h>
-#include <tqtimer.h>
-
-#include <tqtooltip.h>
-#include <ksystemtray.h>
-#include <kuniqueapplication.h>
-#include <kpopupmenu.h>
-#include <kactionclasses.h>
-#include <kstdaction.h>
-#include <kstdguiitem.h>
-
-#include <tqlayout.h>
-#include <tqlabel.h>
-#include <tqcheckbox.h>
-#include <tqprogressbar.h>
-#include <tqguardedptr.h>
-
-#include <tdehardwaredevices.h>
-#include <tdenetworkconnections.h>
-
-#include "tdenetman.h"
-
-class DeviceTrayPrivate;
-
-class DeviceTray : public KSystemTray
-{
-	Q_OBJECT
-  
-
-	public:
-	  DeviceTray (TDENetworkDevice*);
-	  ~DeviceTray ();
-
-		void contextMenuAboutToShow (KPopupMenu* menu);
-		virtual void addMenuItems(KPopupMenu* menu) = 0;
-		TDENetworkDevice* getDevice() const;
-
-	protected:
-		void setPixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQMovie);
-		void setPixmapForState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQPixmap);
-		void resizeEvent ( TQResizeEvent * );
-
-		virtual TQString getTooltipText();
-
-	public slots:
-		void setPixmap(const TQPixmap &);
-		void slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
-		void slotUpdateDeviceState();
-
-	private:
-		void updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
-		void updateActions(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
-		void updateActiveConnection(TDENetworkConnectionStatus::TDENetworkConnectionStatus);
-		void enterEvent (TQEvent*);
-		void loadIcons();
-
-		DeviceTrayPrivate* d;
-		TDENetworkConnectionStatus::TDENetworkConnectionStatus m_currentIconState;
-};
-
-#endif /* KNETWORKMANAGER_DEVICE_TRAY_H */
diff --git a/tdenetworkmanager/src/tdenetman-wireless_manager.h b/tdenetworkmanager/src/tdenetman-wireless_manager.h
index 3eacd6c..8baf68e 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_manager.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_manager.h
@@ -31,7 +31,6 @@
 
 // TDENM includes
 #include "tdenetman.h"
-#include "tdenetman-device_tray.h"
 #include "tdenetman-wireless_network.h"
 
 namespace ConnectionSettings