0191c8c · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

put the buttons side by side

0191c8cLukáš Tinkl11 years ago

qml/Wizard/Pages/55-uaccount.qml+11−5

compare with xenial

unifiedsplit

@@ -24,10 +24,9 @@ LocalComponents.Page {

24 title: i18n.tr("Ubuntu Account")

25 forwardButtonSourceComponent: forwardButton

27− Column {

27+ Item {

28 id: column

29 anchors.fill: content

30− spacing: units.gu(3)

31 anchors.topMargin: units.gu(4)

30 anchors.topMargin: units.gu(4)

33 Label {

32 Label {

@@ -42,21 +41,28 @@ LocalComponents.Page {

42 }

41 }

44 Button {

43 Button {

44+ id: signupButton

45 anchors {

46+ top: infoLabel.bottom

46 left: parent.left

47 left: parent.left

47− right: parent.right

48+ right: parent.horizontalCenter

49+ rightMargin: units.gu(1)

50+ topMargin: units.gu(4)

48 }

51 }

49 text: i18n.tr("Create Account")

52 text: i18n.tr("Create Account")

50−

51 onClicked: {

53 onClicked: {

52 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))

54 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))

53 }

55 }

54 }

56 }

56 Button {

58 Button {

59+ id: signinButton

57 anchors {

60 anchors {

61+ top: infoLabel.bottom

58− left: parent.left

62+ left: parent.horizontalCenter

59 right: parent.right

63 right: parent.right

64+ leftMargin: units.gu(1)

65+ topMargin: units.gu(4)

60 }

66 }

61 text: i18n.tr("Sign In")

67 text: i18n.tr("Sign In")

62 onClicked: {

68 onClicked: {

qml/Wizard/Pages/uaccount-signup.qml+2−1

@@ -155,7 +155,8 @@ LocalComponents.Page {

155 Component {

156 id: forwardButton

157 LocalComponents.StackButton {

158+ enabled: emailInput.acceptableInput && termsCheck.checked &&

158− enabled: emailInput.acceptableInput && passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text

159+ passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text