--- a/ViewStyle.st Tue Nov 17 10:50:38 2009 +0100
+++ b/ViewStyle.st Tue Nov 17 11:01:40 2009 +0100
@@ -56,7 +56,7 @@
fromFile:aFileNameArg
"get the preferences definitions from a file"
- |aFileName prefs failed nm dir path baseName|
+ |aFileName prefs failed nm nmInStyles dir path baseName|
aFileName := aFileNameArg asFilename.
(aFileName hasSuffix:'style') ifTrue:[
@@ -66,10 +66,19 @@
baseName := aFileName baseName.
nm := aFileName withSuffix:'style'.
].
+ nm isAbsolute ifFalse:[
+ nmInStyles := 'styles' asFilename / nm
+ ].
+
prefs := self new.
prefs at:#name put:baseName.
- path := Smalltalk getResourceFileName:nm forPackage:'stx:libview'.
+ nmInStyles notNil ifTrue:[
+ path := Smalltalk getResourceFileName:nmInStyles forPackage:'stx:libview'.
+ ].
+ path isNil ifTrue:[
+ path := Smalltalk getResourceFileName:nm forPackage:'stx:libview'.
+ ].
path notNil ifTrue:[
dir := path asFilename directory pathName.
].
@@ -278,5 +287,9 @@
!ViewStyle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.34 2008-10-24 13:18:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.35 2009-11-17 10:01:40 cg Exp $'
+!
+
+version_CVS
+ ^ '$Header: /cvs/stx/stx/libview/ViewStyle.st,v 1.35 2009-11-17 10:01:40 cg Exp $'
! !