summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp7
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp120
2 files changed, 62 insertions, 65 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 5029525..544498f 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -645,13 +645,6 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
param = param.left( param.length() - 1 );
qDebug("dest >%s< param >"+param+"<",dest.latin1());
-// if (param.contains("QString,QString,QString")) {
-// QDataStream stream(arg,IO_ReadOnly);
-// QString arg1, arg2, arg3;
-// stream >> arg1 >> arg2 >> arg3 ;
-// qDebug("args: >%s< >%s< >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
-// }
-
QMap<Module*, QLibrary*>::Iterator it;
for( it = libraries.begin(); it != libraries.end(); ++it ){
qDebug("plugin >%s<", it.key()->type().latin1() );
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index bc467bb..e34f0ce 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -7,6 +7,7 @@
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qlabel.h>
+#include <qlineedit.h>
#include <qprogressbar.h>
#include <qspinbox.h>
#include <qtabwidget.h>
@@ -131,69 +132,72 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
QDataStream stream(arg,IO_ReadOnly);
QString interface;
QString action;
-
- stream >> interface;
- stream >> action;
- qDebug("WLANModule 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("WLANModule found interface %s",interface.latin1());
- ifa = i;
+ while (! stream.atEnd() ){
+ stream >> interface;
+ stream >> action;
+ qDebug("WLANModule 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("WLANModule found interface %s",interface.latin1());
+ ifa = i;
+ }
}
- }
-
- if (ifa == 0){
- qFatal("WLANModule Did not find %s",interface.latin1());
- }
- if (count == 2){
- // those should call the interface directly
- QWidget *info = getInfo( ifa );
- info->showMaximized();
-
- if ( action.contains("start" ) ){
- ifa->start();
- } else if ( action.contains("restart" ) ){
- ifa->restart();
- } else if ( action.contains("stop" ) ){
- ifa->stop();
- }else if ( action.contains("refresh" ) ){
- ifa->refresh();
- }
- }else if (count == 3){
- QString value;
- if (!wlanconfigWiget){
- //FIXME: what if it got closed meanwhile?
- wlanconfigWiget = (WLANImp*) configure(ifa);
+ if (ifa == 0){
+ qFatal("WLANModule Did not find %s",interface.latin1());
}
- wlanconfigWiget->showMaximized();
- stream >> value;
- qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
- if ( action.contains("ESSID") ){
- QComboBox *combo = wlanconfigWiget->essid;
- bool found = false;
- for ( int i = 0; i < combo->count(); i++)
- if ( combo->text( i ) == value ){
- combo->setCurrentItem( i );
- found = true;
+
+ if (count == 2){
+ // those should call the interface directly
+ QWidget *info = getInfo( ifa );
+ info->showMaximized();
+
+ if ( action.contains("start" ) ){
+ ifa->start();
+ } else if ( action.contains("restart" ) ){
+ ifa->restart();
+ } else if ( action.contains("stop" ) ){
+ ifa->stop();
+ }else if ( action.contains("refresh" ) ){
+ ifa->refresh();
+ }
+ }else if (count == 3){
+ QString value;
+ if (!wlanconfigWiget){
+ //FIXME: what if it got closed meanwhile?
+ wlanconfigWiget = (WLANImp*) configure(ifa);
+ }
+ wlanconfigWiget->showMaximized();
+ stream >> value;
+ qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
+ if ( action.contains("ESSID") ){
+ QComboBox *combo = wlanconfigWiget->essid;
+ bool found = false;
+ for ( int i = 0; i < combo->count(); i++)
+ if ( combo->text( i ) == value ){
+ combo->setCurrentItem( i );
+ found = true;
}
- if (!found) combo->insertItem( value, 0 );
- }else if ( action.contains("Mode") ){
- QComboBox *combo = wlanconfigWiget->mode;
- for ( int i = 0; i < combo->count(); i++)
- if ( combo->text( i ) == value ){
+ if (!found) combo->insertItem( value, 0 );
+ }else if ( action.contains("Mode") ){
+ QComboBox *combo = wlanconfigWiget->mode;
+ for ( int i = 0; i < combo->count(); i++)
+ if ( combo->text( i ) == value ){
combo->setCurrentItem( i );
- }
-
- }else if (action.contains("Channel")){
- wlanconfigWiget->specifyChan->setChecked( true );
- wlanconfigWiget->networkChannel->setValue( value.toInt() );
- }else
- qDebug("wlan plugin has no clue");
- }
-
+ }
+
+ }else if (action.contains("Channel")){
+ wlanconfigWiget->specifyChan->setChecked( true );
+ wlanconfigWiget->networkChannel->setValue( value.toInt() );
+ }else if (action.contains("MacAddr")){
+ wlanconfigWiget->specifyAp->setChecked( true );
+ wlanconfigWiget->macEdit->setText( value );
+ }else
+ qDebug("wlan plugin has no clue");
+ }
+ }// while stream
}
QWidget *WLANModule::getInfo( Interface *i)