--- a/FSelBox.st Tue Oct 21 20:28:05 1997 +0200
+++ b/FSelBox.st Tue Oct 21 20:32:56 1997 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 21-sep-1997 at 12:09:36 am' !
+'From Smalltalk/X, Version:3.2.1 on 19-oct-1997 at 2:50:05 pm' !
ListSelectionBox subclass:#FileSelectionBox
instanceVariableNames:'patternField selectingDirectory'
@@ -347,6 +347,7 @@
selectionList pattern:aPattern.
aPattern isNil ifTrue:[
patternField beInvisible.
+ self makeUntabable:patternField.
focusSequence := (Array
with:enterField
with:selectionList
@@ -354,6 +355,7 @@
with:abortButton)
] ifFalse:[
patternField beVisible.
+ self makeTabable:patternField before:enterField.
focusSequence := (Array
with:patternField
with:enterField
@@ -366,7 +368,7 @@
windowGroup focusSequence:focusSequence
].
- "Modified: 24.7.1997 / 15:12:32 / cg"
+ "Modified: 18.10.1997 / 03:02:05 / cg"
!
selectingDirectory:aBoolean
@@ -447,7 +449,8 @@
patternField leaveAction:[:reason | self patternChanged].
patternField crAction:[self patternChanged].
patternField hiddenOnRealize:true. "delay showing, until a pattern is defined"
- self makeTabable:patternField before:enterField.
+"/ no, since its invisible
+"/ self makeTabable:patternField before:enterField.
enterField addDependent:self.
@@ -456,7 +459,7 @@
FileSelectionBox new show
"
- "Modified: 4.6.1996 / 20:30:46 / cg"
+ "Modified: 18.10.1997 / 02:47:49 / cg"
!
postRealize
@@ -547,7 +550,7 @@
entry := selectionList selectionValue.
entry notNil ifTrue:[
- ((selectionList directory typeOf:entry) == #directory) ifFalse:[
+ ((selectionList directory asFilename construct:entry) isDirectory) ifFalse:[
selectingDirectory ifFalse:[
enterField contents:entry.
self okPressed
@@ -555,7 +558,7 @@
]
].
- "Modified: 18.4.1996 / 18:33:14 / cg"
+ "Modified: 19.10.1997 / 00:17:37 / cg"
!
okPressed
@@ -615,5 +618,5 @@
!FileSelectionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.45 1997-09-21 18:11:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/FSelBox.st,v 1.46 1997-10-21 18:32:14 cg Exp $'
! !
--- a/FileSelectionBox.st Tue Oct 21 20:28:05 1997 +0200
+++ b/FileSelectionBox.st Tue Oct 21 20:32:56 1997 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.10 on 21-sep-1997 at 12:09:36 am' !
+'From Smalltalk/X, Version:3.2.1 on 19-oct-1997 at 2:50:05 pm' !
ListSelectionBox subclass:#FileSelectionBox
instanceVariableNames:'patternField selectingDirectory'
@@ -347,6 +347,7 @@
selectionList pattern:aPattern.
aPattern isNil ifTrue:[
patternField beInvisible.
+ self makeUntabable:patternField.
focusSequence := (Array
with:enterField
with:selectionList
@@ -354,6 +355,7 @@
with:abortButton)
] ifFalse:[
patternField beVisible.
+ self makeTabable:patternField before:enterField.
focusSequence := (Array
with:patternField
with:enterField
@@ -366,7 +368,7 @@
windowGroup focusSequence:focusSequence
].
- "Modified: 24.7.1997 / 15:12:32 / cg"
+ "Modified: 18.10.1997 / 03:02:05 / cg"
!
selectingDirectory:aBoolean
@@ -447,7 +449,8 @@
patternField leaveAction:[:reason | self patternChanged].
patternField crAction:[self patternChanged].
patternField hiddenOnRealize:true. "delay showing, until a pattern is defined"
- self makeTabable:patternField before:enterField.
+"/ no, since its invisible
+"/ self makeTabable:patternField before:enterField.
enterField addDependent:self.
@@ -456,7 +459,7 @@
FileSelectionBox new show
"
- "Modified: 4.6.1996 / 20:30:46 / cg"
+ "Modified: 18.10.1997 / 02:47:49 / cg"
!
postRealize
@@ -547,7 +550,7 @@
entry := selectionList selectionValue.
entry notNil ifTrue:[
- ((selectionList directory typeOf:entry) == #directory) ifFalse:[
+ ((selectionList directory asFilename construct:entry) isDirectory) ifFalse:[
selectingDirectory ifFalse:[
enterField contents:entry.
self okPressed
@@ -555,7 +558,7 @@
]
].
- "Modified: 18.4.1996 / 18:33:14 / cg"
+ "Modified: 19.10.1997 / 00:17:37 / cg"
!
okPressed
@@ -615,5 +618,5 @@
!FileSelectionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.45 1997-09-21 18:11:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/FileSelectionBox.st,v 1.46 1997-10-21 18:32:14 cg Exp $'
! !
--- a/Label.st Tue Oct 21 20:28:05 1997 +0200
+++ b/Label.st Tue Oct 21 20:32:56 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:09:54 pm' !
+
View subclass:#Label
instanceVariableNames:'logo labelWidth labelHeight labelOriginX labelOriginY adjust
hSpace vSpace bgColor fgColor fixSize labelMsg converter
@@ -815,25 +817,25 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#labelForegroundColor #labelBackgroundColor
+ <resource: #style (#'label.foregroundColor' #'label.backgroundColor'
#foregroundColor #backgroundColor
- #labelFont)>
+ #'label.font')>
- DefaultForegroundColor := StyleSheet colorAt:'labelForegroundColor'.
+ DefaultForegroundColor := StyleSheet colorAt:'label.foregroundColor'.
DefaultForegroundColor isNil ifTrue:[
DefaultForegroundColor := StyleSheet colorAt:'foregroundColor' default:Black.
].
- DefaultBackgroundColor := StyleSheet colorAt:'labelBackgroundColor'.
+ DefaultBackgroundColor := StyleSheet colorAt:'label.backgroundColor'.
DefaultBackgroundColor isNil ifTrue:[
DefaultBackgroundColor := StyleSheet colorAt:'backgroundColor'.
].
- DefaultFont := StyleSheet fontAt:'labelFont'.
+ DefaultFont := StyleSheet fontAt:'label.font'.
"
self updateStyleCache
"
- "Modified: 1.3.1996 / 13:45:36 / cg"
+ "Modified: 20.10.1997 / 13:55:25 / cg"
! !
!Label methodsFor:'accessing-channels'!
@@ -1664,5 +1666,5 @@
!Label class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.81 1997-07-31 21:12:17 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.82 1997-10-21 18:32:15 cg Exp $'
! !
--- a/MenuView.st Tue Oct 21 20:28:05 1997 +0200
+++ b/MenuView.st Tue Oct 21 20:32:56 1997 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.2.1 on 14-oct-1997 at 12:06:49 am' !
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:10:10 pm' !
SelectionInListView subclass:#MenuView
instanceVariableNames:'selectors args receiver enableFlags disabledFgColor onOffFlags
@@ -311,35 +311,35 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#menuForegroundColor #menuBackgroundColor
- #menuViewBackground
- #menuShadowColor #menuLightColor
- #menuHilightForegroundColor #menuHilightBackgroundColor
- #menuHilightFrameColor #selectionHilightFrameColor
- #menuHilightLevel #menuHilightStyle
- #menuSeparatingLineLevel #menuSeparatingLineInset
- #menuDisabledForegroundColor #menuCheckColor
- #menuFont #menuShowAccelerators)>
-
- DefaultViewBackground := StyleSheet colorAt:'menuViewBackground'.
- DefaultForegroundColor := StyleSheet colorAt:'menuForegroundColor'.
- DefaultBackgroundColor := StyleSheet colorAt:'menuBackgroundColor'.
- DefaultShadowColor := StyleSheet colorAt:'menuShadowColor'.
- DefaultLightColor := StyleSheet colorAt:'menuLightColor'.
- DefaultHilightForegroundColor := StyleSheet colorAt:'menuHilightForegroundColor'.
- DefaultHilightBackgroundColor := StyleSheet colorAt:'menuHilightBackgroundColor'.
- DefaultHilightFrameColor := StyleSheet colorAt:'menuHilightFrameColor'
- default:(StyleSheet colorAt:'selectionHilightFrameColor').
- DefaultHilightLevel := StyleSheet at:'menuHilightLevel'.
- DefaultHilightStyle := StyleSheet at:'menuHilightStyle'.
- DefaultLineLevel := StyleSheet at:'menuSeparatingLineLevel'.
- DefaultLineInset := StyleSheet at:'menuSeparatingLineInset'.
- DefaultDisabledForegroundColor := StyleSheet colorAt:'menuDisabledForegroundColor' default:Color darkGray.
- DefaultCheckColor := StyleSheet colorAt:'menuCheckColor'.
- DefaultFont := StyleSheet fontAt:'menuFont'.
- ShowAcceleratorKeys := StyleSheet at:'menuShowAccelerators' default:true.
-
- "Modified: 28.5.1996 / 20:47:31 / cg"
+ <resource: #style (#'menu.foregroundColor' #'menu.backgroundColor'
+ #'menu.viewBackground'
+ #'menu.shadowColor' #'menu.lightColor'
+ #'menu.hilightForegroundColor' #'menu.hilightBackgroundColor'
+ #'menu.hilightFrameColor' #'selection.hilightFrameColor'
+ #'menu.hilightLevel' #'menu.hilightStyle'
+ #'menu.separatingLineLevel' #'menu.separatingLineInset'
+ #'menu.disabledForegroundColor' #'menu.checkColor'
+ #'menu.font' #'menu.showAccelerators')>
+
+ DefaultViewBackground := StyleSheet colorAt:'menu.viewBackground'.
+ DefaultForegroundColor := StyleSheet colorAt:'menu.foregroundColor'.
+ DefaultBackgroundColor := StyleSheet colorAt:'menu.backgroundColor'.
+ DefaultShadowColor := StyleSheet colorAt:'menu.shadowColor'.
+ DefaultLightColor := StyleSheet colorAt:'menu.lightColor'.
+ DefaultHilightForegroundColor := StyleSheet colorAt:'menu.hilightForegroundColor'.
+ DefaultHilightBackgroundColor := StyleSheet colorAt:'menu.hilightBackgroundColor'.
+ DefaultHilightFrameColor := StyleSheet colorAt:'menu.hilightFrameColor'
+ default:(StyleSheet colorAt:'selection.hilightFrameColor').
+ DefaultHilightLevel := StyleSheet at:'menu.hilightLevel'.
+ DefaultHilightStyle := StyleSheet at:'menu.hilightStyle'.
+ DefaultLineLevel := StyleSheet at:'menu.separatingLineLevel'.
+ DefaultLineInset := StyleSheet at:'menu.separatingLineInset'.
+ DefaultDisabledForegroundColor := StyleSheet colorAt:'menu.disabledForegroundColor' default:Color darkGray.
+ DefaultCheckColor := StyleSheet colorAt:'menu.checkColor'.
+ DefaultFont := StyleSheet fontAt:'menu.font'.
+ ShowAcceleratorKeys := StyleSheet at:'menu.showAccelerators' default:true.
+
+ "Modified: 20.10.1997 / 13:58:05 / cg"
! !
!MenuView methodsFor:'accessing-behavior'!
@@ -2647,5 +2647,5 @@
!MenuView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.108 1997-10-16 14:44:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.109 1997-10-21 18:32:56 cg Exp $'
! !