[gnue] r9296 - in trunk: gnue-forms/src/uidrivers/wx26/widgets gnue-navigator/src

[reinhard]

Author: reinhard
Date: 2007-01-12 12:25:21 -0600 (Fri, 12 Jan 2007)
New Revision: 9296

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


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 18:06:28 UTC 
(rev 9295)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2007-01-12 18:25:21 UTC 
(rev 9296)
@@ -127,15 +127,13 @@
             embed = self._uiDriver._parentContainer
             if embed is not None:
                 self.main_window = embed['frame']
-                self._container = embed['panel']
+                parent = embed['parent']
                 self.__embedded = True
             else:
-                self.main_window = wx.Frame(None, -1)
-                self._container = None
+                parent = self.main_window = wx.Frame(None, -1)
         else:
-            self.main_window = wx.Dialog(None, -1,
+            parent = self.main_window = wx.Dialog(None, -1,
                     style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
-            self._container = None
 
         self.main_window.SetTitle(self._form.title)
         self.main_window.SetIcons(self.__load_icons())
@@ -143,16 +141,18 @@
             self.main_window.Bind(wx.EVT_CLOSE, self.__on_close,
                     self.main_window)
 
-        self.__master_sizer = wx.BoxSizer(wx.VERTICAL)
+        if self.__embedded:
+            self.__master_sizer = parent.GetSizer()
+        else:
+            self.__master_sizer = wx.BoxSizer(wx.VERTICAL)
 
         # The base panel is needed on wxMSW to get a uniform background of the
         # frame.
-        if self._container is None:
-            self._container = wx.Panel(self.main_window, -1)
+        self.__base_panel = wx.Panel(parent, -1)
         base_sizer = wx.BoxSizer(wx.VERTICAL)
-        self._container.SetSizer(base_sizer)
+        self.__base_panel.SetSizer(base_sizer)
 
-        self.__master_sizer.Add(self._container, 1, wx.EXPAND)
+        self.__master_sizer.Add(self.__base_panel, 1, wx.EXPAND)
 
         # Add Statusbar, Toolbar and Menubar as requested and/or allowed
         if self._form.style != 'dialog':
@@ -166,16 +166,17 @@
 
             if not self._form._features.get ('GUI:TOOLBAR:SUPPRESS'):
                 tlb = ToolBar(self._uiDriver, self.main_window, self._form)
-                #base_sizer.Add(tlb.toolbar, 0, wx.EXPAND)
 
         # If the form is using tabs, we need to create a Notebook control as
         # page container, otherwise we can just use the base panel
         if self._form._layout.tabbed != 'none':
             style = self._TAB_STYLE[self._form._layout.tabbed]
-            self._container = wx.Notebook(self._container, -1, style = style)
+            self._container = wx.Notebook(self.__base_panel, -1, style = style)
             # The border between the edge of the form and the page is 12 pixel
             # according to the GNOME Human Interface Guidlines.
             base_sizer.Add(self._container, 1, wx.EXPAND | wx.ALL, 12)
+        else:
+            self._container = self.__base_panel
 
         return self.main_window
 
@@ -506,6 +507,10 @@
         if isinstance(self.main_window, wx.Dialog) \
                 and self.main_window.IsModal():
             self.main_window.EndModal(-1)
+        elif self.__embedded:
+            self.main_window.SetToolBar(None)
+            self.main_window.SetStatusBar(None)
+            self.__base_panel.Hide()
         else:
             self.main_window.Hide()
 

Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 18:06:28 UTC (rev 9295)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 18:25:21 UTC (rev 9296)
@@ -111,7 +111,7 @@
 
     if gConfigNav('embedForms') == "%s" % True: 
         self.__instance._uiinstance._parentContainer = {
-                'frame': self.frame, 'panel': self.panel2}
+                'frame': self.frame, 'parent': self.panel2}
 
     app.MainLoop()
 
@@ -186,7 +186,10 @@
     else:
       formfile = step.location
 
-      self.helpText.Hide()
+      if self.__current_form is None:
+        self.helpText.Hide()
+      else:
+        self.__current_form.close()
       self.__current_form = self.__instance.run_from_file(formfile,
               step._params)