Music Lens

Merge lp://qastaging/~stolowski/unity-lens-music/missing-cover-icon into lp://qastaging/unity-lens-music

missing-cover-icon
Merge into trunk

Proposed by Paweł Stołowski on 2012-09-13

Status:

Merged

Approved by:

Neil J. Patel on 2012-09-17

Approved revision:

104

Merged at revision:

105

Proposed branch:

lp://qastaging/~stolowski/unity-lens-music/missing-cover-icon

Merge into:

lp://qastaging/unity-lens-music

Diff against target:

215 lines (+47/-35)

5 files modified

src/banshee-collection.vala (+5/-8)
src/banshee-scope.vala (+8/-7)
src/musicstore-scope.vala (+2/-1)
src/rhythmbox-collection.vala (+19/-10)
src/rhythmbox-scope.vala (+13/-9)

To merge this branch:

bzr merge lp://qastaging/~stolowski/unity-lens-music/missing-cover-icon

Related bugs:

Bug #1049217: Missing generic icons in previews and search results	High	Fix Released
Bug #1049593: [FFE][UIFE]Dash - Finesse the placement, movement and behaviour of the 12.10 Dash	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michal Hruby (community)		2012-09-13	Needs Fixing on 2012-09-13
Review via email: mp+124198@code.qastaging.launchpad.net

Commit message

Use new icons when album cover is missing.

Description of the change

Use new icons when album cover is missing.

lp://qastaging/~stolowski/unity-lens-music/missing-cover-icon updated on 2012-09-13

103. By Paweł Stołowski on 2012-09-13: Use u1-service icon for the 'Download' button in the preview.

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-09-13:

93 +<<<<<<< TREE
94 var download_action = new Unity.PreviewAction ("download_album", _("Download"), null);
95 if (album.formatted_price != null)
96 download_action.extra_text = album.formatted_price;
97 +=======
98 + GLib.Icon? icon = new GLib.FileIcon (File.new_for_path (Config.DATADIR + "/icons/unity-icon-theme/places/svg/service-u1.svg"));
99 + var download_action = new Unity.PreviewAction ("download_album", _("Download"), icon);
100 +>>>>>>> MERGE-SOURCE