refactoring th code for page handling

1 files changed, 11 insertions, 8 deletions

diff --git a/kandid.py b/kandid.py
index 12f3f16..5d5619f 100644
--- a/kandid.py
+++ b/kandid.py
@@ -21,6 +21,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 gtk.gdk.threads_init()
+
 import ka_debug
 import ka_controller
 import ka_widget
@@ -45,7 +46,9 @@ class KandidApplication(object):
     def destroy(self, widget, data=None):
         """Application will be closed."""
         ka_debug.info('Kandid application: destroy signal occurred')
-        self._controller.write_file(TESTMODEL)
+        population_controller = self._controller.find_page('PopulationController')
+        if population_controller is not None:
+            population_controller.write_file(TESTMODEL)
         self._controller.close()
         gtk.main_quit()
 
@@ -58,19 +61,19 @@ class KandidApplication(object):
         # Create GUI
         # Create the main container
         main_view = gtk.HBox()
-        self._widget = ka_widget.KandidWidget(main_view)
+        self._widget = ka_widget.KandidWidget()
+        main_view.pack_start(self._widget.get_widget_tree())
         self._window.add(main_view)
         # Create a controller to connect view and model
-        self._controller = ka_controller.KandidController( \
-                                                    self._widget.widget_tree,
-                                                    TESTPATH)
-        self._controller.read_file(TESTMODEL)
+        self._controller = ka_controller.KandidController(self._widget, TESTPATH)
+        self._controller.create_pages()
 
         # Display everything
         self._window.set_default_size(1200, 800)
-        self._controller.autoconnect_events()
         self._window.show_all()
-#        self._controller.start_all_calculations()
+        population_controller = self._controller.find_page('PopulationController')
+        if population_controller is not None:
+            population_controller.read_file(TESTMODEL)
 
     def main(self):
         """