start working on redesigning configuration dialogs

diff --git a/controller.py b/controller.py
index a451a30..0061007 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -106,6 +106,22 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_fields_configuration_dialog(self, parent):
+        """Shows FieldsConfigurationDialog."""
+
+        selected_fields = self.view.create_fields_configuration_dialog( \
+            self.get_localized_fields(), self.config.get_fields(), parent)
+        if selected_fields is not None:
+            self.config.set_fields(selected_fields)
+
+    def show_fields_order_configuration_dialog(self):
+        """Shows FieldsOrderConfigurationDialog."""
+
+        selected_fields = self.view.create_fields_order_configuration_dialog( \
+            self.get_localized_fields(), self.config.get_order())
+        if selected_fields is not None:
+            self.config.set_order(selected_fields)
+
     def show_search_dialog(self):
         """Shows view Search Dialog."""
 

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index c280dd7..fd514ad 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -51,8 +51,6 @@ def set_box_content(box, handler, items=[]):
 
     def on_button_click(widget):
         handler(widget.get_title(), widget.get_data('iname'))
-        #caller = PhoneCaller()
-        #caller.call(widget.get_value())
 
     for child in box.get_children():
         box.remove(child)
@@ -275,6 +273,14 @@ class HildonMeabook(MeabookUI):
     def create_configuration_dialog(self, controller, config):
         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()
@@ -539,3 +545,85 @@ class ConfigurationDialog:
             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()