--- a/ViewStyle.st Wed Dec 01 20:04:00 1999 +0100
+++ b/ViewStyle.st Wed Dec 01 20:19:11 1999 +0100
@@ -55,7 +55,7 @@
fromFile:aFileName
"get the preferences definitions from a file"
- |prefs failed nm|
+ |prefs failed nm prjDir|
prefs := self new.
(aFileName endsWith:'.style') ifTrue:[
@@ -65,9 +65,13 @@
].
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 ifTrue:[
- failed := (prefs readFromFile:aFileName directory:'packages/stx/libview/resources') isNil.
+ (failed and:[prjDir notNil]) ifTrue:[
+ failed := (prefs readFromFile:aFileName directory:prjDir) isNil.
].
prefs at:#fileReadFailed put:failed.
^ prefs
@@ -208,5 +212,5 @@
!ViewStyle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.18 1999-12-01 18:42:26 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.19 1999-12-01 19:19:11 cg Exp $'
! !