Merge lp:~alecu/unity-scope-click/confirm-uninstalls into lp:unity-scope-click

[Alejandro J. Cura]

Ask for confirmation before uninstall

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

17 + var message = "Uninstall this app will delete all the related information. Are you sure you want to uninstall?";
18 + var preview = new Unity.GenericPreview("Confirmation", message, null);
19 + preview.add_action (new Unity.PreviewAction (ACTION_CLOSE_PREVIEW, ("Not anymore"), null));
20 + preview.add_action (new Unity.PreviewAction (ACTION_CONFIRM_UNINSTALL, ("Yes Uninstall"), null));

The text here should be changed, I think.

We should probably use "Remove" rather than "Uninstall" in the UI, For the message, I would suggest:

"Removing this application will delete all its information. Do you want to continue?"

And for the buttons, I would use "Cancel" and "Remove" respectively.

Also, we should use "application" in all UI, and not the short-hand "app."

review: Needs Fixing

[Alejandro J. Cura (alecu)]

On Wed, Oct 2, 2013 at 10:50 AM, Rodney Dawes
<email address hidden> wrote:
> Review: Needs Fixing
>
> 17 + var message = "Uninstall this app will delete all the related information. Are you sure you want to uninstall?";
> 18 + var preview = new Unity.GenericPreview("Confirmation", message, null);
> 19 + preview.add_action (new Unity.PreviewAction (ACTION_CLOSE_PREVIEW, ("Not anymore"), null));
> 20 + preview.add_action (new Unity.PreviewAction (ACTION_CONFIRM_UNINSTALL, ("Yes Uninstall"), null));
>
> The text here should be changed, I think.
>
> We should probably use "Remove" rather than "Uninstall" in the UI, For the message, I would suggest:
>
> "Removing this application will delete all its information. Do you want to continue?"
>
> And for the buttons, I would use "Cancel" and "Remove" respectively.
>
> Also, we should use "application" in all UI, and not the short-hand "app."

Thanks for your review.
I copied these texts from the UX spec document. If it's ok with you,
let's land this branch as it is, and I'll ask Design to check these
texts with a copy editor.

[Alejandro J. Cura (alecu)]

I've opened this bug to get UX input on this issue: #1234211

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:60
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/52

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-click-ci/58/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-click-autolanding/38/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-autolanding/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-autolanding/35

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

This seems to be failing due to some error with launchpad servers.

[Francis Ginther (fginther)]

Transient network error, best course of action is to re-approve.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-02 15:45:53 +0000
+++ src/click-scope.vala	2013-10-02 15:45:53 +0000
@@ -20,6 +20,7 @@
 private const string ACTION_OPEN_CLICK = "open_click";
 private const string ACTION_PIN_TO_LAUNCHER = "pin_to_launcher";
 private const string ACTION_UNINSTALL_CLICK = "uninstall_click";
+private const string ACTION_CONFIRM_UNINSTALL = "confirm_uninstall";
 private const string ACTION_CLOSE_PREVIEW = "close_preview";
 private const string ACTION_OPEN_ACCOUNTS = "open_accounts";
 
@@ -92,6 +93,14 @@
     return preview;
   }
 
+  Unity.Preview build_uninstall_confirmation_preview () {
+    var message = "Uninstall this app will delete all the related information. Are you sure you want to uninstall?";
+    var preview = new Unity.GenericPreview("Confirmation", message, null);
+    preview.add_action (new Unity.PreviewAction (ACTION_CLOSE_PREVIEW, ("Not anymore"), null));
+    preview.add_action (new Unity.PreviewAction (ACTION_CONFIRM_UNINSTALL, ("Yes Uninstall"), null));
+    return preview;
+  }
+
   internal async Unity.Preview build_app_preview(string app_id) {
     var webservice = new ClickWebservice();
     try {
@@ -188,12 +197,15 @@
                 debug ("Let the dash launch the app: %s", application_uri);
                 return new Unity.ActivationResponse(Unity.HandledType.NOT_HANDLED, application_uri);
             } else if (action_id == ACTION_UNINSTALL_CLICK) {
+                preview = build_uninstall_confirmation_preview();
+            } else if (action_id == ACTION_CONFIRM_UNINSTALL) {
                 yield click_if.uninstall(app_id);
                 results_invalidated(Unity.SearchType.GLOBAL);
                 results_invalidated(Unity.SearchType.DEFAULT);
                 return new Unity.ActivationResponse(Unity.HandledType.SHOW_DASH);
             } else if (action_id == ACTION_CLOSE_PREVIEW) {
-                // default is to close the dash
+                // default is to close the preview
+                return new Unity.ActivationResponse(Unity.HandledType.SHOW_DASH);
             } else if (action_id == ACTION_OPEN_ACCOUNTS) {
                 return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED,
                                                      ACCOUNT_SETTINGS_URL);