summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/TODO6
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp22
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp50
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.h7
4 files changed, 65 insertions, 20 deletions
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO
index 614501f..b28c5a0 100644
--- a/noncore/settings/networksettings/TODO
+++ b/noncore/settings/networksettings/TODO
@@ -1 +1,7 @@
+* make dcop handling portable
+* move dcop call for start, stop interfaces from wlan to interface
+
+
+Old TODO of Benmayer:
+
Types:
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
@@ -16,3 +16,3 @@
-#ifdef QWS
+#ifdef QWS
#include <opie/oprocess.h>
@@ -28,3 +28,3 @@
* 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) {
@@ -42,3 +42,3 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
WLANImp::~WLANImp() {
- delete interfaces;
+//FIXME: delete interfaces;
}
@@ -47,3 +47,3 @@ WLANImp::~WLANImp() {
* Change the profile for both wireless settings and network settings.
- */
+ */
void WLANImp::setProfile(const QString &profile){
@@ -60,3 +60,3 @@ void WLANImp::parseOpts() {
-
+
opt = interfaces->getInterfaceOption("wireless_essid", error);
@@ -77,3 +77,3 @@ void WLANImp::parseOpts() {
}
-
+
opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace();
@@ -134,3 +134,3 @@ void WLANImp::parseKeyStr(QString keystr) {
break;
- }
+ }
} else {
@@ -142,3 +142,3 @@ void WLANImp::parseKeyStr(QString keystr) {
enc = 1;
- QStringList::Iterator next = ++it;
+ QStringList::Iterator next = ++it;
if (it == keys.end()) {
@@ -189,4 +189,4 @@ void WLANImp::accept() {
}
- }
-
+ }
+
if (essid->currentText().isEmpty()) {
@@ -200,3 +200,3 @@ void WLANImp::accept() {
}
-
+
// Try to save the interfaces settings.
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
@@ -10,2 +10,5 @@
+
+
+
/**
@@ -23,2 +26,3 @@ WLANModule::~WLANModule(){
delete i;
+
}
@@ -75,6 +79,3 @@ QWidget *WLANModule::information(Interface *i){
- 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 );
}
@@ -130,11 +131,28 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
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();
}
@@ -144,2 +162,8 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
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");
}
@@ -153 +177,11 @@ void WLANModule::receive(const QCString &param, 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
@@ -5,2 +5,4 @@
+//class WlanInfoImp;
+
class WLANModule : Module{
@@ -28,5 +30,8 @@ public:
private:
+ QWidget *getInfo(Interface*);
+
QList<Interface> list;
QString profile;
-
+ // WlanInfoImp *info;
+ // Interface *iface;
};