@@ -15,6 +15,7 @@
1515 */
1616
1717import QtQuick 2.4
18+import QtQuick.Layouts 1.1
1819import Ubuntu.Components 1.3
1920import ".." as LocalComponents
2021
@@ -31,13 +32,15 @@ LocalComponents.Page {
3132
3233 property alias password: passwordField.text
3334
34− Column {
35+ GridLayout {
3536 id: column
37+ columns: 1
38+ rows: 3
3639 anchors.fill: content
3740 anchors.leftMargin: leftMargin
3841 anchors.rightMargin: rightMargin
3942 anchors.topMargin: customMargin
40− spacing: units.gu(3)
43+ rowSpacing: units.gu(3)
4144
4245 Label {
4346 id: infoLabel
@@ -52,22 +55,24 @@ LocalComponents.Page {
5255 text: i18n.tr("Enter 4 numbers to setup your passcode")
5356 }
5457
55− Grid {
58+ GridLayout {
5659 columns: 2
57− spacing: units.gu(2)
58− verticalItemAlignment: Grid.AlignVCenter
60+ columnSpacing: units.gu(2)
61+ rowSpacing: units.gu(2)
5962
6063 Label {
6164 text: i18n.tr("Choose passcode")
6265 color: textColor
6366 }
6467 LocalComponents.WizardTextField {
68+ Layout.fillWidth: true
6569 id: passwordField
6670 objectName: "passwordField"
6771 echoMode: TextInput.Password
6872 inputMethodHints: Qt.ImhDigitsOnly
6973 validator: RegExpValidator { regExp: /^\d{4}$/ }
7074 maximumLength: 4
75+ onAccepted: password2Field.forceActiveFocus()
7176 }
7277
7378 Label {
@@ -75,6 +80,7 @@ LocalComponents.Page {
7580 color: textColor
7681 }
7782 LocalComponents.WizardTextField {
83+ Layout.fillWidth: true
7884 id: password2Field
7985 objectName: "password2Field"
8086 echoMode: TextInput.Password
@@ -83,6 +89,10 @@ LocalComponents.Page {
8389 maximumLength: 4
8490 }
8591 }
92+
93+ Item { // spacer
94+ Layout.fillHeight: true
95+ }
8696 }
8797
8898 Component {