start with the long awaited wireless applet overhaul

1 files changed, 34 insertions, 21 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 763aab8..cbaf5d6 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -1,27 +1,37 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer
-**               <mickey@tm.informatik.uni-frankfurt.de>
-**               http://www.Vanille.de
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer <mickey@vanille.de>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "wireless.h"
+#include "networkinfo.h"
+#include "mgraph.h"
+#include "advancedconfig.h"
+#include "connect0.xpm"
+#include "connect1.xpm"
+#include "connect2.xpm"
+#include "connect3.xpm"
+#include "connect4.xpm"
+#include "connect5.xpm"
+#include "nowireless.xpm"
 
-#include <qapplication.h>
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
+/* QT */
 #include <qpoint.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qslider.h>
@@ -30,28 +40,16 @@
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
+/* STD */
 #include <sys/types.h>
 #include <signal.h>
 
-#include "networkinfo.h"
-#include "mgraph.h"
-
-#include "advancedconfig.h"
-
-#include "connect0.xpm"
-#include "connect1.xpm"
-#include "connect2.xpm"
-#include "connect3.xpm"
-#include "connect4.xpm"
-#include "connect5.xpm"
-#include "nowireless.xpm"
-
 #define STYLE_BARS 0
 #define STYLE_ANTENNA 1
 
 //#define MDEBUG
 #undef MDEBUG
 
@@ -223,12 +221,13 @@ void WirelessApplet::checkInterface()
     interface = network->getFirstInterface();
     if ( interface )
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
 #endif
+
     }
     else
     {
 #ifdef MDEBUG
         qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
 #endif
@@ -311,14 +310,13 @@ void WirelessApplet::displayStyleChange( int style )
 {
     visualStyle = style;
     repaint();
 }
 
 WirelessApplet::~WirelessApplet()
-{
-}
+{}
 
 void WirelessApplet::timerEvent( QTimerEvent* )
 {
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
   
     if ( iface )
@@ -326,22 +324,24 @@ void WirelessApplet::timerEvent( QTimerEvent* )
         bool statResult = iface->updateStatistics();
         if ( !statResult )
         {
             interface = 0;
             mustRepaint();
             return;
-        } else
+        }
+        else
         if ( mustRepaint() )
         {
             //qDebug( "WIFIAPPLET: A value has changed -> repainting." );
             repaint();
         }
         
         if ( status->isVisible() )
             updatePopupWindow();
-    } else checkInterface();
+    }
+    else checkInterface();
 }
 
 void WirelessApplet::mousePressEvent( QMouseEvent *)
 {   
     if ( status->isVisible() )
          status->hide();
@@ -534,6 +534,19 @@ void WirelessApplet::paintEvent( QPaintEvent* )
             color.setHsv( Hue, 255, intensity );
             p.setPen ( color );
             p.drawLine( leftoffset, height()-bottomoffset-i, pixelWidth+leftoffset, height()-bottomoffset-i );
         }
     }    
 }
+
+
+int WirelessApplet::position()
+{
+    return 6;
+}
+
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
+}
+