[CMF-checkins] CVS: Products/CMFCore - utils.py:1.59.2.1

[Lennart Regebro]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv15576/CMFCore

Modified Files:
      Tag: CMF-1_5-branch
	utils.py 
Log Message:
Tool icons can now reside in subdirectories (Issue #144)


=== Products/CMFCore/utils.py 1.59 => 1.59.2.1 ===
--- Products/CMFCore/utils.py:1.59	Thu Aug 12 11:07:39 2004
+++ Products/CMFCore/utils.py	Fri Sep  3 11:00:38 2004
@@ -431,9 +431,14 @@
             icon = self.icon
             )
 
+        if self.icon:
+            icon = os_path.split(self.icon)[1]            
+        else:
+            icon = None
+        
         for tool in self.tools:
             tool.__factory_meta_type__ = self.meta_type
-            tool.icon = 'misc_/%s/%s' % (self.product_name, self.icon)
+            tool.icon = 'misc_/%s/%s' % (self.product_name, icon)
 
 InitializeClass( ToolInit )