git.iko.soy/unity8
on xenial help sign in
UI review round
commit5e3b3463fd4053b1cea65018bbcd8e03cd29ad82 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 21 Oct 2015, 15:16 (11 years ago) parent6fe973e
3 files changed+7−5
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+2−3 qml/Wizard/Pages/50-timezone.qml+2−1 qml/Wizard/Pages/60-uaccount-signup.qml+3−1
qml/Wizard/Page.qml+2−3
@@ -121,15 +121,14 @@ Item {
121121 right: parent.right
122122 }
123123 source: customTitle ? "" : "Pages/data/Phone header bkg.png"
124− height: units.gu(16)
124+ height: customTitle ? units.gu(10) : units.gu(16)
125125 clip: true
126126
127127 // page title
128128 Label {
129129 id: titleLabel
130130 property real animatedMargin: 0
131− property real animatedTopMargin: customTitle ? customMargin :
132− titleRect.height - customMargin - titleLabel.height
131+ property real animatedTopMargin: 0
133132 anchors {
134133 left: parent.left
135134 right: parent.right
qml/Wizard/Pages/50-timezone.qml+2−1
@@ -43,7 +43,8 @@ LocalComponents.Page {
4343 }
4444 }
4545
46− theme.palette.normal.backgroundText = textColor
46+ theme.palette.normal.backgroundText = textColor;
47+ searchField.forceActiveFocus();
4748 }
4849
4950 Component {
qml/Wizard/Pages/60-uaccount-signup.qml+3−1
@@ -135,7 +135,7 @@ LocalComponents.Page {
135135 anchors.top: pass2Label.bottom
136136 anchors.topMargin: units.gu(1)
137137 echoMode: TextInput.Password
138− KeyNavigation.tab: emailInput
138+ KeyNavigation.tab: cancelButton
139139 }
140140
141141 // buttons
@@ -150,6 +150,7 @@ LocalComponents.Page {
150150 }
151151 text: i18n.tr("Cancel")
152152 onClicked: pageStack.prev()
153+ KeyNavigation.tab: okButton
153154 }
154155
155156 Button {
@@ -170,6 +171,7 @@ LocalComponents.Page {
170171 AccountsService.email = emailInput.text;
171172 pageStack.next() // TODO sign up against U1 in Phase 2
172173 }
174+ KeyNavigation.tab: emailInput
173175 }
174176 }
175177}