| -rw-r--r-- | noncore/applets/wirelessapplet/connect0.xpm | 28 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/connect1.xpm | 28 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/connect2.xpm | 29 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/connect3.xpm | 28 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/connect4.xpm | 26 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/connect5.xpm | 26 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/nowireless.xpm | 22 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 131 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/wireless.h | 5 |
9 files changed, 41 insertions, 282 deletions
diff --git a/noncore/applets/wirelessapplet/connect0.xpm b/noncore/applets/wirelessapplet/connect0.xpm deleted file mode 100644 index f2c0bb7..0000000 --- a/noncore/applets/wirelessapplet/connect0.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect0_xpm[] = { -"14 14 11 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #000000", -"# c #C6C3C6", -"$ c #877F81", -"% c #191819", -"& c #897D7F", -"* c #0E0E0E", -"= c #575657", -"- c #131313", -" ", -" ", -" ", -" +@+ ", -" #@@ ", -" $%+ ", -" + ", -" @ ", -" &*= ", -" +-@ ", -" +@@ ", -" +#@@+ ", -" +#@@@ ", -" +#@@@ "}; diff --git a/noncore/applets/wirelessapplet/connect1.xpm b/noncore/applets/wirelessapplet/connect1.xpm deleted file mode 100644 index d831437..0000000 --- a/noncore/applets/wirelessapplet/connect1.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect1_xpm[] = { -"14 14 11 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #FF2609", -"# c #877F81", -"$ c #000000", -"% c #897D7F", -"& c #0E0E0E", -"* c #575657", -"= c #131313", -"- c #C6C3C6", -" ", -" ", -" ", -" +@+ ", -" @@@ ", -" #@+ ", -" + ", -" $ ", -" %&* ", -" +=$ ", -" +$$ ", -" +-$$+ ", -" +-$$$ ", -" +-$$$ "}; diff --git a/noncore/applets/wirelessapplet/connect2.xpm b/noncore/applets/wirelessapplet/connect2.xpm deleted file mode 100644 index 9e42f33..0000000 --- a/noncore/applets/wirelessapplet/connect2.xpm +++ b/dev/null @@ -1,29 +0,0 @@ -/* XPM */ -static char * connect2_xpm[] = { -"14 14 12 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #897D7F", -"= c #0E0E0E", -"- c #575657", -"; c #131313", -" ", -" ", -" ... ", -" .@#@. ", -" .$##. ", -" .%&@. ", -" ... ", -" # ", -" *=- ", -" @;# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/connect3.xpm b/noncore/applets/wirelessapplet/connect3.xpm deleted file mode 100644 index 263443d..0000000 --- a/noncore/applets/wirelessapplet/connect3.xpm +++ b/dev/null @@ -1,28 +0,0 @@ -/* XPM */ -static char * connect3_xpm[] = { -"14 14 11 1", -" c None", -". c #FF2609", -"+ c #848284", -"@ c #000000", -"# c #C6C3C6", -"$ c #877F81", -"% c #191819", -"& c #897D7F", -"* c #0E0E0E", -"= c #575657", -"- c #131313", -" ", -" ... ", -" . . ", -" . +@+ . ", -" . #@@ . ", -" . $%+ . ", -" . + . ", -" ... ", -" &*= ", -" +-@ ", -" +@@ ", -" +#@@+ ", -" +#@@@ ", -" +#@@@ "}; diff --git a/noncore/applets/wirelessapplet/connect4.xpm b/noncore/applets/wirelessapplet/connect4.xpm deleted file mode 100644 index 471ed64..0000000 --- a/noncore/applets/wirelessapplet/connect4.xpm +++ b/dev/null @@ -1,26 +0,0 @@ -/* XPM */ -static char * connect4_xpm[] = { -"14 14 9 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #131313", -" ... ", -" .. .. ", -" . . ", -" . @#@ . ", -" . $## . ", -" . %&@ . ", -" . @ . ", -" .. # .. ", -" ... ", -" @*# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/connect5.xpm b/noncore/applets/wirelessapplet/connect5.xpm deleted file mode 100644 index a67be9a..0000000 --- a/noncore/applets/wirelessapplet/connect5.xpm +++ b/dev/null @@ -1,26 +0,0 @@ -/* XPM */ -static char * connect5_xpm[] = { -"14 14 9 1", -" c None", -". c #FF2609", -"+ c #FFFFFF", -"@ c #848284", -"# c #000000", -"$ c #C6C3C6", -"% c #877F81", -"& c #191819", -"* c #131313", -" . ... . ", -" . .. .. . ", -" . . . .", -" . . @#@ . .", -" . . $## . .", -" . . %&@ . .", -" . . @ . .", -" . .. # .. . ", -" . ... . ", -" @*# ", -" @## ", -" @$##@ ", -" @$### ", -" @$### "}; diff --git a/noncore/applets/wirelessapplet/nowireless.xpm b/noncore/applets/wirelessapplet/nowireless.xpm deleted file mode 100644 index a76322d..0000000 --- a/noncore/applets/wirelessapplet/nowireless.xpm +++ b/dev/null @@ -1,22 +0,0 @@ -static char * nowireless_xpm[] = { -"14 14 6 1", -" c None", -". c #FFFFFF", -"+ c #848284", -"@ c #000000", -"# c #FF0000", -"$ c #C6C3C6", -" ", -" ", -" ", -" +@+ ", -" # $#@ ", -" ####@+ ", -" ## + ", -" ####@ ", -" # #@+ ", -" # +#@ ", -" +@@ ", -" +$@@+ ", -" +$@@@ ", -" +$@@@ "}; diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp index f244426..711d0dd 100644 --- a/noncore/applets/wirelessapplet/wireless.cpp +++ b/noncore/applets/wirelessapplet/wireless.cpp @@ -1,108 +1,89 @@ /********************************************************************** ** 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 "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" /* OPIE */ #include <opie2/onetwork.h> #include <opie2/otaskbarapplet.h> #include <qpe/config.h> #include <qpe/qpeapplication.h> /* QT */ #include <qradiobutton.h> #include <qpushbutton.h> #include <qpainter.h> #include <qlabel.h> #include <qslider.h> #include <qbuttongroup.h> #include <qlayout.h> #include <qfile.h> #include <qtextstream.h> /* STD */ +#include <math.h> #include <sys/types.h> #include <signal.h> -#define STYLE_BARS 0 -#define STYLE_ANTENNA 1 - //#define MDEBUG #undef MDEBUG using namespace Opie::Ui; using namespace Opie::Net; 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( 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 ); /* advanced configuration Button */ QPushButton* advanced = new QPushButton( "Advanced...", this ); advanced->setFocusPolicy( QWidget::NoFocus ); grid->addWidget( advanced, 2, 0, Qt::AlignCenter ); connect( advanced, SIGNAL( clicked() ), this, SLOT( advancedConfigClicked() ) ); @@ -117,38 +98,34 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const /* update Frequency Slider */ QSlider* updateSlider = new QSlider( QSlider::Horizontal, this ); updateSlider->setRange( 0, 9 ); updateSlider->setValue( updateFrequency ); updateSlider->setTickmarks( QSlider::Both ); 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) ), - this, SLOT( displayStyleChange(int) ) ); - applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE ); } void WirelessControl::advancedConfigClicked() { AdvancedConfig * a = new AdvancedConfig( this, "dialog", TRUE ); int result = a->exec(); a->hide(); delete a; if ( result == QDialog::Accepted ) { readConfig(); applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE ); } } @@ -174,50 +151,49 @@ void WirelessControl::show ( bool ) 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 ); rocESSID = cfg.readBoolEntry( "renew_dhcp_on_essid_change", false ); rocFREQ = cfg.readBoolEntry( "renew_dhcp_on_freq_change", false ); rocAP = cfg.readBoolEntry( "renew_dhcp_on_ap_change", false ); rocMODE = cfg.readBoolEntry( "renew_dhcp_on_mode_change", false ); } 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 ), + : QWidget( parent, name ), timer( 0 ), interface( 0 ), oldiface( 0 ), rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false ) { setFixedHeight( 18 ); setFixedWidth( 14 ); status = new WirelessControl( this, this, "wireless status" ); } void WirelessApplet::checkInterface() { interface = 0L; ONetwork* net = ONetwork::instance(); net->synchronize(); ONetwork::InterfaceIterator it = net->iterator(); while ( it.current() && !it.current()->isWireless() ) ++it; @@ -378,37 +354,37 @@ bool WirelessApplet::mustRepaint() { #ifdef MDEBUG qDebug( "WIFIAPPLET: We had no interface but now we have one! :-)" ); #endif show(); } else { #ifdef MDEBUG qDebug( "WIFIAPPLET: We had a interface but now we don't have one! ;-(" ); #endif hide(); return true; } } - const char** pixmap = getQualityPixmap(); + int rings = numberOfRings(); - if ( pixmap && ( pixmap != oldpixmap ) ) + if ( rings != oldrings ) { - oldpixmap = pixmap; + oldrings = rings; return true; } int noiseH = 50; // iface->noisePercent() * ( height() - 3 ) / 100; int signalH = interface->signalStrength() * ( height() - 3 ) / 100; int qualityH = 50; // iface->qualityPercent() * ( height() - 3 ) / 100; if ( ( noiseH != oldnoiseH ) || ( signalH != oldsignalH ) || ( qualityH != oldqualityH ) ) { oldnoiseH = noiseH; oldsignalH = signalH; oldqualityH = qualityH; return true; } @@ -454,104 +430,75 @@ void WirelessApplet::updatePopupWindow() { int qualityH = interface->signalStrength(); if ( status->mgraph ) status->mgraph->addValue( qualityH, false ); QString freqString; QString cell = ( interface->mode() == "Managed" ) ? "AP: " : "Cell: "; freqString.sprintf( "%.3f GHz", interface->frequency() ); status->statusLabel->setText( "Station: " + interface->nickName() + "<br>" + "ESSID: " + interface->SSID() + "<br>" + "MODE: " + interface->mode() + "<br>" + "FREQ: " + freqString + "<br>" + cell + " " + interface->associatedAP().toString() ); } -const char** WirelessApplet::getQualityPixmap() +int WirelessApplet::numberOfRings() { - if ( !interface ) return ( const char** ) nowireless_xpm; + if ( !interface ) return -1; int qualityH = interface->signalStrength(); - 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 + qDebug( "quality = %d", qualityH ); + if ( qualityH < 1 ) return -1; + if ( qualityH < 20 ) return 0; + if ( qualityH < 40 ) return 1; + if ( qualityH < 60 ) return 2; + if ( qualityH < 65 ) return 3; + return 4; } void WirelessApplet::paintEvent( QPaintEvent* ) { QPainter p( this ); - QColor color; - - const char** pixmap = getQualityPixmap(); + int h = height(); + int w = width(); + int m = 2; - if ( pixmap ) - p.drawPixmap( 0, 1, pixmap ); - else - { + p.drawLine( m, h-m-1, round( w/2.0 ), round( 0+h/3.0 ) ); + p.drawLine( round( w/2.0 ), round( 0+h/3.0 ), w-m, h-m-1 ); + p.setPen( QColor( 150, 150, 150 ) ); + p.drawLine( w-m, h-m-1, m, h-m-1 ); - int noiseH = 30; // iface->noisePercent() * ( height() - 3 ) / 100; - int signalH = 50; // iface->signalPercent() * ( height() - 3 ) / 100; - int qualityH = interface->signalStrength(); // iface->qualityPercent() * ( height() - 3 ) / 100; + int rings = numberOfRings(); - 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 ) + if ( rings == -1 ) { - 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.setPen( QPen( QColor( 200, 20, 20 ), 2 ) ); + p.drawLine( w/2-m-m, h/2-m-m, w/2+m+m, h/2+m+m ); + p.drawLine( w/2+m+m, h/2-m-m, w/2-m-m, h/2+m+m ); + return; } - // 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 ); - } + qDebug( "WirelessApplet: painting %d rings", rings ); + int radius = 2; + int rstep = 4; + int maxrings = w/rstep; - // draw quality indicator - pixelHeight = qualityH; - Hue = 250; - leftoffset += pixelWidth + barSpace; - for ( int i = 0; i < pixelHeight; ++i ) + p.setPen( QColor( 200, 20, 20 ) ); + for ( int i = 0; i < rings; ++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 ); - } - } + p.drawEllipse( w/2 - radius/2, h/3 - radius/2, radius, radius ); + radius += rstep; + }; + + + } int WirelessApplet::position() { return 6; } EXPORT_OPIE_APPLET_v1( WirelessApplet ) diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h index b475a46..9146c66 100644 --- a/noncore/applets/wirelessapplet/wireless.h +++ b/noncore/applets/wirelessapplet/wireless.h @@ -37,75 +37,74 @@ class WirelessControl : public QFrame void readConfig(); void writeConfigEntry( const char* entry, int val ); MGraph* mgraph; QLabel* statusLabel; QLabel* updateLabel; public slots: void updateDelayChange( int ); void displayStyleChange( int ); void advancedConfigClicked(); private: WirelessApplet* applet; - int displayStyle; int updateFrequency; bool rocESSID; bool rocFREQ; bool rocAP; bool rocMODE; }; class WirelessApplet : public QWidget { Q_OBJECT public: WirelessApplet( QWidget *parent = 0, const char *name=0 ); ~WirelessApplet(); static int position(); WirelessControl* status; virtual void timerEvent( QTimerEvent* ); void updateDelayChange( int delay ); void displayStyleChange( int style ); void updateDHCPConfig( bool, bool, bool, bool ); private: void mousePressEvent( QMouseEvent * ); void paintEvent( QPaintEvent* ); void checkInterface(); void renewDHCP(); bool mustRepaint(); void updatePopupWindow(); - const char** getQualityPixmap(); + int numberOfRings(); private: QPixmap snapshotPixmap; int visualStyle; int timer; Opie::Net::OWirelessNetworkInterface* interface; private: - const char** oldpixmap; + int oldrings; Opie::Net::OWirelessNetworkInterface* oldiface; int oldqualityH; int oldsignalH; int oldnoiseH; QString oldESSID; QString oldAP; QString oldMODE; double oldFREQ; bool rocESSID; bool rocFREQ; bool rocAP; bool rocMODE; }; |