start with the long awaited wireless applet overhaul

5 files changed, 133 insertions, 228 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,5 +1,3 @@
 /**********************************************************************
-** 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>
 **
@@ -16,4 +14,15 @@
 #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>
@@ -21,2 +30,3 @@
 
+/* QT */
 #include <qpoint.h>
@@ -35,2 +45,3 @@
 
+/* STD */
 #include <sys/types.h>
@@ -38,15 +49,2 @@
 
-#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
@@ -58,3 +56,3 @@
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
-    : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
+        : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
 {
@@ -72,11 +70,11 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     QString text( "Wireless Status:<br>"
-                        "*** Unknown ***<br>"
-                    "Card not inserted ?<br>"
-                    "Or Sharp ROM ?<br>"
-                    "CELL: 00:00:00:00:00:00" );
-/*    QString text( "Station: Unknown<br>"
-                        "ESSID: Unknown<br>"
-                    "MODE: Unknown<br>"
-                    "FREQ: Unknown<br>"
-                    "CELL: AA:BB:CC:DD:EE:FF" ); */
+                  "*** Unknown ***<br>"
+                  "Card not inserted ?<br>"
+                  "Or Sharp ROM ?<br>"
+                  "CELL: 00:00:00:00:00:00" );
+    /*    QString text( "Station: Unknown<br>"
+                            "ESSID: Unknown<br>"
+                        "MODE: Unknown<br>"
+                        "FREQ: Unknown<br>"
+                        "CELL: AA:BB:CC:DD:EE:FF" ); */
     statusLabel->setText( text );
@@ -138,6 +136,6 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
     applet->updateDelayChange( updateFrequency );
-    
+
     connect( group, SIGNAL( clicked( int ) ),
              this, SLOT( displayStyleChange( int ) ) );
-             
+
     applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE );
@@ -147,3 +145,3 @@ void WirelessControl::advancedConfigClicked()
 {
-    AdvancedConfig* a = new AdvancedConfig( this, "dialog", TRUE );
+    AdvancedConfig * a = new AdvancedConfig( this, "dialog", TRUE );
     int result = a->exec();
@@ -175,12 +173,12 @@ void WirelessControl::show ( bool )
 {
-  QPoint curPos = applet->mapToGlobal( QPoint ( 0, 0 ) );
+    QPoint curPos = applet->mapToGlobal( QPoint ( 0, 0 ) );
 
-  int w = sizeHint().width();
-  int x = curPos.x() - ( w / 2 );
+    int w = sizeHint().width();
+    int x = curPos.x() - ( w / 2 );
 
-  if ( ( x + w ) > QPEApplication::desktop()->width() )
-      x = QPEApplication::desktop ( )-> width ( ) - w;
+    if ( ( x + w ) > QPEApplication::desktop() ->width() )
+        x = QPEApplication::desktop ( ) -> width ( ) - w;
 
-  move( x, curPos.y () - sizeHint().height () );
-  QFrame::show();
+    move( x, curPos.y () - sizeHint().height () );
+    QFrame::show();
 }
@@ -191,3 +189,3 @@ void WirelessControl::readConfig()
     cfg.setGroup( "Wireless" );
-    
+
     updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 );
@@ -206,3 +204,3 @@ void WirelessControl::writeConfigEntry( const char *entry, int val )
 }
-  
+
 //===========================================================================
@@ -210,5 +208,5 @@ void WirelessControl::writeConfigEntry( const char *entry, int val )
 WirelessApplet::WirelessApplet( QWidget *parent, const char *name )
-    : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ),
-      timer( 0 ), interface( 0 ),
-      rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
+        : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ),
+        timer( 0 ), interface( 0 ),
+            rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
 {
@@ -226,4 +224,5 @@ void WirelessApplet::checkInterface()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
+        qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->getName() );
 #endif
+
     }
@@ -246,3 +245,3 @@ void WirelessApplet::renewDHCP()
     if ( !interface )
-        return;
+        return ;
     QString ifacename( interface->getName() );
@@ -251,5 +250,5 @@ void WirelessApplet::renewDHCP()
 
-    pidfile.sprintf( "/var/run/dhcpcd-%s.pid", (const char* ) ifacename );
+    pidfile.sprintf( "/var/run/dhcpcd-%s.pid", ( const char* ) ifacename );
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", (const char*) pidfile );
+    qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", ( const char* ) pidfile );
 #endif
@@ -266,3 +265,3 @@ void WirelessApplet::renewDHCP()
         kill( pid, SIGALRM );
-        return;
+        return ;
     }
@@ -273,5 +272,5 @@ void WirelessApplet::renewDHCP()
 #endif
-    pidfile.sprintf( "/var/run/udhcpc.%s.pid", (const char*) ifacename );
+    pidfile.sprintf( "/var/run/udhcpc.%s.pid", ( const char* ) ifacename );
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", (const char*) pidfile );
+    qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", ( const char* ) pidfile );
 #endif
@@ -287,3 +286,3 @@ void WirelessApplet::renewDHCP()
         kill( pid, SIGUSR1 );
-        return;
+        return ;
     }
@@ -316,4 +315,3 @@ void WirelessApplet::displayStyleChange( int style )
 WirelessApplet::~WirelessApplet()
-{
-}
+{}
 
@@ -321,4 +319,4 @@ void WirelessApplet::timerEvent( QTimerEvent* )
 {
-    MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
-  
+    MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
+
     if ( iface )
@@ -330,19 +328,21 @@ void WirelessApplet::timerEvent( QTimerEvent* )
             mustRepaint();
-            return;
-        } else
-        if ( mustRepaint() )
-        {
-            //qDebug( "WIFIAPPLET: A value has changed -> repainting." );
-            repaint();
+            return ;
         }
-        
+        else
+            if ( mustRepaint() )
+            {
+                //qDebug( "WIFIAPPLET: A value has changed -> repainting." );
+                repaint();
+            }
+
         if ( status->isVisible() )
             updatePopupWindow();
-    } else checkInterface();
+    }
+    else checkInterface();
 }
 
-void WirelessApplet::mousePressEvent( QMouseEvent *)
-{   
+void WirelessApplet::mousePressEvent( QMouseEvent * )
+{
     if ( status->isVisible() )
-         status->hide();
+        status->hide();
     else
@@ -353,8 +353,8 @@ bool WirelessApplet::mustRepaint()
 {
-    MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
-    
+    MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
+
     // check if there are enough changes to justify a (flickering) repaint
-    
+
     // has the interface changed?
-    
+
     if ( iface != oldiface )
@@ -378,5 +378,5 @@ bool WirelessApplet::mustRepaint()
     }
-   
+
     const char** pixmap = getQualityPixmap();
-    
+
     if ( pixmap && ( pixmap != oldpixmap ) )
@@ -386,3 +386,3 @@ bool WirelessApplet::mustRepaint()
     }
-    
+
     int noiseH = iface->noisePercent() * ( height() - 3 ) / 100;
@@ -390,6 +390,6 @@ bool WirelessApplet::mustRepaint()
     int qualityH = iface->qualityPercent() * ( height() - 3 ) / 100;
-    
+
     if ( ( noiseH != oldnoiseH )
-      || ( signalH != oldsignalH )
-      || ( qualityH != oldqualityH ) )
+            || ( signalH != oldsignalH )
+            || ( qualityH != oldqualityH ) )
     {
@@ -404,3 +404,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: ESSID has changed.");
+        qDebug( "WIFIAPPLET: ESSID has changed." );
 #endif
@@ -411,3 +411,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: FREQ has changed.");
+        qDebug( "WIFIAPPLET: FREQ has changed." );
 #endif
@@ -418,3 +418,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: AP has changed.");
+        qDebug( "WIFIAPPLET: AP has changed." );
 #endif
@@ -425,3 +425,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: MODE has changed.");
+        qDebug( "WIFIAPPLET: MODE has changed." );
 #endif
@@ -429,3 +429,3 @@ bool WirelessApplet::mustRepaint()
     }
-    
+
     oldESSID = iface->essid;
@@ -434,3 +434,3 @@ bool WirelessApplet::mustRepaint()
     oldAP = iface->APAddr;
-    
+
     return false;
@@ -440,3 +440,3 @@ void WirelessApplet::updatePopupWindow()
 {
-    MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
+    MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
     int qualityH = iface->qualityPercent();
@@ -445,3 +445,3 @@ void WirelessApplet::updatePopupWindow()
         status->mgraph->addValue( qualityH, false );
-    
+
     QString freqString;
@@ -454,8 +454,8 @@ void WirelessApplet::updatePopupWindow()
                                   cell + " " + iface->APAddr );
-}   
+}
 
 const char** WirelessApplet::getQualityPixmap()
-{    
-    MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
-    
+{
+    MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
+
     if ( !iface ) return ( const char** ) nowireless_xpm;
@@ -463,3 +463,3 @@ const char** WirelessApplet::getQualityPixmap()
     if ( qualityH < 0 ) return ( const char** ) nowireless_xpm;
-    
+
     if ( visualStyle == STYLE_ANTENNA )
@@ -467,3 +467,3 @@ const char** WirelessApplet::getQualityPixmap()
         if ( qualityH < 1 ) return ( const char** ) connect0_xpm;
-        if ( qualityH < 17 ) return ( const char** ) connect1_xpm; 
+        if ( qualityH < 17 ) return ( const char** ) connect1_xpm;
         if ( qualityH < 34 ) return ( const char** ) connect2_xpm;
@@ -473,3 +473,3 @@ const char** WirelessApplet::getQualityPixmap()
     }
-    
+
     return 0; // please draw your bars
@@ -479,5 +479,5 @@ void WirelessApplet::paintEvent( QPaintEvent* )
 {
-    MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
+    MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
 
-    QPainter p(this);
+    QPainter p( this );
     QColor color;
@@ -508,6 +508,6 @@ void WirelessApplet::paintEvent( QPaintEvent* )
         {
-            intensity = 50 + ( (double) i / (double) pixelHeight ) * 205;
+            intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205;
             color.setHsv( Hue, 255, intensity );
             p.setPen ( color );
-            p.drawLine( leftoffset, height()-bottomoffset-i, pixelWidth+leftoffset, height()-bottomoffset-i );
+            p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i );
         }
@@ -520,6 +520,6 @@ void WirelessApplet::paintEvent( QPaintEvent* )
         {
-            intensity = 50 + ( (double) i / (double) pixelHeight ) * 205;
+            intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205;
             color.setHsv( Hue, 255, intensity );
             p.setPen ( color );
-            p.drawLine( leftoffset, height()-bottomoffset-i, pixelWidth+leftoffset, height()-bottomoffset-i );
+            p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i );
         }
@@ -532,8 +532,21 @@ void WirelessApplet::paintEvent( QPaintEvent* )
         {
-            intensity = 50 + ( (double) i / (double) pixelHeight ) * 205;
+            intensity = 50 + ( ( double ) i / ( double ) pixelHeight ) * 205;
             color.setHsv( Hue, 255, intensity );
             p.setPen ( color );
-            p.drawLine( leftoffset, height()-bottomoffset-i, pixelWidth+leftoffset, height()-bottomoffset-i );
+            p.drawLine( leftoffset, height() - bottomoffset - i, pixelWidth + leftoffset, height() - bottomoffset - i );
         }
-    }    
+    }
 }
+
+
+int WirelessApplet::position()
+{
+    return 6;
+}
+
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
+}
+
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 51a3fab..644be26 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -33,6 +33,6 @@ class WirelessControl : public QFrame
     Q_OBJECT
-public:
+  public:
     WirelessControl( WirelessApplet* icon, QWidget *parent=0, const char *name=0 );
     void show( bool );
-    
+
     void readConfig();
@@ -44,3 +44,3 @@ public:
 
-public slots:
+  public slots:
     void updateDelayChange( int );
@@ -48,4 +48,4 @@ public slots:
     void advancedConfigClicked();
-        
-private:
+
+  private:
     WirelessApplet* applet;
@@ -64,7 +64,8 @@ class WirelessApplet : public QWidget
     Q_OBJECT
-public:
+  public:
     WirelessApplet( QWidget *parent = 0, const char *name=0 );
     ~WirelessApplet();
+    static int position();
     WirelessControl* status;
-    
+
     virtual void timerEvent( QTimerEvent* );
@@ -72,6 +73,6 @@ public:
     void displayStyleChange( int style );
-    
+
     void updateDHCPConfig( bool, bool, bool, bool );
 
-private:
+  private:
     void mousePressEvent( QMouseEvent * );
@@ -80,3 +81,3 @@ private:
     void renewDHCP();
-    
+
     bool mustRepaint();
@@ -85,3 +86,3 @@ private:
 
-private:
+  private:
     QPixmap snapshotPixmap;
@@ -89,7 +90,7 @@ private:
     int timer;
-    
+
     MWirelessNetwork* network;
     MNetworkInterface* interface;
-    
-private:
+
+  private:
     const char** oldpixmap;
@@ -98,3 +99,3 @@ private:
     int oldsignalH;
-    int oldnoiseH;       
+    int oldnoiseH;
 
@@ -104,3 +105,3 @@ private:
     double oldFREQ;
-    
+
     bool rocESSID;
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index 411a039..38cb475 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -2,4 +2,4 @@ TEMPLATE     = lib
 CONFIG      += qt plugin warn_on release
-HEADERS      = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
-SOURCES      = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
+HEADERS      = wireless.h networkinfo.h mgraph.h advancedconfig.h
+SOURCES      = wireless.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
 INTERFACES   = advancedconfigbase.ui
@@ -8,5 +8,5 @@ DESTDIR      = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH  += ../$(OPIEDIR)/include
+DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe
-VERSION      = 0.1.0
+VERSION      = 0.1.1
 
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp b/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
deleted file mode 100644
index de70714..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "wireless.h"
-#include "wirelessappletimpl.h"
-
-
-WirelessAppletImpl::WirelessAppletImpl()
-    : wireless(0)
-{
-}
-
-WirelessAppletImpl::~WirelessAppletImpl()
-{
-    delete wireless;
-}
-
-QWidget *WirelessAppletImpl::applet( QWidget *parent )
-{
-    if ( !wireless )
-  wireless = new WirelessApplet( parent );
-    return wireless;
-}
-
-int WirelessAppletImpl::position() const
-{
-    return 6;
-}
-
-QRESULT WirelessAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
-    *iface = 0;
-    if ( uuid == IID_QUnknown )
-  *iface = this;
-    else if ( uuid == IID_TaskbarApplet )
-  *iface = this;
-    else
-        return QS_FALSE;
-        
-    if ( *iface )
-  (*iface)->addRef();
-    return QS_OK;
-}
-
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( WirelessAppletImpl )
-}
-
-
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.h b/noncore/applets/wirelessapplet/wirelessappletimpl.h
deleted file mode 100644
index 1bf4507..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** 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.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef WIRELESSAPPLETIMPL_H
-#define WIRELESSAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class WirelessApplet;
-
-class WirelessAppletImpl : public TaskbarAppletInterface
-{
-public:
-    WirelessAppletImpl();
-    virtual ~WirelessAppletImpl();
-
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
-
-    virtual QWidget *applet( QWidget *parent );
-    virtual int position() const;
-
-private:
-    WirelessApplet *wireless;
-};
-
-#endif