-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 8 |
2 files changed, 6 insertions, 9 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,7 +132,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) QDataStream stream(arg,IO_ReadOnly); QString interface; QString action; - + while (! stream.atEnd() ){ stream >> interface; stream >> action; qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1()); @@ -190,10 +191,13 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) }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) |