Merge lp:~renatofilho/indicators-client/fix-1130264 into lp:indicators-client

[Renato Araujo Oliveira Filho]

[Network] Changed password dialog layout to avoid problems with swipe gestures.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/indicators-client-ci/271/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/271/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicators-client-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/271/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicators-client-ci/271//rebuild/?

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'chewieui/Ubuntu/ChewieUI/CMakeLists.txt'
--- chewieui/Ubuntu/ChewieUI/CMakeLists.txt	2013-01-18 12:13:08 +0000
+++ chewieui/Ubuntu/ChewieUI/CMakeLists.txt	2013-03-06 20:10:26 +0000
@@ -33,6 +33,7 @@
     SectionMenu.qml
     SliderMenu.qml
     SwitchMenu.qml
+    TextMenu.qml
     ProgressMenu.qml
     qmldir
 )

=== added file 'chewieui/Ubuntu/ChewieUI/TextMenu.qml'
--- chewieui/Ubuntu/ChewieUI/TextMenu.qml	1970-01-01 00:00:00 +0000
+++ chewieui/Ubuntu/ChewieUI/TextMenu.qml	2013-03-06 20:10:26 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Renato Araujo Oliveira Filho <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Menu {
+    id: _textMenu
+
+    property alias text: _textField.text
+    property alias password: _showPassword.visible
+
+    implicitHeight: password ? units.gu(10) : units.gu(7)
+
+    Column {
+        spacing: units.gu(0.5)
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: units.gu(3)
+        }
+
+        TextField {
+            id: _textField
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            placeholderText: "Password"
+            echoMode: _textMenu.password && !_checkBox.checked ? TextInput.Password : TextInput.Normal
+        }
+
+        Row {
+            id: _showPassword
+
+            visible: false
+            anchors {
+                left: parent.left
+                right: parent.right
+
+            }
+
+            spacing: units.gu(1)
+
+            CheckBox {
+                id: _checkBox
+            }
+
+            Label {
+                text: "Show password"
+                anchors.verticalCenter: _checkBox.verticalCenter
+            }
+        }
+    }
+
+    DBusActionState {
+        action: menu ? menu.action : undefined
+        target: _textField
+        property: "text"
+    }
+}

=== modified file 'chewieui/Ubuntu/ChewieUI/qmldir'
--- chewieui/Ubuntu/ChewieUI/qmldir	2013-01-09 17:11:42 +0000
+++ chewieui/Ubuntu/ChewieUI/qmldir	2013-03-06 20:10:26 +0000
@@ -13,4 +13,5 @@
 SectionMenu 0.1 SectionMenu.qml
 SliderMenu 0.1 SliderMenu.qml
 SwitchMenu 0.1 SwitchMenu.qml
+TextMenu 0.1 TextMenu.qml
 ProgressMenu 0.1 ProgressMenu.qml

=== modified file 'plugins/networkplugin/qml/PasswordDialog.qml'
--- plugins/networkplugin/qml/PasswordDialog.qml	2013-01-11 15:05:30 +0000
+++ plugins/networkplugin/qml/PasswordDialog.qml	2013-03-06 20:10:26 +0000
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.ChewieUI 0.1 as ChewieUI
 
 Page {
     id: pagePassword
@@ -31,53 +32,31 @@
     title: "Network Authentication"
 
     Column {
-        width: parent.width
-
-        ListItem.Standard {
-            height: units.gu(7)
-            width: parent.width
-            Label {
-                anchors.fill: parent
-                anchors.margins: units.gu(0.5)
-                fontSize: "large"
-                text: "Authentication"
-            }
-        }
-
-        ListItem.Standard {
-            height: units.gu(7)
-            width: parent.width
-            TextField {
-                id: txtPassword
-                anchors.fill: parent
-                anchors.margins: units.gu(0.5)
-                placeholderText: "Password"
-                echoMode: showPasswordCheckBox.checked ? TextInput.Normal : TextInput.Password
-            }
-        }
-
-        ListItem.Standard {
-            height: units.gu(7)
-            Row {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.bottom: parent.bottom
-                anchors.margins: units.gu(0.5)
-                spacing: units.gu(0.5)
-                CheckBox {
-                    id: showPasswordCheckBox
-                }
-                Label {
-                    text: "Show password"
-                    anchors.verticalCenter: showPasswordCheckBox.verticalCenter
-                }
-            }
-            Row {
-                anchors.top: parent.top
-                anchors.right: parent.right
-                anchors.bottom: parent.bottom
-                anchors.margins: units.gu(0.5)
-                spacing: units.gu(0.5)
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        ChewieUI.SectionMenu {
+            label: "Authentication"
+        }
+
+        ChewieUI.TextMenu {
+            id: _password
+
+            password: true
+        }
+
+        ChewieUI.Menu {
+            Row {
+                anchors {
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                    margins: units.gu(3)
+                }
+
+                spacing: units.gu(1)
+
                 Button {
                     text: "Cancel"
                     width: units.gu(10)
@@ -89,8 +68,9 @@
 
                 Button {
                     text: "Ok"
+                    width: units.gu(10)
                     onClicked: {
-                        agent.authenticate(token, txtPassword.text)
+                        agent.authenticate(token, _password.text)
                         pageStack.pop()
                     }
                 }