Merge lp:~stolowski/unity-lens-applications/fix-buy-button-6.0 into lp:unity-lens-applications/6.0

[Paweł Stołowski]

Use extra_hint for price of 'Buy' button.
Cherry-picked trunk rev 310..311.

Use extra_hint for price of 'Buy' button.
Cherry-picked trunk rev 310..311.

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-27 08:38:36 +0000
+++ src/daemon.vala	2012-10-15 09:16:21 +0000
@@ -26,7 +26,7 @@
 
 namespace Unity.ApplicationsLens {
 
-  /* Number of 'Apps available for download' to show if no search query is provided AND a filter is active. 
+  /* Number of 'Apps available for download' to show if no search query is provided AND a filter is active.
      It shouldn't be too high as this may impact lens performance.
    */
   const uint MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY = 100;
@@ -368,7 +368,7 @@
       if (app_menu == null)
       {
         debug ("Building initial application menu");
-        
+
         /* We need INCLUDE_NODISPLAY to employ proper de-duping between
          * the Installed and Availabale categorys. If a NoDisplay app is installed,
          * eg. Evince, it wont otherwise be in the menu index, only in the
@@ -603,7 +603,7 @@
           try
           {
             Set<string> duplicates_lookup = new HashSet<string> ();
-            
+
             if (sc_data_provider == null)
               sc_data_provider = new SoftwareCenterDataCache (TOP_RATED_ITEMS_CACHE_LIFETIME);
 
@@ -632,7 +632,7 @@
 
       if (model.get_n_rows () == 0)
       {
-        search.set_reply_hint ("no-results-hint", 
+        search.set_reply_hint ("no-results-hint",
           _("Sorry, there are no applications that match your search."));
       }
 
@@ -889,7 +889,7 @@
       return desktop_id;
     }
 
-    /* 
+    /*
      * Performs secondary level sorting of the results according to popularity
      * of individual desktop files.
      */
@@ -918,7 +918,7 @@
     }
 
     /**
-     * Sanitize executable name -- make it suitable for Home Lens. 
+     * Sanitize executable name -- make it suitable for Home Lens.
      */
     private static string sanitize_binary_name (string name)
     {
@@ -945,14 +945,14 @@
       {
         annotated_icon.size_hint = IconSizeHint.SMALL;
       }
-      
+
       return annotated_icon.to_string ();
     }
 
     /**
      * Add all results obtained from SoftwareCenterDataProvider
      */
-    private uint add_sc_category_results (SoftwareCenterDataProviderService.AppInfo?[] results, 
+    private uint add_sc_category_results (SoftwareCenterDataProviderService.AppInfo?[] results,
                                           Dee.Model model,
                                           Category category,
                                           ref Set<string> duplicates_lookup,
@@ -985,10 +985,10 @@
         }
 
         model.append (uri, icon_obj,
-                      category, 
+                      category,
                       "application/x-desktop",
                       app.application_name,
-                      "", //comment 
+                      "", //comment
                       "file://" + app.desktop_file);
         duplicates_lookup.add (uri);
         i++;
@@ -1082,11 +1082,11 @@
         {
           icon_str = icon.to_string ();
         }
-     
+
         model.append (uri, icon_str,
                       category,"application/x-desktop",
                       display_name != null ? display_name : "",
-                      comment != null ? comment : "", 
+                      comment != null ? comment : "",
                       full_path != null ? "file://" + full_path : "");
 
         /* Stop if we added the number of items requested */
@@ -1312,7 +1312,7 @@
               File scr_file = File.new_for_uri (sc_data_provider.screenshot);
               screenshot = new FileIcon (scr_file);
             }
- 
+
             string subtitle = "";
             if (sc_data_provider.version != "")
               subtitle = _("Version %s").printf (sc_data_provider.version);
@@ -1340,12 +1340,12 @@
               // uninstalled and not purchased before
               if (sc_data_provider.pkg_state == SoftwareCenterDataProviderProxy.PackageState.NEEDS_PURCHASE)
               {
-                var buy_str = _("Buy");
+                var buy_action = new Unity.PreviewAction ("buy", _("Buy"), null);
                 if (sc_data_provider.price != null && sc_data_provider.price != "")
                 {
-                  buy_str += " " + sc_data_provider.price; //FIXME: implement action hints
+                  buy_action.extra_text = sc_data_provider.price;
                 }
-                var buy_action = new Unity.PreviewAction ("buy", buy_str, null);
+
                 buy_action.activated.connect (app_preview_buy);
                 preview.add_action (buy_action);
               }
@@ -1397,7 +1397,7 @@
             preview = null;
           }
         }
-        
+
         // xapian db doesn't know this .desktop file or S-C dbus data provider fails,
         // fallback to DesktopAppInfo (based on installed .desktop file) if available
         if (preview == null && desktopfile != null)

=== modified file 'tests/manual/apps-lens-tests.txt'
--- tests/manual/apps-lens-tests.txt	2012-10-01 13:04:10 +0000
+++ tests/manual/apps-lens-tests.txt	2012-10-15 09:16:21 +0000
@@ -26,3 +26,17 @@
 Expected Result:
 The search has to find the application when searching both "aisleriot" as well as "aisle" or "riot".
 
+Prices for search results
+------------------------
+Price ribbon in search results and Buy/Free Download button correctly reflects application price.
+
+Setup:
+Software-Center cache is updated (launch Software-Center at least once).
+
+Actions:
+1. Spot some commercial non-free apps as some free open-source apps in the app lens earch results.
+2. Right-click an app to activate its preview (repeat for commercial and free apps).
+
+Expected Result:
+Open-source free applications display 'Free' string in ribbons in the search results. Their previews should have 'Developer site' and 'Free Download' buttons.
+Commercial apps should have the price displayed in ribbons (e.g. 'US$ 8.40'). Their previews should have 'Developer site' and 'Buy US$ ...' buttons.