improved database search functions
[meabook] / ui / hildon_ui.py
index 171f60b..df0eb6f 100644 (file)
@@ -7,11 +7,12 @@ import hildon
 import gobject
 from gettext import gettext as _
 from meabook.constants import *
+from meabook.caller import PhoneCaller
 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,12 +23,47 @@ def create_button(title, value):
 
 
 def create_menu_button(title):
-    """Creates Hildon menu button."""
+    """Create HildonMenu button."""
 
     return hildon.Button(gtk.HILDON_SIZE_AUTO, \
         hildon.BUTTON_ARRANGEMENT_HORIZONTAL, title)
 
 
+def set_selector_content(selector, handler, items=[]):
+    """Updates selector widget content."""
+
+    selector.handler_block(handler) # temporary block handler
+    # setting new content
+    # 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))
+    if selector.get_num_columns():
+        selector.remove_column(0)
+    selector.append_text_column(model, False)
+    selector.unselect_all(0)
+    selector.handler_unblock(handler) # reconnect callback
+
+
+def set_box_content(box, handler, items=[]):
+    """Updates box widget content."""
+
+    def on_button_click(widget):
+        handler(widget.get_title(), widget.get_data('iname'))
+
+    for child in box.get_children():
+        box.remove(child)
+    for title, value, internal_name, item_type in items:
+        button = create_button(title, value)
+        button.connect('clicked', on_button_click)
+        button.set_data('iname', internal_name)
+        button.set_relief(gtk.RELIEF_NONE)
+        button.show()
+        box.pack_start(button, expand=False)
+
+
+
 class HildonMeabook(MeabookUI):
     def __init__(self, controller, renderer, config):
         MeabookUI.__init__(self, controller, renderer, config)
@@ -35,13 +71,12 @@ class HildonMeabook(MeabookUI):
         self.window = hildon.StackableWindow()
         self.window.set_title(_('Meabook'))
         self.window.connect('destroy', self.exit)
-
         # create menu buttons
-        self.menu = hildon.AppMenu()
+        menu = hildon.AppMenu()
         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'))
         self.level2_filter = gtk.RadioButton(self.level1_filter, _('level2'))
@@ -50,73 +85,95 @@ class HildonMeabook(MeabookUI):
             self.level3_filter]:
             filter_widget.set_mode(False)
             filter_widget.connect('toggled', self.apply_filter_cb)
-
-        # create items list
+        # create items widgets
         self.selector = hildon.TouchSelector()
-
+        self.box_container = hildon.PannableArea()
+        self.box = gtk.VBox()
+        # create search widgets
         widgets_box = gtk.VBox()
-        self.search_entry = hildon.Entry(gtk.HILDON_SIZE_AUTO)
-
+        self.search_widgets_box = gtk.HBox()
+        self.search_entry = hildon.Entry(gtk.HILDON_SIZE_AUTO | \
+            gtk.HILDON_SIZE_FINGER_HEIGHT)
+        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)
+        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
+        # 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_end(self.search_entry, expand=False)
+        widgets_box.pack_start(self.box_container, 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)
-        self.menu.append(settings_button)
-        self.menu.append(import_button)
-        self.menu.append(about_button)
-        self.menu.show_all()
-        self.window.set_app_menu(self.menu)
+        # packing menu widgets
+        menu.add_filter(self.level1_filter)
+        menu.add_filter(self.level2_filter)
+        menu.add_filter(self.level3_filter)
+        menu.append(settings_button)
+        menu.append(import_button)
+        menu.append(search_button)
+        menu.append(about_button)
+        menu.show_all()
+        self.window.set_app_menu(menu)
         self.window.show_all()
 
+    def _show_ui(self, view='selector', show_search=False):
+        """Shows necessary widgets for selected view."""
+
+        if view == 'selector':
+            self.box_container.hide()
+            self.selector.show()
+        elif view == 'box':
+            self.selector.hide()
+            self.box_container.show_all()
+        else:
+            self.selector.hide()
+            self.box_container.hide()
+        if show_search:
+            self.search_entry.set_text('')
+            self.search_entry.set_placeholder(_('Enter search text here'))
+            self.search_widgets_box.show_all()
+        else:
+            self.search_widgets_box.hide()
+
     def _unfreeze_ui(self):
         while gtk.events_pending():
             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=[]):
-        """Updates selector content."""
-
-        # temporary block handler
-        selector.handler_block(handler)
-
-        # setting new content
-        # model: name, internal_name, type
-        model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, \
-            gobject.TYPE_STRING)
-        for item in items:
-            model.append(item)
-        if selector.get_num_columns():
-            selector.remove_column(0)
-        selector.append_text_column(model, False)
-        selector.unselect_all(0)
-
-        # reconnect callback
-        selector.handler_unblock(handler)
-
-    def _show_items_dialog(self, title, items):
-        """Creates dialog with items."""
+    def _show_items_dialog(self, title, items, touch_selector_view=True):
+        """Creates dialog with items. If 'touch_selector_view' is True,
+        then items will be shown in TouchSelector widget, else each item
+        will be shown as Button in PannableArea."""
 
-        selector = hildon.TouchSelector()
         window = hildon.StackableWindow()
         window.set_title(title)
-        window.add(selector)
-        handler = selector.connect('changed', self.select_item_cb)
-        self._set_selector_content(selector, handler, items)
+        if touch_selector_view:
+            container = hildon.TouchSelector()
+            handler = container.connect('changed', self.select_item_cb)
+            set_selector_content(container, handler, items)
+        else:
+            widgets_box = gtk.VBox()
+            container = hildon.PannableArea()
+            container.add_with_viewport(items_box)
+            set_box_content(widgets_box, self._show_item_dialog, items)
+        window.add(container)
         window.show_all()
 
     def _show_item_dialog(self, title, entry_id):
@@ -141,11 +198,14 @@ class HildonMeabook(MeabookUI):
                 if fname == 'image':
                     continue
                 button = self.renderer.render_button(_(fname) , fvalue, fname)
+                if fname in (FIELD_PHONE_HOME, FIELD_PHONE_GENERAL, \
+                    FIELD_PHONE_INTERNAL, FIELD_PHONE_MOBILE):
+                    button.connect('clicked', self.call_cb)
                 info_box.pack_start(button, expand=False)
             # pack widgets
             image_box.pack_start(image, expand=False)
-            widgets_table.attach(image_box, 0, 1, 0, 1, xoptions=gtk.SHRINK, \
-                yoptions=gtk.FILL, xpadding=4, ypadding=8)
+            widgets_table.attach(image_box, 0, 1, 0, 1, xoptions=gtk.FILL|gtk.SHRINK, \
+                yoptions=gtk.FILL, xpadding=14, ypadding=8)
             pannable_area.add_with_viewport(info_box)
             widgets_table.attach(pannable_area, 1, 2, 0, 1, ypadding=8)
             child = window.get_child()
@@ -193,26 +253,7 @@ class HildonMeabook(MeabookUI):
         dialog.destroy()
 
     def create_about_dialog(self):
-        from meabook.version import version
-        dialog = hildon.Dialog()
-        dialog.set_title(_('About'))
-        info_label = gtk.Label()
-        info_label.set_use_markup(True)
-        info_label.set_justify(gtk.JUSTIFY_CENTER)
-        info_label.set_markup("<span foreground='white' size='medium'><b>" \
-            "Meabook</b></span><span foreground='white' size='small'> - " \
-            "Enterprise address book</span>\n<span foreground='white' " \
-            "size='small'>Version %s</span>\n\n\n<span foreground='white'" \
-            "size='small'><b>Developers:</b></span>\n<span foreground=" \
-            "'white' size='small'>Tanya Makova | </span><span foreground=" \
-            "'#299BFC' size='small'>tanyshk@gmail.com</span>\n<span " \
-            "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()
-        dialog.destroy()
+        AboutDialog()
 
     def create_import_dialog(self):
         chooser = gobject.new(hildon.FileChooserDialog, \
@@ -225,13 +266,26 @@ class HildonMeabook(MeabookUI):
 
     def create_progress_dialog(self, title=None):
         self._update_title(title)
-        self.selector.hide()
+        self._show_ui('hide', False)
         hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
         self._unfreeze_ui()
 
     def create_configuration_dialog(self, controller, config):
-        dialog = ConfigurationDialog(controller, config)
-        dialog.run()
+        ConfigurationDialog(controller, config).run()
+
+    def create_fields_configuration_dialog(self, all_fields, fields_to_show, parent):
+        dialog = FieldsConfigurationDialog(all_fields, fields_to_show, parent)
+        return dialog.run()
+
+    def create_fields_order_configuration_dialog(self, all_fields, ordered_fields):
+        dialog = FieldsOrderConfigurationDialog(all_fields, ordered_fields)
+        return dialog.run()
+
+    def create_search_dialog(self, controller):
+        dialog = SearchDialog(controller)
+        param = dialog.run()
+        if param:
+            print(param)
 
 
     # Hildon UI callbacks
@@ -244,8 +298,8 @@ class HildonMeabook(MeabookUI):
         """Shows Import Dialog."""
 
         if self.controller.show_import_dialog():
+            self._show_ui('selector')
             self.apply_filter_cb(self.level1_filter)
-            self.selector.show_all()
         hildon.hildon_gtk_window_set_progress_indicator(self.window, 0)
 
     def show_settings_dialog_cb(self, widget):
@@ -253,6 +307,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."""
 
@@ -260,19 +319,19 @@ class HildonMeabook(MeabookUI):
             return
 
         self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
-        self.search_entry.hide()
 
         if widget == self.level1_filter:
-            self._set_selector_content(self.selector, self.handler, \
+            self._show_ui()
+            set_selector_content(self.selector, self.handler, \
                 self.controller.get_all_folders())
         elif widget == self.level2_filter:
-            self._set_selector_content(self.selector, self.handler, \
+            self._show_ui()
+            set_selector_content(self.selector, self.handler, \
                 self.controller.get_all_subfolders())
         else:
-            self.search_entry.set_text('')
-            self.search_entry.set_placeholder(_('Enter search text here'))
-            self.search_entry.show()
-            self._set_selector_content(self.selector, self.handler)
+            self._show_ui(view='box', show_search=True)
+            set_box_content(self.box, self._show_item_dialog, \
+                self.controller.get_files_by_pattern())
 
     def select_item_cb(self, widget, column):
         """
@@ -291,15 +350,94 @@ class HildonMeabook(MeabookUI):
     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()))
+        set_box_content(self.box, self._show_item_dialog, \
+            self.controller.get_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('')
+        set_box_content(self.box, self._show_item_dialog, \
+                self.controller.get_files_by_pattern())
+
+
+    def call_cb(self, widget):
+        """Nake a phone call."""
+
+        self.controller.call(widget.get_value())
+
+
+
+class AboutDialog(hildon.Dialog):
+    """Hildon About Dialog."""
+
+    def __init__(self):
+        from meabook.version import version
+        hildon.Dialog.__init__(self)
+        self.set_title(_('About'))
+        info_label = gtk.Label()
+        info_label.set_use_markup(True)
+        info_label.set_justify(gtk.JUSTIFY_CENTER)
+        info_label.set_markup("<span foreground='white' size='medium'><b>" \
+            "Meabook</b></span><span foreground='white' size='small'> - " \
+            "Enterprise address book</span>\n<span foreground='white' " \
+            "size='small'>Version %s</span>\n\n\n<span foreground='white'" \
+            "size='small'><b>Developers:</b></span>\n<span foreground=" \
+            "'white' size='small'>Tanya Makova | </span><span foreground=" \
+            "'#299BFC' size='small'>tanyshk@gmail.com</span>\n<span " \
+            "foreground='white' size='small'>Max Usachev | </span><span " \
+            "foreground='#299BFC' size='small'>maxusachev@gmail.com</span>" \
+            "\n" % version)
+        self.vbox.add(info_label)
+        self.vbox.show_all()
+        self.run()
+        self.destroy()
+
+
+
+class SearchDialog:
+    """Hildon Search Dialog."""
+
+    def __init__(self, controller):
+        self.controller = controller
+
+    def run(self):
+        dialog = hildon.Dialog()
+        dialog.set_title(_('Search'))
+
+        selector = hildon.TouchSelector(text=True)
+        #for item in ('cn', 'mobile'):
+        for item in self.controller.get_fields():
+            selector.append_text(_(item))
+        selector.set_active(0, 0)
+
+        button = hildon.PickerButton(gtk.HILDON_SIZE_AUTO | \
+            gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL)
+        button.set_alignment(0, 0, 0, 0)
+        button.set_title(_("Search criterion"))
+        button.set_selector(selector)
+
+        entry = hildon.Entry(gtk.HILDON_SIZE_AUTO | gtk.HILDON_SIZE_FINGER_HEIGHT)
+        entry.set_placeholder(_("Enter search text here"))
+
+        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:
+            result = (self.controller.get_localized_fields()[ \
+                button.get_value().decode('utf-8')], entry.get_text())
+            dialog.destroy()
+            return result
+        dialog.destroy()
+        return (False, None)
 
 
 
 class ConfigurationDialog:
-    """Configuration dialog"""
+    """Hildon Configuration Dialog."""
 
     def __init__(self, controller, config):
         self.config = config
@@ -403,11 +541,92 @@ class ConfigurationDialog:
         dialog.vbox.show_all()
         response = dialog.run()
         if response == gtk.RESPONSE_OK:
-            fields_dict = dict([(_(field).decode('utf-8'), field) for field \
-                in self.controller.get_fields()])
+            fields_dict = self.controller.get_localized_fields()
             new_ordered_fields = [fields_dict[button.get_value().decode( \
                 'utf-8')] for button in vbox.get_children()]
             self.config.set_order(new_ordered_fields)
             self._update_value(widget, new_ordered_fields)
         dialog.destroy()
         return response
+
+
+
+class FieldsConfigurationDialog():
+    def __init__(self, fields, fields_to_select, parent):
+        dialog = hildon.PickerDialog(parent)
+        dialog.set_title(_('Fields to show'))
+        selector = hildon.TouchSelector(text=True)
+        # fill items list
+        for field in fields.keys():
+            selector.append_text(field)
+        selector.set_column_selection_mode( \
+            hildon.TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE)
+        selector.unselect_all(0)
+        # mark necessary fields
+        model = selector.get_model(0)
+        for index, field in enumerate(fields.values()):
+            if field in fields_to_select:
+                selector.select_iter(0, model.get_iter(index), False)
+        dialog.set_selector(selector)
+        # creates class attributes
+        self.fields = fields
+        self.dialog = dialog
+        self.selector = selector
+
+    def run(self):
+        if self.dialog.run() == gtk.RESPONSE_OK:
+            model = self.selector.get_model(0)
+            indexes = [item[0] for item in self.selector.get_selected_rows(0)]
+            self.dialog.destroy()
+            return [self.fields.values()[index] for index in indexes]
+        self.dialog.destroy()
+        return None
+
+
+
+class FieldsOrderConfigurationDialog():
+    def __init__(self, fields, ordered_fields):
+        dialog = hildon.Dialog()
+        dialog.set_title(_('Fields order'))
+        pannable_area = hildon.PannableArea()
+        pannable_area.set_size_request_policy(hildon.SIZE_REQUEST_CHILDREN)
+        vbox = gtk.VBox()
+        for index, field in enumerate(ordered_fields):
+            button = create_button(' '.join([_('Position'), str(index)]), \
+                _(field))
+            button.connect('clicked', self.show_fields_chooser, fields.keys(), \
+                dialog)
+            vbox.pack_start(button, expand=False)
+        pannable_area.add_with_viewport(vbox)
+        dialog.add_button(_('Done'), gtk.RESPONSE_OK)
+        dialog.vbox.pack_start(pannable_area)
+        dialog.vbox.show_all()
+        # create class attributes
+        self.dialog = dialog
+        self.fields = fields
+        self.widgets_box = vbox
+
+    def run(self):
+        if self.dialog.run() == gtk.RESPONSE_OK:
+            selected_fields = [self.fields[button.get_value().decode('utf-8')] \
+                for button in self.widgets_box.get_children()]
+            self.dialog.destroy()
+            return selected_fields
+        self.dialog.destroy()
+        return None
+
+    def show_fields_chooser(self, widget, fields, parent):
+        """Shows dialog to select field from fields list."""
+
+        dialog = hildon.PickerDialog(parent)
+        dialog.set_title(_('Fields'))
+        selector = hildon.TouchSelector(text=True)
+        dialog.set_selector(selector)
+        selector.set_column_selection_mode( \
+            hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE)
+        # fill fields list
+        for field in fields:
+            selector.append_text(field)
+        dialog.run()
+        widget.set_value(selector.get_current_text())
+        dialog.destroy()