git.iko.soy/unity8
on xenial help sign in
use StyledItem for theming, fix the "white" color bug for final page
13c4946Lukáš Tinkl
qml/Wizard/Page.qml+2−2
compare with xenial
unifiedsplit
@@ -42,7 +42,7 @@ Item {
42 readonly property color textColor: UbuntuColors.slate
42 readonly property color textColor: UbuntuColors.slate
43 readonly property color errorColor: theme.palette.normal.negative
43 readonly property color errorColor: theme.palette.normal.negative
44 readonly property color okColor: theme.palette.normal.positive
44 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
46
46
47 // If you want to skip a page, mark skipValid false while you figure out
47 // If you want to skip a page, mark skipValid false while you figure out
48 // whether to skip, then set it to true once you've determined the value
48 // whether to skip, then set it to true once you've determined the value
@@ -156,7 +156,7 @@ Item {
156 Label {
156 Label {
157 id: indicatorTime
157 id: indicatorTime
158 anchors.verticalCenter: parent.verticalCenter
158 anchors.verticalCenter: parent.verticalCenter
159− color: indicatorColor
159+ color: whiteColor
160 fontSize: "small"
160 fontSize: "small"
161 }
161 }
162 }
162 }
qml/Wizard/Pages.qml+5−1
@@ -22,7 +22,7 @@ import Ubuntu.SystemSettings.Diagnostics 1.0
22import Wizard 0.1
22import Wizard 0.1
23import "../Components"
23import "../Components"
24
24
25−Item {
25+StyledItem {
26 id: root
26 id: root
27 objectName: "wizardPages"
27 objectName: "wizardPages"
28 focus: true
28 focus: true
@@ -40,6 +40,10 @@ Item {
40 property alias simManager0: simManager0
40 property alias simManager0: simManager0
41 property alias simManager1: simManager1
41 property alias simManager1: simManager1
42
42
43+ theme: ThemeSettings {
44+ name: "Ubuntu.Components.Themes.Ambiance"
45+ }
46+
43 UbuntuSecurityPrivacyPanel {
47 UbuntuSecurityPrivacyPanel {
44 id: securityPrivacy
48 id: securityPrivacy
45 objectName: "securityPrivacy"
49 objectName: "securityPrivacy"
qml/Wizard/Pages/10-welcome.qml+2
@@ -107,6 +107,8 @@ LocalComponents.Page {
107 id: itemDelegate
107 id: itemDelegate
108 objectName: "languageDelegate" + index
108 objectName: "languageDelegate" + index
109 highlightColor: backgroundColor
109 highlightColor: backgroundColor
110+ divider.colorFrom: dividerColor
111+ divider.colorTo: backgroundColor
110 readonly property bool isCurrent: index === ListView.view.currentIndex
112 readonly property bool isCurrent: index === ListView.view.currentIndex
111
113
112 Label {
114 Label {
qml/Wizard/Pages/80-finished.qml+4−4
@@ -87,7 +87,7 @@ LocalComponents.Page {
87 font.weight: Font.Light
87 font.weight: Font.Light
88 lineHeight: 1.2
88 lineHeight: 1.2
89 text: i18n.tr("Welcome to Ubuntu")
89 text: i18n.tr("Welcome to Ubuntu")
90− color: "white"
90+ color: whiteColor
91 }
91 }
92
92
93 Label {
93 Label {
@@ -102,7 +102,7 @@ LocalComponents.Page {
102 font.weight: Font.Light
102 font.weight: Font.Light
103 lineHeight: 1.2
103 lineHeight: 1.2
104 text: i18n.tr("You are ready to use your device now")
104 text: i18n.tr("You are ready to use your device now")
105− color: "white"
105+ color: whiteColor
106 }
106 }
107
107
108 Rectangle {
108 Rectangle {
@@ -113,14 +113,14 @@ LocalComponents.Page {
113 }
113 }
114 color: "transparent"
114 color: "transparent"
115 border.width: units.dp(1)
115 border.width: units.dp(1)
116− border.color: "white"
116+ border.color: whiteColor
117 radius: units.dp(4)
117 radius: units.dp(4)
118 width: buttonLabel.paintedWidth + units.gu(6)
118 width: buttonLabel.paintedWidth + units.gu(6)
119 height: buttonLabel.paintedHeight + units.gu(1.8)
119 height: buttonLabel.paintedHeight + units.gu(1.8)
120
120
121 Label {
121 Label {
122 id: buttonLabel
122 id: buttonLabel
123− color: "white"
123+ color: whiteColor
124 text: i18n.tr("Get Started")
124 text: i18n.tr("Get Started")
125 fontSize: "medium"
125 fontSize: "medium"
126 anchors.centerIn: parent
126 anchors.centerIn: parent
qml/Wizard/Wizard.qml−3
@@ -33,10 +33,7 @@ Showable {
33
33
34 onRequiredChanged: {
34 onRequiredChanged: {
35 if (!required) {
35 if (!required) {
36− theme.name = "Ubuntu.Components.Themes.SuruDark";
37 System.wizardEnabled = false;
36 System.wizardEnabled = false;
38− } else if (active) {
39− theme.name = "Ubuntu.Components.Themes.Ambiance";
40 }
37 }
41 }
38 }
42
39