Indicator Date and Time

Merge lp://staging/~charlesk/indicator-datetime/alarms into lp://staging/indicator-datetime/14.04

alarms
Merge into trunk.14.04

Proposed by Charles Kerr on 2014-02-03

Status:

Merged

Approved by:

Ted Gould on 2014-02-06

Approved revision:

405

Merged at revision:

305

Proposed branch:

lp://staging/~charlesk/indicator-datetime/alarms

Merge into:

lp://staging/indicator-datetime/14.04

Prerequisite:

lp://staging/~charlesk/indicator-datetime/lp-1271484

Diff against target:

1743 lines (+1011/-204)

25 files modified

CMakeLists.txt (+2/-2)
debian/control (+1/-1)
include/datetime/clock-watcher.h (+72/-0)
include/datetime/date-time.h (+3/-0)
include/datetime/planner-eds.h (+3/-2)
include/datetime/snap.h (+51/-0)
include/datetime/timezone-file.h (+2/-2)
po/POTFILES.in (+2/-0)
src/CMakeLists.txt (+2/-0)
src/actions-live.cpp (+1/-1)
src/clock-watcher.cpp (+71/-0)
src/date-time.cpp (+18/-0)
src/main.cpp (+22/-9)
src/menu.cpp (+37/-66)
src/planner-eds.cpp (+216/-105)
src/snap.cpp (+256/-0)
src/timezone-file.cpp (+4/-4)
tests/CMakeLists.txt (+5/-0)
tests/geoclue-fixture.h (+1/-1)
tests/manual-test-snap.cpp (+63/-0)
tests/test-clock-watcher.cpp (+166/-0)
tests/test-clock.cpp (+2/-2)
tests/test-planner.cpp (+8/-6)
tests/test-settings.cpp (+2/-2)
tests/test-utils.cpp (+1/-1)

To merge this branch:

bzr merge lp://staging/~charlesk/indicator-datetime/alarms

Related bugs:

Bug #1233176: Alarm notifications do not appear when an alarm is triggered	High	Fix Released
Bug #1237752: alarm / appointment times aren't displayed on touch	High	Fix Released
Bug #1255716: Running the "click" command on the desktop greeter seems wrong	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2014-02-03	Approve on 2014-02-06
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-06
Review via email: mp+204420@code.staging.launchpad.net

Commit message

support for ubuntu-clock-app's alarms

Description of the change

Alarm Support for indicator-datetime:

* add ECalClient view to monitor changes in the client's components
* watch both calendar and task-list because ubuntu-ui-tookit uses the latter
* add ClockWatcher + unit tests to decide when to show a snap decision
* restore Snap decision code + manual tests to display alarms on phone
* play a looping sound while the snap decision is being shown
* update the header state when alarms change s.t. we sync the icon
* use the ubuntu-mobile icon 'alarm-clock' for alarm + header icon

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-03:

PASSED: Continuous integration, rev:388
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/53/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/173/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/54/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/174/rebuild

review: Approve (continuous-integration)

lp://staging/~charlesk/indicator-datetime/alarms updated on 2014-02-05

397. By Charles Kerr on 2014-02-05: bugfix: when closing the snap decision, ensure there's not a timeout waiting to loop the ringtone

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

PASSED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/55/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/175/rebuild

review: Approve (continuous-integration)

lp://staging/~charlesk/indicator-datetime/alarms updated on 2014-02-05

398. By Charles Kerr on 2014-02-05: copyediting: make the Snap lambdas a little easier to read.
399. By Charles Kerr on 2014-02-05: add utils.c to POTFILES.in
400. By Charles Kerr on 2014-02-05: remove alarms from the menu once they've been shown in a snap decision.
401. By Charles Kerr on 2014-02-05: if an alarm doesn't have a URL associated with it, use 'appid://com.ubuntu.clock/clock/current-user-version' as a fallback url.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

PASSED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/56/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/176/rebuild

review: Approve (continuous-integration)

lp://staging/~charlesk/indicator-datetime/alarms updated on 2014-02-05

402. By Charles Kerr on 2014-02-05: revert r400; we can't block alarms by UID because that would hide recurring alarms
403. By Charles Kerr on 2014-02-05: remove upcoming events from the menu once they're no longer upcoming.
404. By Charles Kerr on 2014-02-05: when playing a sound in canberra, don't use CA_PROP_EVENT_ID if caching failed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/177/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/57/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/177/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/178/rebuild

review: Approve (continuous-integration)

lp://staging/~charlesk/indicator-datetime/alarms updated on 2014-02-06

405. By Charles Kerr on 2014-02-06: another pass at removing alarms from the menu once they're no longer upcoming. This version fixes the header's icon as well.