git.iko.soy/unity8
on xenial help sign in
Fix some uses of UbuntuColors
12dff53Michael Terry
plugins/Dash/AudioProgressBar.qml+1−1
compare with xenial
unifiedsplit
@@ -49,6 +49,6 @@ Item {
49 rightMargin: maxWidth - (maxWidth * root.progress)
49 rightMargin: maxWidth - (maxWidth * root.progress)
50 }
50 }
51 height: units.dp(2)
51 height: units.dp(2)
52− backgroundColor: UbuntuColors.orange
52+ backgroundColor: theme.palette.normal.activity
53 }
53 }
54}
54}
plugins/Dash/ScopeStyle.qml+1−1
@@ -70,7 +70,7 @@ QtObject {
70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
70 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
71
71
72 /// Color of the primary preview button
72 /// Color of the primary preview button
73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange
73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive
74
74
75 //! @cond
75 //! @cond
76 property var d: QtObject {
76 property var d: QtObject {
qml/Components/Dialogs.qml+2−2
@@ -185,7 +185,7 @@ Item {
185 unitySessionService.reboot();
185 unitySessionService.reboot();
186 rebootDialog.hide();
186 rebootDialog.hide();
187 }
187 }
188− color: UbuntuColors.red
188+ color: theme.palette.normal.negative
189 }
189 }
190 }
190 }
191 }
191 }
@@ -203,7 +203,7 @@ Item {
203 powerDialog.hide();
203 powerDialog.hide();
204 root.powerOffClicked();
204 root.powerOffClicked();
205 }
205 }
206− color: UbuntuColors.red
206+ color: theme.palette.normal.negative
207 }
207 }
208 Button {
208 Button {
209 text: i18n.ctr("Button: Restart the system", "Restart")
209 text: i18n.ctr("Button: Restart the system", "Restart")
qml/Components/ModeSwitchWarningDialog.qml+1−1
@@ -86,7 +86,7 @@ ShellDialog {
86 Button {
86 Button {
87 objectName: "forceCloseButton"
87 objectName: "forceCloseButton"
88 text: i18n.tr("Close all")
88 text: i18n.tr("Close all")
89− color: UbuntuColors.red
89+ color: theme.palette.normal.negative
90 onClicked: {
90 onClicked: {
91 root.forceClose();
91 root.forceClose();
92 }
92 }
qml/Components/WindowControlButtons.qml+1−1
@@ -43,7 +43,7 @@ Row {
43 width: units.gu(2)
43 width: units.gu(2)
44 height: units.gu(2)
44 height: units.gu(2)
45 radius: height / 2
45 radius: height / 2
46− color: UbuntuColors.red
46+ color: theme.palette.normal.negative
47 visible: parent.containsMouse
47 visible: parent.containsMouse
48 }
48 }
49 Icon {
49 Icon {
qml/Dash/DashPageHeader.qml+1−1
@@ -269,7 +269,7 @@ Item {
269 anchors.fill: parent
269 anchors.fill: parent
270 anchors.margins: units.gu(2)
270 anchors.margins: units.gu(2)
271 name: "filters"
271 name: "filters"
272− color: root.activeFiltersCount > 0 ? UbuntuColors.orange : header.__styleInstance.foregroundColor
272+ color: root.activeFiltersCount > 0 ? theme.palette.normal.positive : header.__styleInstance.foregroundColor
273 }
273 }
274
274
275 onClicked: {
275 onClicked: {
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -65,7 +65,7 @@ PreviewWidget {
65 visible: row.actions && row.actions.length > 0
65 visible: row.actions && row.actions.length > 0
66 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
66 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
67 width: (root.width - units.gu(1)) / 2
67 width: (root.width - units.gu(1)) / 2
68− color: root.scopeStyle ? root.scopeStyle.previewButtonColor : UbuntuColors.orange
68+ color: root.scopeStyle ? root.scopeStyle.previewButtonColor : theme.palette.normal.positive
69 }
69 }
70 }
70 }
71}
71}
qml/Dash/Previews/PreviewPayments.qml+1−1
@@ -35,7 +35,7 @@ PreviewWidget {
35 id: paymentButton
35 id: paymentButton
36 objectName: "paymentButton"
36 objectName: "paymentButton"
37
37
38− color: UbuntuColors.orange
38+ color: theme.palette.normal.positive
39 text: paymentClient.formattedPrice
39 text: paymentClient.formattedPrice
40 onClicked: {
40 onClicked: {
41 paymentClient.start();
41 paymentClient.start();
qml/Launcher/LauncherDelegate.qml+2−2
@@ -164,7 +164,7 @@ Item {
164 }
164 }
165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
165 width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
166 height: units.gu(2)
166 height: units.gu(2)
167− backgroundColor: UbuntuColors.green
167+ backgroundColor: theme.palette.normal.positive
168 visible: root.countVisible
168 visible: root.countVisible
169 aspect: UbuntuShape.Flat
169 aspect: UbuntuShape.Flat
170
170
@@ -207,7 +207,7 @@ Item {
207 top: parent.top
207 top: parent.top
208 bottom: parent.bottom
208 bottom: parent.bottom
209 }
209 }
210− backgroundColor: UbuntuColors.blue
210+ backgroundColor: theme.palette.normal.activity
211 borderSource: "none"
211 borderSource: "none"
212 width: progressOverlay.width
212 width: progressOverlay.width
213 }
213 }
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
89
89
90 Rectangle {
90 Rectangle {
91 id: indicatorAreaBackground
91 id: indicatorAreaBackground
92− color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
92+ color: callHint.visible ? theme.palette.normal.positive : theme.palette.normal.background
93 anchors {
93 anchors {
94 top: parent.top
94 top: parent.top
95 left: parent.left
95 left: parent.left
qml/Stages/DecoratedWindow.qml+1−1
@@ -62,7 +62,7 @@ FocusScope {
62 Rectangle {
62 Rectangle {
63 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
63 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
64 height: units.dp(2)
64 height: units.dp(2)
65− color: UbuntuColors.orange
65+ color: theme.palette.normal.focus
66 visible: highlightShown
66 visible: highlightShown
67 }
67 }
68
68
qml/Stages/DesktopSpread.qml+1−1
@@ -494,7 +494,7 @@ FocusScope {
494 // Rectangle {
494 // Rectangle {
495 // anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
495 // anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
496 // height: units.dp(2)
496 // height: units.dp(2)
497− // color: UbuntuColors.orange
497+ // color: theme.palette.normal.focus
498 // visible: index == 0 // TODO: should be active workspace index
498 // visible: index == 0 // TODO: should be active workspace index
499 // }
499 // }
500 }
500 }
qml/Stages/DesktopSpreadDelegate.qml+1−1
@@ -83,7 +83,7 @@ Item {
83 Rectangle {
83 Rectangle {
84 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
84 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
85 height: units.dp(2)
85 height: units.dp(2)
86− color: UbuntuColors.orange
86+ color: theme.palette.normal.focus
87 visible: root.highlightShown
87 visible: root.highlightShown
88 antialiasing: true
88 antialiasing: true
89 }
89 }
qml/Stages/SpreadDelegate.qml+1−1
@@ -286,7 +286,7 @@ FocusScope {
286 Rectangle {
286 Rectangle {
287 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
287 anchors { left: selectionHighlight.left; right: selectionHighlight.right; bottom: selectionHighlight.bottom; }
288 height: units.dp(2)
288 height: units.dp(2)
289− color: UbuntuColors.orange
289+ color: theme.palette.normal.focus
290 visible: root.highlightShown
290 visible: root.highlightShown
291 antialiasing: true
291 antialiasing: true
292 }
292 }
tests/plugins/Dash/tst_ScopeStyle.qml+1−1
@@ -174,7 +174,7 @@ Rectangle {
174
174
175 function test_previewButtonColor_data() {
175 function test_previewButtonColor_data() {
176 return [
176 return [
177− { tag: "default", index: 0, previewButtonColor: UbuntuColors.orange },
177+ { tag: "default", index: 0, previewButtonColor: theme.palette.normal.positive },
178 { tag: "red", index: 1, previewButtonColor: "red" },
178 { tag: "red", index: 1, previewButtonColor: "red" },
179 ];
179 ];
180 }
180 }