* fluent: General cleanup.

fluent

@@ -12,6 +12,7 @@ import gtk.glade
 import gnome
 import gnome.ui
 import pango
+import project
 import workflow
 import logger
 import plots
@@ -21,7 +22,6 @@ import go_workflow
 PROGRAM_NAME = 'fluent'
 VERSION = '0.1.0'
 GLADEFILENAME = 'system/fluent.glade'
-APP = 'appwindow'
 WF_BOX = 'workflow_vbox'
 DATA_BOX = 'data_vbox'
 
@@ -32,8 +32,10 @@ class FluentApp:
         self.navigator = navigator.NavigatorStore()
         self.current_data = None
 
+        self.project = project.Project()
+
         gtk.glade.set_custom_handler(self.custom_object_factory)
-        self.widget_tree = gtk.glade.XML(GLADEFILENAME, APP)
+        self.widget_tree = gtk.glade.XML(GLADEFILENAME, 'appwindow')
         self.workflow = go_workflow.EinarsWorkflow(self)
 
     def custom_object_factory(self, glade, function_name, widget_name,\
@@ -71,31 +73,15 @@ class FluentApp:
         self.init_gui()
 
     def init_gui(self):
-        self.app = self.widget_tree.get_widget(APP)
-        self.app.set_size_request(800, 600)
+        self['appwindow'].set_size_request(800, 600)
 
         # Set up workflow
-        wf_box = self.widget_tree.get_widget(WF_BOX)
         wf_menu = workflow.WorkflowView(self.workflow)
         wf_menu.show()
-        wf_box.pack_end(wf_menu)
+        self['workflow_vbox'].pack_end(wf_menu)
 
-        # Set up plots
-        pt = self.widget_tree.get_widget('small_view')
-        plot = plots.SinePlot()
-        plot.show()
-        plot.mark_active(True)
-
-        plot2 = plots.ScatterPlot()
-        plot2.show()
-
-        plot3 = plots.ScatterPlot()
-        plot3.show()
-
-        #        pt.set_child(plot, 0, 1)
         # Set up plot toolbar
-        dock = self.widget_tree.get_widget('plot_toolbar_dock')
-        dock.add(plot.get_toolbar(self.app))
+#        self['plot_toolbar_dock'].add(plot.get_toolbar(self.app))
 
         # Connect signals
         signals = {'on_quit1_activate' : (gtk.main_quit),
@@ -128,6 +114,9 @@ class FluentApp:
         nb = self.widget_tree.get_widget('main_view')
         nb.goto_small()
 
+    def __getitem__(self, key):
+        return self.widget_tree.get_widget(key)
+
 if __name__ == '__main__':
     gnome.program_init(PROGRAM_NAME, VERSION)
     app = FluentApp()