summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlan.ui20
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp1
-rw-r--r--noncore/settings/networksettings/wlan/wlan.ui20
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp1
4 files changed, 20 insertions, 22 deletions
diff --git a/noncore/net/networksetup/wlan/wlan.ui b/noncore/net/networksetup/wlan/wlan.ui
index 09593b3..744c559 100644
--- a/noncore/net/networksetup/wlan/wlan.ui
+++ b/noncore/net/networksetup/wlan/wlan.ui
@@ -48,17 +48,17 @@
48 <widget> 48 <widget>
49 <class>QWidget</class> 49 <class>QWidget</class>
50 <property stdset="1"> 50 <property stdset="1">
51 <name>name</name> 51 <name>name</name>
52 <cstring>ConfigPage</cstring> 52 <cstring>ConfigPage</cstring>
53 </property> 53 </property>
54 <attribute> 54 <attribute>
55 <name>title</name> 55 <name>title</name>
56 <string>WLAN General</string> 56 <string>General</string>
57 </attribute> 57 </attribute>
58 <vbox> 58 <vbox>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>margin</name> 60 <name>margin</name>
61 <number>11</number> 61 <number>11</number>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>spacing</name> 64 <name>spacing</name>
@@ -67,32 +67,32 @@
67 <widget> 67 <widget>
68 <class>QCheckBox</class> 68 <class>QCheckBox</class>
69 <property stdset="1"> 69 <property stdset="1">
70 <name>name</name> 70 <name>name</name>
71 <cstring>essAny</cstring> 71 <cstring>essAny</cstring>
72 </property> 72 </property>
73 <property stdset="1"> 73 <property stdset="1">
74 <name>text</name> 74 <name>text</name>
75 <string>Sepecify Access Point</string> 75 <string>&amp;Specify Access Point</string>
76 </property> 76 </property>
77 </widget> 77 </widget>
78 <widget> 78 <widget>
79 <class>QGroupBox</class> 79 <class>QGroupBox</class>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>name</name> 81 <name>name</name>
82 <cstring>GroupBox1</cstring> 82 <cstring>GroupBox1</cstring>
83 </property> 83 </property>
84 <property stdset="1"> 84 <property stdset="1">
85 <name>enabled</name> 85 <name>enabled</name>
86 <bool>false</bool> 86 <bool>false</bool>
87 </property> 87 </property>
88 <property stdset="1"> 88 <property stdset="1">
89 <name>title</name> 89 <name>title</name>
90 <string>Settings</string> 90 <string>Specific &amp;Access Point Settings</string>
91 </property> 91 </property>
92 <grid> 92 <grid>
93 <property stdset="1"> 93 <property stdset="1">
94 <name>margin</name> 94 <name>margin</name>
95 <number>11</number> 95 <number>11</number>
96 </property> 96 </property>
97 <property stdset="1"> 97 <property stdset="1">
98 <name>spacing</name> 98 <name>spacing</name>
@@ -108,17 +108,17 @@
108 <name>text</name> 108 <name>text</name>
109 <string>ESS-ID</string> 109 <string>ESS-ID</string>
110 </property> 110 </property>
111 </widget> 111 </widget>
112 <widget row="1" column="0" > 112 <widget row="1" column="0" >
113 <class>QLabel</class> 113 <class>QLabel</class>
114 <property stdset="1"> 114 <property stdset="1">
115 <name>name</name> 115 <name>name</name>
116 <cstring>TextLabel2_2</cstring> 116 <cstring>TextLabel2</cstring>
117 </property> 117 </property>
118 <property stdset="1"> 118 <property stdset="1">
119 <name>text</name> 119 <name>text</name>
120 <string>Network Type</string> 120 <string>Network Type</string>
121 </property> 121 </property>
122 </widget> 122 </widget>
123 <widget row="0" column="1" rowspan="1" colspan="2" > 123 <widget row="0" column="1" rowspan="1" colspan="2" >
124 <class>QLineEdit</class> 124 <class>QLineEdit</class>
@@ -229,17 +229,17 @@
229 <widget> 229 <widget>
230 <class>QWidget</class> 230 <class>QWidget</class>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>name</name> 232 <name>name</name>
233 <cstring>WepPage</cstring> 233 <cstring>WepPage</cstring>
234 </property> 234 </property>
235 <attribute> 235 <attribute>
236 <name>title</name> 236 <name>title</name>
237 <string>Wep</string> 237 <string>Encryption</string>
238 </attribute> 238 </attribute>
239 <vbox> 239 <vbox>
240 <property stdset="1"> 240 <property stdset="1">
241 <name>margin</name> 241 <name>margin</name>
242 <number>11</number> 242 <number>11</number>
243 </property> 243 </property>
244 <property stdset="1"> 244 <property stdset="1">
245 <name>spacing</name> 245 <name>spacing</name>
@@ -248,32 +248,32 @@
248 <widget> 248 <widget>
249 <class>QCheckBox</class> 249 <class>QCheckBox</class>
250 <property stdset="1"> 250 <property stdset="1">
251 <name>name</name> 251 <name>name</name>
252 <cstring>wepEnabled</cstring> 252 <cstring>wepEnabled</cstring>
253 </property> 253 </property>
254 <property stdset="1"> 254 <property stdset="1">
255 <name>text</name> 255 <name>text</name>
256 <string>Enable Wep</string> 256 <string>&amp;Enable WEP</string>
257 </property> 257 </property>
258 </widget> 258 </widget>
259 <widget> 259 <widget>
260 <class>QButtonGroup</class> 260 <class>QButtonGroup</class>
261 <property stdset="1"> 261 <property stdset="1">
262 <name>name</name> 262 <name>name</name>
263 <cstring>ButtonGroup43</cstring> 263 <cstring>ButtonGroup43</cstring>
264 </property> 264 </property>
265 <property stdset="1"> 265 <property stdset="1">
266 <name>enabled</name> 266 <name>enabled</name>
267 <bool>false</bool> 267 <bool>false</bool>
268 </property> 268 </property>
269 <property stdset="1"> 269 <property stdset="1">
270 <name>title</name> 270 <name>title</name>
271 <string>Authentication Type</string> 271 <string>&amp;Authentication Type</string>
272 </property> 272 </property>
273 <hbox> 273 <hbox>
274 <property stdset="1"> 274 <property stdset="1">
275 <name>margin</name> 275 <name>margin</name>
276 <number>11</number> 276 <number>11</number>
277 </property> 277 </property>
278 <property stdset="1"> 278 <property stdset="1">
279 <name>spacing</name> 279 <name>spacing</name>
@@ -282,49 +282,49 @@
282 <widget> 282 <widget>
283 <class>QRadioButton</class> 283 <class>QRadioButton</class>
284 <property stdset="1"> 284 <property stdset="1">
285 <name>name</name> 285 <name>name</name>
286 <cstring>authOpen</cstring> 286 <cstring>authOpen</cstring>
287 </property> 287 </property>
288 <property stdset="1"> 288 <property stdset="1">
289 <name>text</name> 289 <name>text</name>
290 <string>Open System</string> 290 <string>&amp;Open System</string>
291 </property> 291 </property>
292 <property stdset="1"> 292 <property stdset="1">
293 <name>checked</name> 293 <name>checked</name>
294 <bool>true</bool> 294 <bool>true</bool>
295 </property> 295 </property>
296 </widget> 296 </widget>
297 <widget> 297 <widget>
298 <class>QRadioButton</class> 298 <class>QRadioButton</class>
299 <property stdset="1"> 299 <property stdset="1">
300 <name>name</name> 300 <name>name</name>
301 <cstring>authShared</cstring> 301 <cstring>authShared</cstring>
302 </property> 302 </property>
303 <property stdset="1"> 303 <property stdset="1">
304 <name>text</name> 304 <name>text</name>
305 <string>Shared Key</string> 305 <string>&amp;Shared Key</string>
306 </property> 306 </property>
307 </widget> 307 </widget>
308 </hbox> 308 </hbox>
309 </widget> 309 </widget>
310 <widget> 310 <widget>
311 <class>QButtonGroup</class> 311 <class>QButtonGroup</class>
312 <property stdset="1"> 312 <property stdset="1">
313 <name>name</name> 313 <name>name</name>
314 <cstring>KeyButtonGroup</cstring> 314 <cstring>KeyButtonGroup</cstring>
315 </property> 315 </property>
316 <property stdset="1"> 316 <property stdset="1">
317 <name>enabled</name> 317 <name>enabled</name>
318 <bool>false</bool> 318 <bool>false</bool>
319 </property> 319 </property>
320 <property stdset="1"> 320 <property stdset="1">
321 <name>title</name> 321 <name>title</name>
322 <string>Key Setting</string> 322 <string>&amp;Key Setting</string>
323 </property> 323 </property>
324 <grid> 324 <grid>
325 <property stdset="1"> 325 <property stdset="1">
326 <name>margin</name> 326 <name>margin</name>
327 <number>11</number> 327 <number>11</number>
328 </property> 328 </property>
329 <property stdset="1"> 329 <property stdset="1">
330 <name>spacing</name> 330 <name>spacing</name>
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index ef7329e..120d4e5 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -219,17 +219,16 @@ void WLANImp::accept(){
219 219
220 // Ok settings are good here, save 220 // Ok settings are good here, save
221 changeAndSaveSettingFile(); 221 changeAndSaveSettingFile();
222 222
223 // Try to save the interfaces settings. 223 // Try to save the interfaces settings.
224 if(!interfaceSetup->saveChanges()) 224 if(!interfaceSetup->saveChanges())
225 return; 225 return;
226 226
227 return;
228 // Restart the device now that the settings have changed 227 // Restart the device now that the settings have changed
229 QString initpath; 228 QString initpath;
230 if( QDir("/etc/rc.d/init.d").exists() ) 229 if( QDir("/etc/rc.d/init.d").exists() )
231 initpath = "/etc/rc.d/init.d"; 230 initpath = "/etc/rc.d/init.d";
232 else if( QDir("/etc/init.d").exists() ) 231 else if( QDir("/etc/init.d").exists() )
233 initpath = "/etc/init.d"; 232 initpath = "/etc/init.d";
234 if( initpath ) 233 if( initpath )
235 system(QString("%1/pcmcia stop").arg(initpath)); 234 system(QString("%1/pcmcia stop").arg(initpath));
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui
index 09593b3..744c559 100644
--- a/noncore/settings/networksettings/wlan/wlan.ui
+++ b/noncore/settings/networksettings/wlan/wlan.ui
@@ -48,17 +48,17 @@
48 <widget> 48 <widget>
49 <class>QWidget</class> 49 <class>QWidget</class>
50 <property stdset="1"> 50 <property stdset="1">
51 <name>name</name> 51 <name>name</name>
52 <cstring>ConfigPage</cstring> 52 <cstring>ConfigPage</cstring>
53 </property> 53 </property>
54 <attribute> 54 <attribute>
55 <name>title</name> 55 <name>title</name>
56 <string>WLAN General</string> 56 <string>General</string>
57 </attribute> 57 </attribute>
58 <vbox> 58 <vbox>
59 <property stdset="1"> 59 <property stdset="1">
60 <name>margin</name> 60 <name>margin</name>
61 <number>11</number> 61 <number>11</number>
62 </property> 62 </property>
63 <property stdset="1"> 63 <property stdset="1">
64 <name>spacing</name> 64 <name>spacing</name>
@@ -67,32 +67,32 @@
67 <widget> 67 <widget>
68 <class>QCheckBox</class> 68 <class>QCheckBox</class>
69 <property stdset="1"> 69 <property stdset="1">
70 <name>name</name> 70 <name>name</name>
71 <cstring>essAny</cstring> 71 <cstring>essAny</cstring>
72 </property> 72 </property>
73 <property stdset="1"> 73 <property stdset="1">
74 <name>text</name> 74 <name>text</name>
75 <string>Sepecify Access Point</string> 75 <string>&amp;Specify Access Point</string>
76 </property> 76 </property>
77 </widget> 77 </widget>
78 <widget> 78 <widget>
79 <class>QGroupBox</class> 79 <class>QGroupBox</class>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>name</name> 81 <name>name</name>
82 <cstring>GroupBox1</cstring> 82 <cstring>GroupBox1</cstring>
83 </property> 83 </property>
84 <property stdset="1"> 84 <property stdset="1">
85 <name>enabled</name> 85 <name>enabled</name>
86 <bool>false</bool> 86 <bool>false</bool>
87 </property> 87 </property>
88 <property stdset="1"> 88 <property stdset="1">
89 <name>title</name> 89 <name>title</name>
90 <string>Settings</string> 90 <string>Specific &amp;Access Point Settings</string>
91 </property> 91 </property>
92 <grid> 92 <grid>
93 <property stdset="1"> 93 <property stdset="1">
94 <name>margin</name> 94 <name>margin</name>
95 <number>11</number> 95 <number>11</number>
96 </property> 96 </property>
97 <property stdset="1"> 97 <property stdset="1">
98 <name>spacing</name> 98 <name>spacing</name>
@@ -108,17 +108,17 @@
108 <name>text</name> 108 <name>text</name>
109 <string>ESS-ID</string> 109 <string>ESS-ID</string>
110 </property> 110 </property>
111 </widget> 111 </widget>
112 <widget row="1" column="0" > 112 <widget row="1" column="0" >
113 <class>QLabel</class> 113 <class>QLabel</class>
114 <property stdset="1"> 114 <property stdset="1">
115 <name>name</name> 115 <name>name</name>
116 <cstring>TextLabel2_2</cstring> 116 <cstring>TextLabel2</cstring>
117 </property> 117 </property>
118 <property stdset="1"> 118 <property stdset="1">
119 <name>text</name> 119 <name>text</name>
120 <string>Network Type</string> 120 <string>Network Type</string>
121 </property> 121 </property>
122 </widget> 122 </widget>
123 <widget row="0" column="1" rowspan="1" colspan="2" > 123 <widget row="0" column="1" rowspan="1" colspan="2" >
124 <class>QLineEdit</class> 124 <class>QLineEdit</class>
@@ -229,17 +229,17 @@
229 <widget> 229 <widget>
230 <class>QWidget</class> 230 <class>QWidget</class>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>name</name> 232 <name>name</name>
233 <cstring>WepPage</cstring> 233 <cstring>WepPage</cstring>
234 </property> 234 </property>
235 <attribute> 235 <attribute>
236 <name>title</name> 236 <name>title</name>
237 <string>Wep</string> 237 <string>Encryption</string>
238 </attribute> 238 </attribute>
239 <vbox> 239 <vbox>
240 <property stdset="1"> 240 <property stdset="1">
241 <name>margin</name> 241 <name>margin</name>
242 <number>11</number> 242 <number>11</number>
243 </property> 243 </property>
244 <property stdset="1"> 244 <property stdset="1">
245 <name>spacing</name> 245 <name>spacing</name>
@@ -248,32 +248,32 @@
248 <widget> 248 <widget>
249 <class>QCheckBox</class> 249 <class>QCheckBox</class>
250 <property stdset="1"> 250 <property stdset="1">
251 <name>name</name> 251 <name>name</name>
252 <cstring>wepEnabled</cstring> 252 <cstring>wepEnabled</cstring>
253 </property> 253 </property>
254 <property stdset="1"> 254 <property stdset="1">
255 <name>text</name> 255 <name>text</name>
256 <string>Enable Wep</string> 256 <string>&amp;Enable WEP</string>
257 </property> 257 </property>
258 </widget> 258 </widget>
259 <widget> 259 <widget>
260 <class>QButtonGroup</class> 260 <class>QButtonGroup</class>
261 <property stdset="1"> 261 <property stdset="1">
262 <name>name</name> 262 <name>name</name>
263 <cstring>ButtonGroup43</cstring> 263 <cstring>ButtonGroup43</cstring>
264 </property> 264 </property>
265 <property stdset="1"> 265 <property stdset="1">
266 <name>enabled</name> 266 <name>enabled</name>
267 <bool>false</bool> 267 <bool>false</bool>
268 </property> 268 </property>
269 <property stdset="1"> 269 <property stdset="1">
270 <name>title</name> 270 <name>title</name>
271 <string>Authentication Type</string> 271 <string>&amp;Authentication Type</string>
272 </property> 272 </property>
273 <hbox> 273 <hbox>
274 <property stdset="1"> 274 <property stdset="1">
275 <name>margin</name> 275 <name>margin</name>
276 <number>11</number> 276 <number>11</number>
277 </property> 277 </property>
278 <property stdset="1"> 278 <property stdset="1">
279 <name>spacing</name> 279 <name>spacing</name>
@@ -282,49 +282,49 @@
282 <widget> 282 <widget>
283 <class>QRadioButton</class> 283 <class>QRadioButton</class>
284 <property stdset="1"> 284 <property stdset="1">
285 <name>name</name> 285 <name>name</name>
286 <cstring>authOpen</cstring> 286 <cstring>authOpen</cstring>
287 </property> 287 </property>
288 <property stdset="1"> 288 <property stdset="1">
289 <name>text</name> 289 <name>text</name>
290 <string>Open System</string> 290 <string>&amp;Open System</string>
291 </property> 291 </property>
292 <property stdset="1"> 292 <property stdset="1">
293 <name>checked</name> 293 <name>checked</name>
294 <bool>true</bool> 294 <bool>true</bool>
295 </property> 295 </property>
296 </widget> 296 </widget>
297 <widget> 297 <widget>
298 <class>QRadioButton</class> 298 <class>QRadioButton</class>
299 <property stdset="1"> 299 <property stdset="1">
300 <name>name</name> 300 <name>name</name>
301 <cstring>authShared</cstring> 301 <cstring>authShared</cstring>
302 </property> 302 </property>
303 <property stdset="1"> 303 <property stdset="1">
304 <name>text</name> 304 <name>text</name>
305 <string>Shared Key</string> 305 <string>&amp;Shared Key</string>
306 </property> 306 </property>
307 </widget> 307 </widget>
308 </hbox> 308 </hbox>
309 </widget> 309 </widget>
310 <widget> 310 <widget>
311 <class>QButtonGroup</class> 311 <class>QButtonGroup</class>
312 <property stdset="1"> 312 <property stdset="1">
313 <name>name</name> 313 <name>name</name>
314 <cstring>KeyButtonGroup</cstring> 314 <cstring>KeyButtonGroup</cstring>
315 </property> 315 </property>
316 <property stdset="1"> 316 <property stdset="1">
317 <name>enabled</name> 317 <name>enabled</name>
318 <bool>false</bool> 318 <bool>false</bool>
319 </property> 319 </property>
320 <property stdset="1"> 320 <property stdset="1">
321 <name>title</name> 321 <name>title</name>
322 <string>Key Setting</string> 322 <string>&amp;Key Setting</string>
323 </property> 323 </property>
324 <grid> 324 <grid>
325 <property stdset="1"> 325 <property stdset="1">
326 <name>margin</name> 326 <name>margin</name>
327 <number>11</number> 327 <number>11</number>
328 </property> 328 </property>
329 <property stdset="1"> 329 <property stdset="1">
330 <name>spacing</name> 330 <name>spacing</name>
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index ef7329e..120d4e5 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -219,17 +219,16 @@ void WLANImp::accept(){
219 219
220 // Ok settings are good here, save 220 // Ok settings are good here, save
221 changeAndSaveSettingFile(); 221 changeAndSaveSettingFile();
222 222
223 // Try to save the interfaces settings. 223 // Try to save the interfaces settings.
224 if(!interfaceSetup->saveChanges()) 224 if(!interfaceSetup->saveChanges())
225 return; 225 return;
226 226
227 return;
228 // Restart the device now that the settings have changed 227 // Restart the device now that the settings have changed
229 QString initpath; 228 QString initpath;
230 if( QDir("/etc/rc.d/init.d").exists() ) 229 if( QDir("/etc/rc.d/init.d").exists() )
231 initpath = "/etc/rc.d/init.d"; 230 initpath = "/etc/rc.d/init.d";
232 else if( QDir("/etc/init.d").exists() ) 231 else if( QDir("/etc/init.d").exists() )
233 initpath = "/etc/init.d"; 232 initpath = "/etc/init.d";
234 if( initpath ) 233 if( initpath )
235 system(QString("%1/pcmcia stop").arg(initpath)); 234 system(QString("%1/pcmcia stop").arg(initpath));