From 8be6e42e44143c2a0554aeccb2f18b78b8cea616 Mon Sep 17 00:00:00 2001 From: Max Usachev Date: Fri, 18 Jun 2010 08:21:21 +0300 Subject: [PATCH] fixed UI bugs --- controller.py | 2 +- ui/hildon_ui.py | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/controller.py b/controller.py index e7717e6..63bacfa 100644 --- a/controller.py +++ b/controller.py @@ -91,7 +91,7 @@ class MeabookController: from meabook.parsers.ldif_parser import MeabookLDIFParser parser = MeabookLDIFParser(open(path), self.model) try: - self.view.create_progress_dialog(_('Importing...')) + self.view.create_progress_dialog(_('Importing')) #FIXME: implement update_fraction parser.parse() self.config.set_fields(self.model.get_fields()) diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py index 7d8a8ce..2be5ef2 100644 --- a/ui/hildon_ui.py +++ b/ui/hildon_ui.py @@ -323,10 +323,11 @@ class ConfigurationDialog: 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 \ + selected_item_indexes = [index 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) + selected_fields = [fields[index] for index in selected_item_indexes] + self.config.set_fields(selected_fields) + self._update_value(widget, selected_fields) dialog.destroy() return response @@ -345,7 +346,7 @@ class ConfigurationDialog: hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE) # fill fields list for field in self.controller.get_fields(): - selector.append_text(field) + selector.append_text(_(field)) dialog.run() widget.set_value(selector.get_current_text()) dialog.destroy() @@ -357,20 +358,22 @@ class ConfigurationDialog: pannable_area.set_size_request_policy(hildon.SIZE_REQUEST_CHILDREN) vbox = gtk.VBox() - for index, field in enumerate(self.config.get_order()): + fields = self.config.get_order() + for index, field in enumerate(fields): button = create_button(' '.join([_('Position'), str(index)]), \ _(field)) button.connect('clicked', show_fields_chooser, 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() 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) + fields_dict = dict([(_(field), field) for field in fields]) + new_ordered_fields = [fields_dict[button.get_value()] for button \ + in vbox.get_children()] + self.config.set_order(new_ordered_fields) + self._update_value(widget, new_ordered_fields) dialog.destroy() return response -- 1.7.9.5