git.iko.soy/unity8
on xenial help sign in
put the buttons side by side
commit0191c8c953c9395a4a06e3a61c5ce308e61ab9d7 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateSat 11 Jul 2015, 21:39 (11 years ago) parent968ea21
2 files changed+13−6
compare with xenial
unifiedsplit
qml/Wizard/Pages/55-uaccount.qml+11−5 qml/Wizard/Pages/uaccount-signup.qml+2−1
qml/Wizard/Pages/55-uaccount.qml+11−5
@@ -24,10 +24,9 @@ LocalComponents.Page {
2424 title: i18n.tr("Ubuntu Account")
2525 forwardButtonSourceComponent: forwardButton
2626
27− Column {
27+ Item {
2828 id: column
2929 anchors.fill: content
30− spacing: units.gu(3)
3130 anchors.topMargin: units.gu(4)
3231
3332 Label {
@@ -42,21 +41,28 @@ LocalComponents.Page {
4241 }
4342
4443 Button {
44+ id: signupButton
4545 anchors {
46+ top: infoLabel.bottom
4647 left: parent.left
47− right: parent.right
48+ right: parent.horizontalCenter
49+ rightMargin: units.gu(1)
50+ topMargin: units.gu(4)
4851 }
4952 text: i18n.tr("Create Account")
50−
5153 onClicked: {
5254 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))
5355 }
5456 }
5557
5658 Button {
59+ id: signinButton
5760 anchors {
58− left: parent.left
61+ top: infoLabel.bottom
62+ left: parent.horizontalCenter
5963 right: parent.right
64+ leftMargin: units.gu(1)
65+ topMargin: units.gu(4)
6066 }
6167 text: i18n.tr("Sign In")
6268 onClicked: {
qml/Wizard/Pages/uaccount-signup.qml+2−1
@@ -155,7 +155,8 @@ LocalComponents.Page {
155155 Component {
156156 id: forwardButton
157157 LocalComponents.StackButton {
158− enabled: emailInput.acceptableInput && passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text
158+ enabled: emailInput.acceptableInput && termsCheck.checked &&
159+ passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text
159160 text: i18n.tr("Sign Up")
160161 onClicked: pageStack.next() // TODO sign up against U1
161162 }