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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/21 19:36:28

Modified files:
        gnuef/designer/src: Incubator.py TriggerEditor.py 

Log message:
        Added a pulldown for the trigger editor... only works for shared(named) 
triggers currently

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/Incubator.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/TriggerEditor.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/Incubator.py
diff -u gnue/gnuef/designer/src/Incubator.py:1.3 
gnue/gnuef/designer/src/Incubator.py:1.4
--- gnue/gnuef/designer/src/Incubator.py:1.3    Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/Incubator.py        Thu Jun 21 19:36:28 2001
@@ -72,7 +72,7 @@
     if attrs.has_key(attr): 
       o.__dict__[attr] = attributes[attr]
   o.name = name
-  self.nameMappings[object.name] = object
+  instance.nameMappings[o.name] = o
   o.buildObject()
   instance.onCreateObject(o, __name__)
   instance.onSetCurrentObject(o, __name__)
Index: gnue/gnuef/designer/src/TriggerEditor.py
diff -u gnue/gnuef/designer/src/TriggerEditor.py:1.6 
gnue/gnuef/designer/src/TriggerEditor.py:1.7
--- gnue/gnuef/designer/src/TriggerEditor.py:1.6        Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/TriggerEditor.py    Thu Jun 21 19:36:28 2001
@@ -34,23 +34,33 @@
 from GFDesigner import *
 
 
+# What Mode are we in?
+NAMED_TRIGGER = 1
+EVENT_TRIGGER = 0
+
+
 class TriggerEditor (wxPanel): 
   def __init__(self, parent, instance, form):
     width  = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_X )/3)
     height = int(wxSystemSettings_GetSystemMetric( wxSYS_SCREEN_Y )/3)
     
     wxPanel.__init__(self, parent, -1)
-    self.editor = 
wxTextCtrl(self,-1,style=wxTE_PROCESS_TAB|wxTE_MULTILINE|wxHSCROLL)
+    self.editor = 
wxTextCtrl(self,-1,style=wxTE_PROCESS_TAB|wxTE_MULTILINE|wxHSCROLL, 
+      pos=wxPoint(0,32))
     self.SetSize(parent.GetClientSize())
     #self.SetSize(wxSize(width,height))
     self.editor.SetSize(self.GetClientSize())
     parent.SetSize(self.GetSize())
     self.object = None
     parent.Refresh()
+
+    self.namedTriggerList = []
+
     self.parent = parent
     self.instance = instance
     self.form = form
     self.editor.SetEditable(0)
+    self.triggerList = []
     EVT_SIZE(self, self._onSize)
 # This isn't working! Argh!!!!!
 #    EVT_KILL_FOCUS(self.editor, self.OnKillFocus)  
@@ -58,38 +68,69 @@
     EVT_TEXT(self, self.editor.GetId(), self.OnKillFocus)
     self.__ignoreevent = 0
 
+    self.mode = NAMED_TRIGGER
+
+    self.toolpanel = wxPanel(self, -1, pos=wxPoint(0,0), size=wxSize(32,32), 
style=wxRAISED_BORDER|wxCLIP_CHILDREN)
+
+    self.namedNameLabel = wxStaticText(self.toolpanel, -1, "Trigger: ", 
pos=wxPoint(4,6))
+    self.namedTriggerCombo = wxComboBox(self.toolpanel, -1, 
pos=wxPoint(self.namedNameLabel.GetSize().width + 10,4), style=wxCB_READONLY)
+    EVT_COMBOBOX(self, self.namedTriggerCombo.GetId(), 
self.OnNamedTriggerSelected)
+
+    form.walk(self.inventoryObject)
+
+
+  def OnNamedTriggerSelected(self, event): 
+    self.instance.onSetCurrentObject(
+        self.namedTriggerList[event.GetSelection()], __name__)
+
+
   def _onSize(self, event):
-    self.editor.SetSize(self.GetClientSize())
+    w,h = self.GetClientSizeTuple()
+    self.toolpanel.SetSize(wxSize(w,32))
+    self.editor.SetSize(wxSize(w,h-32))
+
     
   def onSetCurrentObject (self, object, handler):
     if object == None: 
       return
-    if handler != __name__:
-      if isinstance(object, GFTrigger.GFTrigger): 
-        self.__ignoreevent = 1
-        self.editor.SetValue(object.getChildrenAsContent())
-        self.__ignoreevent = 0
-        self.object = object
-        if not len(self.object._children): 
-          GParser.GContent(object, "")
-        elif len(self.object._children) > 1: 
-          content = self.object.getChildrenAsContent()
-          self.object._children = []
-          GParser.GContent(self.object, "")
-        self.editor.SetEditable(1)
+
+    if isinstance(object, GFTrigger.GFTrigger): 
+      self.__ignoreevent = 1
+      self.editor.SetValue(object.getChildrenAsContent())
+      self.__ignoreevent = 0
+      self.object = object
+      if not len(self.object._children): 
+        GParser.GContent(object, "")
+      elif len(self.object._children) > 1: 
+        content = self.object.getChildrenAsContent()
+        self.object._children = []
+        GParser.GContent(self.object, "")
+      self.editor.SetEditable(1)
+      
+      if object.type == 'NAMED': 
+        self.mode = NAMED_TRIGGER
+        i = 0
+        while self.namedTriggerList[i] != object: 
+          i = i + 1
+        self.namedTriggerCombo.SetSelection(i)
+      else: 
+         self.mode = EVENT_TRIGGER
+
+  def inventoryObject(self, object): 
+    if isinstance(object, GFTrigger.GFTrigger): 
+      if object.type == 'NAMED':
+        self.namedTriggerList.append(object)
+        self.namedTriggerCombo.Append(object.name)
 
   def OnKillFocus(self, event): 
-#    if object != None: 
-#      object._children = []
     if self.object != None and not self.__ignoreevent: 
       self.object._children[0]._content = self.editor.GetValue()
-      print "Set"
 
   def onCreateObject (self, object, handler):
     if object == None: 
       return
-    if handler != __name__:
-      pass
+
+    self.inventoryObject(object)      
 
   def onModifyObject (self, object, handler, modifications):
     if object == None: 
@@ -101,7 +142,14 @@
   def onDeleteObject (self, object, handler):
     if object == None: 
       return
-    if handler != __name__:
-      pass
 
+    if isinstance(object, GFTrigger.GFTrigger): 
+      if object.type == 'NAMED': 
+
+        i = 0 
+        while self.namedTriggerList[i] != object: 
+          i = i + 1
+
+        self.namedTriggerList.pop(i)
+        self.namedComboBox.Delete(i)