Music Lens

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

  1. design-fixes
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 169
Merged at revision: 139
Proposed branch: lp:~mandel/unity-lens-music/design-fixes
Merge into: lp:unity-lens-music
Diff against target: 52 lines (+16/-3)
1 file modified
src/musicstore-scope.vala (+16/-3)
To merge this branch: bzr merge lp:~mandel/unity-lens-music/design-fixes
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
Alejandro J. Cura (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+167763@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Alejandro J. Cura (alecu) wrote :

looks good. +1

review: Approve
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/musicstore-scope.vala'
2--- src/musicstore-scope.vala 2013-05-21 16:16:28 +0000
3+++ src/musicstore-scope.vala 2013-06-06 14:02:26 +0000
4@@ -171,7 +171,7 @@
5
6 delegate Unity.ActivationResponse LinkHandler (string uri);
7
8- private Unity.ActivationResponse build_error_preview (string uri, string error_header, string album_price, string link_text, LinkHandler link_handler)
9+ private Unity.ActivationResponse build_error_preview (string uri, string error_header, string album_price, string link_text, LinkHandler link_handler, bool has_cancel=true)
10 {
11 Album album = null;
12 SList<Track> tracks = null;
13@@ -186,10 +186,17 @@
14 var error_action = new Unity.PreviewAction ("open_u1_link", link_text, null);
15 error_action.activated.connect (() => link_handler (uri));
16 error_preview.add_action (error_action);
17+
18+ if (has_cancel)
19+ {
20+ var cancel_action = new Unity.PreviewAction ("cancel", _("Cancel"), null);
21+ cancel_action.activated.connect (cancel_purchase);
22+ error_preview.add_action (cancel_action);
23+ }
24+
25 return new Unity.ActivationResponse.with_preview (error_preview);
26 }
27
28-
29 public Unity.ActivationResponse open_forgot_password_url (string uri)
30 {
31 return open_uri (forgotten_password_url ());
32@@ -197,6 +204,12 @@
33
34 public Unity.ActivationResponse change_payment_method (string uri)
35 {
36+ if (purchase_service.open_url != null)
37+ {
38+ debug ("Open url is %s", purchase_service.open_url);
39+ return open_uri (purchase_service.open_url);
40+ }
41+
42 return open_uri (change_payment_method_url ());
43 }
44
45@@ -385,7 +398,7 @@
46
47 // actions
48
49- var purchase_action = new Unity.PreviewAction ("purchase_album", _("Purchase"), null);
50+ var purchase_action = new Unity.PreviewAction ("purchase_album", _("Buy Now"), null);
51 purchase_action.activated.connect (purchase_album);
52 album_purchase_preview.add_action (purchase_action);
53

Subscribers

People subscribed via source and target branches

to all changes: