summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp3
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp2
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp50
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.h7
4 files changed, 42 insertions, 20 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index 0ef1e68..5029525 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -662,5 +662,6 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg)
}
- if (!found) qDebug("Huh what do ya want");
+ if (found) QPEApplication::setKeepRunning();
+ else qDebug("Huh what do ya want");
}
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index b988822..cdafb4d 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -28,7 +28,7 @@
* 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;
+ interfaces = new Interfaces();
interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
tabWidget->insertTab(interfaceSetup, "TCP/IP");
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index e6f082c..bc467bb 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -4,8 +4,11 @@
#include "wextensions.h"
#include "interfaceinformationimp.h"
+#include <qcheckbox.h>
+#include <qcombobox.h>
#include <qlabel.h>
#include <qprogressbar.h>
+#include <qspinbox.h>
#include <qtabwidget.h>
@@ -14,7 +17,10 @@
/**
* Constructor, find all of the possible interfaces
*/
-WLANModule::WLANModule() : Module() {
+WLANModule::WLANModule()
+ : Module(),
+ wlanconfigWiget(0)
+{
}
/**
@@ -115,7 +121,7 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
qDebug("WLANModule::receive "+param);
QStringList params = QStringList::split(",",param);
int count = params.count();
- qDebug("got %i params", count );
+ qDebug("WLANModule got %i params", count );
if (count < 2){
qDebug("Erorr less than 2 parameter");
qDebug("RETURNING");
@@ -128,18 +134,18 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
stream >> interface;
stream >> action;
- qDebug("got interface %s and acion %s", interface.latin1(), action.latin1());
+ 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("found interface %s",interface.latin1());
+ qDebug("WLANModule found interface %s",interface.latin1());
ifa = i;
}
}
if (ifa == 0){
- qFatal("Did not find %s",interface.latin1());
+ qFatal("WLANModule Did not find %s",interface.latin1());
}
if (count == 2){
@@ -158,21 +164,36 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
}
}else if (count == 3){
QString value;
+ if (!wlanconfigWiget){
+ //FIXME: what if it got closed meanwhile?
+ wlanconfigWiget = (WLANImp*) configure(ifa);
+ }
+ wlanconfigWiget->showMaximized();
stream >> value;
- qDebug("setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
+ qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
if ( action.contains("ESSID") ){
- qDebug("Setting ESSID not yet impl");
+ 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 ){
+ combo->setCurrentItem( i );
+ }
+
}else if (action.contains("Channel")){
- qDebug("Setting Channel not yet impl");
+ wlanconfigWiget->specifyChan->setChecked( true );
+ wlanconfigWiget->networkChannel->setValue( value.toInt() );
}else
qDebug("wlan plugin has no clue");
}
- // if (param.contains("QString,QString,QString")) {
-// QDataStream stream(arg,IO_ReadOnly);
-// QString arg1, arg2, arg3;
-// stream >> arg1 >> arg2 >> arg3 ;
-// qDebug("interface >%s< setting >%s< value >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
-// }
+
}
QWidget *WLANModule::getInfo( Interface *i)
@@ -185,3 +206,4 @@ QWidget *WLANModule::getInfo( Interface *i)
qDebug("WLANModule::getInfo return");
return info;
}
+
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h
index 0963137..027ecec 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.h
+++ b/noncore/settings/networksettings/wlan/wlanmodule.h
@@ -3,7 +3,7 @@
#include "module.h"
-//class WlanInfoImp;
+class WLANImp;
class WLANModule : Module{
@@ -29,11 +29,10 @@ public:
private:
QWidget *getInfo(Interface*);
-
+ WLANImp *wlanconfigWiget;
QList<Interface> list;
QString profile;
- // WlanInfoImp *info;
- // Interface *iface;
+
};
extern "C"