Deleted unnecessary 'returns' and 'passes'

[findit] / src / mvc / controllers / application.py

diff --git a/src/mvc/controllers/application.py b/src/mvc/controllers/application.py
index c117b7b..6b492a5 100755 (executable)
--- a/src/mvc/controllers/application.py
+++ b/src/mvc/controllers/application.py
@@ -1,6 +1,8 @@
 from gtkmvc import Controller
 import gtk
 
+from filesearch import FilesearchCtrl
+
 from about import AboutCtrl
 from views.about import AboutView
 
@@ -10,17 +12,18 @@ class ApplicationCtrl(Controller):
 
     def __init__(self, model):
         Controller.__init__(self, model)
-        return
+        self.filesearch = FilesearchCtrl(model.filesearch)
 
     def register_view(self, view):
-        """Creates treeview columns, and connect missing signals"""
+        """Creates subviews and connect signals"""
         Controller.register_view(self, view)
 
+        self.view.create_sub_views(self.filesearch)
+
         # connects the signals:
         self.view['main_window'].connect('destroy', gtk.main_quit)
-        self.view['about_btn'].connect('clicked', self.on_tb_about_clicked)
-        self.view['quit_btn'].connect('clicked', self.on_tb_quit_clicked)
-        return
+        self.view['about_btn'].connect('clicked', self.on_about_btn_clicked)
+        self.view['quit_btn'].connect('clicked', self.on_quit_btn_clicked)
 
     # -----------------------------------------------------
     #                  user callbacks
@@ -28,23 +31,19 @@ class ApplicationCtrl(Controller):
 
     def quit(self):
         gtk.main_quit()
-        return
 
     # -----------------------------------------------------
     #                    gtk signals
     # -----------------------------------------------------
 
-    def on_tb_about_clicked(self, tb):
+    def on_about_btn_clicked(self, tb):
         c = AboutCtrl(self.model.about)
         v = AboutView(c)
         v.run() # this runs in modal mode
-        return
 
-    def on_tb_quit_clicked(self, bt):
+    def on_quit_btn_clicked(self, bt):
         self.quit()
 
     # -----------------------------------------------------
     #                observable properties
     # -----------------------------------------------------
-
-    pass # end of class