lp:~zsombi/ubuntu-ui-toolkit/alarm-sound-update-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1239

PS Jenkins bot: Approve (continuous-integration) on 2014-09-05

Cris Dywan: Approve on 2014-09-04

Nekhelesh Ramananthan: Pending requested 2014-09-04

Diff: 206 lines (+113/-4)

6 files modified

modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+79/-3)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+3/-1)
modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+8/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+2/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+4/-0)
tests/unit/tst_alarms/tst_alarms.cpp (+17/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1364949: Editing alarm sounds doesn't actually change them

Critical

Fix Released

Link a bug report

Related blueprints

1234. By Zsombor Egri on 2014-09-04

alarm data check under the hood - added a function to AlarmManager to check whether the data has been properly set in the adapters. Requires adaptation specific implementation

1233. By Zsombor Egri on 2014-09-04

bug attached

1232. By Zsombor Egri on 2014-09-04

update audible reminder when sound changes

1231. By Cris Dywan on 2014-09-04

Handle singleton in qmldir and explicitly skip unknown keywords.

Approved by PS Jenkins bot, Zsombor Egri.

1230. By Tim Peeters on 2014-09-03

Revert Icon10 change from header animations MR to fix coloring of icons.

Approved by PS Jenkins bot, Zsombor Egri.

1229. By Lars Karlitski on 2014-09-02

unitythemeiconprovider: manually load icons

Previously, UnityThemeIconProvider used QIcon::fromTheme() to lookup and load icons. That function uses fdo's default icon lookup algorithm: it looks at the current theme and all parent themes for each icon in turn. We'd prefer a breadth-first search, where all icon names are looked up in the current theme before falling back to the parent themes (see lp: #1324184). This patch implements fdo's FindBestIcon() algorithm, which behaves like that.

It also now properly support rectangular icons and always returns an icon with the requested size (adjusted for preserving the aspect ratio).

As a result, the Icon component is much simpler and only requires height to be set for rectangular icons. Fixes: https://bugs.launchpad.net/bugs/1324184.

Approved by Zsombor Egri, PS Jenkins bot.

1228. By Zsombor Egri on 2014-09-02

Focus should not be taken by a component if disabled. Complete child filtering properly.

Approved by PS Jenkins bot, Christian Dywan.

1227. By Cris Dywan on 2014-09-02

Fix wrong sheet labels and pick up dtr strings
. Fixes: https://bugs.launchpad.net/bugs/1354485.

Approved by Zsombor Egri, PS Jenkins bot.

1226. By Zsombor Egri on 2014-08-29

Dialog title is wrapped into maximum two lines, then elides. Fixes: https://bugs.launchpad.net/bugs/1354376.

Approved by PS Jenkins bot, Tim Peeters.

1225. By Tim Peeters on 2014-08-28

Fix header test.

Approved by PS Jenkins bot, Zsombor Egri.