git.iko.soy/unity8
on xenial help sign in
* MenuItemFactory: bind calendar backend properties to calendarMenu item

Adds support for showing the calendar at the requested date, marking days with events properly and toggling the visibility of the week number. * Bump version as USC breaks with unity8 << 8.14

commit0917e088e337eef52f417b9bd22b20f46c2eab6e authorBileto Bot <ci-train-bot@canonical.com> dateWed 16 Nov 2016, 10:43 (10 years ago) parent10a9a7a40f5bdc
10 files changed+116−12
compare with xenial
unifiedsplit
debian/changelog+11 debian/control+2−2 qml/Panel/Indicators/MenuItemFactory.qml+26−3 qml/Panel/Indicators/client/IndicatorsTree.qml+1 tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+18−1 tests/qmltests/Dash/Previews/tst_Preview.qml+20−1 tests/qmltests/Dash/tst_DashContent.qml+1 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+33−1 tests/qmltests/tst_OrientedShell.qml+2−2 tests/utils/modules/Unity/Test/UnityTestCase.qml+2−2
debian/changelog+11
@@ -1,3 +1,14 @@
1+unity8 (8.15) UNRELEASED; urgency=medium
2+
3+ * MenuItemFactory: bind calendar backend properties to calendarMenu item
4+
5+ Adds support for showing the calendar at the requested date, marking days
6+ with events properly and toggling the visibility of the week number.
7+
8+ * Bump version as USC breaks with unity8 << 8.14
9+
10+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Thu, 27 Oct 2016 14:03:03 +0200
11+
112unity8 (8.14+17.04.20161109-0ubuntu1) zesty; urgency=medium
213
314 [ Albert Astals Cid ]
debian/control+2−2
@@ -65,7 +65,7 @@ Build-Depends: cmake,
6565 qtdeclarative5-dev-tools,
6666 qtdeclarative5-private-dev (>= 5.4),
6767 qtdeclarative5-ubuntu-content1,
68− qtdeclarative5-ubuntu-settings-components (>= 0.10),
68+ qtdeclarative5-ubuntu-settings-components (>= 0.11),
6969 ttf-ubuntu-font-family,
7070Standards-Version: 3.9.4
7171Homepage: http://launchpad.net/unity
@@ -154,7 +154,7 @@ Architecture: all
154154Depends: qml-module-qtquick-layouts,
155155 qml-module-ubuntu-components (>= 1.3.2030) | qml-module-ubuntu-components-gles (>= 1.3.2030),
156156 qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
157− qtdeclarative5-ubuntu-settings-components (>= 0.7),
157+ qtdeclarative5-ubuntu-settings-components (>= 0.11),
158158 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
159159 qttranslations5-l10n,
160160 ubuntu-thumbnailer-impl-0,
qml/Panel/Indicators/MenuItemFactory.qml+26−3
@@ -505,15 +505,38 @@ Item {
505505 id: calendarMenu
506506
507507 Menus.CalendarMenu {
508+ id: calendarItem
508509 objectName: "calendarMenu"
509− highlightWhenPressed: false
510510 focus: true
511511
512+ property QtObject menuData: null
512513 property var menuModel: menuFactory.menuModel
514+ property var actionState: menuData && menuData.actionState || null
515+ property real calendarDay: getExtendedProperty(actionState, "calendar-day", 0)
513516 property int menuIndex: -1
514517
515− onSelectedDateChanged: {
516− menuModel.activate(menuIndex, selectedDate.getTime() / 1000 | 0)
518+ showWeekNumbers: getExtendedProperty(actionState, "show-week-numbers", false)
519+ eventDays: getExtendedProperty(actionState, "appointment-days", [])
520+
521+ onCalendarDayChanged: {
522+ if (calendarDay > 0) {
523+ // This would trigger a selectionDateChanged signal, thus
524+ // we've to avoid that the subsequent model activation
525+ // would cause an infinite loop
526+ modelUpdateConnections.enabled = false
527+ currentDate = new Date(calendarDay * 1000)
528+ modelUpdateConnections.enabled = true
529+ }
530+ }
531+
532+ Connections {
533+ id: modelUpdateConnections
534+ property bool enabled: true
535+ target: (enabled && calendarItem.visible) ? calendarItem : null
536+
537+ onSelectedDateChanged: {
538+ menuModel.activate(menuIndex, selectedDate.getTime() / 1000 | 0)
539+ }
517540 }
518541 }
519542 }
qml/Panel/Indicators/client/IndicatorsTree.qml+1
@@ -34,6 +34,7 @@ IndicatorBase {
3434 TextArea {
3535 anchors.fill: parent
3636 anchors.margins: units.gu(0.5)
37+ readOnly: true
3738 id: all_data
3839 text: printer.text
3940 }
tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js+18−1
@@ -651,7 +651,7 @@ var fakeMenuData = {
651651 "rowData": {
652652 "action": "indicator.calendar",
653653 "actionState": {
654− "appointment-days": "",
654+ "appointment-days": [10],
655655 "calendar-day": (new Date).getTime() / 1000,
656656 "show-week-numbers": false,
657657 },
@@ -696,6 +696,23 @@ var fakeMenuData = {
696696 "type": ""
697697 }
698698 },
699+ {
700+ "rowData": {
701+ "action": "indicator.phone.open-appointment",
702+ "actionState": {},
703+ "ext": {
704+ "xCanonicalTime": (new Date).getTime() / 1000 + 55 * 60
705+ },
706+ "icon": "image://theme/alarm-clock",
707+ "isCheck": false,
708+ "isRadio": false,
709+ "isSeparator": false,
710+ "isToggled": false,
711+ "label": "Wake up!",
712+ "sensitive": true,
713+ "type": "com.canonical.indicator.alarm"
714+ }
715+ },
699716 {
700717 "rowData": {
701718 "action": "indicator.phone.open-appointment",
tests/qmltests/Dash/Previews/tst_Preview.qml+20−1
@@ -119,14 +119,33 @@ Rectangle {
119119 var moreLessButton = findChild(widget, "moreLessButton");
120120 mouseClick(moreLessButton);
121121
122+
123+ // FIXME: For some reason the PreviewWidgetFactory (parent of 'widget')
124+ // is destroyed on idle calls, when the test is under stress.
125+ // Not to compromise the result, we just skip the test if this happens
126+ var widget_str = widget.toString()
127+ var preview_str = preview.toString()
128+ var skipped = false
129+ function skipTest() { skipped = true; }
130+ preview.Component.onDestruction.connect(skipTest)
131+ widget.Component.onDestruction.connect(skipTest)
132+
122133 // Wait for the combo to stop growing
123− tryCompare(widget, "height", units.gu(15));
134+ tryCompareFunction(function(){ return (widget.height == units.gu(15) || skipped) }, true, 5000, "Widget lost "+widget_str+" was skipped ");
124135
125136 // Make sure the combo bottom is on the viewport
126137 tryCompareFunction(function () {
138+ if (skipped) return true;
127139 var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
128140 return bottomLeft.y <= preview.height + 1 // FIXME the +1 is to workaround https://bugreports.qt.io/browse/QTBUG-56961
129141 }, true);
142+
143+ if (!skipped) {
144+ preview.Component.onDestruction.disconnect(skipTest)
145+ widget.Component.onDestruction.disconnect(skipTest)
146+ } else {
147+ skip("preview %1 or widget %2 have been destroyed, thus we can't safely continue this test".arg(preview_str).arg(widget_str))
148+ }
130149 }
131150 }
132151}
tests/qmltests/Dash/tst_DashContent.qml+1
@@ -673,6 +673,7 @@ Item {
673673 compare(dashContentList.currentIndex, 0);
674674 compare(dashContentList.indexAt(dashContentList.width * 1.5, 0), 1);
675675 var nextScopeId = dashContentList.itemAt(dashContentList.width * 1.5, 0).item.scope.id;
676+ waitForRendering(favoriteAction);
676677 mouseClick(favoriteAction);
677678 tryCompareFunction(function() { return dashContentList.currentItem.item.scope.id == nextScopeId; }, true);
678679 compare(dashContentList.currentIndex, 0);
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+33−1
@@ -80,9 +80,11 @@ Item {
8080 menuData.isCheck = false;
8181 menuData.isRadio = false;
8282 menuData.isToggled = false;
83+ }
8384
84− loader.sourceComponent = null;
85+ function cleanup() {
8586 loader.data = undefined;
87+ loader.sourceComponent = undefined;
8688
8789 verify(loader.item == null);
8890 }
@@ -116,6 +118,8 @@ Item {
116118 { tag: 'accesspoint', type: "unity.widgets.systemsettings.tablet.accesspoint", objectName: "accessPoint" },
117119 { tag: 'modeminfoitem', type: "com.canonical.indicator.network.modeminfoitem", objectName: "modemInfoItem" },
118120
121+ { tag: 'calendar', type: "com.canonical.indicator.calendar", objectName: "calendarMenu" },
122+
119123 { tag: 'unknown', type: "", objectName: "standardMenu"}
120124 ];
121125 }
@@ -812,5 +816,33 @@ Item {
812816 compare(loader.item.checked, true, "Clicking switch menu should toggle check");
813817 tryCompare(loader.item, "checked", false);
814818 }
819+
820+ function test_create_calendar_data() {
821+ return [
822+ { calendarDay: new Date(), showWeekNumbers: false, eventDays: new Array() },
823+ { calendarDay: new Date(2016, 8), showWeekNumbers: true, eventDays: [31] },
824+ { calendarDay: new Date(), showWeekNumbers: false, eventDays: [1, 5, 10] },
825+ ];
826+ }
827+
828+ function test_create_calendar(data) {
829+ menuData.type = "com.canonical.indicator.calendar";
830+ menuData.actionState = {
831+ "calendar-day": data.calendarDay.getTime() / 1000 | 0,
832+ "show-week-numbers": data.showWeekNumbers,
833+ "appointment-days": data.eventDays
834+ }
835+
836+ loader.data = menuData;
837+ loader.sourceComponent = factory.load(menuData);
838+ tryCompareFunction(function() { return loader.item != undefined; }, true);
839+ compare(loader.item.objectName, "calendarMenu", "Should have created a calendar menu")
840+
841+ compare(loader.item.currentDate.getFullYear(), data.calendarDay.getFullYear(), "Calendar year does not match data")
842+ compare(loader.item.currentDate.getMonth(), data.calendarDay.getMonth(), "Calendar month does not match data")
843+ compare(loader.item.currentDate.getDate(), data.calendarDay.getDate(), "Calendar day does not match data")
844+ compare(loader.item.showWeekNumbers, data.showWeekNumbers, "Week numbers visibility does not match data")
845+ compare(loader.item.eventDays, data.eventDays, "Event days do not match data")
846+ }
815847 }
816848}
tests/qmltests/tst_OrientedShell.qml+2−2
@@ -495,7 +495,7 @@ Rectangle {
495495 }
496496
497497 function cleanup() {
498− tryCompare(shell, "waitingOnGreeter", false); // make sure greeter didn't leave us in disabled state
498+ tryCompare(shell, "waitingOnGreeter", false, 10000); // make sure greeter didn't leave us in disabled state
499499 shell = null;
500500 topLevelSurfaceList = null;
501501
@@ -1235,7 +1235,7 @@ Rectangle {
12351235
12361236 swipeAwayGreeter();
12371237
1238− tryCompareFunction(function() { return isAppSurfaceFocused(primarySurfaceId)}, true)
1238+ tryCompareFunction(function() { return isAppSurfaceFocused(primarySurfaceId)}, true, 10000)
12391239
12401240 signalSpy.clear();
12411241 signalSpy.target = shell;
tests/utils/modules/Unity/Test/UnityTestCase.qml+2−2
@@ -258,7 +258,7 @@ TestCase {
258258 // Keeps executing a given parameter-less function until it returns the given
259259 // expected result or the timemout is reached (in which case a test failure
260260 // is generated)
261− function tryCompareFunction(func, expectedResult, timeout) {
261+ function tryCompareFunction(func, expectedResult, timeout, message) {
262262 var timeSpent = 0
263263 if (timeout === undefined)
264264 timeout = 5000;
@@ -276,7 +276,7 @@ TestCase {
276276 var act = qtest_results.stringify(actualResult)
277277 var exp = qtest_results.stringify(expectedResult)
278278 if (!qtest_results.compare(success,
279− "function returned unexpected result",
279+ message || "function returned unexpected result",
280280 act, exp,
281281 util.callerFile(), util.callerLine())) {
282282 throw new Error("QtQuickTest::fail")