Unity 8

Merge lp:~unity-team/unity8/palette-fixes into lp:unity8

palette-fixes
Merge into trunk

Proposed by Michael Zanetti on 2016-03-09

Status:

Merged

Approved by:

Michał Sawicz on 2016-03-11

Approved revision:

2228

Merged at revision:

2255

Proposed branch:

lp:~unity-team/unity8/palette-fixes

Merge into:

lp:unity8

Diff against target:

159 lines (+21/-12)

9 files modified

qml/Components/ShellDialog.qml (+8/-0)
qml/Dash/Previews/PreviewOverlay.qml (+1/-1)
qml/Notifications/Notification.qml (+5/-1)
qml/Panel/Handle.qml (+2/-2)
qml/Panel/Indicators/MenuItemFactory.qml (+0/-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)

To merge this branch:

bzr merge lp:~unity-team/unity8/palette-fixes

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2016-03-09	Approve on 2016-03-11
Unity8 CI Bot	continuous-integration	2016-03-09	Needs Fixing on 2016-03-11
Review via email: mp+288560@code.launchpad.net

This proposal supersedes a proposal from 2016-03-09.

Commit Message

some fixes for the new palette

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.

* Did you perform an exploratory manual test run of your code change and any related functionality?

yes

* Did you make sure that your branch does not contain spurious tags?

yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

* If you changed the UI, has there been a design review?

- spread background value given by Vesa
- Panel drag handle values given by Rae

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-09: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/631/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/638/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-03-10:

Text conflict in qml/Panel/Handle.qml
1 conflicts encountered.

Please merge trunk.

review: Needs Fixing

lp:~unity-team/unity8/palette-fixes updated on 2016-03-10

2221. By Michael Zanetti on 2016-03-10: merge with trunk
2222. By Michael Zanetti on 2016-03-10: fix the Dialogs
2223. By Michael Zanetti on 2016-03-10: fix the snap decisions
2224. By Michael Zanetti on 2016-03-10: fix it without breaking the rest of the shell
2225. By Andrea Cimitan on 2016-03-10: Fix close button in previewOverlay

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/647/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/palette-fixes updated on 2016-03-10

2226. By Nick Dedekind on 2016-03-10: enable progres value

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/650/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/palette-fixes updated on 2016-03-10

2227. By Nick Dedekind on 2016-03-10: fixed progress item test

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/659/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/palette-fixes updated on 2016-03-10

2228. By Lukáš Tinkl on 2016-03-10: unify the panel and window decos colors

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/665/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/670/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-03-11:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y
* Did CI run pass? If not, please explain why.
AP fix in another branch
* Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

Michael Zanetti (mzanetti) wrote on 2016-03-11:

@Saviq, sorry, I pushed another change. Wasn't really happy with just keeping the battery percentage entry enabled as pressing it would produce visual and haptics feedback without actually doing anything.

My change is more hacky, but better from a user point of view. Zsombor is fixing the issue in the SDK as we speek so we can eventually set my hacked color value "theme.palette.normal.foreground".

Note that this also requires a patch in ubuntu-settings-components (see description). Please add that to the silo too.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Components/ShellDialog.qml'
2	--- qml/Components/ShellDialog.qml 2015-11-06 10:06:58 +0000
3	+++ qml/Components/ShellDialog.qml 2016-03-11 15:14:12 +0000
4	@@ -37,7 +37,15 @@
5
6	focus: true
7
8	+ // FIXME: this is a hack because Dialog subtheming seems broken atm
9	+ // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
10	+ ThemeSettings {
11	+ id: themeHack
12	+ name: "Ubuntu.Components.Themes.Ambiance"
13	+ }
14	+
15	Component.onCompleted: {
16	+ __foreground.theme = themeHack
17	show();
18	}
19	}
20
21	=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
22	--- qml/Dash/Previews/PreviewOverlay.qml 2015-07-15 15:07:19 +0000
23	+++ qml/Dash/Previews/PreviewOverlay.qml 2016-03-11 15:14:12 +0000
24	@@ -158,7 +158,7 @@
25	anchors.centerIn: parent
26	width: units.gu(2.5)
27	height: width
28	- color: theme.palette.normal.foregroundText
29	+ color: "white"
30	name: "close"
31	}
32	}
33
34	=== modified file 'qml/Notifications/Notification.qml'
35	--- qml/Notifications/Notification.qml 2016-02-29 11:31:46 +0000
36	+++ qml/Notifications/Notification.qml 2016-03-11 15:14:12 +0000
37	@@ -23,7 +23,7 @@
38	import Utils 0.1
39	import "../Components"
40
41	-Item {
42	+StyledItem {
43	id: notification
44
45	property alias iconSource: icon.fileSource
46	@@ -58,6 +58,10 @@
47	color: (type === Notification.Confirmation && notificationList.useModal && !greeter.shown) \|\| darkOnBright ? sdLightGrey : Qt.rgba(0.132, 0.117, 0.109, 0.97)
48	opacity: 1 - (x / notification.width) // FIXME: non-zero initially because of LP: #1354406 workaround, we want this to start at 0 upon creation eventually
49
50	+ theme: ThemeSettings {
51	+ name: "Ubuntu.Components.Themes.Ambiance"
52	+ }
53	+
54	state: {
55	var result = "";
56
57
58	=== modified file 'qml/Panel/Handle.qml'
59	--- qml/Panel/Handle.qml 2016-03-08 20:59:14 +0000
60	+++ qml/Panel/Handle.qml 2016-03-11 15:14:12 +0000
61	@@ -19,7 +19,7 @@
62
63	Rectangle {
64	id: handle
65	- color: UbuntuColors.slate
66	+ color: theme.palette.normal.foreground
67	height: units.gu(2)
68	property bool active: false
69
70	@@ -35,7 +35,7 @@
71	id: dot
72	width: units.dp(3)
73	height: width
74	- color: handle.active ? UbuntuColors.orange : UbuntuColors.ash
75	+ color: handle.active ? theme.palette.highlighted.foreground : theme.palette.normal.raised
76	radius: units.dp(1)
77	}
78	}
79
80	=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
81	--- qml/Panel/Indicators/MenuItemFactory.qml 2016-03-08 20:59:14 +0000
82	+++ qml/Panel/Indicators/MenuItemFactory.qml 2016-03-11 15:14:12 +0000
83	@@ -228,7 +228,6 @@
84	text: menuData && menuData.label \|\| ""
85	iconSource: menuData && menuData.icon \|\| ""
86	value : menuData && menuData.actionState \|\| 0.0
87	- enabled: menuData && menuData.sensitive \|\| false
88	highlightWhenPressed: false
89	}
90	}
91
92	=== modified file 'qml/Panel/IndicatorsMenu.qml'
93	--- qml/Panel/IndicatorsMenu.qml 2016-03-08 20:59:14 +0000
94	+++ qml/Panel/IndicatorsMenu.qml 2016-03-11 15:14:12 +0000
95	@@ -38,7 +38,7 @@
96	property bool enableHint: true
97	property bool contentEnabled: true
98	property bool showOnClick: true
99	- property color panelColor: theme.palette.normal.background
100	+ property color panelColor: UbuntuColors.jet
101
102	signal showTapped(point position)
103
104
105	=== modified file 'qml/Panel/Panel.qml'
106	--- qml/Panel/Panel.qml 2016-03-08 20:59:14 +0000
107	+++ qml/Panel/Panel.qml 2016-03-11 15:14:12 +0000
108	@@ -89,7 +89,7 @@
109
110	Rectangle {
111	id: indicatorAreaBackground
112	- color: callHint.visible ? UbuntuColors.green : theme.palette.normal.background
113	+ color: callHint.visible ? UbuntuColors.green : indicators.panelColor
114	anchors {
115	top: parent.top
116	left: parent.left
117
118	=== modified file 'qml/Stages/AbstractStage.qml'
119	--- qml/Stages/AbstractStage.qml 2016-01-14 13:03:20 +0000
120	+++ qml/Stages/AbstractStage.qml 2016-03-11 15:14:12 +0000
121	@@ -21,7 +21,7 @@
122	Rectangle {
123	id: root
124
125	- color: "#111111"
126	+ color: "#060606"
127
128	// Controls to be set from outside
129	property bool altTabPressed
130
131	=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
132	--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2015-10-26 09:59:50 +0000
133	+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2016-03-11 15:14:12 +0000
134	@@ -274,15 +274,14 @@
135
136	function test_create_progressMenu_data() {
137	return [
138	- {label: "testLabel1", enabled: true, value: 10 },
139	- {label: "testLabel2", enabled: false, value: 55 },
140	+ {label: "testLabel1", value: 10 },
141	+ {label: "testLabel2", value: 55 },
142	];
143	}
144
145	function test_create_progressMenu(data) {
146	menuData.type = "com.canonical.indicator.progress"
147	menuData.label = data.label;
148	- menuData.sensitive = data.enabled;
149	menuData.actionState = data.value;
150
151	loader.data = menuData;
152	@@ -292,7 +291,6 @@
153
154	compare(loader.item.text, data.label, "Label does not match data");
155	compare(loader.item.value, data.value, "Value does not match data");
156	- compare(loader.item.enabled, data.enabled, "Enabled does not match data");
157	}
158
159	function test_create_standardMenu_data() {