summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfacesetupimp.cpp2
-rw-r--r--noncore/net/networksetup/interfacesetupimp.h2
-rw-r--r--noncore/net/networksetup/mainwindowimp.cpp13
-rw-r--r--noncore/net/networksetup/networksetup.pro6
-rw-r--r--noncore/net/networksetup/wlan/wlan.pro6
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp9
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.h3
-rw-r--r--noncore/net/networksetup/wlan/wlanmodule.cpp7
-rw-r--r--noncore/settings/networksettings/interfacesetupimp.cpp2
-rw-r--r--noncore/settings/networksettings/interfacesetupimp.h2
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp13
-rw-r--r--noncore/settings/networksettings/networksetup.pro6
-rw-r--r--noncore/settings/networksettings/wlan/wlan.pro6
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.h3
-rw-r--r--noncore/settings/networksettings/wlan/wlanmodule.cpp7
16 files changed, 38 insertions, 58 deletions
diff --git a/noncore/net/networksetup/interfacesetupimp.cpp b/noncore/net/networksetup/interfacesetupimp.cpp
index 1327726..a8731a9 100644
--- a/noncore/net/networksetup/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfacesetupimp.cpp
@@ -35,13 +35,13 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
35 * Save the current settings, then write out the interfaces file and close. 35 * Save the current settings, then write out the interfaces file and close.
36 */ 36 */
37void InterfaceSetupImp::accept(){ 37void InterfaceSetupImp::accept(){
38 if(!saveSettings()) 38 if(!saveSettings())
39 return; 39 return;
40 interfaces->write(); 40 interfaces->write();
41 close(true); 41 QDialog::accept();
42} 42}
43 43
44/** 44/**
45 * Save the settings for the current Interface. 45 * Save the settings for the current Interface.
46 * @return bool true if successfull, false otherwise 46 * @return bool true if successfull, false otherwise
47 */ 47 */
diff --git a/noncore/net/networksetup/interfacesetupimp.h b/noncore/net/networksetup/interfacesetupimp.h
index 7df0d46..a0bec32 100644
--- a/noncore/net/networksetup/interfacesetupimp.h
+++ b/noncore/net/networksetup/interfacesetupimp.h
@@ -8,13 +8,13 @@ class Interfaces;
8 8
9class InterfaceSetupImp : public InterfaceSetup { 9class InterfaceSetupImp : public InterfaceSetup {
10 Q_OBJECT 10 Q_OBJECT
11 11
12public: 12public:
13 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0); 13 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0);
14 14
15protected slots: 15protected slots:
16 void accept(); 16 void accept();
17 17
18public slots: 18public slots:
19 void setProfile(const QString &profile); 19 void setProfile(const QString &profile);
20 20
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp
index c86acdc..4a088cb 100644
--- a/noncore/net/networksetup/mainwindowimp.cpp
+++ b/noncore/net/networksetup/mainwindowimp.cpp
@@ -75,32 +75,32 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
75} 75}
76 76
77/** 77/**
78 * Deconstructor. Save profiles. Delete loaded libraries. 78 * Deconstructor. Save profiles. Delete loaded libraries.
79 */ 79 */
80MainWindowImp::~MainWindowImp(){ 80MainWindowImp::~MainWindowImp(){
81 qDebug("start Saving mainwindow"); 81 qDebug("Deleting main window");
82 // Save profiles. 82 // Save profiles.
83 Config cfg("NetworkSetup"); 83 Config cfg("NetworkSetup");
84 cfg.setGroup("General"); 84 cfg.setGroup("General");
85 cfg.writeEntry("Profiles", profiles.join(" ")); 85 cfg.writeEntry("Profiles", profiles.join(" "));
86 86
87 // Delete all interfaces that don't have owners. 87 // Delete all interfaces that don't have owners.
88 QMap<Interface*, QListViewItem*>::Iterator iIt; 88 QMap<Interface*, QListViewItem*>::Iterator iIt;
89 for( iIt = items.begin(); iIt != items.end(); ++iIt ){ 89 for( iIt = items.begin(); iIt != items.end(); ++iIt ){
90 if(iIt.key()->getModuleOwner() == NULL) 90 if(iIt.key()->getModuleOwner() == NULL)
91 delete iIt.key(); 91 delete iIt.key();
92 } 92 }
93 93
94 // Delete Modules and Libraries 94 // Delete Modules and Libraries
95 QMap<Module*, QLibrary*>::Iterator it; 95 QMap<Module*, QLibrary*>::Iterator it;
96 for( it = libraries.begin(); it != libraries.end(); ++it ){ 96 for( it = libraries.begin(); it != libraries.end(); ++it ){
97 delete it.key(); 97 delete it.key();
98 delete it.data(); 98 //delete it.data();
99 } 99 }
100 qDebug("done Saving mainwindow"); 100 qDebug("Done deleting main window");
101} 101}
102 102
103/** 103/**
104 * Load all modules that are found in the path 104 * Load all modules that are found in the path
105 * @param path a directory that is scaned for any plugins that can be loaded 105 * @param path a directory that is scaned for any plugins that can be loaded
106 * and attempts to load them 106 * and attempts to load them
@@ -241,24 +241,23 @@ void MainWindowImp::configureClicked(){
241 if(i->getModuleOwner()){ 241 if(i->getModuleOwner()){
242 i->getModuleOwner()->setProfile(currentProfile); 242 i->getModuleOwner()->setProfile(currentProfile);
243 QTabWidget *tabWidget = NULL; 243 QTabWidget *tabWidget = NULL;
244 QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget); 244 QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
245 if(moduleConfigure != NULL){ 245 if(moduleConfigure != NULL){
246 if(tabWidget != NULL){ 246 if(tabWidget != NULL){
247 InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); 247 InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
248 configure->setProfile(currentProfile); 248 configure->setProfile(currentProfile);
249 tabWidget->insertTab(configure, "TCP/IP"); 249 tabWidget->insertTab(configure, "TCP/IP");
250
251 } 250 }
252 moduleConfigure->showMaximized(); 251 moduleConfigure->showMaximized();
253 moduleConfigure->show(); 252 moduleConfigure->show();
254 return; 253 return;
255 } 254 }
256 } 255 }
257 256
258 InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); 257 InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
259 configure->setProfile(currentProfile); 258 configure->setProfile(currentProfile);
260 configure->showMaximized(); 259 configure->showMaximized();
261 configure->show(); 260 configure->show();
262} 261}
263 262
264/** 263/**
diff --git a/noncore/net/networksetup/networksetup.pro b/noncore/net/networksetup/networksetup.pro
index f09db93..7299cc6 100644
--- a/noncore/net/networksetup/networksetup.pro
+++ b/noncore/net/networksetup/networksetup.pro
@@ -1,10 +1,10 @@
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 interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h 5 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
6 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 6 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 10 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
diff --git a/noncore/net/networksetup/wlan/wlan.pro b/noncore/net/networksetup/wlan/wlan.pro
index 432a096..814a0b4 100644
--- a/noncore/net/networksetup/wlan/wlan.pro
+++ b/noncore/net/networksetup/wlan/wlan.pro
@@ -1,10 +1,10 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2#CONFIG += qt warn_on release
3 #CONFIG += qt warn_on debug 3 CONFIG += qt warn_on debug
4DESTDIR = $(OPIEDIR)/plugins/networksetup 4#DESTDIR = $(OPIEDIR)/plugins/networksetup
5 HEADERS = wlanimp.h wlanmodule.h wextensions.h 5 HEADERS = wlanimp.h wlanmodule.h wextensions.h
6 SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp 6 SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp
7 INCLUDEPATH+= $(OPIEDIR)/include ../ 7 INCLUDEPATH+= $(OPIEDIR)/include ../
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= wlan.ui info.ui 10 INTERFACES= wlan.ui info.ui
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 94c7518..45952b9 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -13,13 +13,13 @@
13#include <qlineedit.h> 13#include <qlineedit.h>
14#include <qspinbox.h> 14#include <qspinbox.h>
15#include <qradiobutton.h> 15#include <qradiobutton.h>
16#include <qcheckbox.h> 16#include <qcheckbox.h>
17#include <qregexp.h> 17#include <qregexp.h>
18 18
19WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ 19WLANImp::WLANImp( QWidget* parent, const char* name, bool modal, WFlags fl):WLAN(parent, name, modal, fl){
20 config = new Config("wireless"); 20 config = new Config("wireless");
21 readConfig(); 21 readConfig();
22} 22}
23 23
24WLANImp::~WLANImp( ){ 24WLANImp::~WLANImp( ){
25 delete config; 25 delete config;
@@ -98,29 +98,24 @@ bool WLANImp::writeConfig()
98 config->writeEntry( "dot11WEPDefaultKeyID", 3 ); 98 config->writeEntry( "dot11WEPDefaultKeyID", 3 );
99 } 99 }
100 config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); 100 config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
101 config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); 101 config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
102 config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); 102 config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
103 config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); 103 config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
104 return true;
104 return writeWirelessOpts( ); 105 return writeWirelessOpts( );
105} 106}
106 107
107/** 108/**
108 */ 109 */
109void WLANImp::accept() 110void WLANImp::accept()
110{ 111{
111 if ( writeConfig() ) 112 if ( writeConfig() )
112 QDialog::accept(); 113 QDialog::accept();
113} 114}
114 115
115void WLANImp::done ( int r )
116{
117 QDialog::done ( r );
118 close ( );
119}
120
121bool WLANImp::writeWirelessOpts( QString scheme ) 116bool WLANImp::writeWirelessOpts( QString scheme )
122{ 117{
123 qWarning( "WLANImp::writeWirelessOpts entered." ); 118 qWarning( "WLANImp::writeWirelessOpts entered." );
124 QString prev = "/etc/pcmcia/wireless.opts"; 119 QString prev = "/etc/pcmcia/wireless.opts";
125 QFile prevFile(prev); 120 QFile prevFile(prev);
126 if ( !prevFile.open( IO_ReadOnly ) ) 121 if ( !prevFile.open( IO_ReadOnly ) )
diff --git a/noncore/net/networksetup/wlan/wlanimp.h b/noncore/net/networksetup/wlan/wlanimp.h
index 22ce143..59b7c59 100644
--- a/noncore/net/networksetup/wlan/wlanimp.h
+++ b/noncore/net/networksetup/wlan/wlanimp.h
@@ -6,18 +6,17 @@
6#include <qpe/config.h> 6#include <qpe/config.h>
7 7
8class WLANImp : public WLAN { 8class WLANImp : public WLAN {
9 Q_OBJECT 9 Q_OBJECT
10 10
11public: 11public:
12 WLANImp( QWidget* parent = 0, const char* name = 0); 12 WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
13 ~WLANImp( ); 13 ~WLANImp( );
14 14
15protected: 15protected:
16 void accept(); 16 void accept();
17 void done ( int r );
18 17
19private: 18private:
20 void readConfig(); 19 void readConfig();
21 bool writeConfig(); 20 bool writeConfig();
22 bool writeWirelessOpts( QString scheme = "*" ); 21 bool writeWirelessOpts( QString scheme = "*" );
23 bool writeWlanngOpts( QString scheme = "*" ); 22 bool writeWlanngOpts( QString scheme = "*" );
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp
index 7507c54..3363b8a 100644
--- a/noncore/net/networksetup/wlan/wlanmodule.cpp
+++ b/noncore/net/networksetup/wlan/wlanmodule.cpp
@@ -12,12 +12,13 @@
12WLANModule::WLANModule() : Module() { 12WLANModule::WLANModule() : Module() {
13} 13}
14 14
15/** 15/**
16 */ 16 */
17WLANModule::~WLANModule(){ 17WLANModule::~WLANModule(){
18 qDebug("Deleting module");
18 Interface *i; 19 Interface *i;
19 for ( i=list.first(); i != 0; i=list.next() ) 20 for ( i=list.first(); i != 0; i=list.next() )
20 delete i; 21 delete i;
21} 22}
22 23
23/** 24/**
@@ -54,13 +55,13 @@ bool WLANModule::isOwner(Interface *i){
54/** 55/**
55 * Create, set tabWiget and return the WLANConfigure Module 56 * Create, set tabWiget and return the WLANConfigure Module
56 * @param tabWidget a pointer to the tab widget that this configure has. 57 * @param tabWidget a pointer to the tab widget that this configure has.
57 * @return QWidget* pointer to the tab widget in this modules configure. 58 * @return QWidget* pointer to the tab widget in this modules configure.
58 */ 59 */
59QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ 60QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){
60 WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); 61 WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose);
61 (*tabWidget) = wlanconfig->tabWidget; 62 (*tabWidget) = wlanconfig->tabWidget;
62 return wlanconfig; 63 return wlanconfig;
63} 64}
64 65
65/** 66/**
66 * Create, set tabWiget and return the Information Module 67 * Create, set tabWiget and return the Information Module
@@ -85,16 +86,12 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
85 int quality = 0; 86 int quality = 0;
86 we.stats(signal, noise, quality); 87 we.stats(signal, noise, quality);
87 info->signalProgressBar->setProgress(signal); 88 info->signalProgressBar->setProgress(signal);
88 info->noiseProgressBar->setProgress(noise); 89 info->noiseProgressBar->setProgress(noise);
89 info->qualityProgressBar->setProgress(quality); 90 info->qualityProgressBar->setProgress(quality);
90 info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); 91 info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
91 //WlanInfo info (0, "wireless info", true);
92 //info.show();
93 //return NULL;
94
95 return info; 92 return info;
96} 93}
97 94
98/** 95/**
99 * Get all active (up or down) interfaces 96 * Get all active (up or down) interfaces
100 * @return QList<Interface> A list of interfaces that exsist that havn't 97 * @return QList<Interface> A list of interfaces that exsist that havn't
diff --git a/noncore/settings/networksettings/interfacesetupimp.cpp b/noncore/settings/networksettings/interfacesetupimp.cpp
index 1327726..a8731a9 100644
--- a/noncore/settings/networksettings/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfacesetupimp.cpp
@@ -35,13 +35,13 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac
35 * Save the current settings, then write out the interfaces file and close. 35 * Save the current settings, then write out the interfaces file and close.
36 */ 36 */
37void InterfaceSetupImp::accept(){ 37void InterfaceSetupImp::accept(){
38 if(!saveSettings()) 38 if(!saveSettings())
39 return; 39 return;
40 interfaces->write(); 40 interfaces->write();
41 close(true); 41 QDialog::accept();
42} 42}
43 43
44/** 44/**
45 * Save the settings for the current Interface. 45 * Save the settings for the current Interface.
46 * @return bool true if successfull, false otherwise 46 * @return bool true if successfull, false otherwise
47 */ 47 */
diff --git a/noncore/settings/networksettings/interfacesetupimp.h b/noncore/settings/networksettings/interfacesetupimp.h
index 7df0d46..a0bec32 100644
--- a/noncore/settings/networksettings/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfacesetupimp.h
@@ -8,13 +8,13 @@ class Interfaces;
8 8
9class InterfaceSetupImp : public InterfaceSetup { 9class InterfaceSetupImp : public InterfaceSetup {
10 Q_OBJECT 10 Q_OBJECT
11 11
12public: 12public:
13 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0); 13 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0);
14 14
15protected slots: 15protected slots:
16 void accept(); 16 void accept();
17 17
18public slots: 18public slots:
19 void setProfile(const QString &profile); 19 void setProfile(const QString &profile);
20 20
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index c86acdc..4a088cb 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -75,32 +75,32 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par
75} 75}
76 76
77/** 77/**
78 * Deconstructor. Save profiles. Delete loaded libraries. 78 * Deconstructor. Save profiles. Delete loaded libraries.
79 */ 79 */
80MainWindowImp::~MainWindowImp(){ 80MainWindowImp::~MainWindowImp(){
81 qDebug("start Saving mainwindow"); 81 qDebug("Deleting main window");
82 // Save profiles. 82 // Save profiles.
83 Config cfg("NetworkSetup"); 83 Config cfg("NetworkSetup");
84 cfg.setGroup("General"); 84 cfg.setGroup("General");
85 cfg.writeEntry("Profiles", profiles.join(" ")); 85 cfg.writeEntry("Profiles", profiles.join(" "));
86 86
87 // Delete all interfaces that don't have owners. 87 // Delete all interfaces that don't have owners.
88 QMap<Interface*, QListViewItem*>::Iterator iIt; 88 QMap<Interface*, QListViewItem*>::Iterator iIt;
89 for( iIt = items.begin(); iIt != items.end(); ++iIt ){ 89 for( iIt = items.begin(); iIt != items.end(); ++iIt ){
90 if(iIt.key()->getModuleOwner() == NULL) 90 if(iIt.key()->getModuleOwner() == NULL)
91 delete iIt.key(); 91 delete iIt.key();
92 } 92 }
93 93
94 // Delete Modules and Libraries 94 // Delete Modules and Libraries
95 QMap<Module*, QLibrary*>::Iterator it; 95 QMap<Module*, QLibrary*>::Iterator it;
96 for( it = libraries.begin(); it != libraries.end(); ++it ){ 96 for( it = libraries.begin(); it != libraries.end(); ++it ){
97 delete it.key(); 97 delete it.key();
98 delete it.data(); 98 //delete it.data();
99 } 99 }
100 qDebug("done Saving mainwindow"); 100 qDebug("Done deleting main window");
101} 101}
102 102
103/** 103/**
104 * Load all modules that are found in the path 104 * Load all modules that are found in the path
105 * @param path a directory that is scaned for any plugins that can be loaded 105 * @param path a directory that is scaned for any plugins that can be loaded
106 * and attempts to load them 106 * and attempts to load them
@@ -241,24 +241,23 @@ void MainWindowImp::configureClicked(){
241 if(i->getModuleOwner()){ 241 if(i->getModuleOwner()){
242 i->getModuleOwner()->setProfile(currentProfile); 242 i->getModuleOwner()->setProfile(currentProfile);
243 QTabWidget *tabWidget = NULL; 243 QTabWidget *tabWidget = NULL;
244 QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget); 244 QWidget *moduleConfigure = i->getModuleOwner()->configure(i, &tabWidget);
245 if(moduleConfigure != NULL){ 245 if(moduleConfigure != NULL){
246 if(tabWidget != NULL){ 246 if(tabWidget != NULL){
247 InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); 247 InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
248 configure->setProfile(currentProfile); 248 configure->setProfile(currentProfile);
249 tabWidget->insertTab(configure, "TCP/IP"); 249 tabWidget->insertTab(configure, "TCP/IP");
250
251 } 250 }
252 moduleConfigure->showMaximized(); 251 moduleConfigure->showMaximized();
253 moduleConfigure->show(); 252 moduleConfigure->show();
254 return; 253 return;
255 } 254 }
256 } 255 }
257 256
258 InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); 257 InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, false, Qt::WDestructiveClose);
259 configure->setProfile(currentProfile); 258 configure->setProfile(currentProfile);
260 configure->showMaximized(); 259 configure->showMaximized();
261 configure->show(); 260 configure->show();
262} 261}
263 262
264/** 263/**
diff --git a/noncore/settings/networksettings/networksetup.pro b/noncore/settings/networksettings/networksetup.pro
index f09db93..7299cc6 100644
--- a/noncore/settings/networksettings/networksetup.pro
+++ b/noncore/settings/networksettings/networksetup.pro
@@ -1,10 +1,10 @@
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 interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h 5 HEADERS = mainwindowimp.h addconnectionimp.h interface.h interfaceinformationimp.h interfacesetupimp.h interfaces.h defaultmodule.h kprocctrl.h module.h kprocess.h
6 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp 6 SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp interface.cpp interfaceinformationimp.cpp interfacesetupimp.cpp kprocctrl.cpp kprocess.cpp interfaces.cpp
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui 10 INTERFACES= mainwindow.ui addconnection.ui interfaceinformation.ui interfaceadvanced.ui interfacesetup.ui
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 432a096..814a0b4 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,10 +1,10 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2#CONFIG += qt warn_on release
3 #CONFIG += qt warn_on debug 3 CONFIG += qt warn_on debug
4DESTDIR = $(OPIEDIR)/plugins/networksetup 4#DESTDIR = $(OPIEDIR)/plugins/networksetup
5 HEADERS = wlanimp.h wlanmodule.h wextensions.h 5 HEADERS = wlanimp.h wlanmodule.h wextensions.h
6 SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp 6 SOURCES = wlanimp.cpp wlanmodule.cpp wextensions.cpp
7 INCLUDEPATH+= $(OPIEDIR)/include ../ 7 INCLUDEPATH+= $(OPIEDIR)/include ../
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe
10 INTERFACES= wlan.ui info.ui 10 INTERFACES= wlan.ui info.ui
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 94c7518..45952b9 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -13,13 +13,13 @@
13#include <qlineedit.h> 13#include <qlineedit.h>
14#include <qspinbox.h> 14#include <qspinbox.h>
15#include <qradiobutton.h> 15#include <qradiobutton.h>
16#include <qcheckbox.h> 16#include <qcheckbox.h>
17#include <qregexp.h> 17#include <qregexp.h>
18 18
19WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ 19WLANImp::WLANImp( QWidget* parent, const char* name, bool modal, WFlags fl):WLAN(parent, name, modal, fl){
20 config = new Config("wireless"); 20 config = new Config("wireless");
21 readConfig(); 21 readConfig();
22} 22}
23 23
24WLANImp::~WLANImp( ){ 24WLANImp::~WLANImp( ){
25 delete config; 25 delete config;
@@ -98,29 +98,24 @@ bool WLANImp::writeConfig()
98 config->writeEntry( "dot11WEPDefaultKeyID", 3 ); 98 config->writeEntry( "dot11WEPDefaultKeyID", 3 );
99 } 99 }
100 config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() ); 100 config->writeEntry( "dot11WEPDefaultKey0", keyLineEdit0->text() );
101 config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() ); 101 config->writeEntry( "dot11WEPDefaultKey1", keyLineEdit1->text() );
102 config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() ); 102 config->writeEntry( "dot11WEPDefaultKey2", keyLineEdit2->text() );
103 config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() ); 103 config->writeEntry( "dot11WEPDefaultKey3", keyLineEdit3->text() );
104 return true;
104 return writeWirelessOpts( ); 105 return writeWirelessOpts( );
105} 106}
106 107
107/** 108/**
108 */ 109 */
109void WLANImp::accept() 110void WLANImp::accept()
110{ 111{
111 if ( writeConfig() ) 112 if ( writeConfig() )
112 QDialog::accept(); 113 QDialog::accept();
113} 114}
114 115
115void WLANImp::done ( int r )
116{
117 QDialog::done ( r );
118 close ( );
119}
120
121bool WLANImp::writeWirelessOpts( QString scheme ) 116bool WLANImp::writeWirelessOpts( QString scheme )
122{ 117{
123 qWarning( "WLANImp::writeWirelessOpts entered." ); 118 qWarning( "WLANImp::writeWirelessOpts entered." );
124 QString prev = "/etc/pcmcia/wireless.opts"; 119 QString prev = "/etc/pcmcia/wireless.opts";
125 QFile prevFile(prev); 120 QFile prevFile(prev);
126 if ( !prevFile.open( IO_ReadOnly ) ) 121 if ( !prevFile.open( IO_ReadOnly ) )
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h
index 22ce143..59b7c59 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.h
+++ b/noncore/settings/networksettings/wlan/wlanimp.h
@@ -6,18 +6,17 @@
6#include <qpe/config.h> 6#include <qpe/config.h>
7 7
8class WLANImp : public WLAN { 8class WLANImp : public WLAN {
9 Q_OBJECT 9 Q_OBJECT
10 10
11public: 11public:
12 WLANImp( QWidget* parent = 0, const char* name = 0); 12 WLANImp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
13 ~WLANImp( ); 13 ~WLANImp( );
14 14
15protected: 15protected:
16 void accept(); 16 void accept();
17 void done ( int r );
18 17
19private: 18private:
20 void readConfig(); 19 void readConfig();
21 bool writeConfig(); 20 bool writeConfig();
22 bool writeWirelessOpts( QString scheme = "*" ); 21 bool writeWirelessOpts( QString scheme = "*" );
23 bool writeWlanngOpts( QString scheme = "*" ); 22 bool writeWlanngOpts( QString scheme = "*" );
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 7507c54..3363b8a 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -12,12 +12,13 @@
12WLANModule::WLANModule() : Module() { 12WLANModule::WLANModule() : Module() {
13} 13}
14 14
15/** 15/**
16 */ 16 */
17WLANModule::~WLANModule(){ 17WLANModule::~WLANModule(){
18 qDebug("Deleting module");
18 Interface *i; 19 Interface *i;
19 for ( i=list.first(); i != 0; i=list.next() ) 20 for ( i=list.first(); i != 0; i=list.next() )
20 delete i; 21 delete i;
21} 22}
22 23
23/** 24/**
@@ -54,13 +55,13 @@ bool WLANModule::isOwner(Interface *i){
54/** 55/**
55 * Create, set tabWiget and return the WLANConfigure Module 56 * Create, set tabWiget and return the WLANConfigure Module
56 * @param tabWidget a pointer to the tab widget that this configure has. 57 * @param tabWidget a pointer to the tab widget that this configure has.
57 * @return QWidget* pointer to the tab widget in this modules configure. 58 * @return QWidget* pointer to the tab widget in this modules configure.
58 */ 59 */
59QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ 60QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){
60 WLANImp *wlanconfig = new WLANImp(0, "WlanConfig"); 61 WLANImp *wlanconfig = new WLANImp(0, "WlanConfig", false, Qt::WDestructiveClose);
61 (*tabWidget) = wlanconfig->tabWidget; 62 (*tabWidget) = wlanconfig->tabWidget;
62 return wlanconfig; 63 return wlanconfig;
63} 64}
64 65
65/** 66/**
66 * Create, set tabWiget and return the Information Module 67 * Create, set tabWiget and return the Information Module
@@ -85,16 +86,12 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){
85 int quality = 0; 86 int quality = 0;
86 we.stats(signal, noise, quality); 87 we.stats(signal, noise, quality);
87 info->signalProgressBar->setProgress(signal); 88 info->signalProgressBar->setProgress(signal);
88 info->noiseProgressBar->setProgress(noise); 89 info->noiseProgressBar->setProgress(noise);
89 info->qualityProgressBar->setProgress(quality); 90 info->qualityProgressBar->setProgress(quality);
90 info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate())); 91 info->rateLabel->setText(QString("%1 Mb/s").arg(we.rate()));
91 //WlanInfo info (0, "wireless info", true);
92 //info.show();
93 //return NULL;
94
95 return info; 92 return info;
96} 93}
97 94
98/** 95/**
99 * Get all active (up or down) interfaces 96 * Get all active (up or down) interfaces
100 * @return QList<Interface> A list of interfaces that exsist that havn't 97 * @return QList<Interface> A list of interfaces that exsist that havn't