git.iko.soy/unity8
on xenial help sign in
some final page tweakings
c7906b2Lukáš Tinkl
qml/Wizard/Page.qml+3−1
compare with xenial
unifiedsplit
@@ -111,7 +111,7 @@ Item {
111 }
111 }
112 }
112 }
113
113
114− // title
114+ // page header
115 Image {
115 Image {
116 id: titleRect
116 id: titleRect
117 visible: !lastPage
117 visible: !lastPage
@@ -124,6 +124,7 @@ Item {
124 height: customTitle ? customMargin + titleLabel.height + customMargin : units.gu(16)
124 height: customTitle ? customMargin + titleLabel.height + customMargin : units.gu(16)
125 clip: true
125 clip: true
126
126
127+ // page title
127 Label {
128 Label {
128 id: titleLabel
129 id: titleLabel
129 anchors {
130 anchors {
@@ -140,6 +141,7 @@ Item {
140 fontSize: "x-large"
141 fontSize: "x-large"
141 }
142 }
142
143
144+ // indicators
143 Row {
145 Row {
144 id: indicatorRow
146 id: indicatorRow
145 visible: !customTitle
147 visible: !customTitle
qml/Wizard/Pages/80-finished.qml+12−4
@@ -41,16 +41,20 @@ LocalComponents.Page {
41 spacing: units.gu(3)
41 spacing: units.gu(3)
42
42
43 Label {
43 Label {
44− anchors.horizontalCenter: parent.horizontalCenter
44+ anchors.left: parent.left
45+ anchors.right: parent.right
46+ horizontalAlignment: Text.AlignHCenter
45− wrapMode: Text.WordWrap
47+ wrapMode: Text.Wrap
46 fontSize: "x-large"
48 fontSize: "x-large"
47 font.weight: Font.Light
49 font.weight: Font.Light
48 text: i18n.tr("Welcome to Ubuntu")
50 text: i18n.tr("Welcome to Ubuntu")
49 }
51 }
50
52
51 Label {
53 Label {
52− anchors.horizontalCenter: parent.horizontalCenter
54+ anchors.left: parent.left
55+ anchors.right: parent.right
56+ horizontalAlignment: Text.AlignHCenter
53− wrapMode: Text.WordWrap
57+ wrapMode: Text.Wrap
54 fontSize: "large"
58 fontSize: "large"
55 font.weight: Font.Light
59 font.weight: Font.Light
56 text: i18n.tr("You are ready to use your device now")
60 text: i18n.tr("You are ready to use your device now")
@@ -59,6 +63,10 @@ LocalComponents.Page {
59 Button {
63 Button {
60 anchors.horizontalCenter: parent.horizontalCenter
64 anchors.horizontalCenter: parent.horizontalCenter
61 text: i18n.tr("Get Started")
65 text: i18n.tr("Get Started")
66+ color: "transparent"
67+ strokeColor: "white"
68+ font.weight: Font.DemiBold
69+ width: Math.max(implicitWidth, parent.width/2) // make the button slightly wider than usual
62 onClicked: {
70 onClicked: {
63 root.quitWizard();
71 root.quitWizard();
64 }
72 }