[gnue] r9293 - trunk/gnue-navigator/src

[reinhard]

Author: reinhard
Date: 2007-01-12 11:47:08 -0600 (Fri, 12 Jan 2007)
New Revision: 9293

Modified:
   trunk/gnue-navigator/src/UIwx26.py
Log:
More work on embedded forms.


Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 17:22:18 UTC (rev 9292)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 17:47:08 UTC (rev 9293)
@@ -86,11 +86,16 @@
 
     self.panel1 = wx.Panel(self.splitter)
     self.panel2 = wx.Panel(self.splitter)
-    self.form_panel = wx.Panel(self.splitter)
 
+    sizer1 = wx.BoxSizer(wx.VERTICAL)
+    sizer2 = wx.BoxSizer(wx.VERTICAL)
+
+    self.panel1.SetSizer(sizer1)
+    self.panel2.SetSizer(sizer2)
+
     # Panel 1 contents
-    self.panel1.SetBackgroundColour(wx.WHITE)
     self.tree = wx.TreeCtrl(self.panel1, -1)
+    sizer1.Add(self.tree, 1, wx.EXPAND)
     self.processes.setClientHandlers({'form':self.runForm})
 
     self.tree.Bind(wx.EVT_TREE_SEL_CHANGED, self.__on_select, self.tree)
@@ -102,13 +107,10 @@
     self.tree.Expand(self.processes.__node)
 
     # Panel 2 contents
-    self.panel2.SetBackgroundColour(wx.WHITE)
     self.helpText = wx.html.HtmlWindow(self.panel2, -1)
+    sizer2.Add(self.helpText, 1, wx.EXPAND)
     self.helpText.SetPage(self.titlePage)
 
-    wx.EVT_SIZE(self.panel1,self.__on_resize)
-    wx.EVT_SIZE(self.panel2,self.__on_resize)
-
     self.frame.Show(True)
 
     self.splitter.SetMinimumPaneSize(20)
@@ -117,15 +119,11 @@
 
     if gConfigNav('embedForms') == "%s" % True: 
         self.__instance._uiinstance._parentContainer = {
-                'frame': self.frame, 'panel': self.form_panel}
+                'frame': self.frame, 'panel': self.panel2}
 
     app.MainLoop()
 
-  def __on_resize(self,evt):
-    self.tree.SetSize(self.panel1.GetSize())
-    self.helpText.SetSize(self.panel2.GetSize())
 
-
   def __buildTreeControl(self, object):
 
     if object._type == 'GNProcesses':
@@ -208,7 +206,7 @@
 
 
   def _runForm(self, formfile, parameters):
-      self.splitter.ReplaceWindow(self.panel2, self.form_panel)
+      self.helpText.Hide()
       self.__current_form = self.__instance.run_from_file(formfile, parameters)