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

[Didier Roche-Tolomelli]

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

[Mark Tully (markjtully)]

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

[lp:~didrocks/askubuntu-lens/add-online-disabling-support]

68. By Mark Tully on 2012-09-27

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

=== modified file 'scopes/asklibreoffice/unity-asklibreoffice-daemon'
--- scopes/asklibreoffice/unity-asklibreoffice-daemon	2012-09-25 20:51:50 +0000
+++ scopes/asklibreoffice/unity-asklibreoffice-daemon	2012-09-27 08:23:45 +0000
@@ -54,11 +54,14 @@
         # Listen for changes and requests
         self.scope.props.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
-        self.scope.connect("filters-changed", self.on_filters_changed)
+        self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
         self.scope.connect("notify::active", self.on_lens_active)
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
+
         self.scope.export()
 
-    def on_filters_changed(self, *_):
+    def on_filters_or_preferences_changed(self, *_):
         """ Called when a filter is clicked.  Queue's a new search
         """
         self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
@@ -83,6 +86,14 @@
         else:
             search_string = ""
 
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            scope.props.results_model.clear()
+            scope.props.global_results_model.clear()
+            search.finished()
+            return
+
         if search_type == Unity.SearchType.DEFAULT:
             results = scope.props.results_model
         else:
 
=== modified file 'scopes/askubuntu/unity-askubuntu-daemon'
--- scopes/askubuntu/unity-askubuntu-daemon	2012-09-21 00:34:41 +0000
+++ scopes/askubuntu/unity-askubuntu-daemon	2012-09-27 08:23:45 +0000
@@ -68,12 +68,16 @@
         # Listen for changes and requests
         self.scope.props.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
-        self.scope.connect("filters-changed", self.on_filters_changed)
+        self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
         self.scope.connect("notify::active", self.on_lens_active)
         self.scope.connect("activate-uri", self.activate_uri)
+
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
+
         self.scope.export()
 
-    def on_filters_changed(self, *_):
+    def on_filters_or_preferences_changed(self, *_):
         """ Called when a filter is clicked.  Queue's a new search
         """
         self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
@@ -98,6 +102,14 @@
         else:
             search_string = ""
 
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            scope.props.results_model.clear()
+            scope.props.global_results_model.clear()
+            search.finished()
+            return
+
         if search_type == Unity.SearchType.DEFAULT:
             results = scope.props.results_model
         else:
 
=== modified file 'scopes/sumo/unity-sumo-daemon'
--- scopes/sumo/unity-sumo-daemon	2012-09-25 20:51:50 +0000
+++ scopes/sumo/unity-sumo-daemon	2012-09-27 08:23:45 +0000
@@ -53,11 +53,15 @@
         # Listen for changes and requests
         self.scope.props.search_in_global = False
         self.scope.connect("search-changed", self.on_search_changed)
-        self.scope.connect("filters-changed", self.on_filters_changed)
+        self.scope.connect("filters-changed", self.on_filters_or_preferences_changed)
         self.scope.connect("notify::active", self.on_lens_active)
+
+        self.preferences = Unity.PreferencesManager.get_default()
+        self.preferences.connect("notify::remote-content-search", self.on_filters_or_preferences_changed)
+
         self.scope.export()
 
-    def on_filters_changed(self, *_):
+    def on_filters_or_preferences_changed(self, *_):
         """ Called when a filter is clicked.  Queue's a new search
         """
         self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
@@ -82,6 +86,14 @@
         else:
             search_string = ""
 
+        # only perform the request if the user has not disabled
+        # online results. That will hide the category as well.
+        if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
+            scope.props.results_model.clear()
+            scope.props.global_results_model.clear()
+            search.finished()
+            return
+
         if search_type == Unity.SearchType.DEFAULT:
             results = scope.props.results_model
         else: