more UI work

[meabook] / controller.py

diff --git a/controller.py b/controller.py
index 91a7a6c..3f1494d 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -8,10 +8,10 @@ _ = gettext.gettext
 
 
 class MeabookController:
-    def __init__(self, model, view_class, config):
+    def __init__(self, model, view_class, renderer_class, config):
         self.config = config
         self.model = model
-        self.view = view_class(self)
+        self.view = view_class(self, renderer_class(), self.config)
         self.view.start()
 
     def stop(self):
@@ -24,7 +24,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
 
@@ -34,9 +34,12 @@ class MeabookController:
         info = []
         entry = self.model.get_entry(_id)
         entry_fields = entry.keys()
-        ordered_fields = []
         fields_to_show = self.config.get_fields()
-        for field in dict().fromkeys(self.config.get_order()).keys():
+        ordered_fields = []
+        for field in self.config.get_order():
+            if field not in ordered_fields:
+                ordered_fields.append(field)
+        for field in ordered_fields:
             if (field in fields_to_show) and (field in entry_fields):
                 info.append((field, entry[field]))
         return info
@@ -44,13 +47,13 @@ class MeabookController:
     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):
@@ -58,7 +61,7 @@ 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 \
+        return [(files_dict[internal_name]['cn'], internal_name, 'f') for \
             internal_name in files_dict]
 
     def get_fields(self):