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

[Nick Dedekind]

Fixed datetime indicator appointment colour

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".

[PS Jenkins bot (ps-jenkins)]

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]

833. By Launchpad Translations on behalf of unity-team on 2014-04-15

Launchpad automatic translations update.

834. By Leo Arias on 2014-04-15

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

835. By Leo Arias on 2014-04-15

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

836. By Michael Terry on 2014-04-15

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 on 2014-04-15

Releasing 7.85+14.04.20140415.2-0ubuntu1

838. By Launchpad Translations on behalf of unity-team on 2014-04-16

Launchpad automatic translations update.

[Andrea Cimitan (cimi)]

 * 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]

839. By Mirco Müller on 2014-04-16

Fix notification ap-test assertions.

840. By Leo Arias on 2014-04-16

Reverted the change that returns application cards instead of titles.

841. By Allan LeSage on 2014-04-16

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

842. By Albert Astals Cid on 2014-04-16

Fix last item X position

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

843. By Andrea Cimitan on 2014-04-16

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

844. By Nick Dedekind on 2014-04-16

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

845. By Albert Astals Cid on 2014-04-16

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 on 2014-04-16

Remove AnimationControllerWithSignals.

847. By Albert Astals Cid on 2014-04-16

Use the correct delegate base item for the Carousel test

848. By Albert Astals Cid on 2014-04-16

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 on 2014-04-16

Use new tablet and phone backgrounds from Design.

850. By Michael Zanetti on 2014-04-16

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

851. By Albert Astals Cid on 2014-04-16

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 on 2014-04-16

Releasing 7.85+14.04.20140416-0ubuntu1

853. By Launchpad Translations on behalf of unity-team on 2014-04-22

Launchpad automatic translations update.

854. By Launchpad Translations on behalf of unity-team on 2014-04-23

Launchpad automatic translations update.

855. By Albert Astals Cid on 2014-04-29

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

856. By Albert Astals Cid on 2014-04-29

CategoryDelegateRange: Fix condition for detecting overshooting

857. By Albert Astals Cid on 2014-04-29

Make xvfbtests work in the DashView plugins

858. By Nick Dedekind on 2014-04-29

Fixed datetime indicator appointment colour Fixes: 1307048

=== 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 @@
             text: menuData && menuData.label || ""
             iconSource: menuData && menuData.icon || "image://theme/calendar"
             time: timeFormatter.timeString
-            eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+            eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
             enabled: menuData && menuData.sensitive || false
 
             onMenuModelChanged: {

=== 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 @@
 import Unity.Test 0.1 as UT
 import QMenuModel 0.1
 import Unity.Indicators 0.1 as Indicators
+import Utils 0.1 as Utils
 
 Item {
     id: testView
@@ -42,6 +43,10 @@
         }
     }
 
+    Utils.GDateTimeFormatter {
+        id: timeFormatter
+    }
+
     UT.UnityTestCase {
         name: "MenuItemFactory"
 
@@ -357,8 +362,10 @@
 
         function test_create_alarmMenu_data() {
             return [
-                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
-                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
+                {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
+                            time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
+                {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
+                            time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
             ];
         }
 
@@ -367,6 +374,12 @@
             menuData.label = data.label;
             menuData.sensitive = data.enabled;
             menuData.icon = data.icon;
+            menuData.ext = {
+                'xCanonicalTime': data.time,
+                'xCanonicalTimeFormat': data.timeFormat
+            };
+            timeFormatter.format = data.timeFormat;
+            timeFormatter.time = data.time;
 
             loader.data = menuData;
             loader.sourceComponent = factory.load(menuData);
@@ -375,13 +388,16 @@
 
             compare(loader.item.text, data.label, "Label does not match data");
             compare(loader.item.iconSource, data.icon, "Icon does not match data");
+            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
         }
 
         function test_create_appointmentMenu_data() {
             return [
-                {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },
-                {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },
+                {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
+                            time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
+                {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
+                            time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
             ];
         }
 
@@ -390,6 +406,13 @@
             menuData.label = data.label;
             menuData.sensitive = data.enabled;
             menuData.icon = data.icon;
+            menuData.ext = {
+                'xCanonicalColor': data.colour,
+                'xCanonicalTime': data.time,
+                'xCanonicalTimeFormat': data.timeFormat
+            };
+            timeFormatter.format = data.timeFormat;
+            timeFormatter.time = data.time;
 
             loader.data = menuData;
             loader.sourceComponent = factory.load(menuData);
@@ -398,6 +421,8 @@
 
             compare(loader.item.text, data.label, "Label does not match data");
             compare(loader.item.iconSource, data.icon, "Icon does not match data");
+            compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
+            compare(loader.item.eventColor, data.color, "Colour does not match data");
             compare(loader.item.enabled, data.enabled, "Enabled does not match data");
         }