X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=controller.py;h=3701b645eadc7cdefd45da0fb4f1245a410b63fb;hb=79660ba7ff6dc8c6970e084278050cd519130af0;hp=f696a7cbe1044c8583528695af27f33fb48a9a44;hpb=708bd3b943a642bd982f756b42ceb2fb72ceeede;p=meabook

diff --git a/controller.py b/controller.py
index f696a7c..3701b64 100644
--- a/controller.py
+++ b/controller.py
@@ -2,8 +2,9 @@
 Meabook controller class
 """
 
-from meabook.constants import *
-from gettext import gettext as _
+import gettext
+
+_ = gettext.gettext
 
 
 class MeabookController:
@@ -23,7 +24,7 @@ class MeabookController:
         """Gets from model items with selected level."""
 
         folders_list = list(self.get_all_folders(parent))
-        files_list = [(fields['cn'], int_name, TYPE_FILE) for int_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
 
@@ -48,27 +49,22 @@ class MeabookController:
     def get_all_folders(self, parent=0):
         """Gets all filials."""
 
-        return [(name, internal_name, TYPE_DIRECTORY) for name, internal_name \
-            in self.model.get_folders(parent)]
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders(parent)]
 
     def get_all_subfolders(self):
         """Gets all departments."""
 
-        return self.get_all_folders(parent=None)
+        return [(name, internal_name, 'd') for name, internal_name in \
+            self.model.get_folders()]
 
     def get_all_files(self):
         """Gets all peoples."""
 
         # 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]
-
-    def get_all_files_by_pattern(self, pattern):
-        """Gets all peoples matched pattern."""
-
-        return [(name, internal_name, TYPE_FILE) for internal_name, name in \
-            self.model.get_files_by_pattern(pattern)]
+        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
+            internal_name in files_dict]
 
     def get_fields(self):
         """Returns all exists fields from model."""
@@ -85,6 +81,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."""