gnue/gnuef designer/src/GFDesigner.py src/GFIns...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/01 12:55:48

Modified files:
        gnuef/designer/src: GFDesigner.py 
        gnuef/src      : GFInstance.py 

Log message:
        Stuff

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/GFDesigner.py
diff -u gnue/gnuef/designer/src/GFDesigner.py:1.2 
gnue/gnuef/designer/src/GFDesigner.py:1.3
--- gnue/gnuef/designer/src/GFDesigner.py:1.2   Fri Jun  1 10:59:02 2001
+++ gnue/gnuef/designer/src/GFDesigner.py       Fri Jun  1 12:55:48 2001
@@ -149,10 +149,10 @@
      self.Append(self._window, '&Window')
      self.Append(self._help, '&Help')
 
-class GFDInstance(GFInstance.GFInstance, wxMDIParentFrame):
+class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
     GFInstance.GFInstance.__init__(self, app, -1, app.connections, None)
-    wxMDIParentFrame.__init__(self, NULL, -1, "")
+    wxFrame.__init__(self, NULL, -1, "")
 
     self._app = app
     app.addInstance(self) 
@@ -173,13 +173,54 @@
     self.SetMenuBar(MainMenuBar(self))
     self.Show(true)
 
-    self.formInfoFrame = FormInfoFrame(self)
-    self.dataSourceFrame = DataSourceFrame(self)
-    self.formInfoFrame.Show(true)
-    self.dataSourceFrame.Show(true)
- 
-  def OnSave(self, event): 
+    # Split Plane
+    hsplitter = wxSplitterWindow (self, -1, style=wxSP_3D|wxNO_3D)
+    hsplitter.SetMinimumPaneSize (1)
+
+    vsplitter = wxSplitterWindow (hsplitter, -1, style=wxSP_3D|wxNO_3D)
+    vsplitter.SetMinimumPaneSize (1)
+
+    # Create tree
+    tID = wxNewId()
+    self.tree = wxTreeCtrl (hsplitter, tID, style=wxTR_HAS_BUTTONS |
+                                                 wxTR_EDIT_LABELS |
+                                        wxTR_HAS_VARIABLE_ROW_HEIGHT)
+
+    EVT_TREE_BEGIN_LABEL_EDIT(self.tree, tID, self.OnTreeLabelEdit)
+    EVT_TREE_END_LABEL_EDIT(self.tree, tID, self.OnTreeLabelEditEnd)
+    EVT_TREE_ITEM_ACTIVATED(self.tree, tID, self.OnTreeItemActivated)
+
+    self.editor = wxTextCtrl(vsplitter, -1, style=wxTE_MULTILINE)
+    self.editor.Enable (0)
+
+    self.editor2 = wxTextCtrl(vsplitter, -1, style=wxTE_MULTILINE)
+    self.editor2.Enable (0)
+
+    splitter.SplitVertically (self.tree, self.editor)
+    splitter.SetSashPosition (180, true)
+
+    self.Refresh()
+
+    self._form.walk(self.inventoryLoadedItems)
+
+
+  def inventoryLoadedItems (self, object): 
+    pass
+
+  def OnTreeLabelEdit(self, event): 
+    pass
+
+  def OnTreeLabelEditEnd(self, event): 
     pass
+
+  def OnTreeItemActivated(self, event): 
+    pass
+
+  def OnSave(self, event): 
+    if not len(self._path): 
+      self.OnSaveAs(event)
+    else: 
+      self.saveForm()
  
   def OnSaveAs(self, event): 
     pass
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.4 gnue/gnuef/src/GFInstance.py:1.5
--- gnue/gnuef/src/GFInstance.py:1.4    Thu May 31 22:19:24 2001
+++ gnue/gnuef/src/GFInstance.py        Fri Jun  1 12:55:48 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.4 2001/06/01 05:19:24 jcater Exp $
+# $Id: GFInstance.py,v 1.5 2001/06/01 19:55:48 jcater Exp $
 #
 
 import pstats
@@ -64,7 +64,7 @@
     self.connections = connections
     self.manager = manager
     self._serial = serial 
-    self._ui = ui
+    self._uiclass = ui
 
     # Incomming events
     self.incommingEvent = {'requestNEXTENTRY'    : self.nextEntry,
@@ -471,7 +471,7 @@
   #
   def activate(self): 
 
-    ui = self._ui()
+    ui = self._uiclass()
     ui.registerEventListener(self.processEvent)
     self.registerEventListener(ui.processEvent)
             
@@ -536,5 +536,6 @@
     ui.buildForm(self._form)
     ui.activateForm(self._form)
     self.updateStatus()
+    self._ui = ui
     ui.mainLoop()