added config initialization after Import

[meabook] / ui / hildon_ui.py

diff --git a/ui/hildon_ui.py b/ui/hildon_ui.py
index fd78cc2..270c959 100644 (file)
--- a/ui/hildon_ui.py
+++ b/ui/hildon_ui.py
@@ -157,15 +157,15 @@ class HildonMeabook(MeabookUI):
         chooser.run()
         path = chooser.get_filename()
         chooser.destroy()
-
-        hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
-        self._update_title(_('Importing...'))
-        self.selector.hide()
-        self._unfreeze_ui()
         return path
 
-    def create_progress_dialog(self):
+    def create_progress_dialog(self, title=None):
+        if title is not None:
+            self._update_title(title)
+        self.selector.hide()
+        #self._unfreeze_ui()
         hildon.hildon_gtk_window_set_progress_indicator(self.window, 1)
+        self._unfreeze_ui()
 
     def create_configuration_dialog(self, controller, config):
         ConfigurationDialog(controller, config)
@@ -180,9 +180,9 @@ class HildonMeabook(MeabookUI):
     def show_import_dialog_cb(self, widget):
         """Shows Import Dialog."""
 
-        self.controller.show_import_dialog()
-        self.apply_filter_cb(self.level1_filter)
-        self.selector.show_all()
+        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):
@@ -198,10 +198,6 @@ class HildonMeabook(MeabookUI):
 
         self._update_title(' - '.join([_('Meabook'), widget.get_label()]))
 
-        # hide menu if next is longtime operation
-        self.menu.hide()
-        self._unfreeze_ui()
-
         if widget == self.level1_filter:
             self._set_selector_content(self.selector, self.handler, \
                 self.controller.get_all_folders())
@@ -320,7 +316,7 @@ class ConfigurationDialog:
             button = create_button(' '.join([_('Position'), str(index)]), \
                 _(field))
             button.connect('clicked', show_fields_chooser)
-            vbox.pack_start(button)
+            vbox.pack_start(button, expand=False)
 
         self.pannable_area.add_with_viewport(vbox)
         self.pannable_area.show_all()