fixed conflicts

[meabook] / ui / hildon_ui.py

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index 3a67139..43d9446 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -6,12 +6,11 @@ import gtk
 import hildon
 import gobject
 from gettext import gettext as _
-from meabook.constants import *
 from meabook.ui.ui import MeabookUI
 
 
 def create_button(title, value):
-    """Creates HildonButton."""
+    """Create HildonButton."""
 
     button = hildon.Button(gtk.HILDON_SIZE_AUTO | \
         gtk.HILDON_SIZE_FINGER_HEIGHT, \
@@ -22,8 +21,6 @@ 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)
 
@@ -41,6 +38,7 @@ class HildonMeabook(MeabookUI):
         settings_button = create_menu_button(_('Settings'))
         about_button = create_menu_button(_('About'))
         import_button = create_menu_button(_('Import'))
+        search_button = create_menu_button(_('Search'))
 
         # create filter widgets and connect signals
         self.level1_filter = gtk.RadioButton(None, _('level1'))
@@ -68,6 +66,7 @@ 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', \
@@ -91,6 +90,7 @@ class HildonMeabook(MeabookUI):
         self.menu.add_filter(self.level3_filter)
         self.menu.append(settings_button)
         self.menu.append(import_button)
+        self.menu.append(search_button)
         self.menu.append(about_button)
         self.menu.show_all()
         self.window.set_app_menu(self.menu)
@@ -117,8 +117,6 @@ 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)
 
@@ -130,8 +128,8 @@ class HildonMeabook(MeabookUI):
         # model: name, internal_name, type
         model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, \
             gobject.TYPE_STRING)
-        for item in items:
-            model.append(item)
+        for name, internal_name, item_type in items:
+            model.append((name, internal_name, item_type))
         if selector.get_num_columns():
             selector.remove_column(0)
         selector.append_text_column(model, False)
@@ -264,6 +262,7 @@ 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()
@@ -288,6 +287,12 @@ class HildonMeabook(MeabookUI):
         dialog = ConfigurationDialog(controller, config)
         dialog.run()
 
+    def create_search_dialog(self, controller):
+        dialog = SearchDialog(controller)
+        param = dialog.run()
+        if param:
+            print(param)
+
 
     # Hildon UI callbacks
     def show_about_dialog_cb(self, widget):
@@ -308,6 +313,11 @@ class HildonMeabook(MeabookUI):
 
         self.controller.show_configuration_dialog()
 
+    def show_search_dialog_cb(self, widget):
+        """Show Search dialog."""
+        
+        self.controller.show_search_dialog()
+
     def apply_filter_cb(self, widget):
         """Updates toplevel selector with different level items."""
 
@@ -326,9 +336,9 @@ class HildonMeabook(MeabookUI):
                 self.controller.get_all_subfolders())
         else:
             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.
@@ -342,7 +352,7 @@ class HildonMeabook(MeabookUI):
                 internal_name))
         else:
             self._show_item_dialog(item_name, internal_name)
-
+  
     def search_item_cb(self, widget, event):
         """Search items from database."""
 
@@ -356,7 +366,42 @@ class HildonMeabook(MeabookUI):
 
         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: