git.iko.soy/unity8
on xenial help sign in
tweak the Get Started button ;)
391acffLukáš Tinkl
qml/Wizard/Pages.qml+2−2
compare with xenial
unifiedsplit
@@ -82,7 +82,7 @@ Item {
82 }
82 }
83
83
84 function prev() {
84 function prev() {
85− var isPrimaryPage = !currentPage.customTitle; // skip for secondary/extra pages
85+ var isPrimaryPage = !currentPage.customTitle;
86 if (pageList.index >= pageStack.depth - 1) {
86 if (pageList.index >= pageStack.depth - 1) {
87 pageList.prev(); // update pageList.index, but not for extra pages
87 pageList.prev(); // update pageList.index, but not for extra pages
88 }
88 }
@@ -115,7 +115,7 @@ Item {
115 // skipValid to be assigned (see Connections object below)
115 // skipValid to be assigned (see Connections object below)
116 checkSkip()
116 checkSkip()
117
117
118− var isPrimaryPage = !currentPage.customTitle; // skip for secondary/extra pages
118+ var isPrimaryPage = !currentPage.customTitle;
119 if (isPrimaryPage) {
119 if (isPrimaryPage) {
120 currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
120 currentPage.aboutToShow(UbuntuAnimation.BriskDuration, Qt.RightToLeft);
121 } else {
121 } else {
qml/Wizard/Pages/80-finished.qml+22−10
@@ -41,6 +41,7 @@ LocalComponents.Page {
41 spacing: units.gu(2)
41 spacing: units.gu(2)
42
42
43 Label {
43 Label {
44+ id: welcomeLabel
44 anchors.left: parent.left
45 anchors.left: parent.left
45 anchors.right: parent.right
46 anchors.right: parent.right
46 horizontalAlignment: Text.AlignHCenter
47 horizontalAlignment: Text.AlignHCenter
@@ -60,16 +61,27 @@ LocalComponents.Page {
60 text: i18n.tr("You are ready to use your device now")
61 text: i18n.tr("You are ready to use your device now")
61 }
62 }
62
63
63− Button {
64+ Rectangle {
65+ anchors {
64− anchors.horizontalCenter: parent.horizontalCenter
66+ horizontalCenter: parent.horizontalCenter
67+ }
68+ color: 'transparent'
69+ border.width: units.dp(1)
70+ border.color: 'white'
71+ radius: units.dp(4)
72+ width: buttonLabel.paintedWidth + units.gu(3)
73+ height: buttonLabel.paintedHeight + units.gu(1.5)
74+
75+ Label {
76+ id: buttonLabel
77+ color: 'white'
65− text: i18n.tr("Get Started")
78+ text: i18n.tr("Get Started")
66− color: "transparent"
79+ fontSize: "medium"
67− strokeColor: "white"
80+ anchors.centerIn: parent
68− font.weight: Font.Normal
81+ }
69− font.pixelSize: FontUtils.sizeToPixels("medium")
82+ MouseArea {
70− width: Math.max(parent.width/2, implicitWidth)
83+ anchors.fill: parent
71− onClicked: {
72− root.quitWizard();
84+ onClicked: root.quitWizard()
73 }
85 }
74 }
86 }
75 }
87 }