little application mvc update

diff --git a/src/mvc/controllers/application.py b/src/mvc/controllers/application.py
index 03770f1..c4cf508 100755 (executable)
--- a/src/mvc/controllers/application.py
+++ b/src/mvc/controllers/application.py
@@ -1,7 +1,7 @@
 from gtkmvc import Controller
 import gtk
 
-#from filesearch import FilesearchCtrl
+from filesearch import FilesearchCtrl
 from debsearch import DebsearchCtrl
 
 from views.about import AboutView
@@ -12,15 +12,15 @@ class ApplicationCtrl(Controller):
 
     def __init__(self, model):
         Controller.__init__(self, model)
-#        self.filesearch = FilesearchCtrl(model.filesearch)
+        self.filesearch = FilesearchCtrl(model.filesearch)
         self.debsearch = DebsearchCtrl(model.debsearch)
 
     def register_view(self, view):
         """Creates subviews and connect signals"""
         Controller.register_view(self, view)
 
-#        self.view.create_sub_views(self.filesearch)
-        self.view.create_sub_views(self.debsearch)
+        self.view.create_sub_views('file', self.filesearch)
+#        self.view.create_sub_views('deb', self.debsearch)
 
         # connects the signals:
         self.view['main_window'].connect('destroy', gtk.main_quit)

diff --git a/src/mvc/models/application.py b/src/mvc/models/application.py
index 10a133a..6eb4783 100755 (executable)
--- a/src/mvc/models/application.py
+++ b/src/mvc/models/application.py
@@ -1,6 +1,6 @@
 from gtkmvc import Model
 
-#from filesearch import FilesearchModel
+from filesearch import FilesearchModel
 from debsearch import DebsearchModel
 
 
@@ -9,5 +9,5 @@ class ApplicationModel(Model):
     def __init__(self):
         Model.__init__(self)
 
-#        self.filesearch = FilesearchModel()
+        self.filesearch = FilesearchModel()
         self.debsearch = DebsearchModel()

diff --git a/src/mvc/views/application.py b/src/mvc/views/application.py
index 0aaa410..58ae864 100755 (executable)
--- a/src/mvc/views/application.py
+++ b/src/mvc/views/application.py
@@ -1,7 +1,7 @@
 from gtkmvc import View
 import gtk
 
-#from filesearch import FilesearchView
+from filesearch import FilesearchView
 from debsearch import DebsearchView
 
 
@@ -35,12 +35,8 @@ class ApplicationView(View):
         self['main_window'].add(self['vbox'])
         self['main_window'].show_all()
 
-#     def create_sub_views(self, filesearch_ctrl):
-#         """Creates and connects sub views"""
-#         self.filesearch = FilesearchView(filesearch_ctrl) # not a top level
-#         self['vbox'].pack_start(self.filesearch['vbox'])
-
-    def create_sub_views(self, debsearch_ctrl):
+    def create_sub_views(self, view, ctrl):
         """Creates and connects sub views"""
-        self.debsearch = DebsearchView(debsearch_ctrl) # not a top level
-        self['vbox'].pack_start(self.debsearch['vbox'])
+        if view == 'file': search = FilesearchView(ctrl)
+        if view == 'deb' : search = DebsearchView(ctrl)
+        self['vbox'].pack_start(search['vbox'])