updated localization

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 8c5da4f..54f579d 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -2,9 +2,8 @@
 Meabook controller class
 """
 
-import gettext
-
-_ = gettext.gettext
+from meabook.constants import *
+from gettext import gettext as _
 
 
 class MeabookController:
@@ -24,7 +23,7 @@ class MeabookController:
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], internal_name, 'fi') for internal_name, \
+        files_list = [(fields['cn'], internal_name, 'f') for internal_name, \
             fields in self.model.get_files(['cn'], parent).items()]
         return folders_list + files_list
 
@@ -42,18 +41,20 @@ class MeabookController:
         for field in ordered_fields:
             if (field in fields_to_show) and (field in entry_fields):
                 info.append((field, entry[field]))
+        if not 'image' in fields_to_show and 'image' in entry.keys():
+            info.append(('image', entry['image']))
         return info
 
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, 'fo') for name, internal_name in \
+        return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return [(name, internal_name, 'fo') for name, internal_name in \
+        return [(name, internal_name, 'd') for name, internal_name in \
             self.model.get_folders()]
 
     def get_all_files(self):
@@ -61,14 +62,33 @@ class MeabookController:
 
         # FIXME: read field names from Config
         files_dict = self.model.get_files(['cn'])
-        return [(files_dict[internal_name]['cn'], internal_name, 'file') for \
-            internal_name in files_dict]
+        return [(files_dict[internal_name]['cn'], internal_name, TYPE_FILE) \
+            for internal_name in files_dict]
+
+    def get_files_by_pattern(self, pattern, separated=False):
+        """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]
 
     def get_fields(self):
         """Returns all exists fields from model."""
 
         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."""
 
@@ -79,6 +99,11 @@ class MeabookController:
 
         self.view.create_configuration_dialog(self, self.config)
 
+    def show_search_dialog(self):
+        """Shows view Search Dialog."""
+
+        self.view.create_search_dialog(self)
+
     def show_import_dialog(self):
         """Shows view IMport Dialog."""
 
@@ -89,7 +114,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())