Merge lp:~feng-kylin/unity8/openPrepopulatedScopeInManageDash into lp:unity8

[handsome_feng]

When click the favorite scope in Dash Manager , it just return to the corresponding scope page.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no
 * Did you perform an exploratory manual test run of your code change and any related functionality?
yes
 * Did you make sure that your branch does not contain spurious tags?
yes
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Albert Astals Cid (aacid)]

Honestly i think this is something that should be fixed in the scopes shell plugin but let's see what Pawel says about it.

[Paweł Stołowski (stolowski)]

Ok, after some investigation I think what this fix does it OK. Since the existing code takes the "fake" result from manage dash model results and activates its uri (which is a canned query like scope://... pointing to the respective scope), we would need to special case it in the plugin code *not* to re-do search, but this is impossible since it's the same execution path we hit when e.g. a redo-search action is triggered in a preview (where we want to re-execute the search even if search string is the same). So, +1 for this fix & thanks!

review: Approve

[Albert Astals Cid (aacid)]

Ok, i've triggered CI, let's see what it says

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1748
http://jenkins.qa.ubuntu.com/job/unity8-ci/5651/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/816
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/816
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20081

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5651/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Yes, except the 3 failures we all love

 * Did you make sure that the branch does not contain spurious tags?
N/A

review: Approve

[Albert Astals Cid (aacid)]

And by

* Did you make sure that the branch does not contain spurious tags?
N/A

i mean

 * Did you make sure that the branch does not contain spurious tags?
Yes

[Michael Zanetti (mzanetti)]

@handsome_feng: Thank you for you contribution. For future branches, please make sure to put the checklist into the description as specified here: https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

This helps us with getting the branch merged.

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2015-04-09 14:00:37 +0000
+++ qml/Dash/Dash.qml	2015-04-28 07:58:46 +0000
@@ -187,6 +187,11 @@
         onRequestFavoriteMoveTo: {
             scopes.moveFavoriteTo(scopeId, index);
         }
+        onRequestRestore: {
+            bottomEdgeController.enableAnimation = true;
+            bottomEdgeController.progress = 0;
+            dash.setCurrentScope(scopeId, false, false);
+        }
 
         Binding {
             target: scopesList.scope

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-01-05 10:40:46 +0000
+++ qml/Dash/ScopesList.qml	2015-04-28 07:58:46 +0000
@@ -31,6 +31,7 @@
     signal storeClicked()
     signal requestFavorite(string scopeId, bool favorite)
     signal requestFavoriteMoveTo(string scopeId, int index)
+    signal requestRestore(string scopeId)
 
     state: "browse"
 
@@ -124,6 +125,7 @@
                         onRequestEditMode: root.state = "edit";
                         onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
                         onRequestActivate: root.scope.activate(result);
+                        onRequestRestore: root.requestRestore(scopeId);
                     }
                 }
             }

=== modified file 'qml/Dash/ScopesListCategory.qml'
--- qml/Dash/ScopesListCategory.qml	2014-12-12 09:49:02 +0000
+++ qml/Dash/ScopesListCategory.qml	2015-04-28 07:58:46 +0000
@@ -35,6 +35,7 @@
     signal requestEditMode()
     signal requestScopeMoveTo(string scopeId, int index)
     signal requestActivate(var result)
+    signal requestRestore(string scopeId)
 
     implicitHeight: visible ? childrenRect.height : 0
 
@@ -93,7 +94,10 @@
 
                 onClicked: {
                     if (!editMode) {
-                        root.requestActivate(result);
+                        if (root.isFavoritesFeed)
+                            root.requestRestore(model.scopeId);
+                        else
+                            root.requestActivate(result);
                     }
                 }
                 onPressAndHold: {