gnue designer/doc/installer/gfdesigner.iss desi...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/11/13 17:12:49

Modified files:
        designer/doc/installer: gfdesigner.iss 
        designer/src   : Icons.py Instance.py TreeView.py 
        gnue-common    : MANIFEST.in setup.py 
Added files:
        gnue-common/images: destree_block.ico destree_datasource.ico 
                            destree_entry.ico destree_import.ico 
                            destree_page.ico destree_pagewidget.ico 
                            destree_properties.ico destree_trigger.ico 

Log message:
        Updates to add icons back on designer

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/doc/installer/gfdesigner.iss.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TreeView.py.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_block.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_datasource.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_entry.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_import.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_page.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_pagewidget.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_properties.ico?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/images/destree_trigger.ico?cvsroot=OldCVS&rev=1.1

Patches:
Index: gnue/designer/doc/installer/gfdesigner.iss
diff -u gnue/designer/doc/installer/gfdesigner.iss:1.3 
gnue/designer/doc/installer/gfdesigner.iss:1.4
--- gnue/designer/doc/installer/gfdesigner.iss:1.3      Tue Nov 13 00:53:28 2001
+++ gnue/designer/doc/installer/gfdesigner.iss  Tue Nov 13 17:12:49 2001
@@ -23,6 +23,7 @@
 [Files]
 Source: "C:\installer\designer\dist_gfdesigner\gfdesigner.exe"; DestDir: 
"{app}"; CopyMode: alwaysoverwrite
 Source: "C:\installer\designer\dist_gfdesigner\*.*"; DestDir: "{app}"; 
CopyMode: alwaysoverwrite
+Source: "C:\python21\shared\images\*.ico"; DestDir: "{app}\..\shared\images"
 
 [INI]
 Filename: "{app}\gfdesigner.url"; Section: "InternetShortcut"; Key: "URL"; 
String: "http://www.gnuenterprise.org";
Index: gnue/designer/src/Icons.py
diff -u gnue/designer/src/Icons.py:1.4 gnue/designer/src/Icons.py:1.5
--- gnue/designer/src/Icons.py:1.4      Sun Nov  4 21:27:23 2001
+++ gnue/designer/src/Icons.py  Tue Nov 13 17:12:49 2001
@@ -37,18 +37,21 @@
 treeIconMap = {}
 treeIconList = myImageList(16,16,false)
 
-if not os.environ.has_key('INSTALL_PREFIX'):
-  iconlocation = os.environ['INSTALL_PREFIX']
-  print iconlocation
+iconlocation = "%s/%s" % (os.environ['INSTALL_PREFIX'],'/shared/images')
+
+if sys.platform != 'win32': 
+  icontype = wxBITMAP_TYPE_XPM
+  iconextension = 'xpm'
 else:
-  iconlocation = '/usr/local/gnue/shared/images'
+  icontype = wxBITMAP_TYPE_ICO
+  iconextension = 'ico'
 
 for f in ('block','datasource','entry','import','pagewidget',
           'page','trigger','properties'):
-#  if os.path.isfile('%s/destree_%s.xpm' % (iconlocation, f)):
-#    treeIconMap[f] = treeIconList.AddIcon(
-#        wxIcon('%s/destree_%s.xpm' % (iconlocation, f), wxBITMAP_TYPE_XPM))
-#  else:
+  if os.path.isfile('%s/destree_%s.%s' % (iconlocation, f,iconextension)):
+    treeIconMap[f] = treeIconList.AddIcon(
+        wxIcon('%s/destree_%s.%s' % (iconlocation, f,iconextension), icontype))
+  else:
     treeIconMap[f] = treeIconList.AddIcon(wxNullIcon)
 
 
Index: gnue/designer/src/Instance.py
diff -u gnue/designer/src/Instance.py:1.26 gnue/designer/src/Instance.py:1.27
--- gnue/designer/src/Instance.py:1.26  Sat Nov 10 17:01:09 2001
+++ gnue/designer/src/Instance.py       Tue Nov 13 17:12:49 2001
@@ -119,15 +119,16 @@
     self._form.walk(self.inventoryLoadedItems)
 
     # Create our tools
+    self.objectListeners = ()
+
     self.tree = TreeView(self, self._form, vsplitter)
     self.layoutEditor = LayoutEditor(self, vsplitter)
     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.layoutEditor,
Index: gnue/designer/src/TreeView.py
diff -u gnue/designer/src/TreeView.py:1.14 gnue/designer/src/TreeView.py:1.15
--- gnue/designer/src/TreeView.py:1.14  Sun Nov  4 20:28:05 2001
+++ gnue/designer/src/TreeView.py       Tue Nov 13 17:12:49 2001
@@ -52,19 +52,19 @@
     self.form._treeItem = self.AddRoot("Form")
     self.form._treeItemFormProperties = \
         self.AppendItem(self.form._treeItem, "Properties")
-    #self.SetItemImage(self.form._treeItemFormProperties, 
treeIconMap['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.SetItemImage(self.form._treeItemImportedLibraries, 
treeIconMap['import'])
     self.form._treeItemDataSources = \
         self.AppendItem(self.form._treeItem, "Data Sources")
-    #self.SetItemImage(self.form._treeItemDataSources, 
treeIconMap['datasource'])
+    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.SetItemImage(self.form._treeItemNamedTriggers, treeIconMap['trigger'])
     self.form._treeItemPageLayout = \
         self.AppendItem(self.form._treeItem, "Page Layout")
-    #self.SetItemImage(self.form._treeItemPageLayout, treeIconMap['page'])
+    self.SetItemImage(self.form._treeItemPageLayout, treeIconMap['page'])
 
     self.SetPyData(self.form._treeItem, self.form)
     self.SetPyData(self.form._treeItemFormProperties, 
ObjectMenu(self.instance,None))
Index: gnue/gnue-common/MANIFEST.in
diff -u gnue/gnue-common/MANIFEST.in:1.4 gnue/gnue-common/MANIFEST.in:1.5
--- gnue/gnue-common/MANIFEST.in:1.4    Sat Jun 30 18:58:26 2001
+++ gnue/gnue-common/MANIFEST.in        Tue Nov 13 17:12:49 2001
@@ -8,6 +8,6 @@
 include TODO
 
 include setup.cfg.in
-include images/*.png
+include images/*
 include setupext/*.py
 include etc/*
Index: gnue/gnue-common/setup.py
diff -u gnue/gnue-common/setup.py:1.29 gnue/gnue-common/setup.py:1.30
--- gnue/gnue-common/setup.py:1.29      Mon Nov 12 22:55:12 2001
+++ gnue/gnue-common/setup.py   Tue Nov 13 17:12:49 2001
@@ -78,6 +78,7 @@
              copy_to = 'shared',
              template = ['recursive-include images *.png',
                          'recursive-include images *.xpm',
+                         'recursive-include images *.ico',
                          'prune images/CVS'],
              preserve_path = 1),
   Data_Files(