Merge lp://qastaging/~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events into lp://qastaging/indicator-datetime/15.04
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Approved by: | Antti Kaijanmäki |
Approved revision: | 430 |
Merged at revision: | 422 |
Proposed branch: | lp://qastaging/~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events |
Merge into: | lp://qastaging/indicator-datetime/15.04 |
Diff against target: |
654 lines (+206/-40) 22 files modified
CMakeLists.txt (+6/-0) data/CMakeLists.txt (+5/-3) data/com.canonical.indicator.datetime.gschema.xml.in.in (+8/-1) debian/control (+2/-0) include/datetime/settings-live.h (+1/-0) include/datetime/settings-shared.h (+1/-0) include/datetime/settings.h (+1/-0) include/datetime/snap.h (+2/-0) include/notifications/sound.h (+22/-0) src/main.cpp (+2/-1) src/settings-live.cpp (+14/-0) src/snap.cpp (+15/-9) tests/CMakeLists.txt (+3/-1) tests/manual-test-snap.cpp (+2/-1) tests/test-eds-ics-missing-trigger.cpp (+1/-1) tests/test-eds-ics-missing-trigger.ics.in (+2/-2) tests/test-eds-ics-nonrepeating-events.cpp (+1/-1) tests/test-eds-ics-nonrepeating-events.ics.in (+1/-1) tests/test-eds-ics-repeating-events.cpp (+8/-8) tests/test-eds-ics-repeating-events.ics.in (+1/-1) tests/test-settings.cpp (+1/-0) tests/test-snap.cpp (+107/-10) |
To merge this branch: | bzr merge lp://qastaging/~charlesk/indicator-datetime/15.04-lp-1505688-different-default-sounds-for-alarms-and-events |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antti Kaijanmäki (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
dobey (community) | Approve | ||
Review via email:
|
Commit message
Use a different default sound for alarms and calendar events.
Description of the change
* Use a different default sound for alarms and calendar events.
* Define the default sounds once in cmake so that source files, schemas, and test datafiles don't all have to change each time the default value changes.
* Add a simple Sound factory so that we can use dependency injection to test notification sounds' properties
* Add unit tests to confirm the role and default sound of alarms and calendar events.
To post a comment you must log in.
FAILED: Continuous integration, rev:422 jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-ci/ 8/ jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-vivid- amd64-ci/ 8/console jenkins. qa.ubuntu. com/job/ indicator- datetime- 15.04-vivid- armhf-ci/ 8/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- 15.04-ci/ 8/rebuild
http://