-rw-r--r-- | noncore/net/networksetup/wlan/wlan.ui | 20 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.ui | 20 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 1 |
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 | |||
@@ -53,7 +53,7 @@ | |||
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"> |
@@ -72,7 +72,7 @@ | |||
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>&Specify Access Point</string> |
76 | </property> | 76 | </property> |
77 | </widget> | 77 | </widget> |
78 | <widget> | 78 | <widget> |
@@ -87,7 +87,7 @@ | |||
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 &Access Point Settings</string> |
91 | </property> | 91 | </property> |
92 | <grid> | 92 | <grid> |
93 | <property stdset="1"> | 93 | <property stdset="1"> |
@@ -113,7 +113,7 @@ | |||
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> |
@@ -234,7 +234,7 @@ | |||
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"> |
@@ -253,7 +253,7 @@ | |||
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>&Enable WEP</string> |
257 | </property> | 257 | </property> |
258 | </widget> | 258 | </widget> |
259 | <widget> | 259 | <widget> |
@@ -268,7 +268,7 @@ | |||
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>&Authentication Type</string> |
272 | </property> | 272 | </property> |
273 | <hbox> | 273 | <hbox> |
274 | <property stdset="1"> | 274 | <property stdset="1"> |
@@ -287,7 +287,7 @@ | |||
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>&Open System</string> |
291 | </property> | 291 | </property> |
292 | <property stdset="1"> | 292 | <property stdset="1"> |
293 | <name>checked</name> | 293 | <name>checked</name> |
@@ -302,7 +302,7 @@ | |||
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>&Shared Key</string> |
306 | </property> | 306 | </property> |
307 | </widget> | 307 | </widget> |
308 | </hbox> | 308 | </hbox> |
@@ -319,7 +319,7 @@ | |||
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>&Key Setting</string> |
323 | </property> | 323 | </property> |
324 | <grid> | 324 | <grid> |
325 | <property stdset="1"> | 325 | <property stdset="1"> |
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 | |||
@@ -224,7 +224,6 @@ void WLANImp::accept(){ | |||
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() ) |
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 | |||
@@ -53,7 +53,7 @@ | |||
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"> |
@@ -72,7 +72,7 @@ | |||
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>&Specify Access Point</string> |
76 | </property> | 76 | </property> |
77 | </widget> | 77 | </widget> |
78 | <widget> | 78 | <widget> |
@@ -87,7 +87,7 @@ | |||
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 &Access Point Settings</string> |
91 | </property> | 91 | </property> |
92 | <grid> | 92 | <grid> |
93 | <property stdset="1"> | 93 | <property stdset="1"> |
@@ -113,7 +113,7 @@ | |||
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> |
@@ -234,7 +234,7 @@ | |||
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"> |
@@ -253,7 +253,7 @@ | |||
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>&Enable WEP</string> |
257 | </property> | 257 | </property> |
258 | </widget> | 258 | </widget> |
259 | <widget> | 259 | <widget> |
@@ -268,7 +268,7 @@ | |||
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>&Authentication Type</string> |
272 | </property> | 272 | </property> |
273 | <hbox> | 273 | <hbox> |
274 | <property stdset="1"> | 274 | <property stdset="1"> |
@@ -287,7 +287,7 @@ | |||
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>&Open System</string> |
291 | </property> | 291 | </property> |
292 | <property stdset="1"> | 292 | <property stdset="1"> |
293 | <name>checked</name> | 293 | <name>checked</name> |
@@ -302,7 +302,7 @@ | |||
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>&Shared Key</string> |
306 | </property> | 306 | </property> |
307 | </widget> | 307 | </widget> |
308 | </hbox> | 308 | </hbox> |
@@ -319,7 +319,7 @@ | |||
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>&Key Setting</string> |
323 | </property> | 323 | </property> |
324 | <grid> | 324 | <grid> |
325 | <property stdset="1"> | 325 | <property stdset="1"> |
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 | |||
@@ -224,7 +224,6 @@ void WLANImp::accept(){ | |||
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() ) |