author | benmeyer <benmeyer> | 2002-10-24 20:20:12 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-10-24 20:20:12 (UTC) |
commit | 57c34f2f0b35ab13e7618ba77480c9b28b83885a (patch) (unidiff) | |
tree | 406fc6016ccea8d9d77a3b251361d11828e7afbc | |
parent | 013b5a78262099a55de8e7228436f2c00660e6b1 (diff) | |
download | opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.zip opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.tar.gz opie-57c34f2f0b35ab13e7618ba77480c9b28b83885a.tar.bz2 |
Fix segfault
-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.cpp | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.h | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 13 | ||||
-rw-r--r-- | noncore/net/networksetup/networksetup.pro | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlan.pro | 6 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 9 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.h | 3 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfacesetupimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfacesetupimp.h | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 13 | ||||
-rw-r--r-- | noncore/settings/networksettings/networksetup.pro | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.pro | 6 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.h | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 7 |
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 | |||
@@ -29,25 +29,25 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac | |||
29 | leaseTime->hide(); | 29 | leaseTime->hide(); |
30 | leaseHoursLabel->hide(); | 30 | leaseHoursLabel->hide(); |
31 | } | 31 | } |
32 | } | 32 | } |
33 | 33 | ||
34 | /** | 34 | /** |
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 | */ |
37 | void InterfaceSetupImp::accept(){ | 37 | void 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 | */ |
48 | bool InterfaceSetupImp::saveSettings(){ | 48 | bool InterfaceSetupImp::saveSettings(){ |
49 | // eh can't really do anything about it other then return. :-D | 49 | // eh can't really do anything about it other then return. :-D |
50 | if(!interfaces->isInterfaceSet()) | 50 | if(!interfaces->isInterfaceSet()) |
51 | return true; | 51 | return true; |
52 | 52 | ||
53 | bool error = false; | 53 | bool error = false; |
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 | |||
@@ -2,25 +2,25 @@ | |||
2 | #define INTERFACESETUPIMP_H | 2 | #define INTERFACESETUPIMP_H |
3 | 3 | ||
4 | #include "interfacesetup.h" | 4 | #include "interfacesetup.h" |
5 | 5 | ||
6 | class Interface; | 6 | class Interface; |
7 | class Interfaces; | 7 | class Interfaces; |
8 | 8 | ||
9 | class InterfaceSetupImp : public InterfaceSetup { | 9 | class InterfaceSetupImp : public InterfaceSetup { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
12 | public: | 12 | public: |
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 | ||
15 | protected slots: | 15 | protected slots: |
16 | void accept(); | 16 | void accept(); |
17 | 17 | ||
18 | public slots: | 18 | public slots: |
19 | void setProfile(const QString &profile); | 19 | void setProfile(const QString &profile); |
20 | 20 | ||
21 | private: | 21 | private: |
22 | bool saveSettings(); | 22 | bool saveSettings(); |
23 | Interfaces *interfaces; | 23 | Interfaces *interfaces; |
24 | Interface *interface; | 24 | Interface *interface; |
25 | 25 | ||
26 | }; | 26 | }; |
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 | |||
@@ -69,44 +69,44 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
69 | currentProfileLabel->setText(line); | 69 | currentProfileLabel->setText(line); |
70 | break; | 70 | break; |
71 | } | 71 | } |
72 | } | 72 | } |
73 | file.close(); | 73 | file.close(); |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Deconstructor. Save profiles. Delete loaded libraries. | 78 | * Deconstructor. Save profiles. Delete loaded libraries. |
79 | */ | 79 | */ |
80 | MainWindowImp::~MainWindowImp(){ | 80 | MainWindowImp::~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 |
107 | */ | 107 | */ |
108 | void MainWindowImp::loadModules(QString path){ | 108 | void MainWindowImp::loadModules(QString path){ |
109 | //qDebug(path.latin1()); | 109 | //qDebug(path.latin1()); |
110 | QDir d(path); | 110 | QDir d(path); |
111 | if(!d.exists()) | 111 | if(!d.exists()) |
112 | return; | 112 | return; |
@@ -235,36 +235,35 @@ void MainWindowImp::configureClicked(){ | |||
235 | QString currentProfile = currentProfileLabel->text(); | 235 | QString currentProfile = currentProfileLabel->text(); |
236 | if(profilesList->count() <= 1 || currentProfile == "All"){ | 236 | if(profilesList->count() <= 1 || currentProfile == "All"){ |
237 | currentProfile = ""; | 237 | currentProfile = ""; |
238 | } | 238 | } |
239 | 239 | ||
240 | Interface *i = interfaceItems[item]; | 240 | Interface *i = interfaceItems[item]; |
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 | /** |
265 | * Pull up the information about the currently selected interface. | 264 | * Pull up the information about the currently selected interface. |
266 | * Report an error if no interface is selected. | 265 | * Report an error if no interface is selected. |
267 | * If the interface has a module owner then request its configure with a empty | 266 | * If the interface has a module owner then request its configure with a empty |
268 | * tab. If tab is !NULL then append the interfaces setup widget to it. | 267 | * tab. If tab is !NULL then append the interfaces setup widget to it. |
269 | */ | 268 | */ |
270 | void MainWindowImp::informationClicked(){ | 269 | void MainWindowImp::informationClicked(){ |
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,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 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 |
9 | LIBS += -lqpe | 9 | LIBS += -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 |
11 | TARGET = networksetup | 11 | TARGET = networksetup |
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,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | #CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | CONFIG += qt warn_on debug |
4 | DESTDIR = $(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 |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | INTERFACES= wlan.ui info.ui | 10 | INTERFACES= wlan.ui info.ui |
11 | TARGET = wlanplugin | 11 | TARGET = wlanplugin |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
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 | |||
@@ -7,25 +7,25 @@ | |||
7 | /* system() */ | 7 | /* system() */ |
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qfile.h> | 9 | #include <qfile.h> |
10 | #include <qdir.h> | 10 | #include <qdir.h> |
11 | #include <qtextstream.h> | 11 | #include <qtextstream.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
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 | ||
19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ | 19 | WLANImp::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 | ||
24 | WLANImp::~WLANImp( ){ | 24 | WLANImp::~WLANImp( ){ |
25 | delete config; | 25 | delete config; |
26 | } | 26 | } |
27 | 27 | ||
28 | void WLANImp::readConfig() | 28 | void WLANImp::readConfig() |
29 | { | 29 | { |
30 | qWarning( "WLANImp::readConfig() called." ); | 30 | qWarning( "WLANImp::readConfig() called." ); |
31 | config->setGroup( "Properties" ); | 31 | config->setGroup( "Properties" ); |
@@ -92,41 +92,36 @@ bool WLANImp::writeConfig() | |||
92 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); | 92 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); |
93 | } else if( keyRadio1->isChecked() ){ | 93 | } else if( keyRadio1->isChecked() ){ |
94 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); | 94 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); |
95 | } else if( keyRadio2->isChecked() ){ | 95 | } else if( keyRadio2->isChecked() ){ |
96 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); | 96 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); |
97 | } else if( keyRadio3->isChecked() ){ | 97 | } else if( keyRadio3->isChecked() ){ |
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 | */ |
109 | void WLANImp::accept() | 110 | void WLANImp::accept() |
110 | { | 111 | { |
111 | if ( writeConfig() ) | 112 | if ( writeConfig() ) |
112 | QDialog::accept(); | 113 | QDialog::accept(); |
113 | } | 114 | } |
114 | 115 | ||
115 | void WLANImp::done ( int r ) | ||
116 | { | ||
117 | QDialog::done ( r ); | ||
118 | close ( ); | ||
119 | } | ||
120 | |||
121 | bool WLANImp::writeWirelessOpts( QString scheme ) | 116 | bool 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 ) ) |
127 | return false; | 122 | return false; |
128 | 123 | ||
129 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; | 124 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; |
130 | QFile tmpFile(tmp); | 125 | QFile tmpFile(tmp); |
131 | if ( !tmpFile.open( IO_WriteOnly ) ) | 126 | if ( !tmpFile.open( IO_WriteOnly ) ) |
132 | return false; | 127 | return false; |
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 | |||
@@ -1,28 +1,27 @@ | |||
1 | #ifndef WLANIMP_H | 1 | #ifndef WLANIMP_H |
2 | #define WLANIMP_H | 2 | #define WLANIMP_H |
3 | 3 | ||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | 7 | ||
8 | class WLANImp : public WLAN { | 8 | class WLANImp : public WLAN { |
9 | Q_OBJECT | 9 | Q_OBJECT |
10 | 10 | ||
11 | public: | 11 | public: |
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 | ||
15 | protected: | 15 | protected: |
16 | void accept(); | 16 | void accept(); |
17 | void done ( int r ); | ||
18 | 17 | ||
19 | private: | 18 | private: |
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 = "*" ); |
24 | Config* config; | 23 | Config* config; |
25 | }; | 24 | }; |
26 | 25 | ||
27 | #endif | 26 | #endif |
28 | 27 | ||
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 | |||
@@ -6,24 +6,25 @@ | |||
6 | #include <qlabel.h> | 6 | #include <qlabel.h> |
7 | #include <qprogressbar.h> | 7 | #include <qprogressbar.h> |
8 | 8 | ||
9 | /** | 9 | /** |
10 | * Constructor, find all of the possible interfaces | 10 | * Constructor, find all of the possible interfaces |
11 | */ | 11 | */ |
12 | WLANModule::WLANModule() : Module() { | 12 | WLANModule::WLANModule() : Module() { |
13 | } | 13 | } |
14 | 14 | ||
15 | /** | 15 | /** |
16 | */ | 16 | */ |
17 | WLANModule::~WLANModule(){ | 17 | WLANModule::~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 | /** |
24 | * Change the current profile | 25 | * Change the current profile |
25 | */ | 26 | */ |
26 | void WLANModule::setProfile(QString newProfile){ | 27 | void WLANModule::setProfile(QString newProfile){ |
27 | profile = newProfile; | 28 | profile = newProfile; |
28 | } | 29 | } |
29 | 30 | ||
@@ -48,25 +49,25 @@ bool WLANModule::isOwner(Interface *i){ | |||
48 | 49 | ||
49 | i->setHardwareName("802.11b"); | 50 | i->setHardwareName("802.11b"); |
50 | list.append(i); | 51 | list.append(i); |
51 | return true; | 52 | return true; |
52 | } | 53 | } |
53 | 54 | ||
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 | */ |
59 | QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ | 60 | QWidget *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 |
67 | * @param tabWidget a pointer to the tab widget that this information has. | 68 | * @param tabWidget a pointer to the tab widget that this information has. |
68 | * @return QWidget* pointer to the tab widget in this modules info. | 69 | * @return QWidget* pointer to the tab widget in this modules info. |
69 | */ | 70 | */ |
70 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | 71 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ |
71 | WExtensions we(i->getInterfaceName()); | 72 | WExtensions we(i->getInterfaceName()); |
72 | if(!we.doesHaveWirelessExtensions()) | 73 | if(!we.doesHaveWirelessExtensions()) |
@@ -79,28 +80,24 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | |||
79 | info->apLabel->setText(we.ap()); | 80 | info->apLabel->setText(we.ap()); |
80 | info->stationLabel->setText(we.station()); | 81 | info->stationLabel->setText(we.station()); |
81 | info->modeLabel->setText(we.mode()); | 82 | info->modeLabel->setText(we.mode()); |
82 | info->freqLabel->setText(QString("%1 GHz").arg(we.frequency())); | 83 | info->freqLabel->setText(QString("%1 GHz").arg(we.frequency())); |
83 | int signal = 0; | 84 | int signal = 0; |
84 | int noise = 0; | 85 | int noise = 0; |
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 |
101 | * been called by isOwner() | 98 | * been called by isOwner() |
102 | */ | 99 | */ |
103 | QList<Interface> WLANModule::getInterfaces(){ | 100 | QList<Interface> WLANModule::getInterfaces(){ |
104 | return list; | 101 | return list; |
105 | } | 102 | } |
106 | 103 | ||
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 | |||
@@ -29,25 +29,25 @@ InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interfac | |||
29 | leaseTime->hide(); | 29 | leaseTime->hide(); |
30 | leaseHoursLabel->hide(); | 30 | leaseHoursLabel->hide(); |
31 | } | 31 | } |
32 | } | 32 | } |
33 | 33 | ||
34 | /** | 34 | /** |
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 | */ |
37 | void InterfaceSetupImp::accept(){ | 37 | void 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 | */ |
48 | bool InterfaceSetupImp::saveSettings(){ | 48 | bool InterfaceSetupImp::saveSettings(){ |
49 | // eh can't really do anything about it other then return. :-D | 49 | // eh can't really do anything about it other then return. :-D |
50 | if(!interfaces->isInterfaceSet()) | 50 | if(!interfaces->isInterfaceSet()) |
51 | return true; | 51 | return true; |
52 | 52 | ||
53 | bool error = false; | 53 | bool error = false; |
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 | |||
@@ -2,25 +2,25 @@ | |||
2 | #define INTERFACESETUPIMP_H | 2 | #define INTERFACESETUPIMP_H |
3 | 3 | ||
4 | #include "interfacesetup.h" | 4 | #include "interfacesetup.h" |
5 | 5 | ||
6 | class Interface; | 6 | class Interface; |
7 | class Interfaces; | 7 | class Interfaces; |
8 | 8 | ||
9 | class InterfaceSetupImp : public InterfaceSetup { | 9 | class InterfaceSetupImp : public InterfaceSetup { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
12 | public: | 12 | public: |
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 | ||
15 | protected slots: | 15 | protected slots: |
16 | void accept(); | 16 | void accept(); |
17 | 17 | ||
18 | public slots: | 18 | public slots: |
19 | void setProfile(const QString &profile); | 19 | void setProfile(const QString &profile); |
20 | 20 | ||
21 | private: | 21 | private: |
22 | bool saveSettings(); | 22 | bool saveSettings(); |
23 | Interfaces *interfaces; | 23 | Interfaces *interfaces; |
24 | Interface *interface; | 24 | Interface *interface; |
25 | 25 | ||
26 | }; | 26 | }; |
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 | |||
@@ -69,44 +69,44 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
69 | currentProfileLabel->setText(line); | 69 | currentProfileLabel->setText(line); |
70 | break; | 70 | break; |
71 | } | 71 | } |
72 | } | 72 | } |
73 | file.close(); | 73 | file.close(); |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Deconstructor. Save profiles. Delete loaded libraries. | 78 | * Deconstructor. Save profiles. Delete loaded libraries. |
79 | */ | 79 | */ |
80 | MainWindowImp::~MainWindowImp(){ | 80 | MainWindowImp::~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 |
107 | */ | 107 | */ |
108 | void MainWindowImp::loadModules(QString path){ | 108 | void MainWindowImp::loadModules(QString path){ |
109 | //qDebug(path.latin1()); | 109 | //qDebug(path.latin1()); |
110 | QDir d(path); | 110 | QDir d(path); |
111 | if(!d.exists()) | 111 | if(!d.exists()) |
112 | return; | 112 | return; |
@@ -235,36 +235,35 @@ void MainWindowImp::configureClicked(){ | |||
235 | QString currentProfile = currentProfileLabel->text(); | 235 | QString currentProfile = currentProfileLabel->text(); |
236 | if(profilesList->count() <= 1 || currentProfile == "All"){ | 236 | if(profilesList->count() <= 1 || currentProfile == "All"){ |
237 | currentProfile = ""; | 237 | currentProfile = ""; |
238 | } | 238 | } |
239 | 239 | ||
240 | Interface *i = interfaceItems[item]; | 240 | Interface *i = interfaceItems[item]; |
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 | /** |
265 | * Pull up the information about the currently selected interface. | 264 | * Pull up the information about the currently selected interface. |
266 | * Report an error if no interface is selected. | 265 | * Report an error if no interface is selected. |
267 | * If the interface has a module owner then request its configure with a empty | 266 | * If the interface has a module owner then request its configure with a empty |
268 | * tab. If tab is !NULL then append the interfaces setup widget to it. | 267 | * tab. If tab is !NULL then append the interfaces setup widget to it. |
269 | */ | 268 | */ |
270 | void MainWindowImp::informationClicked(){ | 269 | void MainWindowImp::informationClicked(){ |
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,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 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 |
9 | LIBS += -lqpe | 9 | LIBS += -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 |
11 | TARGET = networksetup | 11 | TARGET = networksetup |
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,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | #CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | CONFIG += qt warn_on debug |
4 | DESTDIR = $(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 |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | INTERFACES= wlan.ui info.ui | 10 | INTERFACES= wlan.ui info.ui |
11 | TARGET = wlanplugin | 11 | TARGET = wlanplugin |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
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 | |||
@@ -7,25 +7,25 @@ | |||
7 | /* system() */ | 7 | /* system() */ |
8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
9 | #include <qfile.h> | 9 | #include <qfile.h> |
10 | #include <qdir.h> | 10 | #include <qdir.h> |
11 | #include <qtextstream.h> | 11 | #include <qtextstream.h> |
12 | #include <qmessagebox.h> | 12 | #include <qmessagebox.h> |
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 | ||
19 | WLANImp::WLANImp( QWidget* parent, const char* name):WLAN(parent, name, Qt::WDestructiveClose){ | 19 | WLANImp::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 | ||
24 | WLANImp::~WLANImp( ){ | 24 | WLANImp::~WLANImp( ){ |
25 | delete config; | 25 | delete config; |
26 | } | 26 | } |
27 | 27 | ||
28 | void WLANImp::readConfig() | 28 | void WLANImp::readConfig() |
29 | { | 29 | { |
30 | qWarning( "WLANImp::readConfig() called." ); | 30 | qWarning( "WLANImp::readConfig() called." ); |
31 | config->setGroup( "Properties" ); | 31 | config->setGroup( "Properties" ); |
@@ -92,41 +92,36 @@ bool WLANImp::writeConfig() | |||
92 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); | 92 | config->writeEntry( "dot11WEPDefaultKeyID", 0 ); |
93 | } else if( keyRadio1->isChecked() ){ | 93 | } else if( keyRadio1->isChecked() ){ |
94 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); | 94 | config->writeEntry( "dot11WEPDefaultKeyID", 1 ); |
95 | } else if( keyRadio2->isChecked() ){ | 95 | } else if( keyRadio2->isChecked() ){ |
96 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); | 96 | config->writeEntry( "dot11WEPDefaultKeyID", 2 ); |
97 | } else if( keyRadio3->isChecked() ){ | 97 | } else if( keyRadio3->isChecked() ){ |
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 | */ |
109 | void WLANImp::accept() | 110 | void WLANImp::accept() |
110 | { | 111 | { |
111 | if ( writeConfig() ) | 112 | if ( writeConfig() ) |
112 | QDialog::accept(); | 113 | QDialog::accept(); |
113 | } | 114 | } |
114 | 115 | ||
115 | void WLANImp::done ( int r ) | ||
116 | { | ||
117 | QDialog::done ( r ); | ||
118 | close ( ); | ||
119 | } | ||
120 | |||
121 | bool WLANImp::writeWirelessOpts( QString scheme ) | 116 | bool 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 ) ) |
127 | return false; | 122 | return false; |
128 | 123 | ||
129 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; | 124 | QString tmp = "/etc/pcmcia/wireless.opts-qpe-new"; |
130 | QFile tmpFile(tmp); | 125 | QFile tmpFile(tmp); |
131 | if ( !tmpFile.open( IO_WriteOnly ) ) | 126 | if ( !tmpFile.open( IO_WriteOnly ) ) |
132 | return false; | 127 | return false; |
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 | |||
@@ -1,28 +1,27 @@ | |||
1 | #ifndef WLANIMP_H | 1 | #ifndef WLANIMP_H |
2 | #define WLANIMP_H | 2 | #define WLANIMP_H |
3 | 3 | ||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | 5 | ||
6 | #include <qpe/config.h> | 6 | #include <qpe/config.h> |
7 | 7 | ||
8 | class WLANImp : public WLAN { | 8 | class WLANImp : public WLAN { |
9 | Q_OBJECT | 9 | Q_OBJECT |
10 | 10 | ||
11 | public: | 11 | public: |
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 | ||
15 | protected: | 15 | protected: |
16 | void accept(); | 16 | void accept(); |
17 | void done ( int r ); | ||
18 | 17 | ||
19 | private: | 18 | private: |
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 = "*" ); |
24 | Config* config; | 23 | Config* config; |
25 | }; | 24 | }; |
26 | 25 | ||
27 | #endif | 26 | #endif |
28 | 27 | ||
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 | |||
@@ -6,24 +6,25 @@ | |||
6 | #include <qlabel.h> | 6 | #include <qlabel.h> |
7 | #include <qprogressbar.h> | 7 | #include <qprogressbar.h> |
8 | 8 | ||
9 | /** | 9 | /** |
10 | * Constructor, find all of the possible interfaces | 10 | * Constructor, find all of the possible interfaces |
11 | */ | 11 | */ |
12 | WLANModule::WLANModule() : Module() { | 12 | WLANModule::WLANModule() : Module() { |
13 | } | 13 | } |
14 | 14 | ||
15 | /** | 15 | /** |
16 | */ | 16 | */ |
17 | WLANModule::~WLANModule(){ | 17 | WLANModule::~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 | /** |
24 | * Change the current profile | 25 | * Change the current profile |
25 | */ | 26 | */ |
26 | void WLANModule::setProfile(QString newProfile){ | 27 | void WLANModule::setProfile(QString newProfile){ |
27 | profile = newProfile; | 28 | profile = newProfile; |
28 | } | 29 | } |
29 | 30 | ||
@@ -48,25 +49,25 @@ bool WLANModule::isOwner(Interface *i){ | |||
48 | 49 | ||
49 | i->setHardwareName("802.11b"); | 50 | i->setHardwareName("802.11b"); |
50 | list.append(i); | 51 | list.append(i); |
51 | return true; | 52 | return true; |
52 | } | 53 | } |
53 | 54 | ||
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 | */ |
59 | QWidget *WLANModule::configure(Interface *, QTabWidget **tabWidget){ | 60 | QWidget *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 |
67 | * @param tabWidget a pointer to the tab widget that this information has. | 68 | * @param tabWidget a pointer to the tab widget that this information has. |
68 | * @return QWidget* pointer to the tab widget in this modules info. | 69 | * @return QWidget* pointer to the tab widget in this modules info. |
69 | */ | 70 | */ |
70 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | 71 | QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ |
71 | WExtensions we(i->getInterfaceName()); | 72 | WExtensions we(i->getInterfaceName()); |
72 | if(!we.doesHaveWirelessExtensions()) | 73 | if(!we.doesHaveWirelessExtensions()) |
@@ -79,28 +80,24 @@ QWidget *WLANModule::information(Interface *i, QTabWidget **tabWidget){ | |||
79 | info->apLabel->setText(we.ap()); | 80 | info->apLabel->setText(we.ap()); |
80 | info->stationLabel->setText(we.station()); | 81 | info->stationLabel->setText(we.station()); |
81 | info->modeLabel->setText(we.mode()); | 82 | info->modeLabel->setText(we.mode()); |
82 | info->freqLabel->setText(QString("%1 GHz").arg(we.frequency())); | 83 | info->freqLabel->setText(QString("%1 GHz").arg(we.frequency())); |
83 | int signal = 0; | 84 | int signal = 0; |
84 | int noise = 0; | 85 | int noise = 0; |
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 |
101 | * been called by isOwner() | 98 | * been called by isOwner() |
102 | */ | 99 | */ |
103 | QList<Interface> WLANModule::getInterfaces(){ | 100 | QList<Interface> WLANModule::getInterfaces(){ |
104 | return list; | 101 | return list; |
105 | } | 102 | } |
106 | 103 | ||