summaryrefslogtreecommitdiff
authortille <tille>2003-06-13 14:54:32 (UTC)
committer tille <tille>2003-06-13 14:54:32 (UTC)
commit006f7b028f03232e51dd6ceab35a7d492288fd22 (patch) (unidiff)
tree27fe264b7628f7ac4f17b925803b3f562f165fb7
parente5d826221bab71c39dc8fc89d91509dd16bc2a8a (diff)
downloadopie-006f7b028f03232e51dd6ceab35a7d492288fd22.zip
opie-006f7b028f03232e51dd6ceab35a7d492288fd22.tar.gz
opie-006f7b028f03232e51dd6ceab35a7d492288fd22.tar.bz2
qcop channels for ESSID, Channel and Mode
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)
662 } 662 }
663 663
664 664
665 if (!found) qDebug("Huh what do ya want"); 665 if (found) QPEApplication::setKeepRunning();
666 else qDebug("Huh what do ya want");
666} 667}
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 @@
28 * Constructor, read in the wireless.opts file for parsing later. 28 * Constructor, read in the wireless.opts file for parsing later.
29 */ 29 */
30WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), currentProfile("*"), interface(i) { 30WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), currentProfile("*"), interface(i) {
31 interfaces = new Interfaces; 31 interfaces = new Interfaces();
32 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); 32 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
33 tabWidget->insertTab(interfaceSetup, "TCP/IP"); 33 tabWidget->insertTab(interfaceSetup, "TCP/IP");
34 34
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 @@
4#include "wextensions.h" 4#include "wextensions.h"
5#include "interfaceinformationimp.h" 5#include "interfaceinformationimp.h"
6 6
7#include <qcheckbox.h>
8#include <qcombobox.h>
7#include <qlabel.h> 9#include <qlabel.h>
8#include <qprogressbar.h> 10#include <qprogressbar.h>
11#include <qspinbox.h>
9#include <qtabwidget.h> 12#include <qtabwidget.h>
10 13
11 14
@@ -14,7 +17,10 @@
14/** 17/**
15 * Constructor, find all of the possible interfaces 18 * Constructor, find all of the possible interfaces
16 */ 19 */
17WLANModule::WLANModule() : Module() { 20WLANModule::WLANModule()
21 : Module(),
22 wlanconfigWiget(0)
23{
18} 24}
19 25
20/** 26/**
@@ -115,7 +121,7 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
115 qDebug("WLANModule::receive "+param); 121 qDebug("WLANModule::receive "+param);
116 QStringList params = QStringList::split(",",param); 122 QStringList params = QStringList::split(",",param);
117 int count = params.count(); 123 int count = params.count();
118 qDebug("got %i params", count ); 124 qDebug("WLANModule got %i params", count );
119 if (count < 2){ 125 if (count < 2){
120 qDebug("Erorr less than 2 parameter"); 126 qDebug("Erorr less than 2 parameter");
121 qDebug("RETURNING"); 127 qDebug("RETURNING");
@@ -128,18 +134,18 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
128 134
129 stream >> interface; 135 stream >> interface;
130 stream >> action; 136 stream >> action;
131 qDebug("got interface %s and acion %s", interface.latin1(), action.latin1()); 137 qDebug("WLANModule got interface %s and acion %s", interface.latin1(), action.latin1());
132 // find interfaces 138 // find interfaces
133 Interface *ifa=0; 139 Interface *ifa=0;
134 for ( Interface *i=list.first(); i != 0; i=list.next() ){ 140 for ( Interface *i=list.first(); i != 0; i=list.next() ){
135 if (i->getInterfaceName() == interface){ 141 if (i->getInterfaceName() == interface){
136 qDebug("found interface %s",interface.latin1()); 142 qDebug("WLANModule found interface %s",interface.latin1());
137 ifa = i; 143 ifa = i;
138 } 144 }
139 } 145 }
140 146
141 if (ifa == 0){ 147 if (ifa == 0){
142 qFatal("Did not find %s",interface.latin1()); 148 qFatal("WLANModule Did not find %s",interface.latin1());
143 } 149 }
144 150
145 if (count == 2){ 151 if (count == 2){
@@ -158,21 +164,36 @@ void WLANModule::receive(const QCString &param, const QByteArray &arg)
158 } 164 }
159 }else if (count == 3){ 165 }else if (count == 3){
160 QString value; 166 QString value;
167 if (!wlanconfigWiget){
168 //FIXME: what if it got closed meanwhile?
169 wlanconfigWiget = (WLANImp*) configure(ifa);
170 }
171 wlanconfigWiget->showMaximized();
161 stream >> value; 172 stream >> value;
162 qDebug("setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); 173 qDebug("WLANModule is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() );
163 if ( action.contains("ESSID") ){ 174 if ( action.contains("ESSID") ){
164 qDebug("Setting ESSID not yet impl"); 175 QComboBox *combo = wlanconfigWiget->essid;
176 bool found = false;
177 for ( int i = 0; i < combo->count(); i++)
178 if ( combo->text( i ) == value ){
179 combo->setCurrentItem( i );
180 found = true;
181 }
182 if (!found) combo->insertItem( value, 0 );
183 }else if ( action.contains("Mode") ){
184 QComboBox *combo = wlanconfigWiget->mode;
185 for ( int i = 0; i < combo->count(); i++)
186 if ( combo->text( i ) == value ){
187 combo->setCurrentItem( i );
188 }
189
165 }else if (action.contains("Channel")){ 190 }else if (action.contains("Channel")){
166 qDebug("Setting Channel not yet impl"); 191 wlanconfigWiget->specifyChan->setChecked( true );
192 wlanconfigWiget->networkChannel->setValue( value.toInt() );
167 }else 193 }else
168 qDebug("wlan plugin has no clue"); 194 qDebug("wlan plugin has no clue");
169 } 195 }
170 // if (param.contains("QString,QString,QString")) { 196
171// QDataStream stream(arg,IO_ReadOnly);
172// QString arg1, arg2, arg3;
173// stream >> arg1 >> arg2 >> arg3 ;
174// qDebug("interface >%s< setting >%s< value >%s<",arg1.latin1(),arg2.latin1(),arg3.latin1());
175// }
176} 197}
177 198
178QWidget *WLANModule::getInfo( Interface *i) 199QWidget *WLANModule::getInfo( Interface *i)
@@ -185,3 +206,4 @@ QWidget *WLANModule::getInfo( Interface *i)
185 qDebug("WLANModule::getInfo return"); 206 qDebug("WLANModule::getInfo return");
186 return info; 207 return info;
187} 208}
209
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 @@
3 3
4#include "module.h" 4#include "module.h"
5 5
6//class WlanInfoImp; 6class WLANImp;
7 7
8class WLANModule : Module{ 8class WLANModule : Module{
9 9
@@ -29,11 +29,10 @@ public:
29 29
30private: 30private:
31 QWidget *getInfo(Interface*); 31 QWidget *getInfo(Interface*);
32 32 WLANImp *wlanconfigWiget;
33 QList<Interface> list; 33 QList<Interface> list;
34 QString profile; 34 QString profile;
35 // WlanInfoImp *info; 35
36 // Interface *iface;
37}; 36};
38 37
39extern "C" 38extern "C"