| -rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 68 | ||||
| -rw-r--r-- | noncore/applets/wirelessapplet/wireless.h | 12 |
2 files changed, 59 insertions, 21 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 @@ -12,16 +12,17 @@ ** 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> @@ -44,16 +45,20 @@ #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>" @@ -72,17 +77,17 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const /* 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 ); @@ -94,75 +99,98 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const //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 ); - connect( group, SIGNAL( clicked( int ) ), - applet, SLOT( styleChange( int ) ) ); + applet->displayStyleChange( displayStyle ); + applet->updateDelayChange( updateFrequency ); + connect( group, SIGNAL( clicked( 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*) @@ -171,28 +199,32 @@ void WirelessApplet::checkInterface() else { qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" ); } } void WirelessApplet::updateDelayChange( int delay ) { + 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 ) { 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 @@ -30,40 +30,46 @@ 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(); |