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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/22 06:16:35

Modified files:
        gnuef/designer/src: GFDesigner.py Instance.py LayoutEditor.py 
                            PropertyEditor.py RuntimeSettings.py 
                            TreeView.py TriggerEditor.py 
Added files:
        gnuef/designer/src: ToolFrame.py 

Log message:
        Added property editor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/ToolFrame.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/GFDesigner.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/PropertyEditor.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/RuntimeSettings.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/TreeView.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/TriggerEditor.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/GFDesigner.py
diff -u gnue/gnuef/designer/src/GFDesigner.py:1.10 
gnue/gnuef/designer/src/GFDesigner.py:1.11
--- gnue/gnuef/designer/src/GFDesigner.py:1.10  Fri Jun 22 00:39:07 2001
+++ gnue/gnuef/designer/src/GFDesigner.py       Fri Jun 22 06:16:35 2001
@@ -39,10 +39,10 @@
 class GFDesigner(GClientApp, wxApp):
 
   # GClientApp stuff...
-  TITLE = TITLE
+  NAME = TITLE
   VERSION = VERSION
   COMMAND = "gfdesign"
-  NAME = "A graphical tool for the creation of GNUe Forms."
+  SUMMARY = "A graphical tool for the creation of GNUe Forms."
   USAGE = "gfdesign [options] [files]"
 
   def __init__(self): 
Index: gnue/gnuef/designer/src/Instance.py
diff -u gnue/gnuef/designer/src/Instance.py:1.10 
gnue/gnuef/designer/src/Instance.py:1.11
--- gnue/gnuef/designer/src/Instance.py:1.10    Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/Instance.py Fri Jun 22 06:16:35 2001
@@ -39,6 +39,8 @@
 from PropertyEditor import * 
 from TriggerEditor import *
 import RuntimeSettings
+from Incubator import elements
+from ToolFrame import ToolFrame
 
 class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
@@ -76,6 +78,8 @@
       fileHandle.close()
       self.makeClean()
 
+    self._form.name = "Form"
+
     self.CreateStatusBar()
     self.SetStatusText('Waddaya mean "Moo! M-Moo! Moo! Moo!"?...."Sheep ya 
dern fool!"')
     self._menubar = MainMenuBar(self)
@@ -86,34 +90,39 @@
     vsplitter = wxSplitterWindow (self, -1, style=wxSP_3D|wxNO_3D)
     vsplitter.SetMinimumPaneSize (100)
 
-    hsplitter = wxSplitterWindow (vsplitter, -1, style=wxSP_3D|wxNO_3D)
-    hsplitter.SetMinimumPaneSize (100)
+#    hsplitter = wxSplitterWindow (vsplitter, -1, style=wxSP_3D|wxNO_3D)
+#    hsplitter.SetMinimumPaneSize (100)
 
     self._form.walk(self.inventoryLoadedItems)
 
     # Create our tools
-    self.tree = TreeView(self, self._form, hsplitter)
+    self.tree = TreeView(self, self._form, vsplitter)
     self.layoutEditor = LayoutEditor(self, vsplitter)
-    self.propertyEditor = PropertyEditor(hsplitter, self, self._form)
     self.triggerEditorWindow = ToolFrame(self, "Trigger Editor")
     self.triggerEditor = TriggerEditor(self.triggerEditorWindow, self, 
self._form)
 
+    self.propertyEditorWindow = PropertyToolFrame(self, "Property Editor")
+    self.propertyEditor = self.propertyEditorWindow.propertyEditor
+#    self.eventEditor = self.propertyEditorWindow.eventEditor
+
     # Store all 
-    self.objectListeners = [ self.tree, 
+    self.objectListeners = ( self.tree, 
                              self.layoutEditor, 
-                             self.propertyEditor, 
-                             self.triggerEditor ]
+                             self.triggerEditor, 
+                             self.propertyEditorWindow, 
+                             self.propertyEditor, )
+#                             self.eventEditor )
 
     self._currentPage = self._pages[0]
-    hsplitter.SplitHorizontally (self.tree, self.propertyEditor)
-    vsplitter.SplitVertically(hsplitter, self.layoutEditor)
+#    hsplitter.SplitHorizontally (self.tree, self.propertyEditor)
+    vsplitter.SplitVertically(self.tree, self.layoutEditor)
     vsplitter.SetSashPosition (
         RuntimeSettings.getint(self.runtime_section, 'vsash', 170), true)
     self.vsplitter = vsplitter
-    self.hsplitter = hsplitter
+#    self.hsplitter = hsplitter
     self.layoutEditor.drawPage(self._currentPage)
-    hsplitter.SetSashPosition (
-        RuntimeSettings.getint(self.runtime_section, 'hsash', 170), true)
+ #   hsplitter.SetSashPosition (
+#        RuntimeSettings.getint(self.runtime_section, 'hsash', 170), true)
     self.tree.Expand(self._form._treeItem)
 
     self._menubar.lastToolAdded()
@@ -121,7 +130,7 @@
     app.addInstance(self) 
 
     # Fit the widgets to the screen
-    hsplitter.Fit()
+#    hsplitter.Fit()
     vsplitter.Fit()
     self.layoutEditor.Fit()
     self.Fit()
@@ -134,6 +143,8 @@
        RuntimeSettings.getint(self.runtime_section, 'x', -1), 
        RuntimeSettings.getint(self.runtime_section, 'y', -1)))
 
+    self.onSetCurrentObject(self._form, __name__)
+
     self.Refresh()
 
     EVT_CLOSE(self, self.OnClose)
@@ -149,10 +160,8 @@
                'y': y, 
                'height': height, 
                'width': width, 
-               'hsash': self.hsplitter.GetSashPosition(),
                'vsash': self.vsplitter.GetSashPosition()  } )
 
-
   # Hack having to do with UIwxpython import
   def uiEventTrap(self, event): 
     pass
@@ -194,7 +203,6 @@
     object._popupMenu = ObjectMenu(self, object)
 
 
-
   def onSetCurrentObject (self, object, handler):
     for listener in self.objectListeners: 
       listener.onSetCurrentObject(object, handler)
@@ -207,7 +215,7 @@
 
   def onModifyObject (self, object, handler, modifications):
     for listener in self.objectListeners: 
-      listener.onModifyObject(object, handler)
+      listener.onModifyObject(object, handler, modifications)
     self.makeDirty()
 
   def onDeleteObject (self, object, handler):
@@ -324,73 +332,5 @@
 
   def OnDebugRun (self, event): 
     DebugSession(self)
-
-#
-# Any tool frames inherit from this
-# It handles the Window menu and 
-# saving size/position/display settings
-#
-class ToolFrame (wxFrame): 
-
-  default_width = 200
-  default_height = 150
-
-  def __init__(self, instance, title): 
-    wxFrame.__init__(self, instance, -1, title, 
-      style=wxMINIMIZE_BOX|wxRESIZE_BORDER|wxCAPTION)#|wxFRAME_FLOAT_ON_PARENT)
-    self.title = title
-    self.runtime_section = "ToolFrame-%s" % string.replace(self.title,' ','')
-    self.instance = instance
-
-    # Add ourselves to the Window menu
-    menuID = wxNewId()
-    self.menu = self.instance._menubar.addTool(self, title)
-    
-    EVT_CLOSE(self, self.OnClose)
-
-    self.SetPosition(( 
-       RuntimeSettings.getint(self.runtime_section, 'x', -1), 
-       RuntimeSettings.getint(self.runtime_section, 'y', -1)))
-
-    self.SetSize(( 
-       RuntimeSettings.getint(self.runtime_section, 'width', 
self.default_width), 
-       RuntimeSettings.getint(self.runtime_section, 'height', 
self.default_height)))
-
-    if RuntimeSettings.getint(self.runtime_section, 'visible', 0):
-      self.show()
-
-    RuntimeSettings.registerRuntimeSettingHandler(instance, self)
-    
-  def saveRuntimeSettings(self): 
-    x, y = self.GetPositionTuple()
-    width, height = self.GetSizeTuple()
-    return ( self.runtime_section, 
-             {'x': x, 
-              'y': y, 
-              'height': height, 
-              'width': width, 
-              'visible': self._menu.IsChecked() } )
-
-  # This event is set by MenuBar.addTool
-  # Called whenever menu item is selected
-  def OnMenuSelected(self, event): 
-    if self._menu.IsChecked(): 
-      self.show()
-    else: 
-      self.hide()
-
-  def show(self): 
-    self._menu.SetHelp("Hide the %s window"  % self.title)
-    self._menu.Check(1)
-    self.Show(1)
-
-  def hide(self): 
-    self._menu.SetHelp("Show the %s window" % self.title)
-    self._menu.Check(0)
-    self.Show(0)
-
-  def OnClose(self, event): 
-    self.hide()
-    event.Veto()
 
 
Index: gnue/gnuef/designer/src/LayoutEditor.py
diff -u gnue/gnuef/designer/src/LayoutEditor.py:1.5 
gnue/gnuef/designer/src/LayoutEditor.py:1.6
--- gnue/gnuef/designer/src/LayoutEditor.py:1.5 Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/LayoutEditor.py     Fri Jun 22 06:16:35 2001
@@ -66,7 +66,6 @@
     if handler != __name__: 
       for o in self._currentSelection.keys():
         o.setSelected(0)
-
       object.walk(self.__setCurrentObject)
 
   def __setCurrentObject(self,object): 
@@ -78,17 +77,19 @@
     if object == None: 
       return
     if handler != __name__:
-      print object
       if object.findParentOfType('GFPage') == self.page: 
         self.__getBlocks(object)
         self.__drawItem(object)
 
+      if istype(object, GFObjects.GFPage): 
+        self.getPages()
+
   def onModifyObject (self, object, handler, modifications):
     if object == None: 
       return
     if handler != __name__:
-      for modification in modifications: 
-        attribute, value = modification
+      if object == self.page or object in self.widgetList: 
+        self.drawPage(self.page)
 
   def onDeleteObject (self, object, handler):
     if object == None: 
@@ -106,19 +107,8 @@
                  self.panelColor.Green()+16,    
                  self.panelColor.Blue()+16)
 
-
-    self.pageCombo.Clear()
-    i = 0
-    selected = 0
-    for p in self._instance._pages: 
-      if p == page: 
-        selected = i
-      self.pageCombo.Append(p.name)
-      i = i + 1
-
-    self.pageCombo.SetSelection(selected)
 
-#    self.pageNameLabel.SetLabel("Page: %s" % page.name)
+    self.getPages()
 
     UIwxpython.initFont(self.panel)
 
@@ -156,6 +146,8 @@
     self.panel.SetClientSize(wxSize(int(width)*int(self.widgetWidth), 
                        int(height)*int(self.widgetHeight)))
 
+    self.widgetList = []
+
     page.walk(self.__drawItem)
 
     self.getBlocks()
@@ -166,6 +158,17 @@
     EVT_RIGHT_UP(self.panel, self.OnRightUp)
     EVT_MOTION(self.panel, self.OnMotion)
 
+  def getPages(self): 
+    self.pageCombo.Clear()
+    i = 0
+    selected = 0
+    for p in self._instance._pages: 
+      if p == self.page: 
+        selected = i
+      self.pageCombo.Append(p.name)
+      i = i + 1
+
+    self.pageCombo.SetSelection(selected)
 
   def getBlocks(self): 
     self.blockCombo.Clear()
@@ -189,6 +192,7 @@
       if not len(self._currentSelection.keys()): 
         self._currentSelection = {object._widgetHandler:1}
         object._widgetHandler.setSelected(0)
+      self.widgetList.append(object)
 
   def OnSize(self, event): 
     self.toolpanel.SetSize(wxSize(self.GetClientSize().x, 
self.toolpanel.GetSize().y))
@@ -376,12 +380,16 @@
       for widget in self.mainWidget.widgets: 
         w,h = widget.GetSizeTuple()
         widget.SetSize(wxSize(w-self.instance.gridWidth,h))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('width', self.object.width)))
     if dx == 1 and \
        hasattr(self.object, 'width'):
       self.object.width = self.object.width + 1
       for widget in self.mainWidget.widgets:
         w,h = widget.GetSizeTuple()
         widget.SetSize(wxSize(w+self.instance.gridWidth,h))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('width', self.object.width)))
     if dy == -1 and \
        hasattr(self.object, 'height') and \
        self.object.height > 1: 
@@ -389,12 +397,16 @@
       for widget in self.mainWidget.widgets: 
         w,h = widget.GetSizeTuple()
         widget.SetSize(wxSize(w,h-self.instance.gridHeight))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('height', self.object.width)))
     if dy == 1 and \
        hasattr(self.object, 'height'):
       self.object.height = self.object.height + 1 
       for widget in self.mainWidget.widgets: 
         w,h = widget.GetSizeTuple()
         widget.SetSize(wxSize(w,h+self.instance.gridHeight))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('height', self.object.width)))
     self.recalcBoundaries()
 
 
@@ -405,22 +417,30 @@
       for widget in self.mainWidget.widgets: 
         x,y = widget.GetPositionTuple()
         widget.SetPosition(wxPoint(x-self.instance.gridWidth,y))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('x', self.object.width)))
     if dx == 1:
       self.object.x = self.object.x + 1 
       for widget in self.mainWidget.widgets: 
         x,y = widget.GetPositionTuple()
         widget.SetPosition(wxPoint(x+self.instance.gridWidth,y))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('x', self.object.width)))
     if dy == -1 and \
        self.object.y > 0: 
       self.object.y = self.object.y - 1 
       for widget in self.mainWidget.widgets: 
         x,y = widget.GetPositionTuple()
         widget.SetPosition(wxPoint(x,y-self.instance.gridHeight))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('y', self.object.width)))
     if dy == 1:
       self.object.y = self.object.y + 1 
       for widget in self.mainWidget.widgets: 
         x,y = widget.GetPositionTuple()
         widget.SetPosition(wxPoint(x,y+self.instance.gridHeight))
+      self.instance._instance.onModifyObject(self.object, __name__, 
+          (('y', self.object.width)))
     self.recalcBoundaries()
 
   def Destroy(self): 
Index: gnue/gnuef/designer/src/PropertyEditor.py
diff -u gnue/gnuef/designer/src/PropertyEditor.py:1.3 
gnue/gnuef/designer/src/PropertyEditor.py:1.4
--- gnue/gnuef/designer/src/PropertyEditor.py:1.3       Wed Jun 20 15:31:55 2001
+++ gnue/gnuef/designer/src/PropertyEditor.py   Fri Jun 22 06:16:35 2001
@@ -29,36 +29,65 @@
 
 import sys, os, time
 from wxPython.wx import *
+from wxPython.grid import *
 from gnue.common import GDebug, GConfig
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
 from GFDesigner import *
+from Incubator import elements
+from ToolFrame import ToolFrame
 
-
-class PropertyEditor (wxScrolledWindow): 
+class PropertyEditor (wxPanel): 
   def __init__(self, parent, instance, form): 
-    wxScrolledWindow.__init__(self,parent,-1)
+    wxPanel.__init__(self,parent,-1,pos=wxPoint(0,0))
+    self.panel = wxPanel(self,-1,style=wxSIMPLE_BORDER, pos=wxPoint(6,6))
+
     self.parent = parent
     self.instance = instance
     self.form = form
+    self.objectList = []
+    self.objectMap = {}
+    self.grid = wxGrid(self.panel, -1, pos=wxPoint(0,0))
+    EVT_SIZE(self, self.onSize)
 
   def onSetCurrentObject (self, object, handler):
     if object == None: 
       return
     if handler != __name__:
-      pass
+      self.object = object
+      self.attributes = elements[string.lower(object.getObjectType()[2:])][1]
+      self.elements = elements[string.lower(object.getObjectType()[2:])]
+
+      # This is a nasty temporary way of refreshing grid
+      if self.grid: 
+        self.grid.Destroy()
+      self.grid = wxGrid(self.panel, -1, pos=wxPoint(0,0))
+
+      self.grid.CreateGrid(len(self.attributes.keys()),1)
+      self.grid.SetColLabelSize(0)
+      self.rowList = self.attributes.keys()
+      self.rowList.sort()
+      i = 0
+      for key in self.rowList: 
+        self.grid.SetRowLabelValue(i, string.upper(key[0]) + 
string.lower(key[1:]))
+        if hasattr(object, key): 
+          self.grid.SetCellValue(i,0,"%s" % object.__dict__[key])
+        i = i + 1
+      self.onSize(None)
+      EVT_GRID_CELL_CHANGE(self.grid, self.OnCellChange)
 
   def onCreateObject (self, object, handler):
     if object == None: 
       return
-    if handler != __name__:
-      pass
+    self.inventoryObject(object)
+    self.generateObjectMap()
 
   def onModifyObject (self, object, handler, modifications):
     if object == None: 
       return
-    if handler != __name__:
-      for modification in modifications: 
-        attribute, value = modification
+    if handler != __name__ and self.object == object:
+#      for modification in modifications: 
+#        attribute, value = modification
+      self.onSetCurrentObject(object, handler)
 
   def onDeleteObject (self, object, handler):
     if object == None: 
@@ -66,5 +95,120 @@
     if handler != __name__:
       pass
 
+  def onSize(self, event): 
+    x,y = self.GetClientSizeTuple()
+    self.panel.SetSize((x-12,y-12))
+    self.grid.SetSize(self.panel.GetClientSizeTuple())
+    w,h = self.grid.GetClientSizeTuple()
+    self.grid.SetColSize(0, w - self.grid.GetRowLabelSize())
+
+  def OnCellChange(self, evt):
+    attr = self.rowList[evt.GetRow()]
+    value = self.grid.GetCellValue(evt.GetRow(), evt.GetCol())
+
+    try: 
+      self.object.__dict__[attr] = self.attributes[attr][2](value)
+      self.instance.onModifyObject(self.object, __name__, ((attr, 
self.object.__dict__[attr]),))
+      evt.Skip()
+    except ValueError: 
+      wxBell()
+      
+#
+#
+#
+class PropertyToolFrame(ToolFrame): 
+  def __init__(self, instance, title): 
+    ToolFrame.__init__(self, instance, "Property Editor")
+
+    self.toolpanel = wxPanel(self, -1, pos=wxPoint(0,0), size=wxSize(32,32), 
+         style=wxRAISED_BORDER|wxCLIP_CHILDREN)
+
+    self.notebook = wxNotebook(self, -1, pos=wxPoint(6, 37), 
size=wxSize(32,32))
+
+    self.propertyEditor = PropertyEditor(
+         self.notebook, instance, instance._form)
+#    self.eventEditor = EventEditor(
+#         self.notebook, instance, instance._form)
+
+    self.notebook.AddPage(self.propertyEditor, 'Properties')
+#    self.notebook.AddPage(self.eventEditor, 'Events')
+
+    self.objectLabel = wxStaticText(self.toolpanel, -1, "Object: ", 
+         pos=wxPoint(4,6))
+    self.objectCombo = wxComboBox(self.toolpanel, -1, 
+         pos=wxPoint(self.objectLabel.GetSize().width + 10,4), 
+         style=wxCB_READONLY)
+
+    EVT_COMBOBOX(self, self.objectCombo.GetId(), self.OnObjectSelected)
+
+    EVT_SIZE(self, self.onSize)
+
+    self.objectList = []
+
+    instance._form.walk (self.inventoryObject)
+    self.generateObjectMap()
+
+  def generateObjectMap(self): 
+    self.objectMap = {}
+
+    # Alphabetize the combo list
+    nameMap = {}
+    for o in self.objectList: 
+      nameMap[string.lower(o.name)] = o
+    keys = nameMap.keys()
+    keys.sort()   
+    i = 0
+
+    self.objectList = []
+    for key in keys: 
+      self.objectList.append(nameMap[key])
+      self.objectMap[nameMap[key]] = i
+      self.objectCombo.Append(nameMap[key].name) 
+      i = i + 1
+
+
+
+  def inventoryObject(self, object): 
+    if hasattr(object, 'name'):
+      self.objectList.append(object)
+
+  def OnObjectSelected(self, event): 
+    self.instance.onSetCurrentObject(
+       self.objectList[event.GetSelection()], "%sFrame" % __name__)
+
+  def onSize(self, event):
+    w,h = self.GetClientSizeTuple()
+    self.toolpanel.SetSize(wxSize(w,32))
+    self.notebook.SetSize(wxSize(w-12,h-44))
+
+  def onSetCurrentObject (self, object, handler):
+    if object == None: 
+      return
+    if handler != "%sFrame" % __name__:
+      if self.objectMap.has_key(object): 
+        self.objectCombo.SetSelection(self.objectMap[object])
+
+  def onCreateObject (self, object, handler):
+    if object == None: 
+      return
+    self.inventoryObject(object)
+    self.generateObjectMap()
+
+  def onModifyObject (self, object, handler, modifications):
+    if object == None: 
+      return
 
+    # All we need to monitor is a name change
+    if handler != __name__ and self.object == object:
+      for modification in modifications: 
+        attribute, value = modification
+        if attribute == 'name': 
+          self.objectTree[self.objectMap['name']] = modification
+          self.generateObjectMap()
+
+  def onDeleteObject (self, object, handler):
+    if object == None: 
+      return
+    self.objectList.pop(self.objectMap[object])
+    self.generateObjectMap()
 
Index: gnue/gnuef/designer/src/RuntimeSettings.py
diff -u gnue/gnuef/designer/src/RuntimeSettings.py:1.1 
gnue/gnuef/designer/src/RuntimeSettings.py:1.2
--- gnue/gnuef/designer/src/RuntimeSettings.py:1.1      Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/RuntimeSettings.py  Fri Jun 22 06:16:35 2001
@@ -78,11 +78,10 @@
           fh.write ("%s=%s\n" % (key, hash[key]))
       fh.write("\n") 
     except: 
-      pass
+      print "\nWarning: Unable to save session data to %s\n" % location
     fh.close()
   except: 
-    pass
-
+    print "\nWarning: Unable to save session data to %s\n" % location
 #
 # Any object (class) that has settings it wants saved should 
 # register with this method.  The object should define a
Index: gnue/gnuef/designer/src/TreeView.py
diff -u gnue/gnuef/designer/src/TreeView.py:1.5 
gnue/gnuef/designer/src/TreeView.py:1.6
--- gnue/gnuef/designer/src/TreeView.py:1.5     Thu Jun 21 18:15:53 2001
+++ gnue/gnuef/designer/src/TreeView.py Fri Jun 22 06:16:35 2001
@@ -122,6 +122,8 @@
     if handler != __name__:
       for modification in modifications: 
         attribute, value = modification
+        if attribute == 'name' and object != self.form: 
+          self.SetItemText(object._treeItem, object.getDescription())
 
   def onDeleteObject (self, object, handler):
     if object == None: 
Index: gnue/gnuef/designer/src/TriggerEditor.py
diff -u gnue/gnuef/designer/src/TriggerEditor.py:1.7 
gnue/gnuef/designer/src/TriggerEditor.py:1.8
--- gnue/gnuef/designer/src/TriggerEditor.py:1.7        Thu Jun 21 19:36:28 2001
+++ gnue/gnuef/designer/src/TriggerEditor.py    Fri Jun 22 06:16:35 2001
@@ -114,7 +114,7 @@
           i = i + 1
         self.namedTriggerCombo.SetSelection(i)
       else: 
-         self.mode = EVENT_TRIGGER
+        self.mode = EVENT_TRIGGER
 
   def inventoryObject(self, object): 
     if isinstance(object, GFTrigger.GFTrigger):