improved search bar

[meabook] / ui / hildon_ui.py

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index 16a5ef3..213503f 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -3,14 +3,16 @@ Hildon UI for Meabook
 """
 
 import gtk
+import pango
 import hildon
 import gobject
 from gettext import gettext as _
+from meabook.constants import *
 from meabook.ui.ui import MeabookUI
 
 
 def create_button(title, value):
-    """Create HildonButton."""
+    """Creates HildonButton."""
 
     button = hildon.Button(gtk.HILDON_SIZE_AUTO | \
         gtk.HILDON_SIZE_FINGER_HEIGHT, \
@@ -21,6 +23,8 @@ def create_button(title, value):
 
 
 def create_menu_button(title):
+    """Creates Hildon menu button."""
+
     return hildon.Button(gtk.HILDON_SIZE_AUTO, \
         hildon.BUTTON_ARRANGEMENT_HORIZONTAL, title)
 
@@ -51,14 +55,31 @@ class HildonMeabook(MeabookUI):
         # create items list
         self.selector = hildon.TouchSelector()
 
+        widgets_box = gtk.VBox()
+        self.search_widgets_box = gtk.HBox()
+        self.search_entry = hildon.Entry(gtk.HILDON_SIZE_AUTO)
+        clear_search_entry_container = gtk.EventBox()
+        clear_search_entry_image = gtk.image_new_from_icon_name( \
+            'general_delete', gtk.HILDON_SIZE_FINGER_HEIGHT)
+
+
         # connect signals
         settings_button.connect('clicked', self.show_settings_dialog_cb)
         about_button.connect('clicked', self.show_about_dialog_cb)
         import_button.connect('clicked', self.show_import_dialog_cb)
         self.handler = self.selector.connect('changed', self.select_item_cb)
+        self.search_entry.connect('key-release-event', self.search_item_cb)
+        clear_search_entry_container.connect('button-press-event', \
+            self.clear_search_entry_cb)
 
         # packing widgets
-        self.window.add(self.selector)
+        clear_search_entry_container.add(clear_search_entry_image)
+        self.search_widgets_box.pack_start(self.search_entry, expand=True)
+        self.search_widgets_box.pack_start(clear_search_entry_container, \
+            expand=False, padding=24)
+        widgets_box.pack_start(self.selector, expand=True)
+        widgets_box.pack_end(self.search_widgets_box, expand=False)
+        self.window.add(widgets_box)
         self.menu.add_filter(self.level1_filter)
         self.menu.add_filter(self.level2_filter)
         self.menu.add_filter(self.level3_filter)
@@ -74,10 +95,12 @@ class HildonMeabook(MeabookUI):
             gtk.main_iteration(False)
 
     def _update_title(self, title):
+        """Set window title text."""
+
         if title is not None:
             self.window.set_title(title)
 
-    def _set_selector_content(self, selector, handler, items):
+    def _set_selector_content(self, selector, handler, items=[]):
         """Updates selector content."""
 
         # temporary block handler
@@ -87,8 +110,8 @@ class HildonMeabook(MeabookUI):
         # model: name, internal_name, type
         model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, \
             gobject.TYPE_STRING)
-        for name, internal_name, item_type in items:
-            model.append((name, internal_name, item_type))
+        for item in items:
+            model.append(item)
         if selector.get_num_columns():
             selector.remove_column(0)
         selector.append_text_column(model, False)
@@ -97,6 +120,7 @@ class HildonMeabook(MeabookUI):
         # reconnect callback
         selector.handler_unblock(handler)
 
+
     def _show_items_dialog(self, title, items):
         """Creates dialog with items."""
 
@@ -198,7 +222,6 @@ class HildonMeabook(MeabookUI):
             "foreground='white' size='small'>Max Usachev | </span><span " \
             "foreground='#299BFC' size='small'>maxusachev@gmail.com</span>" \
             "\n" % version)
-
         dialog.vbox.add(info_label)
         dialog.vbox.show_all()
         dialog.run()
@@ -250,6 +273,7 @@ class HildonMeabook(MeabookUI):
             return
 
         self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
+        self.search_widgets_box.hide()
 
         if widget == self.level1_filter:
             self._set_selector_content(self.selector, self.handler, \
@@ -258,8 +282,10 @@ class HildonMeabook(MeabookUI):
             self._set_selector_content(self.selector, self.handler, \
                 self.controller.get_all_subfolders())
         else:
-            self._set_selector_content(self.selector, self.handler, \
-                self.controller.get_all_files())
+            self.search_entry.set_text('')
+            self.search_entry.set_placeholder(_('Enter search text here'))
+            self.search_widgets_box.show()
+            self._set_selector_content(self.selector, self.handler)
 
     def select_item_cb(self, widget, column):
         """
@@ -267,13 +293,25 @@ class HildonMeabook(MeabookUI):
         Opens new StackableWindow with new content.
         """
 
-        selected_item_index = widget.get_active(0)
-        _iter = widget.get_model(0)[selected_item_index]
-        if _iter[2] == 'd':
-            self._show_items_dialog(_iter[0], self.controller.get_items(\
-                _iter[1]))
+        item_name, internal_name, item_type = \
+            widget.get_model(0)[widget.get_active(0)]
+        if item_type == TYPE_DIRECTORY:
+            self._show_items_dialog(item_name, self.controller.get_items( \
+                internal_name))
         else:
-            self._show_item_dialog(_iter[0], _iter[1])
+            self._show_item_dialog(item_name, internal_name)
+
+    def search_item_cb(self, widget, event):
+        """Search items from database."""
+
+        self._set_selector_content(self.selector, self.handler, \
+            self.controller.get_all_files_by_pattern(widget.get_text()))
+        widget.grab_focus()
+
+    def clear_search_entry_cb(self, widget, event):
+        """Clears search entry content."""
+
+        self.search_entry.set_text('')