implemented full search

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 54f579d..f2f348f 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -3,12 +3,14 @@ Meabook controller class
 """
 
 from meabook.constants import *
+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()
@@ -19,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."""
 
@@ -57,26 +64,22 @@ class MeabookController:
         return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders()]
 
-    def get_all_files(self):
-        """Gets all peoples."""
+    def get_files_by_pattern_ex(self, key, pattern=''):
+        """Gets all peoples matched pattern."""
 
-        # FIXME: read field names from Config
-        files_dict = self.model.get_files(['cn'])
-        return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
-            for internal_name in files_dict]
+        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], key, pattern, True)
+        return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % (
+            files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \
+            internal_name, TYPE_FILE) for internal_name in files_dict]
 
-    def get_files_by_pattern(self, pattern, separated=False):
+
+    def get_files_by_pattern(self, pattern=''):
         """Gets all peoples matched pattern."""
 
-        if not separated:
-            return [(name, internal_name, TYPE_FILE) for internal_name, name \
-                in self.model.get_files_by_pattern(pattern)]
-        else:
-            files_dict = self.model.get_files(['cn', 'o', 'ou'], parent=0, \
-                pattern=pattern)
-            return [("%s" % files_dict[iname]['cn'], "%s / %s" % \
-                (files_dict[iname]['o'], files_dict[iname]['ou']), \
-                iname, TYPE_FILE) for iname in files_dict]
+        files_dict = self.model.get_files_by_pattern(['cn', 'o', 'ou'], 'cn', pattern, True)
+        return [("%s" % files_dict[internal_name]['cn'], "%s / %s" % (
+            files_dict[internal_name]['o'], files_dict[internal_name]['ou']), \
+            internal_name, TYPE_FILE) for internal_name in files_dict]
 
     def get_fields(self):
         """Returns all exists fields from model."""
@@ -99,6 +102,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."""