X-Git-Url: http://git.maemo.org/git/?p=quicknote;a=blobdiff_plain;f=src%2Fsearch.py;h=fab6710881347a4fc23a4647fc11275582461afd;hp=37c90d2ab5ec48f3d32c6ef346612fe979ba9158;hb=f65e95591ddf52734af3102f1db52c903b11590a;hpb=47f27cc4fd54f17f5844c85588b8e79a8eb900d0

diff --git a/src/search.py b/src/search.py
index 37c90d2..fab6710 100644
--- a/src/search.py
+++ b/src/search.py
@@ -7,16 +7,13 @@ import logging
 import gobject
 import gtk
 
-import gtk_toolbox
-import hildonize
-
 try:
 	_
 except NameError:
 	_ = lambda x: x
 
 
-_moduleLogger = logging.getLogger("search")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class Search(gtk.HBox):
@@ -28,15 +25,24 @@ class Search(gtk.HBox):
 	def __init__(self):
 		_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:  "))
 
 		self._searchEntry = gtk.Entry()
 		self._searchEntry.connect("changed", self._on_search_entry_changed, None)
 
+		closeImage = gtk.Image()
+		closeImage.set_from_stock("gtk-close", gtk.ICON_SIZE_MENU)
+		closeSearch = gtk.Button()
+		closeSearch.set_image(closeImage)
+		closeSearch.connect("clicked", self._on_close)
+
 		searchHBox = gtk.HBox()
 		searchHBox.pack_start(label, expand = False, fill = False)
 		searchHBox.pack_start(self._searchEntry, expand = True, fill = True)
+		searchHBox.pack_start(closeSearch, expand = False, fill = False)
 		self.pack_start(searchHBox, expand = True, fill = True)
 
 	def get_search_pattern(self):
@@ -44,3 +50,15 @@ class Search(gtk.HBox):
 
 	def _on_search_entry_changed(self, widget = None, data = None):
 		self.emit("search_changed")
+
+	def _on_close(self, *args):
+		self.hide()
+
+	def _on_show(self, *args):
+		self._searchEntry.grab_focus()
+
+	def _on_hide(self, *args):
+		# HACK Disabled for now.  Clearing this resets the note list which
+		# causes the current note to lose focus.
+		# self._searchEntry.set_text("")
+		pass