FileBrowser.st
changeset 2491 0222b19ee371
parent 2476 866fdfe9b2d6
child 2492 055eef2763e3
--- a/FileBrowser.st	Wed Dec 15 20:42:50 1999 +0100
+++ b/FileBrowser.st	Wed Dec 15 21:39:51 1999 +0100
@@ -167,7 +167,7 @@
         ('application/x-java-source'      nil     'tiny_file_java.xpm'        )
         ('image'                          nil     'tiny_file_pix.xpm'         )
      ) do:[:entry |
-        |key resource defaultName nm|
+        |key resource defaultName nm img|
 
         key := entry at:1.
         resource := entry at:2.
@@ -177,9 +177,21 @@
             nm := resources at:resource default:nil.
         ].
         nm isNil ifTrue:[
-            nm := 'bitmaps/xpmBitmaps/document_images/' , defaultName
+            nm := 'xpmBitmaps/document_images/' , defaultName
         ].
-        Icons at:key put:(Smalltalk imageFromFileNamed:nm forClass:self).
+        img := Smalltalk imageFromFileNamed:nm forClass:self.
+        img isNil ifTrue:[
+            "/ try under the goodies package ...
+            img := Smalltalk imageFromFileNamed:nm inPackage:'stx:goodies'.
+            img isNil ifTrue:[
+                nm := 'bitmaps/' , nm.
+                img := Smalltalk imageFromFileNamed:nm forClass:self.
+                img isNil ifTrue:[
+                    img := Smalltalk imageFromFileNamed:nm inPackage:'stx:goodies'.
+                ]
+            ]
+        ].
+        Icons at:key put:img.
     ]
 
     "
@@ -6911,5 +6923,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.353 1999-12-09 11:14:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.354 1999-12-15 20:39:51 cg Exp $'
 ! !