Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1387656 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[wifi] fix multiple issues in the "Connect to other network" dialog

Fixes the following bugs in the "Connect to other network" dialog:
 * Removes the progression on the entry to the dialog
 * Fixes bug where predictive text would remove the password
 * Stops the "Show password" checkbox from stealing focus from the password textfield

[Sebastien Bacher (seb128)]

thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

[wifi] fix multiple issues in the "Connect to other network" dialog

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2014-09-18 16:48:38 +0000
+++ plugins/wifi/OtherNetwork.qml	2014-11-18 19:42:19 +0000
@@ -196,6 +196,7 @@
             id : networkname
             objectName: "networkname"
             inputMethodHints: Qt.ImhNoPredictiveText
+            Component.onCompleted: forceActiveFocus()
         }
 
         Label {
@@ -234,8 +235,7 @@
             visible: securityList.selectedIndex !== 0
             echoMode: passwordVisibleSwitch.checked ?
                 TextInput.Normal : TextInput.Password
-            inputMethodHints: passwordVisibleSwitch.checked ?
-                Qt.ImhHiddenText : Qt.ImhNoPredictiveText;
+            inputMethodHints: Qt.ImhNoPredictiveText
             onAccepted: {
                 connectAction.trigger();
             }
@@ -249,6 +249,7 @@
 
             CheckBox {
                 id: passwordVisibleSwitch
+                activeFocusOnPress: false
             }
 
             Label {
 
=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-09-26 12:52:31 +0000
+++ plugins/wifi/PageComponent.qml	2014-11-18 19:42:19 +0000
@@ -137,7 +137,8 @@
             ListItem.SingleValue {
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
-                progression: true
+                visible : (actionGroup.actionObject.valid ?
+                           actionGroup.actionObject.state : false)
                 onClicked: {
                     otherNetworLoader.source = "OtherNetwork.qml";
                     PopupUtils.open(otherNetworLoader.item);