2 files changed, 60 insertions, 22 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 15ccc58..183aab8 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -1,358 +1,390 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer
 **               <mickey@tm.informatik.uni-frankfurt.de>
 **               http://www.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 <qapplication.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 
 #include <qpoint.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qslider.h>
 #include <qbuttongroup.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qfile.h>
 
 #include "networkinfo.h"
 #include "mgraph.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
 
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
     : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
 {
 
+    readConfig();
+    writeConfigEntry( "UpdateFrequency", updateFrequency );
+    writeConfigEntry( "DisplayStyle", displayStyle );
+    
     setFrameStyle( QFrame::PopupPanel | QFrame::Raised );    
     QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" );  
     
     /* status label */
     
     statusLabel = new QLabel( this, "statuslabel" );
     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" ); */
     statusLabel->setText( text );
     statusLabel->setFixedSize( statusLabel->sizeHint() );
     grid->addWidget( statusLabel, 0, 0 );
 
     /* visualization group box */
     
     QButtonGroup* group = new QButtonGroup( 1, Qt::Horizontal, "Visualization", this );
     QRadioButton* r1 = new QRadioButton( "Color Bars", group );
     QRadioButton* r2 = new QRadioButton( "Antenna", group );
     r1->setFocusPolicy( QWidget::NoFocus );
     r2->setFocusPolicy( QWidget::NoFocus );
     group->setFocusPolicy( QWidget::NoFocus );
-    group->setButton( STYLE_ANTENNA );
+    group->setButton( displayStyle );
     grid->addWidget( group, 0, 1 );
 
     /* quality graph */
     
     mgraph = new MGraph( this );
     mgraph->setFrameStyle( QFrame::Panel | QFrame::Sunken );
     mgraph->setMin( 0 );
     mgraph->setMax( 92 );
     grid->addWidget( mgraph, 1, 0 );
     mgraph->setFocusPolicy( QWidget::NoFocus );
     
     /* dhcp renew CheckBox */
     
     //FIXME: under construction
     //QCheckBox* dhcpCheckBox = new QCheckBox( "DHCP renew", this );
     //dhcpCheckBox->setFocusPolicy( QWidget::NoFocus );
     //grid->addWidget( dhcpCheckBox, 2, 0, Qt::AlignCenter );
 
     /* update Frequency Label */
     
     updateLabel = new QLabel( this );
-    updateLabel->setText( "Update every 500 ms" );
+    text.sprintf( "Update every %d s", updateFrequency );
+    updateLabel->setText( text );
     grid->addWidget( updateLabel, 2, 1 );
 
     /* update Frequency Slider */
     
     QSlider* updateSlider = new QSlider( QSlider::Horizontal, this );
-    updateSlider->setRange( 50, 999 );
-    updateSlider->setValue( 500 );
+    updateSlider->setRange( 0, 9 );
+    updateSlider->setValue( updateFrequency );
     updateSlider->setTickmarks( QSlider::Both );
-    updateSlider->setTickInterval( 100 );
-    updateSlider->setSteps( 50, 50 );
+    updateSlider->setTickInterval( 1 );
+    updateSlider->setSteps( 1, 1 );
     updateSlider->setFocusPolicy( QWidget::NoFocus );
     grid->addWidget( updateSlider, 1, 1 );
     connect( updateSlider, SIGNAL( valueChanged( int ) ),
              this, SLOT( updateDelayChange( int ) ) );
 
     setFixedSize( sizeHint() );
     setFocusPolicy( QWidget::NoFocus );
 
+    applet->displayStyleChange( displayStyle );
+    applet->updateDelayChange( updateFrequency );
+    
     connect( group, SIGNAL( clicked( int ) ),
-             applet, SLOT( styleChange( int ) ) );   
-
+             this, SLOT( displayStyleChange( int ) ) );    
 }
 
 void WirelessControl::updateDelayChange( int delay )
 {
     QString text;
-    text.sprintf( "Update every %3d ms", delay );
+    text.sprintf( "Update every %d s", delay );
     updateLabel->setText( text );
     applet->updateDelayChange( delay );
+    writeConfigEntry( "UpdateFrequency", delay );
+}
+
+void WirelessControl::displayStyleChange( int style )
+{
+    applet->displayStyleChange( style );
+    writeConfigEntry( "DisplayStyle", style );
 }
 
 void WirelessControl::show ( bool )
 {
   QPoint curPos = applet->mapToGlobal( QPoint ( 0, 0 ) );
 
   int w = sizeHint().width();
   int x = curPos.x() - ( w / 2 );
 
   if ( ( x + w ) > QPEApplication::desktop()->width() )
       x = QPEApplication::desktop ( )-> width ( ) - w;
 
   move( x, curPos.y () - sizeHint().height () );
   QFrame::show();
 }
 
+void WirelessControl::readConfig()
+{
+    Config cfg( "qpe" );
+    cfg.setGroup( "Wireless" );
+    
+    updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 );
+    displayStyle = cfg. readNumEntry( "DisplayStyle", STYLE_ANTENNA );   
+}
 
+void WirelessControl::writeConfigEntry( const char *entry, int val )
+{
+    Config cfg( "qpe" );
+    cfg.setGroup( "Wireless" );
+    cfg.writeEntry( entry, val );
+}
+  
 //===========================================================================
 
 WirelessApplet::WirelessApplet( QWidget *parent, const char *name )
-    : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ), interface( 0 )
+    : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ),
+      timer( 0 ), interface( 0 )
 {
     setFixedHeight( 18 );
     setFixedWidth( 14 );
-    status = new WirelessControl( this, 0, "wireless status" );
-
     network = new MWirelessNetwork();
-    
-    timer = startTimer( 500 );
+    status = new WirelessControl( this, 0, "wireless status" );
 }
 
 void WirelessApplet::checkInterface()
 {
     interface = network->getFirstInterface();
     if ( interface )
     {
         qDebug( "WIFIAPPLET: using interface '%s'", (const char*)
                  interface->getName() );
     }
     else
     {
         qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
     }   
 }    
 
 void WirelessApplet::updateDelayChange( int delay )
 {
-    killTimer( timer );
+    if ( timer )
+        killTimer( timer );
+    delay *= 1000;
+    if ( delay == 0 )
+        delay = 50;
     timer = startTimer( delay );
 }
 
-WirelessApplet::~WirelessApplet()
+void WirelessApplet::displayStyleChange( int style )
 {
+    visualStyle = style;
+    repaint();
 }
 
-void WirelessApplet::styleChange( int style )
+WirelessApplet::~WirelessApplet()
 {
-    visualStyle = style;
-    repaint();
 }
 
 void WirelessApplet::timerEvent( QTimerEvent* )
 {
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
   
     if ( iface )
     {
         iface->updateStatistics();
         if ( mustRepaint() )
         {
             //qDebug( "WIFIAPPLET: A value has changed -> repainting." );
             repaint();
         }
         
         if ( status->isVisible() )
             updatePopupWindow();
     } else checkInterface();
 }
 
 void WirelessApplet::mousePressEvent( QMouseEvent *)
 {   
     if ( status->isVisible() )
          status->hide();
     else
         status->show( true );
 }
 
 bool WirelessApplet::mustRepaint()
 {
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
     
     // check if there are enough changes to justify a (flickering) repaint
     
     // has the interface changed?
     
     if ( iface != oldiface )
     {
         oldiface = iface; 
         return true;
     }
    
     const char** pixmap = getQualityPixmap();
     
     if ( pixmap && ( pixmap != oldpixmap ) )
     {
         oldpixmap = pixmap;
         return true;
     }
     
     int noiseH = iface->noisePercent() * ( height() - 3 ) / 100;
     int signalH = iface->signalPercent() * ( height() - 3 ) / 100;
     int qualityH = iface->qualityPercent() * ( height() - 3 ) / 100;
     
     if ( ( noiseH != oldnoiseH )
       || ( signalH != oldsignalH )
       || ( qualityH != oldqualityH ) )
     {
         oldnoiseH = noiseH;
         oldsignalH = signalH;
         oldqualityH = qualityH;
         return true;
     }
     
     return false;
 }
 
 void WirelessApplet::updatePopupWindow()
 {
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
     int qualityH = iface->qualityPercent();
 
     if ( status->mgraph )
         status->mgraph->addValue( qualityH, false );
     
     QString freqString;
     QString cell = ( iface->mode == "Managed" ) ? "AP: " : "Cell: ";
     freqString.sprintf( "%.3f GHz", iface->freq );
     status->statusLabel->setText( "Station: " + iface->nick + "<br>" +
                                   "ESSID: " + iface->essid + "<br>" +
                                   "MODE: " + iface->mode + "<br>" +
                                   "FREQ: " + freqString + "<br>" +
                                   cell + " " + iface->APAddr );
 }   
 
 const char** WirelessApplet::getQualityPixmap()
 {    
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
     
     if ( !iface ) return ( const char** ) nowireless_xpm;
     int qualityH = iface->qualityPercent();
     if ( qualityH < 0 ) return ( const char** ) nowireless_xpm;
     
     if ( visualStyle == STYLE_ANTENNA )
     {
         if ( qualityH < 1 ) return ( const char** ) connect0_xpm;
         if ( qualityH < 17 ) return ( const char** ) connect1_xpm; 
         if ( qualityH < 34 ) return ( const char** ) connect2_xpm;
         if ( qualityH < 50 ) return ( const char** ) connect3_xpm;
         if ( qualityH < 65 ) return ( const char** ) connect4_xpm;
         return ( const char** ) connect5_xpm;
     }
     
     return 0; // please draw your bars
 }
 
 void WirelessApplet::paintEvent( QPaintEvent* )
 {
     MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface;
 
     QPainter p(this);
     QColor color;
 
     const char** pixmap = getQualityPixmap();
     
     if ( pixmap )
         p.drawPixmap( 0, 1, pixmap );
     else
     {
 
         int noiseH = iface->noisePercent() * ( height() - 3 ) / 100;
         int signalH = iface->signalPercent() * ( height() - 3 ) / 100;
         int qualityH = iface->qualityPercent() * ( height() - 3 ) / 100;
 
         double intensity;
         int pixelHeight;
         int pixelWidth = 2;
         int Hue;
         int barSpace = 3;
         int leftoffset = 0;
         int bottomoffset = 2;
 
         // draw noise indicator
         pixelHeight = noiseH;
         Hue = 50;
         for ( int i = 0; i < pixelHeight; ++i )
         {
             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 );
         }
 
         // draw signal indicator
         pixelHeight = signalH;
         Hue = 100;
         leftoffset += pixelWidth + barSpace;
         for ( int i = 0; i < pixelHeight; ++i )
         {
             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 );
         }
 
         // draw quality indicator
         pixelHeight = qualityH;
         Hue = 250;
         leftoffset += pixelWidth + barSpace;
         for ( int i = 0; i < pixelHeight; ++i )
         {
             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 );
         }
     }    
 }
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index d45ac68..45c519d 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -1,89 +1,95 @@
 /**********************************************************************
 ** Copyright (C) 2002 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 **  All rights reserved.
 **
 ** 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.
 **
 **********************************************************************/
 
 #ifndef __WIRELESS_APPLET_H__
 #define __WIRELESS_APPLET_H__
 
 #include <qwidget.h>
 #include <qframe.h>
 #include <qpixmap.h>
 
 class MNetwork;
 class MWirelessNetwork;
 class MNetworkInterface;
 class MWirelessNetworkInterface;
 class Y;
 class QLabel;
 class WirelessApplet;
 class MGraph;
 
 class WirelessControl : public QFrame
 {
     Q_OBJECT
 public:
     WirelessControl( WirelessApplet* icon, QWidget *parent=0, const char *name=0 );
     void show( bool );
+    
+    void readConfig();
+    void writeConfigEntry( const char* entry, int val );
 
     MGraph* mgraph;
     QLabel* statusLabel;
     QLabel* updateLabel;
 
 public slots:
     void updateDelayChange( int );
+    void displayStyleChange( int );
         
 private:
     WirelessApplet* applet;
+
+    int displayStyle;
+    int updateFrequency;
+
 };
 
 class WirelessApplet : public QWidget
 {
     Q_OBJECT
 public:
     WirelessApplet( QWidget *parent = 0, const char *name=0 );
     ~WirelessApplet();
     WirelessControl* status;
     
     virtual void timerEvent( QTimerEvent* );
     void updateDelayChange( int delay );
-    
-public slots:
-    void styleChange( int );
+    void displayStyleChange( int style );
 
 private:
     void mousePressEvent( QMouseEvent * );
     void paintEvent( QPaintEvent* );
     void checkInterface();
     
     bool mustRepaint();
     void updatePopupWindow();
     const char** getQualityPixmap();
 
 private:
     QPixmap snapshotPixmap;
     int visualStyle;
     int timer;
     
     MWirelessNetwork* network;
     MNetworkInterface* interface;
     
 private:
     const char** oldpixmap;
     MWirelessNetworkInterface* oldiface;
     int oldqualityH;
     int oldsignalH;
     int oldnoiseH;       
 };
 
 #endif // __WIRELESS_APPLET_H__