fixed conflicts

diff --cc controller.py
index baab788,3701b64..1505a67
--- 1/controller.py
--- 2/controller.py
+++ b/controller.py
@@@ -2,8 -2,9 +2,10 @@@
  Meabook controller class
  """
  
 +from meabook.constants import *
- from gettext import gettext as _
+ import gettext
+ 
+ _ = gettext.gettext
  
  
  class MeabookController:

diff --cc ui/hildon_ui.py
index 3a67139,0c83250..43d9446
--- 1/ui/hildon_ui.py
--- 2/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@@ -68,24 -56,11 +66,25 @@@ class HildonMeabook(MeabookUI)
          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)
+         search_button.connect('clicked', self.show_search_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)
 +        # packing search widgets
 +        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)
 +        # packing items widgets
 +        self.box_container.add_with_viewport(self.box)
 +        widgets_box.pack_start(self.selector, expand=True)
 +        widgets_box.pack_start(self.box_container, expand=True)
 +        widgets_box.pack_end(self.search_widgets_box, expand=False)
 +        self.window.add(widgets_box)
 +        # packing menu widgets
          self.menu.add_filter(self.level1_filter)
          self.menu.add_filter(self.level2_filter)
          self.menu.add_filter(self.level3_filter)
@@@ -325,38 -272,59 +335,73 @@@
              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._show_ui('box', True)
-             #self._set_box_content(self.box, [('Petrov', 'GAG'), ('Ivan)
-             #self._set_selector_content(self.selector, self.handler)
  
++    
++    
      def select_item_cb(self, widget, column):
          """
          Emits when changes selector content.
          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_box_content(self.box, \
 +            self.controller.get_all_files_by_pattern(widget.get_text(), \
 +            separated=True))
 +        widget.grab_focus()
 +
 +    def clear_search_entry_cb(self, widget, event):
 +        """Clears search entry content."""
 +
 +        self.search_entry.set_text('')
  
+ class SearchDialog:
+     """Search dialog"""
+ 
+     def __init__(self, controller):
+         self.controller = controller
+ 
+     def run(self):
+         dialog = hildon.Dialog()
+         dialog.set_title(_('Search'))
+ 
+         select_keys = hildon.TouchSelector(text=True)
+         #for item in ('cn', 'mobile'):
+         for item in self.controller.get_fields():
+             select_keys.append_text(item)
+         select_keys.set_active(0, 0)
  
+         button = hildon.PickerButton(gtk.HILDON_SIZE_AUTO | gtk.HILDON_SIZE_FINGER_HEIGHT, 
+             hildon.BUTTON_ARRANGEMENT_VERTICAL)
+         button.set_title("Search key")
+         button.set_selector(select_keys)
+ 
+         entry = hildon.Entry(gtk.HILDON_SIZE_AUTO | gtk.HILDON_SIZE_FINGER_HEIGHT)
+         entry.set_placeholder("")
+ 
+         dialog.vbox.pack_start(button, expand=False)
+         dialog.vbox.pack_end(entry, expand=False)
+         dialog.vbox.show_all()
+         dialog.add_button(_('Search'), gtk.RESPONSE_OK)
+         response = dialog.run()
+         if response == gtk.RESPONSE_OK:
+             ret = (button.get_value(), entry.get_text())
+             dialog.destroy()
+             return ret
+         else:
+             dialog.destroy()
+             return False
  
  
  class ConfigurationDialog:

diff --cc ui/hildon_ui.pyo
index d647345,25cf7bd..ca46d19
Binary files differ