git.iko.soy/unity8
on xenial help sign in
line up with the spec
7020045Lukáš Tinkl
qml/Wizard/Pages.qml−1
compare with xenial
unifiedsplit
@@ -91,7 +91,6 @@ Item {
91 }
91 }
92
92
93 function load(path) {
93 function load(path) {
94− print("Loading: " + path)
95 if (currentPage) {
94 if (currentPage) {
96 currentPage.enabled = false
95 currentPage.enabled = false
97 }
96 }
qml/Wizard/Pages/80-finished.qml+25−22
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013,2014 Canonical, Ltd.
2+ * Copyright (C) 2013-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,44 +14,47 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.3
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.2
19import ".." as LocalComponents
19import ".." as LocalComponents
20
20
21LocalComponents.Page {
21LocalComponents.Page {
22− objectName: "finishedPage"
22+ objectName: "finishedPage" // careful when renaming the page, see Page.qml
23
23
24− title: i18n.tr("All done")
25− forwardButtonSourceComponent: forwardButton
26 hasBackButton: false
24 hasBackButton: false
25+ customTitle: true
27
26
28 Column {
27 Column {
29 id: column
28 id: column
30− anchors.fill: content
29+ anchors.left: parent.left
30+ anchors.right: parent.right
31+ anchors.verticalCenter: parent.verticalCenter
31− spacing: units.gu(1)
32+ spacing: units.gu(3)
32
33
33 Label {
34 Label {
34− anchors.left: parent.left
35+ anchors.horizontalCenter: parent.horizontalCenter
35− anchors.right: parent.right
36 wrapMode: Text.Wrap
36 wrapMode: Text.Wrap
37− fontSize: "large"
37+ fontSize: "x-large"
38− font.bold: true
38+ font.weight: Font.Light
39+ color: "black"
39− text: i18n.tr("Nice work!")
40+ text: i18n.tr("Welcome to Ubuntu")
40 }
41 }
41
42
42 Label {
43 Label {
43− anchors.left: parent.left
44+ anchors.horizontalCenter: parent.horizontalCenter
44− anchors.right: parent.right
45 wrapMode: Text.Wrap
45 wrapMode: Text.Wrap
46+ fontSize: "large"
47+ font.weight: Font.Light
48+ color: "black"
46− text: i18n.tr("Your phone is now ready to use.")
49+ text: i18n.tr("You are ready to use your device now")
47 }
50 }
48− }
49
51
50− Component {
52+ Button {
51− id: forwardButton
53+ anchors.horizontalCenter: parent.horizontalCenter
52− LocalComponents.StackButton {
53− text: i18n.tr("Finish")
54+ text: i18n.tr("Get Started")
54− onClicked: root.quitWizard()
55+ onClicked: {
56+ quit()
57+ }
55 }
58 }
56 }
59 }
57}
60}