summaryrefslogtreecommitdiff
path: root/noncore/applets/wirelessapplet/wireless.cpp
Side-by-side diff
Diffstat (limited to 'noncore/applets/wirelessapplet/wireless.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp137
1 files changed, 42 insertions, 95 deletions
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
@@ -5,100 +5,81 @@
** 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>"
+ "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 );
@@ -121,30 +102,26 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
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();
@@ -178,42 +155,41 @@ void WirelessControl::show ( bool )
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();
@@ -382,29 +358,29 @@ bool WirelessApplet::mustRepaint()
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;
@@ -458,100 +434,71 @@ void WirelessApplet::updatePopupWindow()
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;
+ int h = height();
+ int w = width();
+ int m = 2;
- const char** pixmap = getQualityPixmap();
+ 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 );
- if ( pixmap )
- p.drawPixmap( 0, 1, pixmap );
- else
+ int rings = numberOfRings();
+
+ if ( rings == -1 )
+ {
+ 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;
+ }
+
+ qDebug( "WirelessApplet: painting %d rings", rings );
+ int radius = 2;
+ int rstep = 4;
+ int maxrings = w/rstep;
+
+ p.setPen( QColor( 200, 20, 20 ) );
+ for ( int i = 0; i < rings; ++i )
{
+ p.drawEllipse( w/2 - radius/2, h/3 - radius/2, radius, radius );
+ radius += rstep;
+ };
- 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;
-
- 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 );
- }
- }
}
int WirelessApplet::position()
{
return 6;
}
EXPORT_OPIE_APPLET_v1( WirelessApplet )