From 68c8d3eb878f9ba913c42368fbb253d7320c62be Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 23 Feb 2004 14:42:18 +0000 Subject: working on the overhaul. CAUTION: WirelessApplet is broken now. --- (limited to 'noncore') 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 @@ -24,6 +24,7 @@ #include "nowireless.xpm" /* OPIE */ +#include #include #include #include @@ -207,22 +208,29 @@ 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( 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 } @@ -244,7 +252,7 @@ void WirelessApplet::renewDHCP() QString pidfile; if ( !interface ) return ; - QString ifacename( interface->getName() ); + QString ifacename( interface->name() ); // At first we are trying dhcpcd @@ -317,7 +325,9 @@ WirelessApplet::~WirelessApplet() void WirelessApplet::timerEvent( QTimerEvent* ) { - MWirelessNetworkInterface * iface = ( MWirelessNetworkInterface* ) interface; + /* + + OWirelessNetworkInterface* iface = interface; if ( iface ) { @@ -339,6 +349,8 @@ void WirelessApplet::timerEvent( QTimerEvent* ) updatePopupWindow(); } else checkInterface(); + + */ } void WirelessApplet::mousePressEvent( QMouseEvent * ) @@ -351,7 +363,7 @@ 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 @@ -385,9 +397,9 @@ bool WirelessApplet::mustRepaint() 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 ) @@ -399,28 +411,28 @@ bool WirelessApplet::mustRepaint() 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." ); @@ -428,10 +440,10 @@ bool WirelessApplet::mustRepaint() 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 @@ -19,10 +19,7 @@ #include #include -class MNetwork; -class MWirelessNetwork; -class MNetworkInterface; -class MWirelessNetworkInterface; +class OWirelessNetworkInterface; class Y; class QLabel; class WirelessApplet; @@ -89,12 +86,11 @@ class WirelessApplet : public QWidget 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 @@ -7,7 +7,7 @@ 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 ) -- cgit v0.9.0.2