Merge lp:~lore-mattei/onehundredscopes/deviantart-precise into lp:~davidc3/onehundredscopes/deviantart

[Lorenzo Mattei]

=== modified file 'debian/control'
--- debian/control	2012-02-27 15:05:49 +0000
+++ debian/control	2012-03-07 22:22:28 +0000
@@ -5,8 +5,8 @@
 Build-Depends: debhelper (>= 7),
                pkg-config,
                libglib2.0-dev (>= 2.27),
-               libdee-dev (>= 0.5.16),
-               libunity-dev (>= 3.6.2),
+               libdee-dev (>= 1.0.4),
+               libunity-dev (>= 5.0.0),
                python-all,
                python-distutils-extra
 Standards-Version: 3.9.1
@@ -17,8 +17,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         gir1.2-unity-4.0,
-         gir1.2-dee-0.5,
+         gir1.2-unity-5.0,
+         gir1.2-dee-1.0,
          python-lxml,
          unity-lens-graphicdesign,
 Description: Unity Deviantart scope

=== modified file 'src/unity-scope-deviantart'
--- src/unity-scope-deviantart	2012-02-27 15:05:49 +0000
+++ src/unity-scope-deviantart	2012-03-07 22:22:28 +0000
@@ -29,9 +29,12 @@
 	def __init__ (self):
 		self.scope = Unity.Scope.new ("/net/launchpad/scope/image/deviantart")
 		self.scope.search_in_global = False
-		self.scope.connect ("notify::active-search", self.on_search_changed)
-		self.scope.connect ("filters-changed", self.on_search_changed);
+		self.scope.connect ("search-changed", self.on_search_changed)
+		self.scope.connect ("filters-changed", self.on_filtering_changed);
 		self.scope.connect ("activate-uri", self.on_activate_uri);
+		self.scope.connect("notify::active", self.on_lens_active)
+		self.scope.props.sources.connect("notify::filtering", 
+				self.on_filtering_changed)
 		self.scope.export()
 
 	def on_activate_uri (self, scope, uri):
@@ -46,19 +49,39 @@
 #		GLib.spawn_command_line_async("eog %s" % uri)
 			return Unity.ActivationResponse(Unity.HandledType.HIDE_DASH, uri)
 
-	def get_search_string (self):
-		search = self.scope.props.active_search
-		return search.props.search_string if search else None
-
-	def on_search_changed (self, scope, param_spec=None):
-			search = self.get_search_string()
+	def on_filtering_changed(self, *_):
+		"""Run another search when a filter change is notified."""
+		self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
+	def on_lens_active(self, *_):
+		""" Run a search when the lens is opened """
+		if self.scope.props.active:
+			self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
+
+#	def get_search_string (self):
+#		search = self.scope.props.active_search
+#		return search.props.search_string if search else None
+
+	def on_search_changed (self, scope, search, search_type, _):
+			search_string = search.props.search_string.strip()
 			print "Search changed to: '%s'" % search
-			results = self.scope.props.results_model
-			results.clear()
-			self.update_results_model (search, results, 0)
-			results.flush_revision_queue ()
+			model = search.props.results_model
+			model.clear()
+			if search_type is Unity.SearchType.DEFAULT:
+				if search_string == '':
+					print "Global view without search string : hide"
+				else:
+					self.update_results_model(search_string, model, 0)
+			if search:
+				search.finished()
 
 	def update_results_model(self, search, model, page):
+		cat = 0
+		if len(search) > 0:
+			cat = 3
+		else:
+			cat = 0
 		if self.check_filters("art_categories") == "brushes" or self.check_filters("art_categories") is None:
 			i = None
 			for i in self.deviantart(search, page):
@@ -66,15 +89,12 @@
 				comment = i[1]
 				uri = i[2]
 				icon_hint = i[3]
-				model.append (uri, icon_hint, 3,"text/html", title, comment, uri)
+				model.append (uri, icon_hint, cat,"text/html", title, comment, uri)
 			if i:
 				if not search:
 					search = ''
 				page = int(page)+24
-				model.append ("more__"+search+"__"+str(page), "add", 3,"text/html", "More results", '', '')
-
-		if self.scope.props.active_search:
-			self.scope.props.active_search.emit("finished")
+				model.append ("more__"+search+"__"+str(page), "add", cat,"text/html", "More results", '', '')
 
 	def check_filters(self, filter_name):
 		try: