fixed conflicts with master

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index efa8ecd..9397daf 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -3,14 +3,14 @@ Meabook controller class
 """
 
 from meabook.constants import *
-import gettext
-
-_ = gettext.gettext
+from meabook.caller import PhoneCaller
+from gettext import gettext as _
 
 
 class MeabookController:
     def __init__(self, model, view_class, renderer_class, config):
         self.config = config
+        self.caller = PhoneCaller()
         self.model = model
         self.view = view_class(self, renderer_class(), self.config)
         self.view.start()
@@ -21,6 +21,11 @@ class MeabookController:
         self.config.save()
         self.model.close()
 
+    def call(self, number):
+        """Make a phone call."""
+
+        self.caller.call(number)
+
     def get_items(self, parent=0):
         """Gets from model items with selected level."""
 
@@ -67,7 +72,7 @@ class MeabookController:
     #    return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
     #        for internal_name in files_dict]
 
-    def get_all_files_by_pattern(self, pattern, separated=False):
+    def get_files_by_pattern(self, pattern, separated=False):
         """Gets all peoples matched pattern."""
 
         if not separated:
@@ -84,6 +89,12 @@ class MeabookController:
 
         return self.model.get_fields()
 
+    def get_localized_fields(self):
+        """Returns dict with original and localized filed names."""
+
+        return dict([(_(field).decode('utf-8'), field) for field in \
+            self.model.get_fields()])
+
     def show_about_dialog(self):
         """Shows view About Dialog."""
 
@@ -94,6 +105,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."""