summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/config.in2
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp50
-rw-r--r--noncore/applets/wirelessapplet/wireless.h10
-rw-r--r--noncore/applets/wirelessapplet/wirelessapplet.pro2
4 files changed, 36 insertions, 28 deletions
diff --git a/noncore/applets/wirelessapplet/config.in b/noncore/applets/wirelessapplet/config.in
index 8e948a2..f4828d3 100644
--- a/noncore/applets/wirelessapplet/config.in
+++ b/noncore/applets/wirelessapplet/config.in
@@ -1,4 +1,4 @@
config WIRELESSAPPLET
boolean "opie-wirelessapplet (view wireless signal strength, and renew IP on AP change)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2NET
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index cbaf5d6..dc9742a 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -23,8 +23,9 @@
#include "connect5.xpm"
#include "nowireless.xpm"
/* OPIE */
+#include <opie2/onetwork.h>
#include <opie2/otaskbarapplet.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
@@ -206,24 +207,31 @@ 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 ),
- rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
+ timer( 0 ), interface( 0 ), oldiface( 0 ),
+ rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false )
{
setFixedHeight( 18 );
setFixedWidth( 14 );
- network = new MWirelessNetwork();
status = new WirelessControl( this, this, "wireless status" );
}
void WirelessApplet::checkInterface()
{
- interface = network->getFirstInterface();
+ interface = 0L;
+ ONetwork* net = ONetwork::instance();
+ ONetwork::InterfaceIterator it = net->iterator();
+
+ while ( it.current() && !it.current()->isWireless() ) ++it;
+
+ if ( it.current() && it.current()->isWireless() )
+ interface = static_cast<OWirelessNetworkInterface*>( it.current() );
+
if ( interface )
{
#ifdef MDEBUG
- qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->getName() );
+ qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->name() );
#endif
}
else
@@ -243,9 +251,9 @@ void WirelessApplet::renewDHCP()
QString pidfile;
if ( !interface )
return ;
- QString ifacename( interface->getName() );
+ QString ifacename( interface->name() );
// At first we are trying dhcpcd
pidfile.sprintf( "/var/run/dhcpcd-%s.pid", ( const char* ) ifacename );
@@ -316,9 +324,11 @@ WirelessApplet::~WirelessApplet()
{}
void WirelessApplet::timerEvent( QTimerEvent* )
{
- MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
+ /*
+
+ OWirelessNetworkInterface* iface = interface;
if ( iface )
{
bool statResult = iface->updateStatistics();
@@ -338,8 +348,10 @@ void WirelessApplet::timerEvent( QTimerEvent* )
if ( status->isVisible() )
updatePopupWindow();
}
else checkInterface();
+
+ */
}
void WirelessApplet::mousePressEvent( QMouseEvent * )
{
@@ -350,9 +362,9 @@ void WirelessApplet::mousePressEvent( QMouseEvent * )
}
bool WirelessApplet::mustRepaint()
{
- MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface;
+ OWirelessNetworkInterface* iface = interface;
// check if there are enough changes to justify a (flickering) repaint
// has the interface changed?
@@ -384,11 +396,11 @@ bool WirelessApplet::mustRepaint()
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;
+ int noiseH = 50; // iface->noisePercent() * ( height() - 3 ) / 100;
+ int signalH = iface->signalStrength() * ( height() - 3 ) / 100;
+ int qualityH = 50; // iface->qualityPercent() * ( height() - 3 ) / 100;
if ( ( noiseH != oldnoiseH )
|| ( signalH != oldsignalH )
|| ( qualityH != oldqualityH ) )
@@ -398,41 +410,41 @@ bool WirelessApplet::mustRepaint()
oldqualityH = qualityH;
return true;
}
- if ( rocESSID && ( oldESSID != iface->essid ) )
+ if ( rocESSID && ( oldESSID != iface->SSID() ) )
{
#ifdef MDEBUG
qDebug( "WIFIAPPLET: ESSID has changed." );
#endif
renewDHCP();
}
- else if ( rocFREQ && ( oldFREQ != iface->freq ) )
+ else if ( rocFREQ && ( oldFREQ != iface->frequency() ) )
{
#ifdef MDEBUG
qDebug( "WIFIAPPLET: FREQ has changed." );
#endif
renewDHCP();
}
- else if ( rocAP && ( oldAP != iface->APAddr ) )
+ else if ( rocAP && ( oldAP != iface->associatedAP().toString() ) )
{
#ifdef MDEBUG
qDebug( "WIFIAPPLET: AP has changed." );
#endif
renewDHCP();
}
- else if ( rocMODE && ( oldMODE != iface->mode ) )
+ 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;
+ oldESSID = iface->SSID();
+ oldMODE = iface->mode();
+ oldFREQ = iface->frequency();
+ oldAP = iface->associatedAP().toString();
return false;
}
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 644be26..27f8c90 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -18,12 +18,9 @@
#include <qwidget.h>
#include <qframe.h>
#include <qpixmap.h>
-class MNetwork;
-class MWirelessNetwork;
-class MNetworkInterface;
-class MWirelessNetworkInterface;
+class OWirelessNetworkInterface;
class Y;
class QLabel;
class WirelessApplet;
class MGraph;
@@ -88,14 +85,13 @@ class WirelessApplet : public QWidget
QPixmap snapshotPixmap;
int visualStyle;
int timer;
- MWirelessNetwork* network;
- MNetworkInterface* interface;
+ OWirelessNetworkInterface* interface;
private:
const char** oldpixmap;
- MWirelessNetworkInterface* oldiface;
+ OWirelessNetworkInterface* oldiface;
int oldqualityH;
int oldsignalH;
int oldnoiseH;
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index 38cb475..7bd7380 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -6,8 +6,8 @@ INTERFACES = advancedconfigbase.ui
TARGET = wirelessapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2 -lopienet2
VERSION = 0.1.1
include ( $(OPIEDIR)/include.pro )