fixed conflicts test1
authortanya <tanyshk@gmail.com>
Mon, 21 Jun 2010 13:49:58 +0000 (16:49 +0300)
committertanya <tanyshk@gmail.com>
Mon, 21 Jun 2010 13:49:58 +0000 (16:49 +0300)
1  2 
controller.py
ui/hildon_ui.py
ui/hildon_ui.pyo

diff --combined 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:
@@@ -23,7 -24,7 +25,7 @@@
          """Gets from model items with selected level."""
  
          folders_list = list(self.get_all_folders(parent))
-         files_list = [(fields['cn'], int_name, TYPE_FILE) for int_name, \
+         files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
              fields in self.model.get_files(['cn'], parent).items()]
          return folders_list + files_list
  
      def get_all_folders(self, parent=0):
          """Gets all filials."""
  
-         return [(name, internal_name, TYPE_DIRECTORY) for name, internal_name \
-             in self.model.get_folders(parent)]
+         return [(name, internal_name, 'd') for name, internal_name in \
+             self.model.get_folders(parent)]
  
      def get_all_subfolders(self):
          """Gets all departments."""
  
-         return self.get_all_folders(parent=None)
+         return [(name, internal_name, 'd') for name, internal_name in \
+             self.model.get_folders()]
  
      def get_all_files(self):
          """Gets all peoples."""
  
          # FIXME: read field names from Config
          files_dict = self.model.get_files(['cn'])
 -        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
 -            internal_name in files_dict]
 +        return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
 +            for internal_name in files_dict]
 +
 +    def get_all_files_by_pattern(self, pattern, separated=False):
 +        """Gets all peoples matched pattern."""
 +
 +        if not separated:
 +            return [(name, internal_name, TYPE_FILE) for internal_name, name \
 +                in self.model.get_files_by_pattern(pattern)]
 +        else:
 +            files_dict = self.model.get_files(['cn', 'o', 'ou'], pattern=pattern)
 +            return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % (
 +                files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \
 +                internal_name, TYPE_FILE) for internal_name in files_dict]
  
      def get_fields(self):
          """Returns all exists fields from model."""
  
          self.view.create_configuration_dialog(self, self.config)
  
+     def show_search_dialog(self):
+         """Shows view Search Dialog."""
+         self.view.create_search_dialog(self)
      def show_import_dialog(self):
          """Shows view IMport Dialog."""
  
diff --combined ui/hildon_ui.py
@@@ -6,12 -6,11 +6,11 @@@ import gt
  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 +21,6 @@@
  
  
  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 +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'))
              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_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)
+         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)
          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)
          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()
 +        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):
          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)
 +    def _set_selector_content(self, 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 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)
          selector.unselect_all(0)
 +        selector.handler_unblock(handler) # reconnect callback
 +
 +    def _set_box_content(self, box, items):
 +        """Updates box widget content."""
 +
 +        def on_button_click(widget):
 +            self._show_item_dialog(widget.get_title(), \
 +                widget.get_data('internal_name'))
 +
 +        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('internal_name', internal_name)
 +            button.set_relief(gtk.RELIEF_NONE)
 +            button.show()
 +            box.pack_start(button, expand=False)
 +
 +    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."""
  
 -        # reconnect callback
 -        selector.handler_unblock(handler)
 -
 -    def _show_items_dialog(self, title, items):
 -        """Creates dialog with items."""
 -
 -        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)
 +            self._set_selector_content(container, handler, items)
 +        else:
 +            widgets_box = gtk.VBox()
 +            container = hildon.PannableArea()
 +            container.add_with_viewport(items_box)
 +            self._set_box_content(widgets_box, items)
 +        window.add(container)
          window.show_all()
  
      def _show_item_dialog(self, title, entry_id):
                  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()
              "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 = 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):
  
          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."""
  
          self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
  
          if widget == self.level1_filter:
 +            self._show_ui()
              self._set_selector_content(self.selector, self.handler, \
                  self.controller.get_all_folders())
          elif widget == self.level2_filter:
 +            self._show_ui()
              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 --combined ui/hildon_ui.pyo
index d647345,25cf7bd..ca46d19
Binary files differ