Merge lp:~mandel/unity-lens-music/design-fixes into lp:unity-lens-music

[Manuel de la Peña]

Added a number of small fixes that design pointed out during the manual testing. This branch does not activate the payment feature yet until Ubuntu Payment confirms that all payment issues are fixed.

Added a number of small fixes that design pointed out during the manual testing. This branch does not activate the payment feature yet until Ubuntu Payment confirms that all payment issues are fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/unity-lens-music-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-music-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-music-ci/9/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

looks good. +1

review: Approve

[Paweł Stołowski (stolowski)]

LGTM. +1

review: Approve

=== modified file 'src/musicstore-scope.vala'
--- src/musicstore-scope.vala	2013-05-21 16:16:28 +0000
+++ src/musicstore-scope.vala	2013-06-06 14:02:26 +0000
@@ -171,7 +171,7 @@
 
     delegate Unity.ActivationResponse LinkHandler (string uri);
 
-    private Unity.ActivationResponse build_error_preview (string uri, string error_header, string album_price, string link_text, LinkHandler link_handler)
+    private Unity.ActivationResponse build_error_preview (string uri, string error_header, string album_price, string link_text, LinkHandler link_handler, bool has_cancel=true)
     {
       Album album = null;
       SList<Track> tracks = null;
@@ -186,10 +186,17 @@
       var error_action = new Unity.PreviewAction ("open_u1_link", link_text, null);
       error_action.activated.connect (() => link_handler (uri));
       error_preview.add_action (error_action);
+
+      if (has_cancel)
+      {
+        var cancel_action = new Unity.PreviewAction ("cancel", _("Cancel"), null);
+        cancel_action.activated.connect (cancel_purchase);
+        error_preview.add_action (cancel_action);
+      }
+
       return new Unity.ActivationResponse.with_preview (error_preview);
     }
 
-
     public Unity.ActivationResponse open_forgot_password_url (string uri)
     {
       return open_uri (forgotten_password_url ());
@@ -197,6 +204,12 @@
 
     public Unity.ActivationResponse change_payment_method (string uri)
     {
+      if (purchase_service.open_url != null)
+      {
+        debug ("Open url is %s", purchase_service.open_url);
+        return open_uri (purchase_service.open_url);
+      }
+
       return open_uri (change_payment_method_url ());
     }
 
@@ -385,7 +398,7 @@
 
         // actions
 
-        var purchase_action = new Unity.PreviewAction ("purchase_album", _("Purchase"), null);
+        var purchase_action = new Unity.PreviewAction ("purchase_album", _("Buy Now"), null);
         purchase_action.activated.connect (purchase_album);
         album_purchase_preview.add_action (purchase_action);