Merge lp:~stolowski/unity-lens-music/price-in-results into lp:unity-lens-music

[Paweł Stołowski]

Use annotated icon in musicstore results. Renamed 'Available for purchase' category to 'More suggestions' and use new icon.

Use annotated icon in musicstore results. Renamed 'Available for purchase' category to 'More suggestions' and use new icon.

[lp:~stolowski/unity-lens-music/price-in-results]

105. By Paweł Stołowski on 2012-09-13

Renamed 'Treat yourself' to 'More suggestions', per design request.

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-08-21 11:06:54 +0000
+++ src/daemon.vala	2012-09-13 16:45:34 +0000
@@ -127,8 +127,8 @@
                                  new FileIcon (icon_dir.get_child ("group-albums.svg")));
       categories.append (cat);
 
-      cat = new Unity.Category (_("Available for Purchase"),
-                                new FileIcon (icon_dir.get_child ("group-purchase.svg")),
+      cat = new Unity.Category (_("More suggestions"),
+                                new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")),
                                 Unity.CategoryRenderer.FLOW);
       categories.append (cat);
       

=== modified file 'src/musicstore-collection.vala'
--- src/musicstore-collection.vala	2012-09-11 12:50:34 +0000
+++ src/musicstore-collection.vala	2012-09-13 16:45:34 +0000
@@ -152,12 +152,22 @@
 	  uri = album_obj.get_string_member ("purchase_url");
 	  details_uri = album_obj.get_string_member ("details");
 	  artwork_path = album_obj.get_string_member ("image");
+
+      string icon = artwork_path;
+      if (album_obj.has_member ("formatted_price"))
+      {
+        var icon_obj = new AnnotatedIcon (new FileIcon (File.new_for_uri (artwork_path)));
+        icon_obj.category = CategoryType.MUSIC;
+        icon_obj.ribbon = album_obj.get_string_member ("formatted_price");
+        icon = icon_obj.to_string ();
+      }
+
 	  mimetype = "audio-x-generic";
 	  title = album_obj.get_string_member ("title");
 	  artist = album_obj.get_string_member ("artist");
 	  dnd_uri = uri;
 	  
-	  model.append (uri, artwork_path, PURCHASE_CATEGORY,
+	  model.append (uri, icon, PURCHASE_CATEGORY,
 	                mimetype, title, artist, dnd_uri);
 
       preview_uri_map.insert (uri.substring (7), details_uri); // strip off "u1ms://" from the uri
@@ -169,6 +179,16 @@
 	  uri = track_obj.get_string_member ("purchase_url");
 	  details_uri = track_obj.get_string_member ("details");
 	  artwork_path = track_obj.get_string_member ("image");
+
+      string icon = artwork_path;
+      if (track_obj.has_member ("formatted_price"))
+      {
+        var icon_obj = new AnnotatedIcon (new FileIcon (File.new_for_uri (artwork_path)));
+        icon_obj.category = CategoryType.MUSIC;
+        icon_obj.ribbon = track_obj.get_string_member ("formatted_price");
+        icon = icon_obj.to_string ();
+      }
+
 	  mimetype = "audio-x-generic";
 	  title = track_obj.get_string_member ("title");
 	  artist = track_obj.get_string_member ("artist");
@@ -176,7 +196,7 @@
           
 	  // FIXME drag n drop uri needs to be the u1ms:// link
 	  
-	  model.append (uri, artwork_path, PURCHASE_CATEGORY,
+	  model.append (uri, icon, PURCHASE_CATEGORY,
 	                mimetype, title, artist, dnd_uri);
       preview_uri_map.insert (uri.substring (7), details_uri); // strip off "u1ms://" from the uri
     }