summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/advancedconfig.cpp55
-rw-r--r--noncore/applets/wirelessapplet/advancedconfig.h36
-rw-r--r--noncore/applets/wirelessapplet/advancedconfigbase.ui159
-rw-r--r--noncore/applets/wirelessapplet/networkinfo.cpp30
-rw-r--r--noncore/applets/wirelessapplet/networkinfo.h4
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp149
-rw-r--r--noncore/applets/wirelessapplet/wireless.h18
-rw-r--r--noncore/applets/wirelessapplet/wirelessapplet.pro7
8 files changed, 432 insertions, 26 deletions
diff --git a/noncore/applets/wirelessapplet/advancedconfig.cpp b/noncore/applets/wirelessapplet/advancedconfig.cpp
new file mode 100644
index 0000000..97b008d
--- a/dev/null
+++ b/noncore/applets/wirelessapplet/advancedconfig.cpp
@@ -0,0 +1,55 @@
+/**********************************************************************
+** 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 "advancedconfig.h"
+
+#include <qpe/config.h>
+#include <qwidget.h>
+#include <qcheckbox.h>
+
+AdvancedConfig::AdvancedConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
+ : AdvancedConfigBase( parent, name, modal, fl )
+{
+ Config cfg( "qpe" );
+ cfg.setGroup( "Wireless" );
+
+ bool rocESSID = cfg.readBoolEntry( "renew_dhcp_on_essid_change", false );
+ bool rocFREQ = cfg.readBoolEntry( "renew_dhcp_on_freq_change", false );
+ bool rocAP = cfg.readBoolEntry( "renew_dhcp_on_ap_change", false );
+ bool rocMODE = cfg.readBoolEntry( "renew_dhcp_on_mode_change", false );
+
+ cbESSID->setChecked( rocESSID );
+ cbFrequency->setChecked( rocFREQ );
+ cbAccessPoint->setChecked( rocAP );
+ cbMODE->setChecked( rocMODE );
+}
+
+AdvancedConfig::~AdvancedConfig()
+{
+}
+
+void AdvancedConfig::accept()
+{
+
+ Config cfg( "qpe" );
+ cfg.setGroup( "Wireless" );
+ cfg.writeEntry( "renew_dhcp_on_essid_change", cbESSID->isChecked() );
+ cfg.writeEntry( "renew_dhcp_on_freq_change", cbFrequency->isChecked() );
+ cfg.writeEntry( "renew_dhcp_on_ap_change", cbAccessPoint->isChecked() );
+ cfg.writeEntry( "renew_dhcp_on_mode_change", cbMODE->isChecked() );
+
+ AdvancedConfigBase::accept();
+}
+
diff --git a/noncore/applets/wirelessapplet/advancedconfig.h b/noncore/applets/wirelessapplet/advancedconfig.h
new file mode 100644
index 0000000..17ba3c5
--- a/dev/null
+++ b/noncore/applets/wirelessapplet/advancedconfig.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+** 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.
+**
+**********************************************************************/
+
+#ifndef ADVANCED_CONFIG_H
+#define ADVANCED_CONFIG_H
+
+#include "advancedconfigbase.h"
+
+#include <qnamespace.h>
+
+class AdvancedConfig: public AdvancedConfigBase
+{
+ Q_OBJECT
+
+public:
+ AdvancedConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ ~AdvancedConfig();
+
+protected:
+ virtual void accept();
+
+};
+
+#endif
diff --git a/noncore/applets/wirelessapplet/advancedconfigbase.ui b/noncore/applets/wirelessapplet/advancedconfigbase.ui
new file mode 100644
index 0000000..c7c4a10
--- a/dev/null
+++ b/noncore/applets/wirelessapplet/advancedconfigbase.ui
@@ -0,0 +1,159 @@
+<!DOCTYPE UI><UI>
+<class>AdvancedConfigBase</class>
+<comment>/**********************************************************************
+** Copyright (C) 2001 Trolltech AS. All rights reserved.
+**
+** This file is part of Qt Palmtop 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.
+**
+** $Id$
+**
+**********************************************************************/</comment>
+<widget>
+ <class>QDialog</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>AdvancedConfigBase</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>197</width>
+ <height>158</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>1</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>caption</name>
+ <string>Advanced Config</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>fraStart</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>11</x>
+ <y>11</y>
+ <width>175</width>
+ <height>136</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>frameShape</name>
+ <enum>Box</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Renew DHCP on changing</string>
+ </property>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout5</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>10</x>
+ <y>21</y>
+ <width>98</width>
+ <height>96</height>
+ </rect>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="1" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>cbFrequency</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Frequency</string>
+ </property>
+ </widget>
+ <widget row="3" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>cbMODE</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>MODE</string>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>cbESSID</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>ESSID</string>
+ </property>
+ </widget>
+ <widget row="2" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>cbAccessPoint</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>AccessPoint</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </widget>
+</widget>
+<connections>
+ <slot access="protected">itemUp()</slot>
+ <slot access="protected">itemDown()</slot>
+</connections>
+</UI>
diff --git a/noncore/applets/wirelessapplet/networkinfo.cpp b/noncore/applets/wirelessapplet/networkinfo.cpp
index 22d7d83..8531fd5 100644
--- a/noncore/applets/wirelessapplet/networkinfo.cpp
+++ b/noncore/applets/wirelessapplet/networkinfo.cpp
@@ -52,4 +52,6 @@
#define PROCNETWIRELESS "/proc/net/wireless"
+#define MDEBUG 0
+
//---------------------------------------------------------------------------
// class MNetworkInterface
@@ -70,6 +72,7 @@ MNetworkInterface::~MNetworkInterface()
}
-void MNetworkInterface::updateStatistics()
+bool MNetworkInterface::updateStatistics()
{
+ return true;
}
@@ -105,7 +108,9 @@ int MWirelessNetworkInterface::noisePercent()
}
-void MWirelessNetworkInterface::updateStatistics()
+bool MWirelessNetworkInterface::updateStatistics()
{
- MNetworkInterface::updateStatistics();
+ bool base = MNetworkInterface::updateStatistics();
+ if ( !base )
+ return false;
const char* buffer[200];
@@ -182,9 +187,11 @@ void MWirelessNetworkInterface::updateStatistics()
if ( ( !hasFile ) || ( wstream.atEnd() ) )
{
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: D'oh! Someone removed the card..." );
+#endif
quality = -1;
signal = IW_LOWER;
noise = IW_LOWER;
- return;
+ return false;
}
@@ -192,9 +199,18 @@ void MWirelessNetworkInterface::updateStatistics()
if ( quality > 92 )
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: D'oh! Quality %d > estimated max!\n", quality );
+#endif
if ( ( signal > IW_UPPER ) || ( signal < IW_LOWER ) )
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: Doh! Strength %d > estimated max!\n", signal );
+#endif
if ( ( noise > IW_UPPER ) || ( noise < IW_LOWER ) )
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: Doh! Noise %d > estimated max!\n", noise );
+#endif
+
+ return true;
+
}
@@ -205,5 +221,4 @@ void MWirelessNetworkInterface::updateStatistics()
MNetwork::MNetwork()
{
- //qDebug( "MNetwork::MNetwork()" );
procfile = PROCNETDEV;
}
@@ -211,5 +226,4 @@ MNetwork::MNetwork()
MNetwork::~MNetwork()
{
- //qDebug( "MNetwork::~MNetwork()" );
}
@@ -220,5 +234,4 @@ MNetwork::~MNetwork()
MWirelessNetwork::MWirelessNetwork()
{
- //qDebug( "MWirelessNetwork::MWirelessNetwork()" );
procfile = PROCNETWIRELESS;
}
@@ -226,5 +239,4 @@ MWirelessNetwork::MWirelessNetwork()
MWirelessNetwork::~MWirelessNetwork()
{
- //qDebug( "MWirelessNetwork::~MWirelessNetwork()" );
}
@@ -260,5 +272,7 @@ void MNetwork::enumerateInterfaces()
s >> str;
str.truncate( str.find( ':' ) );
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: found interface '%s'", (const char*) str );
+#endif
interfaces.insert( str, createInterface( str ) );
s.readLine();
diff --git a/noncore/applets/wirelessapplet/networkinfo.h b/noncore/applets/wirelessapplet/networkinfo.h
index c5eb743..7e50bc4 100644
--- a/noncore/applets/wirelessapplet/networkinfo.h
+++ b/noncore/applets/wirelessapplet/networkinfo.h
@@ -38,5 +38,5 @@ public:
const QString& getName() { return name; };
- virtual void updateStatistics();
+ virtual bool updateStatistics();
protected:
@@ -71,5 +71,5 @@ public:
int channel;
- virtual void updateStatistics();
+ virtual bool updateStatistics();
private:
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 183aab8..a5aabb0 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -22,5 +22,5 @@
#include <qpoint.h>
#include <qradiobutton.h>
-#include <qcheckbox.h>
+#include <qpushbutton.h>
#include <qpainter.h>
#include <qlabel.h>
@@ -32,8 +32,14 @@
#include <qstring.h>
#include <qfile.h>
+#include <qtextstream.h>
+
+#include <sys/types.h>
+#include <signal.h>
#include "networkinfo.h"
#include "mgraph.h"
+#include "advancedconfig.h"
+
#include "connect0.xpm"
#include "connect1.xpm"
@@ -47,4 +53,6 @@
#define STYLE_ANTENNA 1
+#define MDEBUG 0
+
WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
: QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
@@ -95,10 +103,11 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
mgraph->setFocusPolicy( QWidget::NoFocus );
- /* dhcp renew CheckBox */
+ /* advanced configuration Button */
- //FIXME: under construction
- //QCheckBox* dhcpCheckBox = new QCheckBox( "DHCP renew", this );
- //dhcpCheckBox->setFocusPolicy( QWidget::NoFocus );
- //grid->addWidget( dhcpCheckBox, 2, 0, Qt::AlignCenter );
+ QPushButton* advanced = new QPushButton( "Advanced...", this );
+ advanced->setFocusPolicy( QWidget::NoFocus );
+ grid->addWidget( advanced, 2, 0, Qt::AlignCenter );
+ connect( advanced, SIGNAL( clicked() ),
+ this, SLOT( advancedConfigClicked() ) );
/* update Frequency Label */
@@ -129,5 +138,20 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const
connect( group, SIGNAL( clicked( int ) ),
- this, SLOT( displayStyleChange( 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 );
+ }
}
@@ -167,5 +191,9 @@ void WirelessControl::readConfig()
updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 );
- displayStyle = cfg. readNumEntry( "DisplayStyle", STYLE_ANTENNA );
+ 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 );
}
@@ -181,5 +209,6 @@ 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 )
+ timer( 0 ), interface( 0 ),
+ rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
{
setFixedHeight( 18 );
@@ -194,13 +223,53 @@ void WirelessApplet::checkInterface()
if ( interface )
{
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: using interface '%s'", (const char*)
+#endif
interface->getName() );
}
else
{
+#ifdef MDEBUG
qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
+ hide();
+#endif
}
}
+void WirelessApplet::renewDHCP()
+{
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." );
+#endif
+
+ QString pidfile;
+ if ( !interface )
+ return;
+ QString ifacename( interface->getName() );
+ pidfile.sprintf( "/var/run/dhcpcd-%s.pid", (const char* ) ifacename );
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: pidfile is '%s'", (const char*) pidfile );
+#endif
+ int pid;
+ QFile pfile( pidfile );
+ bool hasFile = pfile.open( IO_ReadOnly );
+ QTextStream s( &pfile );
+ if ( hasFile )
+ s >> pid;
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: sent -14 to pid %d", pid );
+#endif
+ kill( pid, -14 );
+
+}
+
+void WirelessApplet::updateDHCPConfig( bool ESSID, bool FREQ, bool AP, bool MODE )
+{
+ rocESSID = ESSID;
+ rocFREQ = FREQ;
+ rocAP = AP;
+ rocMODE = MODE;
+}
+
void WirelessApplet::updateDelayChange( int delay )
{
@@ -229,5 +298,11 @@ void WirelessApplet::timerEvent( QTimerEvent* )
if ( iface )
{
- iface->updateStatistics();
+ bool statResult = iface->updateStatistics();
+ if ( !statResult )
+ {
+ interface = 0;
+ mustRepaint();
+ return;
+ } else
if ( mustRepaint() )
{
@@ -259,6 +334,20 @@ bool WirelessApplet::mustRepaint()
if ( iface != oldiface )
{
- oldiface = iface;
- return true;
+ oldiface = iface;
+ if ( iface )
+ {
+#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;
+ }
}
@@ -284,4 +373,38 @@ bool WirelessApplet::mustRepaint()
return true;
}
+
+ if ( rocESSID && ( oldESSID != iface->essid ) )
+ {
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: ESSID has changed.");
+#endif
+ renewDHCP();
+ }
+ else if ( rocFREQ && ( oldFREQ != iface->freq ) )
+ {
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: FREQ has changed.");
+#endif
+ renewDHCP();
+ }
+ else if ( rocAP && ( oldAP != iface->APAddr ) )
+ {
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: AP has changed.");
+#endif
+ renewDHCP();
+ }
+ else if ( rocMODE && ( oldMODE != iface->mode ) )
+ {
+#ifdef MDEBUG
+ qDebug( "WIFIAPPLET: MODE has changed.");
+#endif
+ renewDHCP();
+ }
+
+ oldESSID = iface->essid;
+ oldMODE = iface->mode;
+ oldFREQ = iface->freq;
+ oldAP = iface->APAddr;
return false;
@@ -335,5 +458,5 @@ void WirelessApplet::paintEvent( QPaintEvent* )
const char** pixmap = getQualityPixmap();
-
+
if ( pixmap )
p.drawPixmap( 0, 1, pixmap );
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 45c519d..51a3fab 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -46,4 +46,5 @@ public slots:
void updateDelayChange( int );
void displayStyleChange( int );
+ void advancedConfigClicked();
private:
@@ -53,4 +54,8 @@ private:
int updateFrequency;
+ bool rocESSID;
+ bool rocFREQ;
+ bool rocAP;
+ bool rocMODE;
};
@@ -66,4 +71,6 @@ public:
void updateDelayChange( int delay );
void displayStyleChange( int style );
+
+ void updateDHCPConfig( bool, bool, bool, bool );
private:
@@ -71,4 +78,5 @@ private:
void paintEvent( QPaintEvent* );
void checkInterface();
+ void renewDHCP();
bool mustRepaint();
@@ -90,4 +98,14 @@ private:
int oldsignalH;
int oldnoiseH;
+
+ QString oldESSID;
+ QString oldAP;
+ QString oldMODE;
+ double oldFREQ;
+
+ bool rocESSID;
+ bool rocFREQ;
+ bool rocAP;
+ bool rocMODE;
};
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index b758d4f..390b271 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -1,6 +1,7 @@
TEMPLATE = lib
CONFIG += qt warn_on release
-HEADERS = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h
-SOURCES = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp
+HEADERS = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
+SOURCES = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
+INTERFACES = advancedconfigbase.ui
TARGET = wirelessapplet
DESTDIR = $(OPIEDIR)/plugins/applets
@@ -8,5 +9,5 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
-VERSION = 0.0.3
+VERSION = 0.1.0
TRANSLATIONS = ../../../i18n/de/libwirelessapplet.ts \