Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp2.cpp | 22 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 50 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.h | 7 |
3 files changed, 59 insertions, 20 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index e7b842b..b988822 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp @@ -15,5 +15,5 @@ #include <qcombobox.h> -#ifdef QWS +#ifdef QWS #include <opie/oprocess.h> #else @@ -27,5 +27,5 @@ /** * Constructor, read in the wireless.opts file for parsing later. - */ + */ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), currentProfile("*"), interface(i) { interfaces = new Interfaces; @@ -41,10 +41,10 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W WLANImp::~WLANImp() { - delete interfaces; +//FIXME: delete interfaces; } /** * Change the profile for both wireless settings and network settings. - */ + */ void WLANImp::setProfile(const QString &profile){ interfaceSetup->setProfile(profile); @@ -59,5 +59,5 @@ void WLANImp::parseOpts() { return; - + opt = interfaces->getInterfaceOption("wireless_essid", error); if(opt == "any" || opt == "off" || opt.isNull()){ @@ -76,5 +76,5 @@ void WLANImp::parseOpts() { mode->setCurrentItem(1); } - + opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace(); if (! opt.isNull()) { @@ -133,5 +133,5 @@ void WLANImp::parseKeyStr(QString keystr) { keyRadio3->setChecked(true); break; - } + } } else { // key @@ -141,5 +141,5 @@ void WLANImp::parseKeyStr(QString keystr) { if (enc == -1) enc = 1; - QStringList::Iterator next = ++it; + QStringList::Iterator next = ++it; if (it == keys.end()) { break; @@ -188,6 +188,6 @@ void WLANImp::accept() { return; } - } - + } + if (essid->currentText().isEmpty()) { QMessageBox::information(this, "Error", "Please select/enter an ESSID.", QMessageBox::Ok); @@ -199,5 +199,5 @@ void WLANImp::accept() { return; } - + // Try to save the interfaces settings. writeOpts(); diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 3c988d5..e6f082c 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -9,4 +9,7 @@ #include <qtabwidget.h> + + + /** * Constructor, find all of the possible interfaces @@ -22,4 +25,5 @@ WLANModule::~WLANModule(){ for ( i=list.first(); i != 0; i=list.next() ) delete i; + } @@ -74,8 +78,5 @@ QWidget *WLANModule::information(Interface *i){ return NULL; - WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); - InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); - info->tabWidget->insertTab(information, "TCP/IP"); - return info; + return getInfo( i ); } @@ -129,13 +130,30 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) stream >> action; qDebug("got interface %s and acion %s", interface.latin1(), action.latin1()); + // find interfaces + Interface *ifa=0; + for ( Interface *i=list.first(); i != 0; i=list.next() ){ + if (i->getInterfaceName() == interface){ + qDebug("found interface %s",interface.latin1()); + ifa = i; + } + } + + if (ifa == 0){ + qFatal("Did not find %s",interface.latin1()); + } if (count == 2){ - // those should call the interface + // those should call the interface directly + QWidget *info = getInfo( ifa ); + info->showMaximized(); + if ( action.contains("start" ) ){ - qDebug("starting %s not yet implemented",interface.latin1()); + ifa->start(); } else if ( action.contains("restart" ) ){ - qDebug("restarting %s not yet implemented",interface.latin1()); + ifa->restart(); } else if ( action.contains("stop" ) ){ - qDebug("stopping %s not yet implemented",interface.latin1()); + ifa->stop(); + }else if ( action.contains("refresh" ) ){ + ifa->refresh(); } }else if (count == 3){ @@ -143,4 +161,10 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) stream >> value; qDebug("setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); + if ( action.contains("ESSID") ){ + qDebug("Setting ESSID not yet impl"); + }else if (action.contains("Channel")){ + qDebug("Setting Channel not yet impl"); + }else + qDebug("wlan plugin has no clue"); } // if (param.contains("QString,QString,QString")) { @@ -152,2 +176,12 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) } +QWidget *WLANModule::getInfo( Interface *i) +{ + qDebug("WLANModule::getInfo start"); + WlanInfoImp *info = new WlanInfoImp(0, i->getInterfaceName(), Qt::WDestructiveClose); + InterfaceInformationImp *information = new InterfaceInformationImp(info->tabWidget, "InterfaceSetupImp", i); + info->tabWidget->insertTab(information, "TCP/IP", 0); + + qDebug("WLANModule::getInfo return"); + return info; +} diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index a617a90..0963137 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h @@ -4,4 +4,6 @@ #include "module.h" +//class WlanInfoImp; + class WLANModule : Module{ @@ -27,7 +29,10 @@ public: private: + QWidget *getInfo(Interface*); + QList<Interface> list; QString profile; - + // WlanInfoImp *info; + // Interface *iface; }; |