git.iko.soy/unity8
on xenial help sign in
some fixes for the new palette Fixes: #1554616
ebb7691Nick Dedekind
qml/Components/ShellDialog.qml+8
compare with xenial
unifiedsplit
@@ -37,7 +37,15 @@ Dialog {
37
37
38 focus: true
38 focus: true
39
39
40+ // FIXME: this is a hack because Dialog subtheming seems broken atm
41+ // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
42+ ThemeSettings {
43+ id: themeHack
44+ name: "Ubuntu.Components.Themes.Ambiance"
45+ }
46+
40 Component.onCompleted: {
47 Component.onCompleted: {
48+ __foreground.theme = themeHack
41 show();
49 show();
42 }
50 }
43}
51}
qml/Dash/Previews/PreviewOverlay.qml+1−1
@@ -158,7 +158,7 @@ Rectangle {
158 anchors.centerIn: parent
158 anchors.centerIn: parent
159 width: units.gu(2.5)
159 width: units.gu(2.5)
160 height: width
160 height: width
161− color: theme.palette.normal.foregroundText
161+ color: "white"
162 name: "close"
162 name: "close"
163 }
163 }
164 }
164 }
qml/Notifications/Notification.qml+5−1
@@ -23,7 +23,7 @@ import QMenuModel 0.1
23import Utils 0.1
23import Utils 0.1
24import "../Components"
24import "../Components"
25
25
26−Item {
26+StyledItem {
27 id: notification
27 id: notification
28
28
29 property alias iconSource: icon.fileSource
29 property alias iconSource: icon.fileSource
@@ -58,6 +58,10 @@ Item {
58 color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) || darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
58 color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) || darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
59 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
59 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
60
60
61+ theme: ThemeSettings {
62+ name: "Ubuntu.Components.Themes.Ambiance"
63+ }
64+
61 state: {
65 state: {
62 var result = "";
66 var result = "";
63
67
qml/Panel/Handle.qml+2−2
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.3
19
19
20Rectangle {
20Rectangle {
21 id: handle
21 id: handle
22− color: UbuntuColors.slate
22+ color: theme.palette.normal.foreground
23 height: units.gu(2)
23 height: units.gu(2)
24 property bool active: false
24 property bool active: false
25
25
@@ -35,7 +35,7 @@ Rectangle {
35 id: dot
35 id: dot
36 width: units.dp(3)
36 width: units.dp(3)
37 height: width
37 height: width
38− color: handle.active ? UbuntuColors.orange : UbuntuColors.ash
38+ color: handle.active ? theme.palette.highlighted.foreground : theme.palette.normal.raised
39 radius: units.dp(1)
39 radius: units.dp(1)
40 }
40 }
41 }
41 }
qml/Panel/Indicators/MenuItemFactory.qml−1
@@ -228,7 +228,6 @@ Item {
228 text: menuData && menuData.label || ""
228 text: menuData && menuData.label || ""
229 iconSource: menuData && menuData.icon || ""
229 iconSource: menuData && menuData.icon || ""
230 value : menuData && menuData.actionState || 0.0
230 value : menuData && menuData.actionState || 0.0
231− enabled: menuData && menuData.sensitive || false
232 highlightWhenPressed: false
231 highlightWhenPressed: false
233 }
232 }
234 }
233 }
qml/Panel/IndicatorsMenu.qml+1−1
@@ -38,7 +38,7 @@ Showable {
38 property bool enableHint: true
38 property bool enableHint: true
39 property bool contentEnabled: true
39 property bool contentEnabled: true
40 property bool showOnClick: true
40 property bool showOnClick: true
41− property color panelColor: theme.palette.normal.background
41+ property color panelColor: UbuntuColors.jet
42
42
43 signal showTapped(point position)
43 signal showTapped(point position)
44
44
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 ? UbuntuColors.green : indicators.panelColor
93 anchors {
93 anchors {
94 top: parent.top
94 top: parent.top
95 left: parent.left
95 left: parent.left
qml/Stages/AbstractStage.qml+1−1
@@ -21,7 +21,7 @@ import GSettings 1.0
21Rectangle {
21Rectangle {
22 id: root
22 id: root
23
23
24− color: "#111111"
24+ color: "#060606"
25
25
26 // Controls to be set from outside
26 // Controls to be set from outside
27 property bool altTabPressed
27 property bool altTabPressed
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+2−4
@@ -274,15 +274,14 @@ Item {
274
274
275 function test_create_progressMenu_data() {
275 function test_create_progressMenu_data() {
276 return [
276 return [
277− {label: "testLabel1", enabled: true, value: 10 },
277+ {label: "testLabel1", value: 10 },
278− {label: "testLabel2", enabled: false, value: 55 },
278+ {label: "testLabel2", value: 55 },
279 ];
279 ];
280 }
280 }
281
281
282 function test_create_progressMenu(data) {
282 function test_create_progressMenu(data) {
283 menuData.type = "com.canonical.indicator.progress"
283 menuData.type = "com.canonical.indicator.progress"
284 menuData.label = data.label;
284 menuData.label = data.label;
285− menuData.sensitive = data.enabled;
286 menuData.actionState = data.value;
285 menuData.actionState = data.value;
287
286
288 loader.data = menuData;
287 loader.data = menuData;
@@ -292,7 +291,6 @@ Item {
292
291
293 compare(loader.item.text, data.label, "Label does not match data");
292 compare(loader.item.text, data.label, "Label does not match data");
294 compare(loader.item.value, data.value, "Value does not match data");
293 compare(loader.item.value, data.value, "Value does not match data");
295− compare(loader.item.enabled, data.enabled, "Enabled does not match data");
296 }
294 }
297
295
298 function test_create_standardMenu_data() {
296 function test_create_standardMenu_data() {