git.iko.soy/unity8
on xenial help sign in
some fixes for the new palette Fixes: #1554616
commitebb7691c5c57548a80470f19159ffe17bb48f0ec authorNick Dedekind <nick.dedekind@canonical.com> dateThu 10 Mar 2016, 22:41 (11 years ago) parent3356672b1d16d3
9 files changed+21−12
compare with xenial
unifiedsplit
qml/Components/ShellDialog.qml+8 qml/Dash/Previews/PreviewOverlay.qml+1−1 qml/Notifications/Notification.qml+5−1 qml/Panel/Handle.qml+2−2 qml/Panel/Indicators/MenuItemFactory.qml−1 qml/Panel/IndicatorsMenu.qml+1−1 qml/Panel/Panel.qml+1−1 qml/Stages/AbstractStage.qml+1−1 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+2−4
qml/Components/ShellDialog.qml+8
@@ -37,7 +37,15 @@ Dialog {
3737
3838 focus: true
3939
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+
4047 Component.onCompleted: {
48+ __foreground.theme = themeHack
4149 show();
4250 }
4351}
qml/Dash/Previews/PreviewOverlay.qml+1−1
@@ -158,7 +158,7 @@ Rectangle {
158158 anchors.centerIn: parent
159159 width: units.gu(2.5)
160160 height: width
161− color: theme.palette.normal.foregroundText
161+ color: "white"
162162 name: "close"
163163 }
164164 }
qml/Notifications/Notification.qml+5−1
@@ -23,7 +23,7 @@ import QMenuModel 0.1
2323import Utils 0.1
2424import "../Components"
2525
26−Item {
26+StyledItem {
2727 id: notification
2828
2929 property alias iconSource: icon.fileSource
@@ -58,6 +58,10 @@ Item {
5858 color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) || darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
5959 opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
6060
61+ theme: ThemeSettings {
62+ name: "Ubuntu.Components.Themes.Ambiance"
63+ }
64+
6165 state: {
6266 var result = "";
6367
qml/Panel/Handle.qml+2−2
@@ -19,7 +19,7 @@ import Ubuntu.Components 1.3
1919
2020Rectangle {
2121 id: handle
22− color: UbuntuColors.slate
22+ color: theme.palette.normal.foreground
2323 height: units.gu(2)
2424 property bool active: false
2525
@@ -35,7 +35,7 @@ Rectangle {
3535 id: dot
3636 width: units.dp(3)
3737 height: width
38− color: handle.active ? UbuntuColors.orange : UbuntuColors.ash
38+ color: handle.active ? theme.palette.highlighted.foreground : theme.palette.normal.raised
3939 radius: units.dp(1)
4040 }
4141 }
qml/Panel/Indicators/MenuItemFactory.qml−1
@@ -228,7 +228,6 @@ Item {
228228 text: menuData && menuData.label || ""
229229 iconSource: menuData && menuData.icon || ""
230230 value : menuData && menuData.actionState || 0.0
231− enabled: menuData && menuData.sensitive || false
232231 highlightWhenPressed: false
233232 }
234233 }
qml/Panel/IndicatorsMenu.qml+1−1
@@ -38,7 +38,7 @@ Showable {
3838 property bool enableHint: true
3939 property bool contentEnabled: true
4040 property bool showOnClick: true
41− property color panelColor: theme.palette.normal.background
41+ property color panelColor: UbuntuColors.jet
4242
4343 signal showTapped(point position)
4444
qml/Panel/Panel.qml+1−1
@@ -89,7 +89,7 @@ Item {
8989
9090 Rectangle {
9191 id: indicatorAreaBackground
92− color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
92+ color: callHint.visible ? UbuntuColors.green : indicators.panelColor
9393 anchors {
9494 top: parent.top
9595 left: parent.left
qml/Stages/AbstractStage.qml+1−1
@@ -21,7 +21,7 @@ import GSettings 1.0
2121Rectangle {
2222 id: root
2323
24− color: "#111111"
24+ color: "#060606"
2525
2626 // Controls to be set from outside
2727 property bool altTabPressed
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+2−4
@@ -274,15 +274,14 @@ Item {
274274
275275 function test_create_progressMenu_data() {
276276 return [
277− {label: "testLabel1", enabled: true, value: 10 },
278− {label: "testLabel2", enabled: false, value: 55 },
277+ {label: "testLabel1", value: 10 },
278+ {label: "testLabel2", value: 55 },
279279 ];
280280 }
281281
282282 function test_create_progressMenu(data) {
283283 menuData.type = "com.canonical.indicator.progress"
284284 menuData.label = data.label;
285− menuData.sensitive = data.enabled;
286285 menuData.actionState = data.value;
287286
288287 loader.data = menuData;
@@ -292,7 +291,6 @@ Item {
292291
293292 compare(loader.item.text, data.label, "Label does not match data");
294293 compare(loader.item.value, data.value, "Value does not match data");
295− compare(loader.item.enabled, data.enabled, "Enabled does not match data");
296294 }
297295
298296 function test_create_standardMenu_data() {