diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-21 18:29:03 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2017-09-22 10:26:27 +0200 |
commit | 53c4fa0b3e356a346ea99a02b79a9d7cb7a7f403 (patch) | |
tree | 8a02488d4fab0715747fd0a31d309d48cfd709d8 | |
parent | 1b1e83aeb820df85ce7f10e81fe1f44deab2174e (diff) | |
download | kube-53c4fa0b3e356a346ea99a02b79a9d7cb7a7f403.tar.gz kube-53c4fa0b3e356a346ea99a02b79a9d7cb7a7f403.zip |
Simplify layout
-rw-r--r-- | accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml | 64 |
1 files changed, 29 insertions, 35 deletions
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 { | |||
26 | 26 | ||
27 | property string accountId | 27 | property string accountId |
28 | property string heading: qsTr("Connect your Kolab Now account") | 28 | property string heading: qsTr("Connect your Kolab Now account") |
29 | property string subheadline: qsTr("To let Kube access your account, fill in your name, username, password.") | 29 | property string subheadline: qsTr("Please fill in your name and email address.") |
30 | property bool valid: nameField.acceptableInput && emailField.acceptableInput | 30 | property bool valid: nameField.acceptableInput && emailField.acceptableInput |
31 | 31 | ||
32 | KolabnowAccount.KolabnowSettings { | 32 | KolabnowAccount.KolabnowSettings { |
@@ -43,48 +43,42 @@ Item { | |||
43 | kolabnowSettings.remove() | 43 | kolabnowSettings.remove() |
44 | } | 44 | } |
45 | 45 | ||
46 | Item { | 46 | GridLayout { |
47 | anchors { | 47 | anchors { |
48 | fill: parent | 48 | fill: parent |
49 | } | 49 | } |
50 | columns: 2 | ||
51 | columnSpacing: Kube.Units.largeSpacing | ||
52 | rowSpacing: Kube.Units.largeSpacing | ||
50 | 53 | ||
51 | GridLayout { | 54 | Kube.Label { |
52 | anchors { | 55 | text: qsTr("Name") |
53 | fill: parent | 56 | Layout.alignment: Qt.AlignRight |
54 | } | 57 | } |
55 | columns: 2 | 58 | Kube.RequiredTextField { |
56 | columnSpacing: Kube.Units.largeSpacing | 59 | id: nameField |
57 | rowSpacing: Kube.Units.largeSpacing | 60 | Layout.fillWidth: true |
58 | 61 | placeholderText: qsTr("Your name") | |
59 | Kube.Label { | 62 | text: kolabnowSettings.userName |
60 | text: qsTr("Name") | 63 | onTextChanged: { |
61 | Layout.alignment: Qt.AlignRight | 64 | kolabnowSettings.userName = text |
62 | } | ||
63 | Kube.RequiredTextField { | ||
64 | id: nameField | ||
65 | Layout.fillWidth: true | ||
66 | placeholderText: qsTr("Your name") | ||
67 | text: kolabnowSettings.userName | ||
68 | onTextChanged: { | ||
69 | kolabnowSettings.userName = text | ||
70 | } | ||
71 | } | 65 | } |
66 | } | ||
72 | 67 | ||
73 | Kube.Label { | 68 | Kube.Label { |
74 | text: qsTr("Email address") | 69 | text: qsTr("Email address") |
75 | Layout.alignment: Qt.AlignRight | 70 | Layout.alignment: Qt.AlignRight |
76 | } | 71 | } |
77 | Kube.RequiredTextField { | 72 | Kube.RequiredTextField { |
78 | id: emailField | 73 | id: emailField |
79 | Layout.fillWidth: true | 74 | Layout.fillWidth: true |
80 | 75 | ||
81 | text: kolabnowSettings.emailAddress | 76 | text: kolabnowSettings.emailAddress |
82 | onTextChanged: { | 77 | onTextChanged: { |
83 | kolabnowSettings.emailAddress = text | 78 | kolabnowSettings.emailAddress = text |
84 | kolabnowSettings.accountName = text | 79 | kolabnowSettings.accountName = text |
85 | } | ||
86 | placeholderText: qsTr("Your email address") | ||
87 | } | 80 | } |
81 | placeholderText: qsTr("Your email address") | ||
88 | } | 82 | } |
89 | } | 83 | } |
90 | } | 84 | } |