author | benmeyer <benmeyer> | 2002-10-30 15:36:45 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-30 15:36:45 (UTC) |
commit | a22f8dd98789f4638ab241d281d4319e0ed911ba (patch) (unidiff) | |
tree | 93131daa22042c2c3fbd52f52a90edb1e8fae92c /noncore | |
parent | bc95eea1eda31b458e5342695b3ffe246d5ab006 (diff) | |
download | opie-a22f8dd98789f4638ab241d281d4319e0ed911ba.zip opie-a22f8dd98789f4638ab241d281d4319e0ed911ba.tar.gz opie-a22f8dd98789f4638ab241d281d4319e0ed911ba.tar.bz2 |
Re-added profile information which makes interfaces work again
19 files changed, 59 insertions, 47 deletions
diff --git a/noncore/net/networksetup/TODO b/noncore/net/networksetup/TODO index 0584f81..ec6d2c6 100644 --- a/noncore/net/networksetup/TODO +++ b/noncore/net/networksetup/TODO | |||
@@ -1,16 +1,16 @@ | |||
1 | CLEAN UP | 1 | CLEAN UP |
2 | 2 | ||
3 | Fix Profiles | 3 | Fix Profiles |
4 | 4 | ||
5 | Write dns script | 5 | Write dns script |
6 | 6 | ||
7 | |||
8 | WLAN needs to be re-written to not use Config | 7 | WLAN needs to be re-written to not use Config |
9 | WHERE Is DHCP info stored??? | ||
10 | |||
11 | PPP module needs to be written | ||
12 | 8 | ||
13 | Write a class that parses /proc and not ifconfig | 9 | Write a class that parses /proc and not ifconfig |
10 | udchcp needs to output the dhcp information | ||
11 | |||
12 | Possible other modules to write: ppp, ipsec, bluetooth, ipchains | ||
13 | |||
14 | PPP module needs to scan pppd.tdb to see what is currently active | ||
14 | 15 | ||
15 | Possible other modules: ipsec, bluetooth, ipchains | ||
16 | 16 | ||
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp index 97c05cc..d42b45d 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp | |||
@@ -84,24 +84,25 @@ bool InterfaceSetupImp::saveSettings(){ | |||
84 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 84 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
85 | return true; | 85 | return true; |
86 | } | 86 | } |
87 | 87 | ||
88 | /** | 88 | /** |
89 | * The Profile has changed. | 89 | * The Profile has changed. |
90 | * @profile the new profile. | 90 | * @profile the new profile. |
91 | */ | 91 | */ |
92 | void InterfaceSetupImp::setProfile(const QString &profile){ | 92 | void InterfaceSetupImp::setProfile(const QString &profile){ |
93 | QString newInterfaceName = interface->getInterfaceName(); | 93 | QString newInterfaceName = interface->getInterfaceName(); |
94 | if(profile.length() > 0) | 94 | if(profile.length() > 0) |
95 | newInterfaceName += "_" + profile; | 95 | newInterfaceName += "_" + profile; |
96 | qDebug("InterfaceSetupImp::setProfile"); | ||
96 | // See if we have to make a interface. | 97 | // See if we have to make a interface. |
97 | if(!interfaces->setInterface(newInterfaceName)){ | 98 | if(!interfaces->setInterface(newInterfaceName)){ |
98 | // Add making for this new interface if need too | 99 | // Add making for this new interface if need too |
99 | if(profile != ""){ | 100 | if(profile != ""){ |
100 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 101 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); |
101 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 102 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
102 | interfaces->addMapping(interface->getInterfaceName()); | 103 | interfaces->addMapping(interface->getInterfaceName()); |
103 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 104 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
104 | qDebug("InterfaceSetupImp: Added Mapping, but still can't set."); | 105 | qDebug("InterfaceSetupImp: Added Mapping, but still can't set."); |
105 | return; | 106 | return; |
106 | } | 107 | } |
107 | } | 108 | } |
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.h b/noncore/net/networksetup/interfaces/interfacesetupimp.h index 936f2be..3bbf34e 100644 --- a/noncore/net/networksetup/interfaces/interfacesetupimp.h +++ b/noncore/net/networksetup/interfaces/interfacesetupimp.h | |||
@@ -20,30 +20,36 @@ public slots: | |||
20 | private: | 20 | private: |
21 | Interfaces *interfaces; | 21 | Interfaces *interfaces; |
22 | Interface *interface; | 22 | Interface *interface; |
23 | 23 | ||
24 | }; | 24 | }; |
25 | 25 | ||
26 | 26 | ||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | 28 | ||
29 | class InterfaceSetupImpDialog : public QDialog { | 29 | class InterfaceSetupImpDialog : public QDialog { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ | 33 | InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ |
34 | QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); | 34 | QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); |
35 | setCaption("Interface Setup"); | 35 | setCaption("Interface Setup"); |
36 | interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl); | 36 | interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl); |
37 | InterfaceSetupLayout->addWidget( interfaceSetup ); | 37 | InterfaceSetupLayout->addWidget( interfaceSetup ); |
38 | }; | 38 | }; |
39 | void setProfile(QString &profile){ interfaceSetup->setProfile(profile);}; | ||
39 | 40 | ||
41 | private: | ||
40 | InterfaceSetupImp *interfaceSetup; | 42 | InterfaceSetupImp *interfaceSetup; |
41 | 43 | ||
42 | protected slots: | 44 | protected slots: |
43 | void accept(){ interfaceSetup->saveChanges(); }; | 45 | void accept(){ |
46 | interfaceSetup->saveChanges(); | ||
47 | QDialog::accept(); | ||
48 | }; | ||
49 | |||
44 | }; | 50 | }; |
45 | 51 | ||
46 | #endif | 52 | #endif |
47 | 53 | ||
48 | // interfacesetupimp.h | 54 | // interfacesetupimp.h |
49 | 55 | ||
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index b9fff56..6440bd4 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -221,69 +221,61 @@ void MainWindowImp::removeClicked(){ | |||
221 | /** | 221 | /** |
222 | * Pull up the configure about the currently selected interface. | 222 | * Pull up the configure about the currently selected interface. |
223 | * Report an error if no interface is selected. | 223 | * Report an error if no interface is selected. |
224 | * If the interface has a module owner then request its configure. | 224 | * If the interface has a module owner then request its configure. |
225 | */ | 225 | */ |
226 | void MainWindowImp::configureClicked(){ | 226 | void MainWindowImp::configureClicked(){ |
227 | QListViewItem *item = connectionList->currentItem(); | 227 | QListViewItem *item = connectionList->currentItem(); |
228 | if(!item){ | 228 | if(!item){ |
229 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); | 229 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); |
230 | return; | 230 | return; |
231 | } | 231 | } |
232 | 232 | ||
233 | QString currentProfile = currentProfileLabel->text(); | ||
234 | if(profilesList->count() <= 1 || currentProfile == "All"){ | ||
235 | currentProfile = ""; | ||
236 | } | ||
237 | |||
238 | Interface *i = interfaceItems[item]; | 233 | Interface *i = interfaceItems[item]; |
239 | if(i->getModuleOwner()){ | 234 | if(i->getModuleOwner()){ |
240 | i->getModuleOwner()->setProfile(currentProfile); | ||
241 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); | 235 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); |
242 | if(moduleConfigure != NULL){ | 236 | if(moduleConfigure != NULL){ |
243 | moduleConfigure->showMaximized(); | 237 | moduleConfigure->showMaximized(); |
244 | moduleConfigure->show(); | 238 | moduleConfigure->show(); |
245 | return; | 239 | return; |
246 | } | 240 | } |
247 | } | 241 | } |
248 | 242 | ||
249 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); | 243 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); |
250 | //configure->setProfile(currentProfile); | 244 | QString currentProfileText = currentProfileLabel->text(); |
245 | if(currentProfileText.upper() == "ALL"); | ||
246 | currentProfileText = ""; | ||
247 | configure->setProfile(currentProfileText); | ||
251 | configure->showMaximized(); | 248 | configure->showMaximized(); |
252 | configure->show(); | 249 | configure->show(); |
253 | } | 250 | } |
254 | 251 | ||
255 | /** | 252 | /** |
256 | * Pull up the information about the currently selected interface. | 253 | * Pull up the information about the currently selected interface. |
257 | * Report an error if no interface is selected. | 254 | * Report an error if no interface is selected. |
258 | * If the interface has a module owner then request its configure. | 255 | * If the interface has a module owner then request its configure. |
259 | */ | 256 | */ |
260 | void MainWindowImp::informationClicked(){ | 257 | void MainWindowImp::informationClicked(){ |
261 | QListViewItem *item = connectionList->currentItem(); | 258 | QListViewItem *item = connectionList->currentItem(); |
262 | if(!item){ | 259 | if(!item){ |
263 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); | 260 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); |
264 | return; | 261 | return; |
265 | } | 262 | } |
266 | 263 | ||
267 | Interface *i = interfaceItems[item]; | 264 | Interface *i = interfaceItems[item]; |
268 | if(!i->isAttached()){ | 265 | if(!i->isAttached()){ |
269 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); | 266 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); |
270 | return; | 267 | return; |
271 | } | 268 | } |
272 | 269 | ||
273 | QStringList list; | ||
274 | for(uint i = 0; i < profilesList->count(); i++){ | ||
275 | list.append(profilesList->text(i)); | ||
276 | } | ||
277 | |||
278 | if(i->getModuleOwner()){ | 270 | if(i->getModuleOwner()){ |
279 | QWidget *moduleInformation = i->getModuleOwner()->information(i); | 271 | QWidget *moduleInformation = i->getModuleOwner()->information(i); |
280 | if(moduleInformation != NULL){ | 272 | if(moduleInformation != NULL){ |
281 | moduleInformation->showMaximized(); | 273 | moduleInformation->showMaximized(); |
282 | moduleInformation->show(); | 274 | moduleInformation->show(); |
283 | return; | 275 | return; |
284 | } | 276 | } |
285 | } | 277 | } |
286 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); | 278 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); |
287 | information->showMaximized(); | 279 | information->showMaximized(); |
288 | information->show(); | 280 | information->show(); |
289 | } | 281 | } |
@@ -529,16 +521,17 @@ void MainWindowImp::changeProfile(){ | |||
529 | file.close(); | 521 | file.close(); |
530 | } | 522 | } |
531 | // restart all up devices? | 523 | // restart all up devices? |
532 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ | 524 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ |
533 | // Go through them one by one | 525 | // Go through them one by one |
534 | QMap<Interface*, QListViewItem*>::Iterator it; | 526 | QMap<Interface*, QListViewItem*>::Iterator it; |
535 | for( it = items.begin(); it != items.end(); ++it ){ | 527 | for( it = items.begin(); it != items.end(); ++it ){ |
536 | if(it.key()->getStatus() == true) | 528 | if(it.key()->getStatus() == true) |
537 | it.key()->restart(); | 529 | it.key()->restart(); |
538 | } | 530 | } |
539 | } | 531 | } |
540 | } | 532 | } |
533 | // TODO change the profile in the modules | ||
541 | } | 534 | } |
542 | 535 | ||
543 | // mainwindowimp.cpp | 536 | // mainwindowimp.cpp |
544 | 537 | ||
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro index 1719a35..5666a42 100644 --- a/noncore/net/networksetup/networksetup.pro +++ b/noncore/net/networksetup/networksetup.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | #DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release |
5 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h kprocctrl.h module.h kprocess.h | 5 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h kprocctrl.h module.h kprocess.h |
6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp | 6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ | 7 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ |
8 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan | 8 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan |
9 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces | 9 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces |
10 | INTERFACES = mainwindow.ui addconnection.ui | 10 | INTERFACES = mainwindow.ui addconnection.ui |
11 | TARGET = networksetup | 11 | TARGET = networksetup |
diff --git a/noncore/net/networksetup/opie-networksetup.control b/noncore/net/networksetup/opie-networksetup.control index 35bac52..d14e2d1 100644 --- a/noncore/net/networksetup/opie-networksetup.control +++ b/noncore/net/networksetup/opie-networksetup.control | |||
@@ -1,8 +1,8 @@ | |||
1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 | 1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/settings | 3 | Section: opie/settings |
4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> | 4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) |
8 | Description: Opie network setup tool | 8 | Description: Opie network setup tool |
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index a466020..74bf390 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp | |||
@@ -24,24 +24,28 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); | 24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); |
25 | //configure->setProfile(currentProfile); | 25 | //configure->setProfile(currentProfile); |
26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
27 | 27 | ||
28 | readConfig(); | 28 | readConfig(); |
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | WLANImp::~WLANImp( ){ | 32 | WLANImp::~WLANImp( ){ |
33 | delete config; | 33 | delete config; |
34 | } | 34 | } |
35 | 35 | ||
36 | void WLANImp::setProfile(QString &profile){ | ||
37 | interfaceSetup->setProfile(profile); | ||
38 | } | ||
39 | |||
36 | void WLANImp::readConfig() | 40 | void WLANImp::readConfig() |
37 | { | 41 | { |
38 | qWarning( "WLANImp::readConfig() called." ); | 42 | qWarning( "WLANImp::readConfig() called." ); |
39 | config->setGroup( "Properties" ); | 43 | config->setGroup( "Properties" ); |
40 | QString ssid = config->readEntry( "SSID", "any" ); | 44 | QString ssid = config->readEntry( "SSID", "any" ); |
41 | if( ssid == "any" || ssid == "ANY" ){ | 45 | if( ssid == "any" || ssid == "ANY" ){ |
42 | essNon->setChecked( true ); | 46 | essNon->setChecked( true ); |
43 | } else { | 47 | } else { |
44 | essSpecific->setChecked( true ); | 48 | essSpecific->setChecked( true ); |
45 | essSpecificLineEdit->setText( ssid ); | 49 | essSpecificLineEdit->setText( ssid ); |
46 | } | 50 | } |
47 | QString mode = config->readEntry( "Mode", "Managed" ); | 51 | QString mode = config->readEntry( "Mode", "Managed" ); |
diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h index 608d681..faa1674 100644 --- a/noncore/net/networksetup/wlan/wlanimp.h +++ b/noncore/net/networksetup/wlan/wlanimp.h | |||
@@ -4,24 +4,25 @@ | |||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | class InterfaceSetupImp; | 6 | class InterfaceSetupImp; |
7 | class Interface; | 7 | class Interface; |
8 | class Config; | 8 | class Config; |
9 | 9 | ||
10 | class WLANImp : public WLAN { | 10 | class WLANImp : public WLAN { |
11 | Q_OBJECT | 11 | Q_OBJECT |
12 | 12 | ||
13 | public: | 13 | public: |
14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); | 14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); |
15 | ~WLANImp( ); | 15 | ~WLANImp( ); |
16 | void setProfile(QString &profile); | ||
16 | 17 | ||
17 | protected: | 18 | protected: |
18 | void accept(); | 19 | void accept(); |
19 | 20 | ||
20 | private: | 21 | private: |
21 | void readConfig(); | 22 | void readConfig(); |
22 | bool writeConfig(); | 23 | bool writeConfig(); |
23 | bool writeWirelessOpts( QString scheme = "*" ); | 24 | bool writeWirelessOpts( QString scheme = "*" ); |
24 | bool writeWlanngOpts( QString scheme = "*" ); | 25 | bool writeWlanngOpts( QString scheme = "*" ); |
25 | Config* config; | 26 | Config* config; |
26 | InterfaceSetupImp *interfaceSetup; | 27 | InterfaceSetupImp *interfaceSetup; |
27 | 28 | ||
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp index c8becb0..b14fc0a 100644 --- a/noncore/net/networksetup/wlan/wlanmodule.cpp +++ b/noncore/net/networksetup/wlan/wlanmodule.cpp | |||
@@ -51,24 +51,25 @@ bool WLANModule::isOwner(Interface *i){ | |||
51 | 51 | ||
52 | i->setHardwareName("802.11b"); | 52 | i->setHardwareName("802.11b"); |
53 | list.append(i); | 53 | list.append(i); |
54 | return true; | 54 | return true; |
55 | } | 55 | } |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Create, and return the WLANConfigure Module | 58 | * Create, and return the WLANConfigure Module |
59 | * @return QWidget* pointer to this modules configure. | 59 | * @return QWidget* pointer to this modules configure. |
60 | */ | 60 | */ |
61 | QWidget *WLANModule::configure(Interface *i){ | 61 | QWidget *WLANModule::configure(Interface *i){ |
62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); | 62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); |
63 | wlanconfig->setProfile(profile); | ||
63 | return wlanconfig; | 64 | return wlanconfig; |
64 | } | 65 | } |
65 | 66 | ||
66 | /** | 67 | /** |
67 | * Create, and return the Information Module | 68 | * Create, and return the Information Module |
68 | * @return QWidget* pointer to this modules info. | 69 | * @return QWidget* pointer to this modules info. |
69 | */ | 70 | */ |
70 | QWidget *WLANModule::information(Interface *i){ | 71 | QWidget *WLANModule::information(Interface *i){ |
71 | WExtensions we(i->getInterfaceName()); | 72 | WExtensions we(i->getInterfaceName()); |
72 | if(!we.doesHaveWirelessExtensions()) | 73 | if(!we.doesHaveWirelessExtensions()) |
73 | return NULL; | 74 | return NULL; |
74 | 75 | ||
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 0584f81..ec6d2c6 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO | |||
@@ -1,16 +1,16 @@ | |||
1 | CLEAN UP | 1 | CLEAN UP |
2 | 2 | ||
3 | Fix Profiles | 3 | Fix Profiles |
4 | 4 | ||
5 | Write dns script | 5 | Write dns script |
6 | 6 | ||
7 | |||
8 | WLAN needs to be re-written to not use Config | 7 | WLAN needs to be re-written to not use Config |
9 | WHERE Is DHCP info stored??? | ||
10 | |||
11 | PPP module needs to be written | ||
12 | 8 | ||
13 | Write a class that parses /proc and not ifconfig | 9 | Write a class that parses /proc and not ifconfig |
10 | udchcp needs to output the dhcp information | ||
11 | |||
12 | Possible other modules to write: ppp, ipsec, bluetooth, ipchains | ||
13 | |||
14 | PPP module needs to scan pppd.tdb to see what is currently active | ||
14 | 15 | ||
15 | Possible other modules: ipsec, bluetooth, ipchains | ||
16 | 16 | ||
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 97c05cc..d42b45d 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -84,24 +84,25 @@ bool InterfaceSetupImp::saveSettings(){ | |||
84 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 84 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
85 | return true; | 85 | return true; |
86 | } | 86 | } |
87 | 87 | ||
88 | /** | 88 | /** |
89 | * The Profile has changed. | 89 | * The Profile has changed. |
90 | * @profile the new profile. | 90 | * @profile the new profile. |
91 | */ | 91 | */ |
92 | void InterfaceSetupImp::setProfile(const QString &profile){ | 92 | void InterfaceSetupImp::setProfile(const QString &profile){ |
93 | QString newInterfaceName = interface->getInterfaceName(); | 93 | QString newInterfaceName = interface->getInterfaceName(); |
94 | if(profile.length() > 0) | 94 | if(profile.length() > 0) |
95 | newInterfaceName += "_" + profile; | 95 | newInterfaceName += "_" + profile; |
96 | qDebug("InterfaceSetupImp::setProfile"); | ||
96 | // See if we have to make a interface. | 97 | // See if we have to make a interface. |
97 | if(!interfaces->setInterface(newInterfaceName)){ | 98 | if(!interfaces->setInterface(newInterfaceName)){ |
98 | // Add making for this new interface if need too | 99 | // Add making for this new interface if need too |
99 | if(profile != ""){ | 100 | if(profile != ""){ |
100 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 101 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); |
101 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 102 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
102 | interfaces->addMapping(interface->getInterfaceName()); | 103 | interfaces->addMapping(interface->getInterfaceName()); |
103 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 104 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
104 | qDebug("InterfaceSetupImp: Added Mapping, but still can't set."); | 105 | qDebug("InterfaceSetupImp: Added Mapping, but still can't set."); |
105 | return; | 106 | return; |
106 | } | 107 | } |
107 | } | 108 | } |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h index 936f2be..3bbf34e 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h | |||
@@ -20,30 +20,36 @@ public slots: | |||
20 | private: | 20 | private: |
21 | Interfaces *interfaces; | 21 | Interfaces *interfaces; |
22 | Interface *interface; | 22 | Interface *interface; |
23 | 23 | ||
24 | }; | 24 | }; |
25 | 25 | ||
26 | 26 | ||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | 28 | ||
29 | class InterfaceSetupImpDialog : public QDialog { | 29 | class InterfaceSetupImpDialog : public QDialog { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ | 33 | InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ |
34 | QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); | 34 | QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); |
35 | setCaption("Interface Setup"); | 35 | setCaption("Interface Setup"); |
36 | interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl); | 36 | interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl); |
37 | InterfaceSetupLayout->addWidget( interfaceSetup ); | 37 | InterfaceSetupLayout->addWidget( interfaceSetup ); |
38 | }; | 38 | }; |
39 | void setProfile(QString &profile){ interfaceSetup->setProfile(profile);}; | ||
39 | 40 | ||
41 | private: | ||
40 | InterfaceSetupImp *interfaceSetup; | 42 | InterfaceSetupImp *interfaceSetup; |
41 | 43 | ||
42 | protected slots: | 44 | protected slots: |
43 | void accept(){ interfaceSetup->saveChanges(); }; | 45 | void accept(){ |
46 | interfaceSetup->saveChanges(); | ||
47 | QDialog::accept(); | ||
48 | }; | ||
49 | |||
44 | }; | 50 | }; |
45 | 51 | ||
46 | #endif | 52 | #endif |
47 | 53 | ||
48 | // interfacesetupimp.h | 54 | // interfacesetupimp.h |
49 | 55 | ||
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index b9fff56..6440bd4 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -221,69 +221,61 @@ void MainWindowImp::removeClicked(){ | |||
221 | /** | 221 | /** |
222 | * Pull up the configure about the currently selected interface. | 222 | * Pull up the configure about the currently selected interface. |
223 | * Report an error if no interface is selected. | 223 | * Report an error if no interface is selected. |
224 | * If the interface has a module owner then request its configure. | 224 | * If the interface has a module owner then request its configure. |
225 | */ | 225 | */ |
226 | void MainWindowImp::configureClicked(){ | 226 | void MainWindowImp::configureClicked(){ |
227 | QListViewItem *item = connectionList->currentItem(); | 227 | QListViewItem *item = connectionList->currentItem(); |
228 | if(!item){ | 228 | if(!item){ |
229 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); | 229 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); |
230 | return; | 230 | return; |
231 | } | 231 | } |
232 | 232 | ||
233 | QString currentProfile = currentProfileLabel->text(); | ||
234 | if(profilesList->count() <= 1 || currentProfile == "All"){ | ||
235 | currentProfile = ""; | ||
236 | } | ||
237 | |||
238 | Interface *i = interfaceItems[item]; | 233 | Interface *i = interfaceItems[item]; |
239 | if(i->getModuleOwner()){ | 234 | if(i->getModuleOwner()){ |
240 | i->getModuleOwner()->setProfile(currentProfile); | ||
241 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); | 235 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); |
242 | if(moduleConfigure != NULL){ | 236 | if(moduleConfigure != NULL){ |
243 | moduleConfigure->showMaximized(); | 237 | moduleConfigure->showMaximized(); |
244 | moduleConfigure->show(); | 238 | moduleConfigure->show(); |
245 | return; | 239 | return; |
246 | } | 240 | } |
247 | } | 241 | } |
248 | 242 | ||
249 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); | 243 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); |
250 | //configure->setProfile(currentProfile); | 244 | QString currentProfileText = currentProfileLabel->text(); |
245 | if(currentProfileText.upper() == "ALL"); | ||
246 | currentProfileText = ""; | ||
247 | configure->setProfile(currentProfileText); | ||
251 | configure->showMaximized(); | 248 | configure->showMaximized(); |
252 | configure->show(); | 249 | configure->show(); |
253 | } | 250 | } |
254 | 251 | ||
255 | /** | 252 | /** |
256 | * Pull up the information about the currently selected interface. | 253 | * Pull up the information about the currently selected interface. |
257 | * Report an error if no interface is selected. | 254 | * Report an error if no interface is selected. |
258 | * If the interface has a module owner then request its configure. | 255 | * If the interface has a module owner then request its configure. |
259 | */ | 256 | */ |
260 | void MainWindowImp::informationClicked(){ | 257 | void MainWindowImp::informationClicked(){ |
261 | QListViewItem *item = connectionList->currentItem(); | 258 | QListViewItem *item = connectionList->currentItem(); |
262 | if(!item){ | 259 | if(!item){ |
263 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); | 260 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); |
264 | return; | 261 | return; |
265 | } | 262 | } |
266 | 263 | ||
267 | Interface *i = interfaceItems[item]; | 264 | Interface *i = interfaceItems[item]; |
268 | if(!i->isAttached()){ | 265 | if(!i->isAttached()){ |
269 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); | 266 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); |
270 | return; | 267 | return; |
271 | } | 268 | } |
272 | 269 | ||
273 | QStringList list; | ||
274 | for(uint i = 0; i < profilesList->count(); i++){ | ||
275 | list.append(profilesList->text(i)); | ||
276 | } | ||
277 | |||
278 | if(i->getModuleOwner()){ | 270 | if(i->getModuleOwner()){ |
279 | QWidget *moduleInformation = i->getModuleOwner()->information(i); | 271 | QWidget *moduleInformation = i->getModuleOwner()->information(i); |
280 | if(moduleInformation != NULL){ | 272 | if(moduleInformation != NULL){ |
281 | moduleInformation->showMaximized(); | 273 | moduleInformation->showMaximized(); |
282 | moduleInformation->show(); | 274 | moduleInformation->show(); |
283 | return; | 275 | return; |
284 | } | 276 | } |
285 | } | 277 | } |
286 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); | 278 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); |
287 | information->showMaximized(); | 279 | information->showMaximized(); |
288 | information->show(); | 280 | information->show(); |
289 | } | 281 | } |
@@ -529,16 +521,17 @@ void MainWindowImp::changeProfile(){ | |||
529 | file.close(); | 521 | file.close(); |
530 | } | 522 | } |
531 | // restart all up devices? | 523 | // restart all up devices? |
532 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ | 524 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ |
533 | // Go through them one by one | 525 | // Go through them one by one |
534 | QMap<Interface*, QListViewItem*>::Iterator it; | 526 | QMap<Interface*, QListViewItem*>::Iterator it; |
535 | for( it = items.begin(); it != items.end(); ++it ){ | 527 | for( it = items.begin(); it != items.end(); ++it ){ |
536 | if(it.key()->getStatus() == true) | 528 | if(it.key()->getStatus() == true) |
537 | it.key()->restart(); | 529 | it.key()->restart(); |
538 | } | 530 | } |
539 | } | 531 | } |
540 | } | 532 | } |
533 | // TODO change the profile in the modules | ||
541 | } | 534 | } |
542 | 535 | ||
543 | // mainwindowimp.cpp | 536 | // mainwindowimp.cpp |
544 | 537 | ||
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro index 1719a35..5666a42 100644 --- a/noncore/settings/networksettings/networksetup.pro +++ b/noncore/settings/networksettings/networksetup.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | #DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE = app | 2 | TEMPLATE = app |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release |
5 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h kprocctrl.h module.h kprocess.h | 5 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h kprocctrl.h module.h kprocess.h |
6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp | 6 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp kprocctrl.cpp kprocess.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ | 7 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ |
8 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan | 8 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan |
9 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -linterfaces | 9 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksetup -Linterfaces/ -linterfaces |
10 | INTERFACES = mainwindow.ui addconnection.ui | 10 | INTERFACES = mainwindow.ui addconnection.ui |
11 | TARGET = networksetup | 11 | TARGET = networksetup |
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control index 35bac52..d14e2d1 100644 --- a/noncore/settings/networksettings/opie-networksettings.control +++ b/noncore/settings/networksettings/opie-networksettings.control | |||
@@ -1,8 +1,8 @@ | |||
1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 | 1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/settings | 3 | Section: opie/settings |
4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> | 4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) |
8 | Description: Opie network setup tool | 8 | Description: Opie network setup tool |
diff --git a/noncore/settings/networksettings/opie-networksetup.control b/noncore/settings/networksettings/opie-networksetup.control index 35bac52..d14e2d1 100644 --- a/noncore/settings/networksettings/opie-networksetup.control +++ b/noncore/settings/networksettings/opie-networksetup.control | |||
@@ -1,8 +1,8 @@ | |||
1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 | 1 | Files: bin/networksetup apps/Settings/networksetup.desktop pics/Network plugins/networksetup/* pics/networksetup $QTDIR/lib/libinterfaces.so.1.0.0 $QTDIR/lib/libinterfaces.so.1.0 $QTDIR/lib/libinterfaces.so.1 $OPIEDIR/bin/changedns.sh $OPIEDIR/bin/getprofile.sh |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/settings | 3 | Section: opie/settings |
4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> | 4 | Maintainer: Ben Meyer <meyerb@sharpsec.com> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION) |
8 | Description: Opie network setup tool | 8 | Description: Opie network setup tool |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index a466020..74bf390 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -24,24 +24,28 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); | 24 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);//, Qt::WDestructiveClose); |
25 | //configure->setProfile(currentProfile); | 25 | //configure->setProfile(currentProfile); |
26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 26 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
27 | 27 | ||
28 | readConfig(); | 28 | readConfig(); |
29 | 29 | ||
30 | } | 30 | } |
31 | 31 | ||
32 | WLANImp::~WLANImp( ){ | 32 | WLANImp::~WLANImp( ){ |
33 | delete config; | 33 | delete config; |
34 | } | 34 | } |
35 | 35 | ||
36 | void WLANImp::setProfile(QString &profile){ | ||
37 | interfaceSetup->setProfile(profile); | ||
38 | } | ||
39 | |||
36 | void WLANImp::readConfig() | 40 | void WLANImp::readConfig() |
37 | { | 41 | { |
38 | qWarning( "WLANImp::readConfig() called." ); | 42 | qWarning( "WLANImp::readConfig() called." ); |
39 | config->setGroup( "Properties" ); | 43 | config->setGroup( "Properties" ); |
40 | QString ssid = config->readEntry( "SSID", "any" ); | 44 | QString ssid = config->readEntry( "SSID", "any" ); |
41 | if( ssid == "any" || ssid == "ANY" ){ | 45 | if( ssid == "any" || ssid == "ANY" ){ |
42 | essNon->setChecked( true ); | 46 | essNon->setChecked( true ); |
43 | } else { | 47 | } else { |
44 | essSpecific->setChecked( true ); | 48 | essSpecific->setChecked( true ); |
45 | essSpecificLineEdit->setText( ssid ); | 49 | essSpecificLineEdit->setText( ssid ); |
46 | } | 50 | } |
47 | QString mode = config->readEntry( "Mode", "Managed" ); | 51 | QString mode = config->readEntry( "Mode", "Managed" ); |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h index 608d681..faa1674 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.h +++ b/noncore/settings/networksettings/wlan/wlanimp.h | |||
@@ -4,24 +4,25 @@ | |||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | class InterfaceSetupImp; | 6 | class InterfaceSetupImp; |
7 | class Interface; | 7 | class Interface; |
8 | class Config; | 8 | class Config; |
9 | 9 | ||
10 | class WLANImp : public WLAN { | 10 | class WLANImp : public WLAN { |
11 | Q_OBJECT | 11 | Q_OBJECT |
12 | 12 | ||
13 | public: | 13 | public: |
14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); | 14 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); |
15 | ~WLANImp( ); | 15 | ~WLANImp( ); |
16 | void setProfile(QString &profile); | ||
16 | 17 | ||
17 | protected: | 18 | protected: |
18 | void accept(); | 19 | void accept(); |
19 | 20 | ||
20 | private: | 21 | private: |
21 | void readConfig(); | 22 | void readConfig(); |
22 | bool writeConfig(); | 23 | bool writeConfig(); |
23 | bool writeWirelessOpts( QString scheme = "*" ); | 24 | bool writeWirelessOpts( QString scheme = "*" ); |
24 | bool writeWlanngOpts( QString scheme = "*" ); | 25 | bool writeWlanngOpts( QString scheme = "*" ); |
25 | Config* config; | 26 | Config* config; |
26 | InterfaceSetupImp *interfaceSetup; | 27 | InterfaceSetupImp *interfaceSetup; |
27 | 28 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index c8becb0..b14fc0a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -51,24 +51,25 @@ bool WLANModule::isOwner(Interface *i){ | |||
51 | 51 | ||
52 | i->setHardwareName("802.11b"); | 52 | i->setHardwareName("802.11b"); |
53 | list.append(i); | 53 | list.append(i); |
54 | return true; | 54 | return true; |
55 | } | 55 | } |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Create, and return the WLANConfigure Module | 58 | * Create, and return the WLANConfigure Module |
59 | * @return QWidget* pointer to this modules configure. | 59 | * @return QWidget* pointer to this modules configure. |
60 | */ | 60 | */ |
61 | QWidget *WLANModule::configure(Interface *i){ | 61 | QWidget *WLANModule::configure(Interface *i){ |
62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); | 62 | WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", i, false, Qt::WDestructiveClose); |
63 | wlanconfig->setProfile(profile); | ||
63 | return wlanconfig; | 64 | return wlanconfig; |
64 | } | 65 | } |
65 | 66 | ||
66 | /** | 67 | /** |
67 | * Create, and return the Information Module | 68 | * Create, and return the Information Module |
68 | * @return QWidget* pointer to this modules info. | 69 | * @return QWidget* pointer to this modules info. |
69 | */ | 70 | */ |
70 | QWidget *WLANModule::information(Interface *i){ | 71 | QWidget *WLANModule::information(Interface *i){ |
71 | WExtensions we(i->getInterfaceName()); | 72 | WExtensions we(i->getInterfaceName()); |
72 | if(!we.doesHaveWirelessExtensions()) | 73 | if(!we.doesHaveWirelessExtensions()) |
73 | return NULL; | 74 | return NULL; |
74 | 75 | ||