summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-12-11 22:15:16 (UTC)
committer benmeyer <benmeyer>2002-12-11 22:15:16 (UTC)
commit2217f9ba852aa2ffd36e5398988d9b1c65b18705 (patch) (unidiff)
tree071d5881f45f012720cd212028bd1a6a9455fd9c
parent6523ee46d49203d11f34a3dbbf966a318cef7def (diff)
downloadopie-2217f9ba852aa2ffd36e5398988d9b1c65b18705.zip
opie-2217f9ba852aa2ffd36e5398988d9b1c65b18705.tar.gz
opie-2217f9ba852aa2ffd36e5398988d9b1c65b18705.tar.bz2
Key accell
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
@@ -52,9 +52,9 @@
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>
@@ -71,9 +71,9 @@
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>
@@ -86,9 +86,9 @@
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>
@@ -112,9 +112,9 @@
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>
@@ -233,9 +233,9 @@
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>
@@ -252,9 +252,9 @@
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>
@@ -267,9 +267,9 @@
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>
@@ -286,9 +286,9 @@
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>
@@ -301,9 +301,9 @@
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>
@@ -318,9 +318,9 @@
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>
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
@@ -223,9 +223,8 @@ void WLANImp::accept(){
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";
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
@@ -52,9 +52,9 @@
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>
@@ -71,9 +71,9 @@
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>
@@ -86,9 +86,9 @@
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>
@@ -112,9 +112,9 @@
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>
@@ -233,9 +233,9 @@
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>
@@ -252,9 +252,9 @@
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>
@@ -267,9 +267,9 @@
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>
@@ -286,9 +286,9 @@
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>
@@ -301,9 +301,9 @@
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>
@@ -318,9 +318,9 @@
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>
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
@@ -223,9 +223,8 @@ void WLANImp::accept(){
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";