fixed UI bugs

[meabook] / ui / hildon_ui.py

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index 0a71ce7..2be5ef2 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -5,10 +5,9 @@ Hildon UI for Meabook
 import gtk
 import hildon
 import gobject
-import gettext
+from gettext import gettext as _
 from meabook.ui.ui import MeabookUI
 
-_ = gettext.gettext
 
 def create_button(title, value):
     """Create HildonButton."""
@@ -115,7 +114,6 @@ class HildonMeabook(MeabookUI):
         def show_settings_dialog(widget, parent, func1, func2, entry_id):
             dialog = ConfigurationDialog(self.controller, self.config)
             response = getattr(dialog, func1)(None, parent)
-            print response
             if response == gtk.RESPONSE_OK:
                 func2(parent, entry_id)
 
@@ -129,6 +127,8 @@ class HildonMeabook(MeabookUI):
             pannable_area.set_property('mov-mode', hildon.MOVEMENT_MODE_BOTH)
             image = self.renderer.render_image(dict(entry))
             for fname, fvalue in entry:
+                if fname == 'image':
+                    continue
                 button = self.renderer.render_button(_(fname) , fvalue, fname)
                 info_box.pack_start(button, expand=False)
             # pack widgets
@@ -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