Unity 8

Merge lp:~nick-dedekind/unity8/lp1307048-appointment-colour into lp:unity8

  1. lp1307048-appointment-colour
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Andrea Cimitan
Approved revision: no longer in the source branch.
Merged at revision: 858
Proposed branch: lp:~nick-dedekind/unity8/lp1307048-appointment-colour
Merge into: lp:unity8
Diff against target: 102 lines (+30/-5)
2 files modified
plugins/Unity/Indicators/qml/MenuItemFactory.qml (+1/-1)
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+29/-4)
To merge this branch: bzr merge lp:~nick-dedekind/unity8/lp1307048-appointment-colour
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+215689@code.launchpad.net

Commit message

Fixed datetime indicator appointment colour

Description of the change

Fixed datetime indicator appointment colour

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

 * 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?
N/A - this is a regression from "as designed".

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:833
http://jenkins.qa.ubuntu.com/job/unity8-ci/2815/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/233
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1340
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4402
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4402/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6005
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4957
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4957/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2815/rebuild

review: Needs Fixing (continuous-integration)
lp:~nick-dedekind/unity8/lp1307048-appointment-colour updated
833. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

834. By Leo Arias

Use subprocess.check_call when caling url-dispatcher, so an error will be raised if it fails.

835. By Leo Arias

Test application life cycle with fake apps, instead of messaging and address book.

836. By Michael Terry

When an application requests focus, handle it in Shell.qml by hiding the greeter and stopping any edge demo. Fixes: 1227753, 1267624, 1307489

837. By PS Jenkins bot

Releasing 7.85+14.04.20140415.2-0ubuntu1

838. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

Revision history for this message
Andrea Cimitan (cimi) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Unrelated

review: Approve
lp:~nick-dedekind/unity8/lp1307048-appointment-colour updated
839. By Mirco Müller

Fix notification ap-test assertions.

840. By Leo Arias

Reverted the change that returns application cards instead of titles.

841. By Allan LeSage

DashApps emulator get_applications should return a list ordered by visible y, x.

842. By Albert Astals Cid

Fix last item X position

Fixes clicking on the last item sometimes not working Fixes: 1301871

843. By Andrea Cimitan

Workaround for lp1301309 until fixes for palette in ui toolkit Fixes: 1301309

844. By Nick Dedekind

Indicator services started by unity8 upstart configuration rather than manual emmision from indicator manager.

845. By Albert Astals Cid

Use upstart in ./run

Makes it so that you can use the lock button on the device without getting that nasty hwc crash

846. By Albert Astals Cid

Remove AnimationControllerWithSignals.

847. By Albert Astals Cid

Use the correct delegate base item for the Carousel test

848. By Albert Astals Cid

Some simplification in DashContent

* Kill the ScopeDelegateMapper in favour of a simple if (that will eventually go away)
* Removal of all the fake scopes in the tests that added nothing of value to the tests
* Removal of movementEnded signal that was unused
* Removal of movementStarted and positionedAtBeginning signals that were being used as function calls
* Rework DashContent tests so they what the function does what it is supposed to do instead of just making sure QML signals work

849. By Michael Terry

Use new tablet and phone backgrounds from Design.

850. By Michael Zanetti

workaround the QTestLogger assertion issue with make tryXyz and our custom uqmlscene

851. By Albert Astals Cid

Improve Card creation time by adding loaders that make sure only what's needed is loaded

In my computer it goes from
RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryModel":
     3.217 msecs per iteration (total: 3,218, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":
     1.647 msecs per iteration (total: 1,648, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel":
     1.514 msecs per iteration (total: 1,515, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtModel":
     1.471 msecs per iteration (total: 1,471, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardArtModel":
     1.447 msecs per iteration (total: 1,448, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleModel":
     1.276 msecs per iteration (total: 1,276, iterations: 1000)

to

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotSummaryModel":
     2.916 msecs per iteration (total: 2,917, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleMascotModel":
     1.504 msecs per iteration (total: 1,504, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtSubtitleModel":
     1.060 msecs per iteration (total: 1,061, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleArtModel":
     1.052 msecs per iteration (total: 1,053, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardArtModel":
     0.727 msecs per iteration (total: 728, iterations: 1000)

RESULT : qmltestrunner::benchmark_time:"cardTitleModel":
     0.817 msecs per iteration (total: 818, iterations: 1000) Fixes: 1297197

852. By PS Jenkins bot

Releasing 7.85+14.04.20140416-0ubuntu1

853. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

854. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

855. By Albert Astals Cid

Improve Card creation time by adding loaders that make sure only what's needed is loaded Fixes: 1297197

856. By Albert Astals Cid

CategoryDelegateRange: Fix condition for detecting overshooting

857. By Albert Astals Cid

Make xvfbtests work in the DashView plugins

858. By Nick Dedekind

Fixed datetime indicator appointment colour Fixes: 1307048

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/Unity/Indicators/qml/MenuItemFactory.qml'
--- plugins/Unity/Indicators/qml/MenuItemFactory.qml 2014-03-19 16:22:46 +0000
+++ plugins/Unity/Indicators/qml/MenuItemFactory.qml 2014-04-14 15:07:07 +0000
@@ -273,7 +273,7 @@
273 text: menuData && menuData.label || ""273 text: menuData && menuData.label || ""
274 iconSource: menuData && menuData.icon || "image://theme/calendar"274 iconSource: menuData && menuData.icon || "image://theme/calendar"
275 time: timeFormatter.timeString275 time: timeFormatter.timeString
276 eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)276 eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
277 enabled: menuData && menuData.sensitive || false277 enabled: menuData && menuData.sensitive || false
278278
279 onMenuModelChanged: {279 onMenuModelChanged: {
280280
=== modified file 'tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml'
--- tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2014-03-19 16:32:59 +0000
+++ tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml 2014-04-14 15:07:07 +0000
@@ -19,6 +19,7 @@
19import Unity.Test 0.1 as UT19import Unity.Test 0.1 as UT
20import QMenuModel 0.120import QMenuModel 0.1
21import Unity.Indicators 0.1 as Indicators21import Unity.Indicators 0.1 as Indicators
22import Utils 0.1 as Utils
2223
23Item {24Item {
24 id: testView25 id: testView
@@ -42,6 +43,10 @@
42 }43 }
43 }44 }
4445
46 Utils.GDateTimeFormatter {
47 id: timeFormatter
48 }
49
45 UT.UnityTestCase {50 UT.UnityTestCase {
46 name: "MenuItemFactory"51 name: "MenuItemFactory"
4752
@@ -357,8 +362,10 @@
357362
358 function test_create_alarmMenu_data() {363 function test_create_alarmMenu_data() {
359 return [364 return [
360 {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },365 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
361 {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },366 time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
367 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
368 time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
362 ];369 ];
363 }370 }
364371
@@ -367,6 +374,12 @@
367 menuData.label = data.label;374 menuData.label = data.label;
368 menuData.sensitive = data.enabled;375 menuData.sensitive = data.enabled;
369 menuData.icon = data.icon;376 menuData.icon = data.icon;
377 menuData.ext = {
378 'xCanonicalTime': data.time,
379 'xCanonicalTimeFormat': data.timeFormat
380 };
381 timeFormatter.format = data.timeFormat;
382 timeFormatter.time = data.time;
370383
371 loader.data = menuData;384 loader.data = menuData;
372 loader.sourceComponent = factory.load(menuData);385 loader.sourceComponent = factory.load(menuData);
@@ -375,13 +388,16 @@
375388
376 compare(loader.item.text, data.label, "Label does not match data");389 compare(loader.item.text, data.label, "Label does not match data");
377 compare(loader.item.iconSource, data.icon, "Icon does not match data");390 compare(loader.item.iconSource, data.icon, "Icon does not match data");
391 compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
378 compare(loader.item.enabled, data.enabled, "Enabled does not match data");392 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
379 }393 }
380394
381 function test_create_appointmentMenu_data() {395 function test_create_appointmentMenu_data() {
382 return [396 return [
383 {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },397 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
384 {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },398 time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
399 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
400 time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
385 ];401 ];
386 }402 }
387403
@@ -390,6 +406,13 @@
390 menuData.label = data.label;406 menuData.label = data.label;
391 menuData.sensitive = data.enabled;407 menuData.sensitive = data.enabled;
392 menuData.icon = data.icon;408 menuData.icon = data.icon;
409 menuData.ext = {
410 'xCanonicalColor': data.colour,
411 'xCanonicalTime': data.time,
412 'xCanonicalTimeFormat': data.timeFormat
413 };
414 timeFormatter.format = data.timeFormat;
415 timeFormatter.time = data.time;
393416
394 loader.data = menuData;417 loader.data = menuData;
395 loader.sourceComponent = factory.load(menuData);418 loader.sourceComponent = factory.load(menuData);
@@ -398,6 +421,8 @@
398421
399 compare(loader.item.text, data.label, "Label does not match data");422 compare(loader.item.text, data.label, "Label does not match data");
400 compare(loader.item.iconSource, data.icon, "Icon does not match data");423 compare(loader.item.iconSource, data.icon, "Icon does not match data");
424 compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
425 compare(loader.item.eventColor, data.color, "Colour does not match data");
401 compare(loader.item.enabled, data.enabled, "Enabled does not match data");426 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
402 }427 }
403428

Subscribers

People subscribed via source and target branches