X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fsearch.py;h=fab6710881347a4fc23a4647fc11275582461afd;hp=c16360315848f396c56fe06943ed25e58c0c9f9f;hb=c2072addfb9c5aaa9f48fbb180d17929cdfc339b;hpb=664a39e10a6efc247052937b3b4c46656a0a5f46

diff --git a/src/search.py b/src/search.py
index c163603..fab6710 100644
--- a/src/search.py
+++ b/src/search.py
@@ -13,7 +13,7 @@ except NameError:
 	_ = lambda x: x
 
 
-_moduleLogger = logging.getLogger("search")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class Search(gtk.HBox):
@@ -26,6 +26,7 @@ class Search(gtk.HBox):
 		_moduleLogger.info("search, init")
 		gtk.HBox.__init__(self, homogeneous = False, spacing = 3)
 		self.connect("hide", self._on_hide)
+		self.connect("show", self._on_show)
 
 		label = gtk.Label(_("Search:  "))
 
@@ -33,7 +34,7 @@ class Search(gtk.HBox):
 		self._searchEntry.connect("changed", self._on_search_entry_changed, None)
 
 		closeImage = gtk.Image()
-		closeImage.set_from_stock("gtk-close", gtk.ICON_SIZE_BUTTON)
+		closeImage.set_from_stock("gtk-close", gtk.ICON_SIZE_MENU)
 		closeSearch = gtk.Button()
 		closeSearch.set_image(closeImage)
 		closeSearch.connect("clicked", self._on_close)
@@ -53,5 +54,11 @@ class Search(gtk.HBox):
 	def _on_close(self, *args):
 		self.hide()
 
+	def _on_show(self, *args):
+		self._searchEntry.grab_focus()
+
 	def _on_hide(self, *args):
-		self._searchEntry.set_text("")
+		# HACK Disabled for now.  Clearing this resets the note list which
+		# causes the current note to lose focus.
+		# self._searchEntry.set_text("")
+		pass