gnue/gnuef/designer/src MenuBar.py Incubator.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/19 13:41:34

Modified files:
        gnuef/designer/src: MenuBar.py 
Added files:
        gnuef/designer/src: Incubator.py 

Log message:
        Added Incubator that creates objects and adds in correct location in 
forms tree

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/Incubator.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/MenuBar.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/MenuBar.py
diff -u gnue/gnuef/designer/src/MenuBar.py:1.4 
gnue/gnuef/designer/src/MenuBar.py:1.5
--- gnue/gnuef/designer/src/MenuBar.py:1.4      Mon Jun 18 12:50:12 2001
+++ gnue/gnuef/designer/src/MenuBar.py  Tue Jun 19 13:41:34 2001
@@ -29,8 +29,8 @@
 from wxPython.wx import *
 from gnue.common import GDebug, GConfig
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
+import Incubator
 
-
 ID_NEW = wxNewId()
 ID_OPEN = wxNewId()
 ID_SAVE = wxNewId()
@@ -109,13 +109,13 @@
 
     id = wxNewId()
     menu.Append(id, "Data Source") 
-    EVT_MENU(menu, id, self.OnNewDataSource)
+    EVT_MENU(menu, id, self.OnCreateDataSource)
     id = wxNewId()
     menu.Append(id, "Named Trigger") 
-    EVT_MENU(menu, id, self.OnNewNamedTrigger)
+    EVT_MENU(menu, id, self.OnCreateNamedTrigger)
     id = wxNewId()
     menu.Append(id, "Layout Page") 
-    EVT_MENU(menu, id, self.OnNewPage)
+    EVT_MENU(menu, id, self.OnCreatePage)
 
     self._newMap = {}
 
@@ -181,28 +181,24 @@
     pass
 
   def OnCreateObject(self, event):
-    pass
-
-  def OnNewDataSource(self, event):
-    GDebug.printMesg(3, "Creating Data Source")
+    GDebug.printMesg(3, "Creating Object")
+    tag = self._newMap[event.GetId()]
     o = GFObjects.GFDataSource(self.instance._form)
     o.name = self.instance.getNextGenericName('datasource')
     self.instance.onCreateObject(o, __name__)
     self.instance.onSetCurrentObject(o, __name__)
+
+  def OnCreateDataSource(self, event):
+    GDebug.printMesg(3, "Creating Data Source")
+    Incubator.createObject(self.instance, self.instance._form, 'datasource')
 
-  def OnNewNamedTrigger(self, event):
+  def OnCreateNamedTrigger(self, event):
     GDebug.printMesg(3, "Creating a trigger")
-    o = GFTrigger.GFTrigger(self.instance._form, type="NAMED",text="",
-                    name=self.instance.getNextGenericName('trigger'))
-    self.instance.onCreateObject(o, __name__)
-    self.instance.onSetCurrentObject(o, __name__)
+    Incubator.createObject(self.instance, self.instance._form, 'trigger')
 
-  def OnNewPage(self, event):
+  def OnCreatePage(self, event):
     GDebug.printMesg(3, "Creating a page")
-    o = GFObjects.GFPage(self.instance._form)
-    o.name = self.instance.getNextGenericName('page')
-    self.instance.onCreateObject(o, __name__)
-    self.instance.onSetCurrentObject(o, __name__)
+    Incubator.createObject(self.instance, self.instance._form, 'page')