r5660 - in trunk/gnue-designer/src/base: . tools

[jamest]

Author: jamest
Date: 2004-04-06 19:09:31 -0500 (Tue, 06 Apr 2004)
New Revision: 5660

Modified:
   trunk/gnue-designer/src/base/PopupMenu.py
   trunk/gnue-designer/src/base/tools/TriggerEditor.py
Log:
trigger changes properly saved on exit
fix for adding named triggers from popup menu


Modified: trunk/gnue-designer/src/base/PopupMenu.py
===================================================================
--- trunk/gnue-designer/src/base/PopupMenu.py   2004-04-06 21:43:56 UTC (rev 
5659)
+++ trunk/gnue-designer/src/base/PopupMenu.py   2004-04-07 00:09:31 UTC (rev 
5660)
@@ -122,9 +122,12 @@
   def OnCreateObject(self, event):
     tag = self._newMap[event.GetId()]
     GDebug.printMesg(4,'Creating object %s with id %s'%(tag, event.GetId()))
+    attributes=hasattr(self,'Char__x') and {'Char:x': self.Char__x, 'Char:y': 
self.Char__y} or {}
+    if tag == 'trigger':
+      attributes['type']='named'
+      
     self.instance.incubator.createObject(self.instance.rootObject, tag,
-      self._object,
-      attributes=hasattr(self,'Char__x') and {'Char:x': self.Char__x, 
'Char:y': self.Char__y} or {} )
+      self._object, attributes)
 
   def OnCreateDataSource(self, event):
     self.instance.incubator.createObject(self.instance.rootObject, 
'datasource')

Modified: trunk/gnue-designer/src/base/tools/TriggerEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/TriggerEditor.py 2004-04-06 21:43:56 UTC 
(rev 5659)
+++ trunk/gnue-designer/src/base/tools/TriggerEditor.py 2004-04-07 00:09:31 UTC 
(rev 5660)
@@ -52,9 +52,10 @@
 
     if USE_STC:
       EditorCtrl = PythonEditorControl
+      print "1"
     else:
       EditorCtrl = FallbackPythonEditorControl
-
+      print "2"
     self.editor = EditorCtrl(self,-1, pos=wxPoint(0,32))
     self.editor.InEditMode = 0
 
@@ -221,6 +222,7 @@
         self.refillTriggerCombo()
 
   def OnKillFocus(self, event):
+    # TODO: We might be able to ditch this now since it's done in onChange
     if self.object != None and not self.__ignoreevent:
       self.object._children[0]._content = self.editor.GetText()
 
@@ -275,6 +277,7 @@
     wxStyledTextCtrl.__init__(self, parent, *args, **parms)
 
     self.instance = parent.instance
+    self.parent = parent
 
     self.CmdKeyAssign(ord('B'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMIN)
     self.CmdKeyAssign(ord('N'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMOUT)
@@ -368,7 +371,8 @@
     EVT_KEY_DOWN(self, self.OnKeyPressed)
 
 
-  def OnKeyPressed(self, event):
+  def OnKeyPressed(self, event):    
+    print "press"
     key = event.KeyCode()
     if key == 32 and event.ControlDown():
       pos = self.GetCurrentPos()
@@ -410,7 +414,8 @@
   def OnChange(self, evt):
     if self.InEditMode:
       self.instance.makeDirty()
-
+      self.parent.object._children[0]._content = self.GetText()
+      
   def OnUpdateUI(self, evt):
     # check for matching braces
     braceAtCaret = -1