From c88b0a2d55f434f58d6f935ec29d359a2012b374 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 3 May 2022 00:48:14 +0200
Subject: [PATCH] Confirm the login form on enter

---
 nymea-app/ui/components/PasswordTextField.qml | 12 ++++++++++++
 nymea-app/ui/connection/LoginPage.qml         |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/nymea-app/ui/components/PasswordTextField.qml b/nymea-app/ui/components/PasswordTextField.qml
index 0af67a4c..c4cce26f 100644
--- a/nymea-app/ui/components/PasswordTextField.qml
+++ b/nymea-app/ui/components/PasswordTextField.qml
@@ -67,6 +67,8 @@ ColumnLayout {
 
     property bool showErrors: false
 
+    signal accepted()
+
     RowLayout {
         Layout.fillWidth: true
 
@@ -112,6 +114,14 @@ ColumnLayout {
                 return ret.join("<br>")
             }
 
+            onAccepted: {
+                if (!root.signup) {
+                    root.accepted()
+                } else {
+                    confirmationPasswordTextField.focus = true
+                }
+            }
+
         }
         ColorIcon {
             Layout.preferredHeight: Style.iconSize
@@ -136,6 +146,8 @@ ColumnLayout {
             echoMode: root.hiddenPassword ? TextInput.Password : TextInput.Normal
             placeholderText: qsTr("Confirm password")
             error: root.showErrors && (!root.isValidPassword || !root.confirmationMatches)
+
+            onAccepted: root.accepted()
         }
     }
 }
diff --git a/nymea-app/ui/connection/LoginPage.qml b/nymea-app/ui/connection/LoginPage.qml
index b63e229a..13da4153 100644
--- a/nymea-app/ui/connection/LoginPage.qml
+++ b/nymea-app/ui/connection/LoginPage.qml
@@ -149,6 +149,11 @@ SettingsPageBase {
                 requireSpecialChar: false
                 signup: engine.jsonRpcClient.initialSetupRequired
                 showErrors: loginForm.showErrors
+                onAccepted: {
+                    if (!signup) {
+                        okButton.clicked()
+                    }
+                }
             }
 
             Label {
@@ -177,6 +182,7 @@ SettingsPageBase {
         }
 
         Button {
+            id: okButton
             Layout.fillWidth: true
             Layout.leftMargin: app.margins; Layout.rightMargin: app.margins; Layout.bottomMargin: app.margins
             text: qsTr("OK")