lp://staging/~macslow/unity8/swipe-dismiss-snap-decisions

Branch merges

Propose for merging

1 branch dependent on this one.

Merged into lp://staging/unity8 at revision 1599

Michał Sawicz: Approve (tests) on 2015-02-09

PS Jenkins bot (community): Approve (continuous-integration) on 2015-02-09

Albert Astals Cid (community): Approve on 2015-01-27

Michael Zanetti (community): Abstain on 2014-11-24

Antti Kaijanmäki (community): Needs Information on 2014-11-08

Diff: 1554 lines (+836/-252)

15 files modified

qml/Notifications/Notification.qml (+36/-6)
qml/Notifications/Notifications.qml (+2/-6)
tests/mocks/Unity/Notifications/CMakeLists.txt (+2/-1)
tests/mocks/Unity/Notifications/MockActionModel.cpp (+6/-4)
tests/mocks/Unity/Notifications/MockActionModel.h (+4/-2)
tests/mocks/Unity/Notifications/MockNotification.cpp (+156/-4)
tests/mocks/Unity/Notifications/MockNotification.h (+63/-5)
tests/mocks/Unity/Notifications/MockNotificationModel.cpp (+172/-0)
tests/mocks/Unity/Notifications/MockNotificationModel.h (+72/-0)
tests/mocks/Unity/Notifications/plugin.cpp (+5/-3)
tests/mocks/Unity/Notifications/plugin.h (+1/-2)
tests/qmltests/Notifications/Notification.qml (+31/-0)
tests/qmltests/Notifications/tst_Notifications.qml (+271/-213)
tests/qmltests/Notifications/tst_OptionToggle.qml (+11/-6)
tests/qmltests/Notifications/tst_SwipeToAct.qml (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1334855: [notifications] Can't use toolbar while notifications on screen	Medium	Fix Released
Bug #1355422: [notifications] Can't dismiss notification bubbles	High	Fix Released

Link a bug report

Related blueprints

1285. By Mirco Müller on 2015-02-06

Make sure all rendering operations are completed before doing the swipe-dismiss-checks, thus the tests also pass on very slow (jenkins) systems.

1284. By Mirco Müller on 2015-02-05

Merge with trunk.

1283. By Mirco Müller on 2015-01-27

Delete trailing newlines.

1282. By Mirco Müller on 2015-01-26

Don't check for sound-playback if check is not intended.

1281. By Mirco Müller on 2015-01-26

Don't fix the snapDecisionProxyModel-hack in this branch. It'll be kept in a seperate one to not futher block this one from being MP'ed.

1280. By Mirco Müller on 2015-01-26

Merged with trunk.

1279. By Mirco Müller on 2015-01-26

Tighten ActionModel a bit.

1278. By Mirco Müller on 2015-01-26

Stripped down MockNotificationModel further. Checks of the Audio-state still fail... no idea why.

1277. By Mirco Müller on 2015-01-23

Make sure a click on the button with ok_id does trigger the notification to be removed from the model. Why the button in question reports a size of 0x0 and thus mouseClick() fails is currently beyond me.

1276. By Mirco Müller on 2015-01-22

This signal-spy is not used.