--- a/ViewStyle.st Wed Dec 01 20:20:41 1999 +0100
+++ b/ViewStyle.st Wed Dec 01 20:26:43 1999 +0100
@@ -55,7 +55,7 @@
fromFile:aFileName
"get the preferences definitions from a file"
- |prefs failed nm prjDir|
+ |prefs failed nm dir|
prefs := self new.
(aFileName endsWith:'.style') ifTrue:[
@@ -65,14 +65,16 @@
].
prefs at:#name put:nm.
- "/ search in the classes package directory first ...
- prjDir := Smalltalk projectDirectoryForClass:View.
-
"/ generic search first (allows for user to overwrite it)
- failed := (prefs readFromFile:aFileName directory:'resources') isNil.
- (failed and:[prjDir notNil]) ifTrue:[
- failed := (prefs readFromFile:aFileName directory:(prjDir , '/resources')) isNil.
+ dir := Smalltalk getResourceFileName:aFileName.
+ dir isNil ifTrue:[
+ "/ then search in the classes package directory ...
+ dir := Smalltalk projectDirectoryForClass:View.
+ dir notNil ifTrue:[
+ dir := dir , '/resources'
+ ].
].
+ failed := (prefs readFromFile:aFileName directory:dir) isNil.
prefs at:#fileReadFailed put:failed.
^ prefs
@@ -81,6 +83,7 @@
ViewStyle fromFile:'normal.style'
ViewStyle fromFile:'iris.style'
"
+
! !
!ViewStyle methodsFor:'accessing'!
@@ -212,5 +215,5 @@
!ViewStyle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.20 1999-12-01 19:20:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.21 1999-12-01 19:26:43 cg Exp $'
! !