fixed bug with update widgets
[meabook] / ui / hildon_ui.py
index cc69d98..ea9fd76 100644 (file)
@@ -10,7 +10,6 @@ from meabook.ui.ui import MeabookUI
 
 _ = gettext.gettext
 
-
 def create_button(title, value):
     """Create HildonButton."""
 
@@ -22,84 +21,166 @@ def create_button(title, value):
     return button
 
 
+def create_menu_button(title):
+    return hildon.Button(gtk.HILDON_SIZE_AUTO, \
+        hildon.BUTTON_ARRANGEMENT_HORIZONTAL, title)
+
+
 class HildonMeabook(MeabookUI):
-    def __init__(self, controller):
-        MeabookUI.__init__(self, controller)
-        self.internal_names = []
-        self.callback_id = None
+    def __init__(self, controller, renderer, config):
+        MeabookUI.__init__(self, controller, renderer, config)
+        self.handler = None
         self.window = hildon.StackableWindow()
         self.window.set_title(_('Meabook'))
         self.window.connect('destroy', self.exit)
 
         # create menu buttons
-        menu = hildon.AppMenu()
-        settings_button = hildon.Button(gtk.HILDON_SIZE_AUTO, \
-            hildon.BUTTON_ARRANGEMENT_HORIZONTAL, _('Settings'))
-        about_button = hildon.Button(gtk.HILDON_SIZE_AUTO, \
-            hildon.BUTTON_ARRANGEMENT_HORIZONTAL, _('About'))
+        self.menu = hildon.AppMenu()
+        settings_button = create_menu_button(_('Settings'))
+        about_button = create_menu_button(_('About'))
+        import_button = create_menu_button(_('Import'))
 
-        # create filter widgets
+        # create filter widgets and connect signals
         self.level1_filter = gtk.RadioButton(None, _('level1'))
         self.level2_filter = gtk.RadioButton(self.level1_filter, _('level2'))
         self.level3_filter = gtk.RadioButton(self.level2_filter, _('level3'))
         for filter_widget in [self.level1_filter, self.level2_filter, \
             self.level3_filter]:
             filter_widget.set_mode(False)
+            filter_widget.connect('toggled', self.apply_filter_cb)
 
         # create items list
-        self.selector = hildon.TouchSelector(text=True)
+        self.selector = hildon.TouchSelector()
 
         # connect signals
         settings_button.connect('clicked', self.show_settings_dialog_cb)
         about_button.connect('clicked', self.show_about_dialog_cb)
-        self.level1_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level1_items)
-        self.level2_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level2_items)
-        self.level3_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level3_items)
+        import_button.connect('clicked', self.show_import_dialog_cb)
+        self.handler = self.selector.connect('changed', self.select_item_cb)
 
         # packing widgets
         self.window.add(self.selector)
-        menu.add_filter(self.level1_filter)
-        menu.add_filter(self.level2_filter)
-        menu.add_filter(self.level3_filter)
-        menu.append(settings_button)
-        menu.append(about_button)
-        menu.show_all()
-        self.window.set_app_menu(menu)
+        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)
         self.window.show_all()
 
-    def _set_selector_content(self, items):
-        self.internal_names = []
-        for item in items:
-            self.selector.append_text(item[0])
-            self.internal_names.append(item[1])
+    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)
+
+        # 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)
+
+        # 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)
+        window.show_all()
+
+    def _show_item_dialog(self, title, entry_id):
+        """Shows detailed item information."""
+
+        def show_settings_dialog(widget, parent, func1, func2, entry_id):
+            dialog = ConfigurationDialog(self.controller, self.config)
+            response = getattr(dialog, func1)(None, parent)
+            if response == gtk.RESPONSE_OK:
+                func2(parent, entry_id)
+
+        def update_entry(window, entry_id):
+            # create widgets
+            entry = self.controller.get_item(entry_id)
+            widgets_table = gtk.Table(rows=1, columns=1)
+            info_box = gtk.VBox()
+            image_box = gtk.VBox()
+            pannable_area = hildon.PannableArea()
+            pannable_area.set_property('mov-mode', hildon.MOVEMENT_MODE_BOTH)
+            image = self.renderer.render_image(dict(entry))
+            for fname, fvalue in entry:
+                button = self.renderer.render_button(_(fname) , fvalue, fname)
+                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)
+            pannable_area.add_with_viewport(info_box)
+            widgets_table.attach(pannable_area, 1, 2, 0, 1, ypadding=8)
+            child = window.get_child()
+            if child:
+                child.destroy()
+            window.add(widgets_table)
+            widgets_table.show_all()
+
+
+        # create widgets
+        window = hildon.StackableWindow()
+        window.set_title(title)
+        menu = hildon.AppMenu()
+        fields_button = create_menu_button(_('Fields to show'))
+        order_button = create_menu_button(_('Fields order'))
+        fields_button.connect('clicked', show_settings_dialog, window, \
+            'show_fields_settings_cb', update_entry, entry_id)
+        order_button.connect('clicked', show_settings_dialog, window, \
+            'show_order_settings_cb', update_entry, entry_id)
+        menu.append(fields_button)
+        menu.append(order_button)
+
+        update_entry(window, entry_id)
+        window.set_app_menu(menu)
+        menu.show_all()
+        window.show_all()
+
 
     # Implementation of Base UI interface
     def start(self):
+        self.apply_filter_cb(self.level1_filter)
         gtk.main()
 
     def exit(self, event):
         gtk.main_quit()
         self.controller.stop()
 
-    def get_current_level(self):
-        if self.level1_filter.get_active(): return 1
-        elif self.level2_filter.get_active(): return 2
-        else: return 3
-
-    def show_items(self, items, level):
-        if level == 1:  # level1_button is not in gorup, process separately
-            self.level1_filter.set_active(True)
-            self.apply_filter_cb(self.level1_filter, \
-                self.controller.get_level1_items, items)
-        elif level == 2:
-            self.level2_filter.set_active(True)
-        else:
-            self.level3_filter.set_active(True)
+    def create_information_dialog(self, title, message):
+        dialog = hildon.Dialog()
+        dialog.set_title(title)
+        label = gtk.Label(message)
+        dialog.vbox.add(label)
+        dialog.vbox.show_all()
+        dialog.run()
+        dialog.destroy()
 
-    def show_about_dialog(self):
+    def create_about_dialog(self):
         dialog = hildon.Dialog()
         dialog.set_title(_('About'))
         label = gtk.Label('\nMeabook v0.1\n')
@@ -108,89 +189,76 @@ class HildonMeabook(MeabookUI):
         dialog.run()
         dialog.destroy()
 
-    def show_fields_to_show_dialog(self):
-        ConfigurationDialog(self.controller, page=1)
+    def create_import_dialog(self):
+        chooser = gobject.new(hildon.FileChooserDialog, \
+            action=gtk.FILE_CHOOSER_ACTION_OPEN)
+        chooser.set_property('show-files', True)
+        chooser.run()
+        path = chooser.get_filename()
+        chooser.destroy()
+        return path
+
+    def create_progress_dialog(self, title=None):
+        self._update_title(title)
+        self.selector.hide()
+        hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
+        self._unfreeze_ui()
 
-    def show_fileds_order_dialog(self):
-        ConfigurationDialog(self.controller, page=2)
+    def create_configuration_dialog(self, controller, config):
+        dialog = ConfigurationDialog(controller, config)
+        dialog.run()
 
 
     # Hildon UI callbacks
     def show_about_dialog_cb(self, widget):
         """Shows About Dialog."""
 
-        self.show_about_dialog()
+        self.controller.show_about_dialog()
+
+    def show_import_dialog_cb(self, widget):
+        """Shows Import Dialog."""
+
+        if self.controller.show_import_dialog():
+            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):
         """Shows Config dialog."""
 
-        ConfigurationDialog(self.controller)
+        self.controller.show_configuration_dialog()
 
-    def apply_filter_cb(self, widget, func, items=None):
+    def apply_filter_cb(self, widget):
         """Updates toplevel selector with different level items."""
 
         if not widget.get_active():
             return
 
-        # blocks 'change' event for selector
-        try:
-            self.selector.handler_block(self.callback_id)
-        except:
-            pass
-
-        # update list content
-        self.selector.get_model(0).clear()
-        self._set_selector_content(items or func())
-        self.selector.unselect_all(0)
-
-        self.window.set_title(' - '.join([_('Meabook'), widget.get_label()]))
-
-    def _create_items_dialog(self, title):
-        """Creates dialog for showing items."""
-
-        selector = hildon.TouchSelector(text=True)
-        window = hildon.StackableWindow()
-        window.set_title(title)
-        window.add(selector)
-        return window, selector
-
-    def show_middlelevel_dialog(self, widget, column):
-        """Shows subitems of selected level1-item."""
+        self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
 
-        selected_item = widget.get_current_text()
-        window, selector = self._create_items_dialog(selected_item)
-        selector.connect('changed', self.show_lowlevel_dialog)
-        for item in self.database.get_middlelevel_entries(selected_item):
-            selector.append_text(item)
-        window.show_all()
-
-    def show_lowlevel_dialog(self, widget, column):
-        """Shows lowlevel items."""
-
-        selected_item = widget.get_current_text()
-        window, selector = self._create_items_dialog(selected_item)
-        selector.connect('changed', self.show_item_dialog)
-        for item in self.database.get_lowlevel_entries():
-            selector.append_text(item)
-        window.show_all()
-
-    def show_item_dialog(self, widget, column):
-        """Shows detailed item information."""
-
-        selected_item = widget.get_current_text()
-        entry = self.database.get_entry(selected_item)
-        window = hildon.StackableWindow()
-        window.set_title(selected_item)
-        pannable_area = hildon.PannableArea()
-        vbox = gtk.VBox()
-
-        for key, value in entry.items():
-            button = create_button(_(key) , value)
-            vbox.pack_start(button)
-
-        pannable_area.add_with_viewport(vbox)
-        window.add(pannable_area)
-        window.show_all()
+        if widget == self.level1_filter:
+            self._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.controller.get_all_subfolders())
+        else:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_files())
+
+    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]))
+        else:
+            self._show_item_dialog(_iter[0], _iter[1])
 
 
 
@@ -198,115 +266,110 @@ class HildonMeabook(MeabookUI):
 class ConfigurationDialog:
     """Configuration dialog"""
 
-    def __init__(self, controller, page=1):
+    def __init__(self, controller, config):
+        self.config = config
         self.controller = controller
 
-        self.window = hildon.StackableWindow()
-        self.window.set_title(_('Configuration'))
-        self.window.connect('destroy', self.close_dialog_cb)
-
-        # create menu
-        menu = hildon.AppMenu()
-        self.button_order = gtk.RadioButton(None, _('Order'))
-        self.button_fields = gtk.RadioButton(self.button_order, _('Fields'))
-        self.button_order.set_mode(False)
-        self.button_fields.set_mode(False)
-        menu.add_filter(self.button_fields)
-        menu.add_filter(self.button_order)
-        menu.show_all()
+    def run(self):
+        dialog = hildon.Dialog()
+        dialog.set_title(_('Settings'))
 
-        # create other widgets
-        self.window.set_app_menu(menu)
-        self.selector = hildon.TouchSelector(text=True)
-        self.pannable_area = hildon.PannableArea()
-        vbox = gtk.VBox()
-        vbox.pack_start(self.selector)
-        vbox.pack_start(self.pannable_area)
-        self.window.add(vbox)
+        button_order = create_button(_('Fields order'), self._update_value( \
+            None, self.config.get_order()))
+        button_order.connect('clicked', self.show_order_settings_cb, dialog)
+        button_fields = create_button(_('Fields to show'), self._update_value( \
+            None, self.config.get_fields()))
+        button_fields.connect('clicked', self.show_fields_settings_cb, dialog)
 
-        self.window.show_all()
+        dialog.vbox.pack_start(button_fields, expand=False)
+        dialog.vbox.pack_start(button_order, expand=False)
+        dialog.vbox.show_all()
+        dialog.run()
+        dialog.destroy()
 
-        # switches to necessary page
-        if page == 1:
-            self.button_fields.set_active(True)
-            self.show_fields_settings_cb(None)
-        else:
-            self.button_order.set_active(True)
-            self.show_order_settings_cb(None)
+    def _update_value(self, widget, fields):
+        """Updates widget title."""
 
-        # connect signals
-        self.button_order.connect('clicked', self.show_order_settings_cb)
-        self.button_fields.connect('clicked', self.show_fields_settings_cb)
+        value = ', '.join([_(field) for field in fields])
+        if widget is not None:
+            widget.set_value(value)
+        return value
 
-    def show_fields_settings_cb(self, widget):
+    def show_fields_settings_cb(self, widget, parent):
         """Shows dialog for selecting fields to show."""
 
-        self.pannable_area.hide()
+        dialog = hildon.PickerDialog(parent)
+        dialog.set_title(_('Fields to show'))
+        selector = hildon.TouchSelector(text=True)
 
         fields = self.controller.get_fields()
-
         # fill items list
-        self.selector.get_model(0).clear()
         for field in fields:
-            self.selector.append_text(_(field))
+            selector.append_text(_(field))
 
-        self.selector.set_column_selection_mode( \
-                hildon.TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE)
-        self.selector.unselect_all(0)
+        selector.set_column_selection_mode( \
+            hildon.TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE)
+        selector.unselect_all(0)
 
         # mark necessary fields
-        fields_to_select = self.controller.config.get_fields()
-        model = self.selector.get_model(0)
+        fields_to_select = self.config.get_fields()
+        model = selector.get_model(0)
         for index, field in enumerate(fields):
             if field in fields_to_select:
-                self.selector.select_iter(0, model.get_iter(index), False)
-
-        self.selector.show_all()
+                selector.select_iter(0, model.get_iter(index), False)
+
+        dialog.set_selector(selector)
+        response = dialog.run()
+        if response == gtk.RESPONSE_OK:
+            model = selector.get_model(0)
+            selected_items = [model[index][0] for index in [item[0] for item \
+                in selector.get_selected_rows(0)]]
+            self.config.set_fields(selected_items)
+            self._update_value(widget, selected_items)
+        dialog.destroy()
+        return response
 
-    def show_order_settings_cb(self, widget):
+    def show_order_settings_cb(self, widget, parent):
         """Shows dialog for setting fields order."""
 
 
-        def show_fields_chooser(widget):
+        def show_fields_chooser(widget, parent):
             """Shows dialog to select field from fields list."""
 
-            dialog = hildon.PickerDialog(self.window)
-            dialog.set_title(_('Field selection'))
+            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 self.controller.get_fields():
                 selector.append_text(field)
-
             dialog.run()
             widget.set_value(selector.get_current_text())
             dialog.destroy()
 
-        self.selector.hide()
+
+        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(self.controller.config.get_order()):
+        for index, field in enumerate(self.config.get_order()):
             button = create_button(' '.join([_('Position'), str(index)]), \
                 _(field))
-            button.connect('clicked', show_fields_chooser)
-            vbox.pack_start(button)
-
-        self.pannable_area.add_with_viewport(vbox)
-        self.pannable_area.show_all()
-
-    def close_dialog_cb(self, event):
-        """Save selected options."""
-
-        model = self.selector.get_model(0)
-        selected_items = [model[index][0] for index in [item[0] for item in \
-            self.selector.get_selected_rows(0)]]
-        self.controller.config.set_fields(selected_items)
+            button.connect('clicked', show_fields_chooser, dialog)
+            vbox.pack_start(button, expand=False)
+        pannable_area.add_with_viewport(vbox)
 
-        try:
-            self.controller.config.set_order([button.get_value() for button in \
-                self.pannable_area.get_child().get_children()[0].get_children()])
-        except AttributeError:
-            pass
+        dialog.add_button(_('Done'), gtk.RESPONSE_OK)
+        dialog.vbox.pack_start(pannable_area)
+        dialog.vbox.show_all()
+        response = dialog.run()
+        if response == gtk.RESPONSE_OK:
+            fields = [button.get_value() for button in vbox.get_children()]
+            self.config.set_order(fields)
+            self._update_value(widget, fields)
+        dialog.destroy()
+        return response