Merge lp:~stolowski/unity-2d/search-on-lens-change into lp:unity-2d

[Paweł Stołowski]

[dash] Apply search query on lens switching. Re-opening dash resets search results.

Bind searchQuery property of current lens model to search entry value.

[dash] Apply search query on lens switching. Re-opening dash resets search results.
Set searchQuery property of lens model on onDashActiveLensChanged signal from shellManager.

[Albert Astals Cid (aacid)]

Looks good and test works :-)

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-03-30 13:33:57 +0000
+++ shell/dash/Dash.qml	2012-04-02 12:25:21 +0000
@@ -292,10 +292,16 @@
                     return u2d.tr("Search")
             }
 
-            onSearchQueryChanged: if (dash.currentPage != undefined) dash.currentPage.model.searchQuery = searchQuery
             onActivateFirstResult: if (dash.currentPage != undefined) dash.currentPage.activateFirstResult()
         }
 
+        Binding {
+            /* not using 'when' clause since target needs these check anyway, otherwise it gives warnings if dash.currentPage is undefined */
+            target: dash.currentPage != undefined ? dash.currentPage.model : null
+            property: "searchQuery"
+            value: search_entry.searchQuery
+        }
+
         FilterPane {
             id: filterPane
 

=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-03-30 14:10:19 +0000
+++ tests/manual-tests/dash.txt	2012-04-02 12:25:21 +0000
@@ -98,4 +98,18 @@
   #   * Verify dash is showing maximized
   #   * Verify that pressing dash maximize button has no effect (dash stays in maximized mode).
 
-----
+-----
+
+  # Test case objectives:
+  #   * Check that search query is applied to lenses on lens change
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Open dash
+  #   * Enter a search query
+  #   * Switch between lenses and verify that search query is applied to all lenses.
+  #   * Enter the same search query manually on every lens page - the results should be more less the same as in previous step.
+  #   * Close dash
+  #   * Open dash and verify that all results are displayed in 'Home' lens, and no search query is applied.
+
+-----