From 53c4fa0b3e356a346ea99a02b79a9d7cb7a7f403 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 21 Sep 2017 18:29:03 +0200
Subject: Simplify layout

---
 .../contents/ui/KolabnowAccountSettings.qml        | 64 ++++++++++------------
 1 file changed, 29 insertions(+), 35 deletions(-)

(limited to 'accounts/kolabnow/package')

diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
index 482ddc99..309fa443 100644
--- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
+++ b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml
@@ -26,7 +26,7 @@ Item {
 
     property string accountId
     property string heading: qsTr("Connect your Kolab Now account")
-    property string subheadline: qsTr("To let Kube access your account, fill in your name, username, password.")
+    property string subheadline: qsTr("Please fill in your name and email address.")
     property bool valid: nameField.acceptableInput && emailField.acceptableInput
 
     KolabnowAccount.KolabnowSettings {
@@ -43,48 +43,42 @@ Item {
         kolabnowSettings.remove()
     }
 
-    Item {
+    GridLayout {
         anchors {
             fill: parent
         }
+        columns: 2
+        columnSpacing: Kube.Units.largeSpacing
+        rowSpacing: Kube.Units.largeSpacing
 
-        GridLayout {
-            anchors {
-                fill: parent
-            }
-            columns: 2
-            columnSpacing: Kube.Units.largeSpacing
-            rowSpacing: Kube.Units.largeSpacing
-
-            Kube.Label {
-                text: qsTr("Name")
-                Layout.alignment: Qt.AlignRight
-            }
-            Kube.RequiredTextField {
-                id: nameField
-                Layout.fillWidth: true
-                placeholderText: qsTr("Your name")
-                text: kolabnowSettings.userName
-                onTextChanged: {
-                    kolabnowSettings.userName = text
-                }
+        Kube.Label {
+            text: qsTr("Name")
+            Layout.alignment: Qt.AlignRight
+        }
+        Kube.RequiredTextField {
+            id: nameField
+            Layout.fillWidth: true
+            placeholderText: qsTr("Your name")
+            text: kolabnowSettings.userName
+            onTextChanged: {
+                kolabnowSettings.userName = text
             }
+        }
 
-            Kube.Label {
-                text: qsTr("Email address")
-                Layout.alignment: Qt.AlignRight
-            }
-            Kube.RequiredTextField {
-                id: emailField
-                Layout.fillWidth: true
+        Kube.Label {
+            text: qsTr("Email address")
+            Layout.alignment: Qt.AlignRight
+        }
+        Kube.RequiredTextField {
+            id: emailField
+            Layout.fillWidth: true
 
-                text: kolabnowSettings.emailAddress
-                onTextChanged: {
-                    kolabnowSettings.emailAddress = text
-                    kolabnowSettings.accountName = text
-                }
-                placeholderText: qsTr("Your email address")
+            text: kolabnowSettings.emailAddress
+            onTextChanged: {
+                kolabnowSettings.emailAddress = text
+                kolabnowSettings.accountName = text
             }
+            placeholderText: qsTr("Your email address")
         }
     }
 }
-- 
cgit v1.2.3