git.iko.soy/unity8
on xenial help sign in
use StyledItem for theming, fix the "white" color bug for final page
commit13c4946a7e70ff29dd1b9a052fd747b8c54bf581 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 11 Mar 2016, 14:40 (11 years ago) parent03b0578
5 files changed+13−10
compare with xenial
unifiedsplit
qml/Wizard/Page.qml+2−2 qml/Wizard/Pages.qml+5−1 qml/Wizard/Pages/10-welcome.qml+2 qml/Wizard/Pages/80-finished.qml+4−4 qml/Wizard/Wizard.qml−3
qml/Wizard/Page.qml+2−2
@@ -42,7 +42,7 @@ Item {
4242 readonly property color textColor: UbuntuColors.slate
4343 readonly property color errorColor: theme.palette.normal.negative
4444 readonly property color okColor: theme.palette.normal.positive
45− readonly property color indicatorColor: "white"
45+ readonly property color whiteColor: "white" // workaround for a UITK bug
4646
4747 // If you want to skip a page, mark skipValid false while you figure out
4848 // whether to skip, then set it to true once you've determined the value
@@ -156,7 +156,7 @@ Item {
156156 Label {
157157 id: indicatorTime
158158 anchors.verticalCenter: parent.verticalCenter
159− color: indicatorColor
159+ color: whiteColor
160160 fontSize: "small"
161161 }
162162 }
qml/Wizard/Pages.qml+5−1
@@ -22,7 +22,7 @@ import Ubuntu.SystemSettings.Diagnostics 1.0
2222import Wizard 0.1
2323import "../Components"
2424
25−Item {
25+StyledItem {
2626 id: root
2727 objectName: "wizardPages"
2828 focus: true
@@ -40,6 +40,10 @@ Item {
4040 property alias simManager0: simManager0
4141 property alias simManager1: simManager1
4242
43+ theme: ThemeSettings {
44+ name: "Ubuntu.Components.Themes.Ambiance"
45+ }
46+
4347 UbuntuSecurityPrivacyPanel {
4448 id: securityPrivacy
4549 objectName: "securityPrivacy"
qml/Wizard/Pages/10-welcome.qml+2
@@ -107,6 +107,8 @@ LocalComponents.Page {
107107 id: itemDelegate
108108 objectName: "languageDelegate" + index
109109 highlightColor: backgroundColor
110+ divider.colorFrom: dividerColor
111+ divider.colorTo: backgroundColor
110112 readonly property bool isCurrent: index === ListView.view.currentIndex
111113
112114 Label {
qml/Wizard/Pages/80-finished.qml+4−4
@@ -87,7 +87,7 @@ LocalComponents.Page {
8787 font.weight: Font.Light
8888 lineHeight: 1.2
8989 text: i18n.tr("Welcome to Ubuntu")
90− color: "white"
90+ color: whiteColor
9191 }
9292
9393 Label {
@@ -102,7 +102,7 @@ LocalComponents.Page {
102102 font.weight: Font.Light
103103 lineHeight: 1.2
104104 text: i18n.tr("You are ready to use your device now")
105− color: "white"
105+ color: whiteColor
106106 }
107107
108108 Rectangle {
@@ -113,14 +113,14 @@ LocalComponents.Page {
113113 }
114114 color: "transparent"
115115 border.width: units.dp(1)
116− border.color: "white"
116+ border.color: whiteColor
117117 radius: units.dp(4)
118118 width: buttonLabel.paintedWidth + units.gu(6)
119119 height: buttonLabel.paintedHeight + units.gu(1.8)
120120
121121 Label {
122122 id: buttonLabel
123− color: "white"
123+ color: whiteColor
124124 text: i18n.tr("Get Started")
125125 fontSize: "medium"
126126 anchors.centerIn: parent
qml/Wizard/Wizard.qml−3
@@ -33,10 +33,7 @@ Showable {
3333
3434 onRequiredChanged: {
3535 if (!required) {
36− theme.name = "Ubuntu.Components.Themes.SuruDark";
3736 System.wizardEnabled = false;
38− } else if (active) {
39− theme.name = "Ubuntu.Components.Themes.Ambiance";
4037 }
4138 }
4239