Merge lp:~dandrader/unity/phablet_fixSearchHistory into lp:unity/phablet

Proposed by Daniel d'Andrada
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 647
Proposed branch: lp:~dandrader/unity/phablet_fixSearchHistory
Merge into: lp:unity/phablet
Diff against target: 71 lines (+5/-5)
5 files modified
Dash/DashApps.qml (+1/-0)
Dash/DashContent.qml (+1/-2)
Dash/DashMusic.qml (+1/-1)
Dash/DashPeople.qml (+1/-1)
Dash/DashVideos.qml (+1/-1)
To merge this branch: bzr merge lp:~dandrader/unity/phablet_fixSearchHistory
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti Pending
Review via email: mp+161636@code.launchpad.net

Commit message

Fixes search history in the dash.

It was giving out warnings about non-existing "root" variable.
Also the seach history ended up being per-lens instead of
being the same for all lenses.

Description of the change

Fixes search history in the dash.

It was giving out warnings about non-existing "root" variable.
Also the seach history ended up being per-lens instead of being the same for all lenses.

I started working on a test for it (tst_Dash.qml) but gave up. It would be quite a bit o work to make it properly (loading Dash music, videos, people etc with fake models etc).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dash/DashApps.qml'
2--- Dash/DashApps.qml 2013-04-19 15:09:24 +0000
3+++ Dash/DashApps.qml 2013-04-30 16:16:25 +0000
4@@ -162,6 +162,7 @@
5 width: categoryView.width
6 text: "Apps"
7 searchEntryEnabled: true
8+ searchHistory: lensView.searchHistory
9 }
10 }
11 }
12
13=== modified file 'Dash/DashContent.qml'
14--- Dash/DashContent.qml 2013-04-17 18:03:02 +0000
15+++ Dash/DashContent.qml 2013-04-30 16:16:25 +0000
16@@ -113,16 +113,15 @@
17 source: {
18 var customLens = lensDelegateMapping[lens.id]
19 if (customLens) {
20- customLens.searchHistory = shell.searchHistory
21 return customLens
22 } else {
23- genericLens.searchHistory = shell.searchHistory
24 return genericLens
25 }
26 }
27 onLoaded: {
28 item.lens = Qt.binding(function() { return lens })
29 item.isCurrent = Qt.binding(function() { return ListView.isCurrentItem })
30+ item.searchHistory = Qt.binding(function() { return shell.searchHistory })
31 dashContentList.movementStarted.connect(item.movementStarted)
32 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
33 dashContent.lensLoaded(item.lens.id)
34
35=== modified file 'Dash/DashMusic.qml'
36--- Dash/DashMusic.qml 2013-03-19 12:00:47 +0000
37+++ Dash/DashMusic.qml 2013-04-30 16:16:25 +0000
38@@ -91,7 +91,7 @@
39 width: categoryView.width
40 text: "Music"
41 searchEntryEnabled: true
42- searchHistory: root.searchHistory
43+ searchHistory: lensView.searchHistory
44 }
45 }
46 }
47
48=== modified file 'Dash/DashPeople.qml'
49--- Dash/DashPeople.qml 2013-04-22 10:10:47 +0000
50+++ Dash/DashPeople.qml 2013-04-30 16:16:25 +0000
51@@ -115,7 +115,7 @@
52 width: categoryView.width
53 text: "People"
54 searchEntryEnabled: true
55- searchHistory: root.searchHistory
56+ searchHistory: lensView.searchHistory
57 }
58 }
59
60
61=== modified file 'Dash/DashVideos.qml'
62--- Dash/DashVideos.qml 2013-04-22 10:10:47 +0000
63+++ Dash/DashVideos.qml 2013-04-30 16:16:25 +0000
64@@ -139,7 +139,7 @@
65 width: categoryView.width
66 text: "Videos"
67 searchEntryEnabled: true
68- searchHistory: root.searchHistory
69+ searchHistory: lensView.searchHistory
70 }
71 }
72

Subscribers

People subscribed via source and target branches