| -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 @@ -50,13 +50,13 @@ <property stdset="1"> <name>name</name> <cstring>ConfigPage</cstring> </property> <attribute> <name>title</name> - <string>WLAN General</string> + <string>General</string> </attribute> <vbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -69,13 +69,13 @@ <property stdset="1"> <name>name</name> <cstring>essAny</cstring> </property> <property stdset="1"> <name>text</name> - <string>Sepecify Access Point</string> + <string>&Specify Access Point</string> </property> </widget> <widget> <class>QGroupBox</class> <property stdset="1"> <name>name</name> @@ -84,13 +84,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Settings</string> + <string>Specific &Access Point Settings</string> </property> <grid> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -110,13 +110,13 @@ </property> </widget> <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> </property> </widget> @@ -231,13 +231,13 @@ <property stdset="1"> <name>name</name> <cstring>WepPage</cstring> </property> <attribute> <name>title</name> - <string>Wep</string> + <string>Encryption</string> </attribute> <vbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -250,13 +250,13 @@ <property stdset="1"> <name>name</name> <cstring>wepEnabled</cstring> </property> <property stdset="1"> <name>text</name> - <string>Enable Wep</string> + <string>&Enable WEP</string> </property> </widget> <widget> <class>QButtonGroup</class> <property stdset="1"> <name>name</name> @@ -265,13 +265,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Authentication Type</string> + <string>&Authentication Type</string> </property> <hbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -284,13 +284,13 @@ <property stdset="1"> <name>name</name> <cstring>authOpen</cstring> </property> <property stdset="1"> <name>text</name> - <string>Open System</string> + <string>&Open System</string> </property> <property stdset="1"> <name>checked</name> <bool>true</bool> </property> </widget> @@ -299,13 +299,13 @@ <property stdset="1"> <name>name</name> <cstring>authShared</cstring> </property> <property stdset="1"> <name>text</name> - <string>Shared Key</string> + <string>&Shared Key</string> </property> </widget> </hbox> </widget> <widget> <class>QButtonGroup</class> @@ -316,13 +316,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Key Setting</string> + <string>&Key Setting</string> </property> <grid> <property stdset="1"> <name>margin</name> <number>11</number> </property> 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 @@ -221,13 +221,12 @@ void WLANImp::accept(){ changeAndSaveSettingFile(); // 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"; else if( QDir("/etc/init.d").exists() ) initpath = "/etc/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 @@ -50,13 +50,13 @@ <property stdset="1"> <name>name</name> <cstring>ConfigPage</cstring> </property> <attribute> <name>title</name> - <string>WLAN General</string> + <string>General</string> </attribute> <vbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -69,13 +69,13 @@ <property stdset="1"> <name>name</name> <cstring>essAny</cstring> </property> <property stdset="1"> <name>text</name> - <string>Sepecify Access Point</string> + <string>&Specify Access Point</string> </property> </widget> <widget> <class>QGroupBox</class> <property stdset="1"> <name>name</name> @@ -84,13 +84,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Settings</string> + <string>Specific &Access Point Settings</string> </property> <grid> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -110,13 +110,13 @@ </property> </widget> <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> </property> </widget> @@ -231,13 +231,13 @@ <property stdset="1"> <name>name</name> <cstring>WepPage</cstring> </property> <attribute> <name>title</name> - <string>Wep</string> + <string>Encryption</string> </attribute> <vbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -250,13 +250,13 @@ <property stdset="1"> <name>name</name> <cstring>wepEnabled</cstring> </property> <property stdset="1"> <name>text</name> - <string>Enable Wep</string> + <string>&Enable WEP</string> </property> </widget> <widget> <class>QButtonGroup</class> <property stdset="1"> <name>name</name> @@ -265,13 +265,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Authentication Type</string> + <string>&Authentication Type</string> </property> <hbox> <property stdset="1"> <name>margin</name> <number>11</number> </property> @@ -284,13 +284,13 @@ <property stdset="1"> <name>name</name> <cstring>authOpen</cstring> </property> <property stdset="1"> <name>text</name> - <string>Open System</string> + <string>&Open System</string> </property> <property stdset="1"> <name>checked</name> <bool>true</bool> </property> </widget> @@ -299,13 +299,13 @@ <property stdset="1"> <name>name</name> <cstring>authShared</cstring> </property> <property stdset="1"> <name>text</name> - <string>Shared Key</string> + <string>&Shared Key</string> </property> </widget> </hbox> </widget> <widget> <class>QButtonGroup</class> @@ -316,13 +316,13 @@ <property stdset="1"> <name>enabled</name> <bool>false</bool> </property> <property stdset="1"> <name>title</name> - <string>Key Setting</string> + <string>&Key Setting</string> </property> <grid> <property stdset="1"> <name>margin</name> <number>11</number> </property> 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 @@ -221,13 +221,12 @@ void WLANImp::accept(){ changeAndSaveSettingFile(); // 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"; else if( QDir("/etc/init.d").exists() ) initpath = "/etc/init.d"; |