From a754a1323234be2feb9945128837875d87c3cc34 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Tue, 7 Nov 2017 15:09:55 +0200
Subject: Fix cancel button on WiFi passphrase screen

Task-number: QTBUG-64230
Change-Id: I3859293f2d9422be9a253143544470f39be937ea
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/settingsui/network/PassphraseEnter.qml | 132 +++++++++--------------------
 1 file changed, 38 insertions(+), 94 deletions(-)

(limited to 'src/settingsui/network/PassphraseEnter.qml')

diff --git a/src/settingsui/network/PassphraseEnter.qml b/src/settingsui/network/PassphraseEnter.qml
index de32d2a..2841745 100644
--- a/src/settingsui/network/PassphraseEnter.qml
+++ b/src/settingsui/network/PassphraseEnter.qml
@@ -34,106 +34,50 @@ import QtDeviceUtilities.NetworkSettings 1.0
 
 Item {
     id: root
-    Row {
-        id: backRow
-        anchors.top: parent.top
-        anchors.left: parent.left
-        width: parent.width * 0.2
-        height: parent.height * 0.035
-        Image {
-            id: passBackIcon
-            anchors.verticalCenter: parent.verticalCenter
-            height: parent.height
-            width: height
-            fillMode: Image.PreserveAspectFit
-            source: "../newIcons/back_icon.svg"
+    Column {
+        spacing: pluginMain.spacing
+        anchors.margins: viewSettings.pageMargin
 
-            ColorOverlay {
-                source: passBackIcon
-                anchors.fill: passBackIcon
-                color: viewSettings.buttonGreenColor
-                visible: true
-            }
-            MouseArea {
-                anchors.fill: parent
-                onClicked: settingsLoader.source = "qrc:/network/NetworkSettings.qml"
-            }
-        }
         Text {
-            id: backText
-            anchors.top: parent.top
-            height: parent.height
-            anchors.verticalCenter: parent.verticalCenter
-            verticalAlignment: Text.AlignVCenter
-            fontSizeMode: Text.Fit
-            minimumPixelSize: 1
-            font.pixelSize: height
-            color: viewSettings.buttonGreenColor
-            text: "Back"
-            MouseArea {
-                anchors.fill: parent
-                onClicked: settingsLoader.source = "qrc:/network/NetworkSettings.qml"
-            }
+            id: enterPassphraseText
+            font.pixelSize: pluginMain.subTitleFontSize
+            font.family: appFont
+            color: "white"
+            text: qsTr("Enter Passphrase")
         }
-    }
-
-    Text {
-        id: enterPassphraseText
-        anchors.top: backRow.bottom
-        anchors.topMargin: parent.height * 0.05
-        anchors.left: parent.left
-        fontSizeMode: Text.Fit
-        minimumPixelSize: 1
-        font.pixelSize: parent.height * 0.045
-        color: "white"
-        text: qsTr("Enter Passphrase")
-    }
-    Rectangle {
-        id: btmLine
-        anchors.top: enterPassphraseText.bottom
-        anchors.topMargin: parent.height * 0.025
-        anchors.left: enterPassphraseText.left
-        width: parent.width * 0.275
-        height: parent.height * 0.005
-    }
 
-    TextField {
-        id: passField
-        width: root.width * 0.4
-        height: parent.height * 0.075
-        anchors.top: btmLine.bottom
-        anchors.topMargin: parent.height * 0.05
-        color: "white"
-        echoMode: TextInput.Password
-        background: Rectangle {
-            color: "transparent"
-            border.color: passField.focus ? viewSettings.buttonGreenColor : viewSettings.buttonGrayColor
-            border.width: passField.focus ? width * 0.01 : 2
-        }
-    }
-    Row {
-        height: passField.height
-        anchors.top: passField.bottom
-        anchors.topMargin: parent.height * 0.025
-        spacing: parent.width * 0.025
-        QtButton {
-            id: setButton
-            height: parent.height
-            text: qsTr("SET")
-            onClicked: {
-                passField.focus = false
-                NetworkSettingsManager.userAgent.setPassphrase(passField.text)
+        TextField {
+            id: passField
+            width: root.width * 0.4
+            height: root.height * 0.075
+            color: "white"
+            echoMode: TextInput.Password
+            background: Rectangle {
+                color: "transparent"
+                border.color: passField.focus ? viewSettings.buttonGreenColor : viewSettings.buttonGrayColor
+                border.width: passField.focus ? width * 0.01 : 2
             }
         }
-        QtButton {
-            id: cancelButton
-            height: parent.height
-            text: qsTr("CANCEL")
-            borderColor: "transparent"
-            fillColor: viewSettings.buttonGrayColor
-            onClicked: {
-                passField.focus = false
-                passField.clear()
+
+        Row{
+            spacing: parent.width * 0.025
+            QtButton {
+                id: setButton
+                text: qsTr("SET")
+                onClicked: {
+                    passField.focus = false
+                    NetworkSettingsManager.userAgent.setPassphrase(passField.text)
+                }
+            }
+            QtButton {
+                id: cancelButton
+                text: qsTr("CANCEL")
+                borderColor: "transparent"
+                fillColor: viewSettings.buttonGrayColor
+                onClicked: {
+                    NetworkSettingsManager.userAgent.cancelInput()
+                    settingsLoader.source = "qrc:/network/NetworkSettings.qml"
+                }
             }
         }
     }
-- 
cgit v1.2.3