summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
<cstring>ConfigPage</cstring>
</property>
<attribute>
<name>title</name>
- <string>WLAN General</string>
+ <string>General</string>
</attribute>
<vbox>
<property stdset="1">
<name>margin</name>
@@ -71,9 +71,9 @@
<cstring>essAny</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Sepecify Access Point</string>
+ <string>&amp;Specify Access Point</string>
</property>
</widget>
<widget>
<class>QGroupBox</class>
@@ -86,9 +86,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Settings</string>
+ <string>Specific &amp;Access Point Settings</string>
</property>
<grid>
<property stdset="1">
<name>margin</name>
@@ -112,9 +112,9 @@
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_2</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Network Type</string>
@@ -233,9 +233,9 @@
<cstring>WepPage</cstring>
</property>
<attribute>
<name>title</name>
- <string>Wep</string>
+ <string>Encryption</string>
</attribute>
<vbox>
<property stdset="1">
<name>margin</name>
@@ -252,9 +252,9 @@
<cstring>wepEnabled</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Enable Wep</string>
+ <string>&amp;Enable WEP</string>
</property>
</widget>
<widget>
<class>QButtonGroup</class>
@@ -267,9 +267,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Authentication Type</string>
+ <string>&amp;Authentication Type</string>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
@@ -286,9 +286,9 @@
<cstring>authOpen</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Open System</string>
+ <string>&amp;Open System</string>
</property>
<property stdset="1">
<name>checked</name>
<bool>true</bool>
@@ -301,9 +301,9 @@
<cstring>authShared</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Shared Key</string>
+ <string>&amp;Shared Key</string>
</property>
</widget>
</hbox>
</widget>
@@ -318,9 +318,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Key Setting</string>
+ <string>&amp;Key Setting</string>
</property>
<grid>
<property stdset="1">
<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(){
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
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 @@
<cstring>ConfigPage</cstring>
</property>
<attribute>
<name>title</name>
- <string>WLAN General</string>
+ <string>General</string>
</attribute>
<vbox>
<property stdset="1">
<name>margin</name>
@@ -71,9 +71,9 @@
<cstring>essAny</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Sepecify Access Point</string>
+ <string>&amp;Specify Access Point</string>
</property>
</widget>
<widget>
<class>QGroupBox</class>
@@ -86,9 +86,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Settings</string>
+ <string>Specific &amp;Access Point Settings</string>
</property>
<grid>
<property stdset="1">
<name>margin</name>
@@ -112,9 +112,9 @@
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel2_2</cstring>
+ <cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Network Type</string>
@@ -233,9 +233,9 @@
<cstring>WepPage</cstring>
</property>
<attribute>
<name>title</name>
- <string>Wep</string>
+ <string>Encryption</string>
</attribute>
<vbox>
<property stdset="1">
<name>margin</name>
@@ -252,9 +252,9 @@
<cstring>wepEnabled</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Enable Wep</string>
+ <string>&amp;Enable WEP</string>
</property>
</widget>
<widget>
<class>QButtonGroup</class>
@@ -267,9 +267,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Authentication Type</string>
+ <string>&amp;Authentication Type</string>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
@@ -286,9 +286,9 @@
<cstring>authOpen</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Open System</string>
+ <string>&amp;Open System</string>
</property>
<property stdset="1">
<name>checked</name>
<bool>true</bool>
@@ -301,9 +301,9 @@
<cstring>authShared</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Shared Key</string>
+ <string>&amp;Shared Key</string>
</property>
</widget>
</hbox>
</widget>
@@ -318,9 +318,9 @@
<bool>false</bool>
</property>
<property stdset="1">
<name>title</name>
- <string>Key Setting</string>
+ <string>&amp;Key Setting</string>
</property>
<grid>
<property stdset="1">
<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(){
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
- return;
// Restart the device now that the settings have changed
QString initpath;
if( QDir("/etc/rc.d/init.d").exists() )
initpath = "/etc/rc.d/init.d";