implemented different UI for items

diff --git a/controller.py b/controller.py
index f696a7c..baab788 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -64,11 +64,17 @@ class MeabookController:
         return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
             for internal_name in files_dict]
 
-    def get_all_files_by_pattern(self, pattern):
+    def get_all_files_by_pattern(self, pattern, separated=False):
         """Gets all peoples matched pattern."""
 
-        return [(name, internal_name, TYPE_FILE) for internal_name, name in \
-            self.model.get_files_by_pattern(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."""

diff --git a/database/SQLite.py b/database/SQLite.py
index 2b6d3ab..a51f505 100644 (file)
--- a/database/SQLite.py
+++ b/database/SQLite.py
@@ -149,7 +149,7 @@ class SQLite:
             return self.conn.execute("SELECT DISTINCT name, id FROM struct \
                 WHERE parent=? ORDER BY name ASC", (parent,)).fetchall()
 
-    def get_files(self, fields, parent=0):
+    def get_files(self, fields, parent=0, pattern=''):
         """Returns list of all files from DATA table."""
 
         items_dict = {}
@@ -157,8 +157,10 @@ class SQLite:
         fields = execute("SELECT id, name FROM fields WHERE name IN (%s)" \
             % ','.join('%r' % (field,) for field in fields)).fetchall()
         if parent == 0: # get all files
+            #data_ids = [_id[0] for _id in execute("SELECT DISTINCT id FROM \
+            #    data").fetchall()]
             data_ids = [_id[0] for _id in execute("SELECT DISTINCT id FROM \
-                data").fetchall()]
+                data WHERE value LIKE '%s%%' LIMIT 50" % pattern.capitalize()).fetchall()]
         else: # get files for selected parent
             data_ids = [_id[0] for _id in execute("SELECT data_id FROM \
                 relation WHERE struct_id=?", (parent,)).fetchall()]

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index 213503f..3a67139 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -3,7 +3,6 @@ Hildon UI for Meabook
 """
 
 import gtk
-import pango
 import hildon
 import gobject
 from gettext import gettext as _
@@ -52,9 +51,12 @@ class HildonMeabook(MeabookUI):
             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)
@@ -62,7 +64,6 @@ class HildonMeabook(MeabookUI):
         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)
@@ -73,13 +74,18 @@ class HildonMeabook(MeabookUI):
             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_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)
@@ -90,6 +96,22 @@ class HildonMeabook(MeabookUI):
         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)
@@ -101,11 +123,9 @@ class HildonMeabook(MeabookUI):
             self.window.set_title(title)
 
     def _set_selector_content(self, selector, handler, items=[]):
-        """Updates selector content."""
-
-        # temporary block handler
-        selector.handler_block(handler)
+        """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, \
@@ -116,20 +136,42 @@ class HildonMeabook(MeabookUI):
             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):
@@ -157,8 +199,8 @@ class HildonMeabook(MeabookUI):
                 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()
@@ -273,19 +315,19 @@ class HildonMeabook(MeabookUI):
             return
 
         self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
-        self.search_widgets_box.hide()
 
         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.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)
+            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):
         """
@@ -304,8 +346,9 @@ 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()))
+        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):