Merge lp:~didrocks/askubuntu-lens/add-online-disabling-support into lp:askubuntu-lens

Proposed by Didier Roche-Tolomelli
Status: Merged
Merged at revision: 68
Proposed branch: lp:~didrocks/askubuntu-lens/add-online-disabling-support
Merge into: lp:askubuntu-lens
Diff against target: 110 lines (+41/-6)
3 files modified
scopes/asklibreoffice/unity-asklibreoffice-daemon (+13/-2)
scopes/askubuntu/unity-askubuntu-daemon (+14/-2)
scopes/sumo/unity-sumo-daemon (+14/-2)
To merge this branch: bzr merge lp:~didrocks/askubuntu-lens/add-online-disabling-support
Reviewer Review Type Date Requested Status
Mark Tully Approve
Review via email: mp+126625@code.launchpad.net

Description of the change

Add disabling online search support on the sumo scope (LP: #1054746)

To post a comment you must log in.
Revision history for this message
Mark Tully (markjtully) wrote :

Looks good.

I'm also considering adding (if I have time) a "online results disabled" result to the "Actions" category which would show up when online results are disabled. Clicking it could open the privacy settings window directly.

review: Approve
68. By Mark Tully

Add disabling online search support on the askubuntu, asklibreoffice & sumo scopes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scopes/asklibreoffice/unity-asklibreoffice-daemon'
2--- scopes/asklibreoffice/unity-asklibreoffice-daemon 2012-09-25 20:51:50 +0000
3+++ scopes/asklibreoffice/unity-asklibreoffice-daemon 2012-09-27 08:23:45 +0000
4@@ -54,11 +54,14 @@
5 # Listen for changes and requests
6 self.scope.props.search_in_global = False
7 self.scope.connect("search-changed", self.on_search_changed)
8- self.scope.connect("filters-changed", self.on_filters_changed)
9+ self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
10 self.scope.connect("notify::active", self.on_lens_active)
11+ self.preferences = Unity.PreferencesManager.get_default()
12+ self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
13+
14 self.scope.export()
15
16- def on_filters_changed(self, *_):
17+ def on_filters_or_preferences_changed(self, *_):
18 """ Called when a filter is clicked. Queue's a new search
19 """
20 self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
21@@ -83,6 +86,14 @@
22 else:
23 search_string = ""
24
25+ # only perform the request if the user has not disabled
26+ # online results. That will hide the category as well.
27+ if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
28+ scope.props.results_model.clear()
29+ scope.props.global_results_model.clear()
30+ search.finished()
31+ return
32+
33 if search_type == Unity.SearchType.DEFAULT:
34 results = scope.props.results_model
35 else:
36
37=== modified file 'scopes/askubuntu/unity-askubuntu-daemon'
38--- scopes/askubuntu/unity-askubuntu-daemon 2012-09-21 00:34:41 +0000
39+++ scopes/askubuntu/unity-askubuntu-daemon 2012-09-27 08:23:45 +0000
40@@ -68,12 +68,16 @@
41 # Listen for changes and requests
42 self.scope.props.search_in_global = False
43 self.scope.connect("search-changed", self.on_search_changed)
44- self.scope.connect("filters-changed", self.on_filters_changed)
45+ self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
46 self.scope.connect("notify::active", self.on_lens_active)
47 self.scope.connect("activate-uri", self.activate_uri)
48+
49+ self.preferences = Unity.PreferencesManager.get_default()
50+ self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
51+
52 self.scope.export()
53
54- def on_filters_changed(self, *_):
55+ def on_filters_or_preferences_changed(self, *_):
56 """ Called when a filter is clicked. Queue's a new search
57 """
58 self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
59@@ -98,6 +102,14 @@
60 else:
61 search_string = ""
62
63+ # only perform the request if the user has not disabled
64+ # online results. That will hide the category as well.
65+ if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
66+ scope.props.results_model.clear()
67+ scope.props.global_results_model.clear()
68+ search.finished()
69+ return
70+
71 if search_type == Unity.SearchType.DEFAULT:
72 results = scope.props.results_model
73 else:
74
75=== modified file 'scopes/sumo/unity-sumo-daemon'
76--- scopes/sumo/unity-sumo-daemon 2012-09-25 20:51:50 +0000
77+++ scopes/sumo/unity-sumo-daemon 2012-09-27 08:23:45 +0000
78@@ -53,11 +53,15 @@
79 # Listen for changes and requests
80 self.scope.props.search_in_global = False
81 self.scope.connect("search-changed", self.on_search_changed)
82- self.scope.connect("filters-changed", self.on_filters_changed)
83+ self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
84 self.scope.connect("notify::active", self.on_lens_active)
85+
86+ self.preferences = Unity.PreferencesManager.get_default()
87+ self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
88+
89 self.scope.export()
90
91- def on_filters_changed(self, *_):
92+ def on_filters_or_preferences_changed(self, *_):
93 """ Called when a filter is clicked. Queue's a new search
94 """
95 self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
96@@ -82,6 +86,14 @@
97 else:
98 search_string = ""
99
100+ # only perform the request if the user has not disabled
101+ # online results. That will hide the category as well.
102+ if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
103+ scope.props.results_model.clear()
104+ scope.props.global_results_model.clear()
105+ search.finished()
106+ return
107+
108 if search_type == Unity.SearchType.DEFAULT:
109 results = scope.props.results_model
110 else:

Subscribers

People subscribed via source and target branches