gnue/designer/src TreeView.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/18 21:02:42

Modified files:
        designer/src   : TreeView.py 

Log message:
        Added icons to designer; (rerun gnue-common setup.py install to use); 
misc other bugfixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TreeView.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnue/designer/src/TreeView.py
diff -u gnue/designer/src/TreeView.py:1.7 gnue/designer/src/TreeView.py:1.8
--- gnue/designer/src/TreeView.py:1.7   Thu Jul 12 15:51:08 2001
+++ gnue/designer/src/TreeView.py       Wed Jul 18 21:02:42 2001
@@ -41,6 +41,8 @@
     self.form = form
     self.__handler = None
 
+    self.SetImageList(treeIconList)
+
     EVT_TREE_BEGIN_LABEL_EDIT(self, self.GetId(), self.OnTreeLabelEdit)
     EVT_TREE_END_LABEL_EDIT(self, self.GetId(), self.OnTreeLabelEditEnd)
     EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnTreeItemSelected)
@@ -48,14 +50,19 @@
     self.form._treeItem = self.AddRoot("Form")
     self.form._treeItemFormProperties = \
         self.AppendItem(self.form._treeItem, "Properties")
+    self.SetItemImage(self.form._treeItemFormProperties, 
treeIconMap['properties'])
     self.form._treeItemImportedLibraries = \
         self.AppendItem(self.form._treeItem, "Imported Libraries")
+    self.SetItemImage(self.form._treeItemImportedLibraries, 
treeIconMap['import'])
     self.form._treeItemDataSources = \
         self.AppendItem(self.form._treeItem, "Data Sources")
+    self.SetItemImage(self.form._treeItemDataSources, 
treeIconMap['datasource'])
     self.form._treeItemNamedTriggers = \
         self.AppendItem(self.form._treeItem, "Shared Triggers")
+    self.SetItemImage(self.form._treeItemNamedTriggers, treeIconMap['trigger'])
     self.form._treeItemPageLayout = \
         self.AppendItem(self.form._treeItem, "Page Layout")
+    self.SetItemImage(self.form._treeItemPageLayout, treeIconMap['page'])
 
     self.SetPyData(self.form._treeItem, self.form)
     self.SetPyData(self.form._treeItemFormProperties, 
ObjectMenu(self.instance,None))
@@ -70,29 +77,50 @@
 
   def inventoryLoadedItems (self, object): 
     if object != self.form: 
+      icon = 'properties'
       if isinstance(object, GFObjects.GFOptions) and \
          object._parent == self.form: 
         object._treeItem = self.form._treeItemFormProperties
+        icon = 'properties'
       else: 
         parentTreeItem = object._parent._treeItem
         if isinstance(object, GFTrigger.GFTrigger) and \
            object.type == 'NAMED': 
           parentTreeItem = self.form._treeItemNamedTriggers
+          icon = 'trigger'
         elif isinstance(object, GFTrigger.GFTrigger):
           parentTreeItem = object._parent._treeItemTrigger
+          icon = 'trigger'
         elif isinstance(object, GFObjects.GFDataSource) or \
            isinstance(object, GFObjects.GFDatabase): 
           parentTreeItem = self.form._treeItemDataSources
+          icon = 'datasource'
         elif isinstance(object, GFObjects.GFPage) and \
              object._parent == self.form: 
           parentTreeItem = self.form._treeItemPageLayout
+          icon = 'page'
+        elif object.getObjectType() in ('GFBlock',): 
+          icon = 'block'
+        elif object.getObjectType() in ('GFOption',): 
+          icon = 'properties'
+        elif object.getObjectType() in ('GFEntry',): 
+          icon = 'entry'
+        elif len(object.getObjectType()) >= 8 and object.getObjectType()[:8] 
== 'GFImport': 
+          icon = 'import'
+        elif object.findParentOfType('GFPage') != None: 
+          icon = 'pagewidget'
+ 
+          
+         
         object._treeItem = self.AppendItem(parentTreeItem, 
             "%s" % object.getDescription())
         self.SetPyData(object._treeItem, object)
+        self.SetItemImage(object._treeItem, treeIconMap[icon])
 
     if isinstance (object, GFTrigger.GFTriggerAware): 
       object._treeItemTrigger = \
         self.AppendItem(object._treeItem, "Events")
+      self.SetItemImage(object._treeItemTrigger, treeIconMap['trigger'])
       ##self.SetPyData(object._treeItemTrigger, object)
 
 
@@ -161,3 +189,17 @@
     elif object != None: 
       self.PopupMenu(object._popupMenu, event.GetPosition())
       
+
+
+
+treeIconMap = {}
+treeIconList = wxImageList(24,24,false)
+ 
+# TODO: This should be pulled from settings passed via gfdesigner script
+iconlocation = '/usr/local/gnue/shared/images'
+for f in ('block','datasource','entry','import','pagewidget',
+          'page','trigger','properties'): 
+  treeIconMap[f] = treeIconList.AddIcon(
+      wxIcon('%s/destree_%s.xpm' % (iconlocation, f), wxBITMAP_TYPE_XPM))
+
+