gnue/designer/src forms/TreeView.py reports/Tre...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         
Changes by:     Jason Cater <address@hidden>    03/06/06 19:53:46

Modified files:
        designer/src/forms: TreeView.py 
        designer/src/reports: TreeView.py 
        designer/src/schema: TreeView.py 
        designer/src/base/tools: TreeView.py 

Log message:
        cleanup of Object Tree code; automatically expand the root object's 
node on startup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/TreeView.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/TreeView.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/TreeView.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/TreeView.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/tools/TreeView.py
diff -c gnue/designer/src/base/tools/TreeView.py:1.36 
gnue/designer/src/base/tools/TreeView.py:1.37
*** gnue/designer/src/base/tools/TreeView.py:1.36       Fri May 23 20:02:31 2003
--- gnue/designer/src/base/tools/TreeView.py    Fri Jun  6 19:53:46 2003
***************
*** 68,79 ****
      EVT_TREE_END_LABEL_EDIT(self, self.tree.GetId(), self.OnTreeLabelEditEnd)
      EVT_TREE_SEL_CHANGED(self, self.tree.GetId(), self.OnTreeItemSelected)
  
!     self.rootObject._treeItem = self.tree.AddRoot(self.rootDescr)
  
      EVT_RIGHT_DOWN(self, self.OnRightDown)
      EVT_LEFT_DCLICK(self, self.OnEditProperties)
!     
      self.Fit()
  
    def onSize(self, event):
      x,y = self.GetClientSizeTuple()
--- 68,91 ----
      EVT_TREE_END_LABEL_EDIT(self, self.tree.GetId(), self.OnTreeLabelEditEnd)
      EVT_TREE_SEL_CHANGED(self, self.tree.GetId(), self.OnTreeItemSelected)
  
!     root = self.rootObject._treeItem = self.tree.AddRoot(self.rootDescr)
!     self.tree.SetPyData(self.rootObject._treeItem, self.rootObject)
  
      EVT_RIGHT_DOWN(self, self.OnRightDown)
      EVT_LEFT_DCLICK(self, self.OnEditProperties)
! 
!     self.inittree()
!     self.rootObject.walk(self.inventoryObject)
!     self.tree.Expand(root)
      self.Fit()
+ 
+   # For use by subclasses
+   def inittree(self):
+     pass
+ 
+   # For use by subclasses
+   def inventoryObject(self):
+     pass
  
    def onSize(self, event):
      x,y = self.GetClientSizeTuple()
Index: gnue/designer/src/forms/TreeView.py
diff -c gnue/designer/src/forms/TreeView.py:1.9 
gnue/designer/src/forms/TreeView.py:1.10
*** gnue/designer/src/forms/TreeView.py:1.9     Mon Feb 17 02:32:51 2003
--- gnue/designer/src/forms/TreeView.py Fri Jun  6 19:53:46 2003
***************
*** 44,52 ****
  
    rootDescr = 'Form'
  
!   def init(self):
! 
!     BaseTreeView.init(self)
  
      logic = None
      layout = None
--- 44,50 ----
  
    rootDescr = 'Form'
  
!   def inittree(self):
  
      logic = None
      layout = None
***************
*** 75,88 ****
          self.AppendItem(self.rootObject._treeItem, _("Page Layout"))
      self.tree.SetItemImage(self.rootObject._treeItemPageLayout, 
treeIconMap['page'])
  
-     self.tree.SetPyData(self.rootObject._treeItem, self.rootObject)
      self.tree.SetPyData(self.rootObject._treeItemFormProperties, 
ObjectMenu(self.instance,None))
      self.tree.SetPyData(self.rootObject._treeItemDataSources, 
ObjectMenu(self.instance,None))
      self.tree.SetPyData(self.rootObject._treeItemNamedTriggers, 
ObjectMenu(self.instance,None))
      self.tree.SetPyData(self.rootObject._treeItemLogic, logic)
      self.tree.SetPyData(self.rootObject._treeItemPageLayout, layout)
- 
-     self.rootObject.walk(self.inventoryObject)
  
  
    def inventoryObject (self, object):
--- 73,83 ----
Index: gnue/designer/src/reports/TreeView.py
diff -c gnue/designer/src/reports/TreeView.py:1.8 
gnue/designer/src/reports/TreeView.py:1.9
*** gnue/designer/src/reports/TreeView.py:1.8   Mon Feb 17 02:32:53 2003
--- gnue/designer/src/reports/TreeView.py       Fri Jun  6 19:53:46 2003
***************
*** 37,50 ****
  from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
  
  class TreeView (BaseTreeView):
-   def __init__(self, instance, root, parent):
  
!     self.rootDescr = 'Report'
!     BaseTreeView.__init__(self, instance, root, parent)
! 
!     self.tree.SetPyData(self.rootObject._treeItem, self.rootObject)
! 
!     self.rootObject.walk(self.inventoryObject)
  
    def inventoryObject (self, object):
      if object != self.rootObject:
--- 37,44 ----
  from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
  
  class TreeView (BaseTreeView):
  
!   rootDescr = 'Report'
  
    def inventoryObject (self, object):
      if object != self.rootObject:
***************
*** 70,74 ****
            "%s" % object.getDescription())
        self.tree.SetPyData(object._treeItem, object)
        self.tree.SetItemImage(object._treeItem, treeIconMap[icon])
!       
  
--- 64,68 ----
            "%s" % object.getDescription())
        self.tree.SetPyData(object._treeItem, object)
        self.tree.SetItemImage(object._treeItem, treeIconMap[icon])
! 
  
Index: gnue/designer/src/schema/TreeView.py
diff -c gnue/designer/src/schema/TreeView.py:1.7 
gnue/designer/src/schema/TreeView.py:1.8
*** gnue/designer/src/schema/TreeView.py:1.7    Mon Feb 17 02:32:53 2003
--- gnue/designer/src/schema/TreeView.py        Fri Jun  6 19:53:46 2003
***************
*** 34,46 ****
  from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
  
  class TreeView (BaseTreeView):
-   def __init__(self, instance, root, parent):
- 
-     self.rootDescr = 'Schema'
-     BaseTreeView.__init__(self, instance, root, parent)
-     self.tree.SetPyData(self.rootObject._treeItem, self.rootObject)
-     self.rootObject.walk(self.inventoryObject)
  
  
    def inventoryObject (self, object):
      if object != self.rootObject:
--- 34,41 ----
  from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
  
  class TreeView (BaseTreeView):
  
+   rootDescr = 'Schema'
  
    def inventoryObject (self, object):
      if object != self.rootObject: