--- a/ArrButton.st Tue Oct 21 20:15:06 1997 +0200
+++ b/ArrButton.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:08:27 pm' !
+
Button subclass:#ArrowButton
instanceVariableNames:'arrowStyle direction'
classVariableNames:'DownArrowForm UpArrowForm LeftArrowForm RightArrowForm
@@ -615,48 +617,48 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#arrowButtonStyle
- #arrowButtonActiveLevel #arrowButtonPassiveLevel
- #arrowButtonBackgroundColor #arrowButtonForegroundColor
- #arrowButtonActiveBackgroundColor #arrowButtonActiveForegroundColor
- #arrowButtonEnteredBackgroundColor #arrowButtonEnteredForegroundColor
- #arrowButtonDisabledForegroundColor
- #arrowButtonDownForm #arrowButtonUpForm
- #arrowButtonLeftForm #arrowButtonRightForm
- #arrowButtonDownFormFile #arrowButtonUpFormFile
- #arrowButtonLeftFormFile #arrowButtonRightFormFile)>
+ <resource: #style (#'arrowButton.style'
+ #'arrowButton.activeLevel' #'arrowButton.passiveLevel'
+ #'arrowButton.backgroundColor' #'arrowButton.foregroundColor'
+ #'arrowButton.activeBackgroundColor' #'arrowButton.activeForegroundColor'
+ #'arrowButton.enteredBackgroundColor' #'arrowButton.enteredForegroundColor'
+ #'arrowButton.disabledForegroundColor'
+ #'arrowButton.downForm' #'arrowButton.upForm'
+ #'arrowButton.leftForm' #'arrowButton.rightForm'
+ #'arrowButton.downFormFile' #'arrowButton.upFormFile'
+ #'arrowButton.leftFormFile' #'arrowButton.rightFormFile')>
- DefaultArrowStyle := StyleSheet at:'arrowButtonStyle' default:StyleSheet name.
+ DefaultArrowStyle := StyleSheet at:'arrowButton.style' default:StyleSheet name.
DefaultArrowStyle := DefaultArrowStyle asSymbol.
- DefaultArrowButtonActiveLevel := StyleSheet at:'arrowButtonActiveLevel' default:nil.
- DefaultArrowButtonPassiveLevel := StyleSheet at:'arrowButtonPassiveLevel' default:nil.
+ DefaultArrowButtonActiveLevel := StyleSheet at:'arrowButton.activeLevel' default:nil.
+ DefaultArrowButtonPassiveLevel := StyleSheet at:'arrowButton.passiveLevel' default:nil.
- DefaultBackgroundColor := StyleSheet colorAt:'arrowButtonBackgroundColor'.
- DefaultForegroundColor := StyleSheet colorAt:'arrowButtonForegroundColor'.
- DefaultActiveBackgroundColor := StyleSheet colorAt:'arrowButtonActiveBackgroundColor'.
- DefaultActiveForegroundColor := StyleSheet colorAt:'arrowButtonActiveForegroundColor'.
- DefaultEnteredBackgroundColor := StyleSheet colorAt:'arrowButtonEnteredBackgroundColor'.
- DefaultEnteredForegroundColor := StyleSheet colorAt:'arrowButtonEnteredForegroundColor'.
- DefaultDisabledForegroundColor := StyleSheet colorAt:'arrowButtonDisabledForegroundColor'.
+ DefaultBackgroundColor := StyleSheet colorAt:'arrowButton.backgroundColor'.
+ DefaultForegroundColor := StyleSheet colorAt:'arrowButton.foregroundColor'.
+ DefaultActiveBackgroundColor := StyleSheet colorAt:'arrowButton.activeBackgroundColor'.
+ DefaultActiveForegroundColor := StyleSheet colorAt:'arrowButton.activeForegroundColor'.
+ DefaultEnteredBackgroundColor := StyleSheet colorAt:'arrowButton.enteredBackgroundColor'.
+ DefaultEnteredForegroundColor := StyleSheet colorAt:'arrowButton.enteredForegroundColor'.
+ DefaultDisabledForegroundColor := StyleSheet colorAt:'arrowButton.disabledForegroundColor'.
- DownArrowForm := StyleSheet at:'arrowButtonDownForm' default:nil.
- UpArrowForm := StyleSheet at:'arrowButtonUpForm' default:nil.
- LeftArrowForm := StyleSheet at:'arrowButtonLeftForm' default:nil.
- RightArrowForm := StyleSheet at:'arrowButtonRightForm' default:nil.
+ DownArrowForm := StyleSheet at:'arrowButton.downForm' default:nil.
+ UpArrowForm := StyleSheet at:'arrowButton.upForm' default:nil.
+ LeftArrowForm := StyleSheet at:'arrowButton.leftForm' default:nil.
+ RightArrowForm := StyleSheet at:'arrowButton.rightForm' default:nil.
UpArrowFormFile := DownArrowFormFile := LeftArrowFormFile := RightArrowFormFile := nil.
UpArrowForm isNil ifTrue:[
- UpArrowFormFile := StyleSheet at:'arrowButtonUpFormFile' default:'ScrollUp.xbm'.
+ UpArrowFormFile := StyleSheet at:'arrowButton.upFormFile' default:'ScrollUp.xbm'.
].
DownArrowForm isNil ifTrue:[
- DownArrowFormFile := StyleSheet at:'arrowButtonDownFormFile' default:'ScrollDn.xbm'.
+ DownArrowFormFile := StyleSheet at:'arrowButton.downFormFile' default:'ScrollDn.xbm'.
].
LeftArrowForm isNil ifTrue:[
- LeftArrowFormFile := StyleSheet at:'arrowButtonLeftFormFile' default:'ScrollLt.xbm'.
+ LeftArrowFormFile := StyleSheet at:'arrowButton.leftFormFile' default:'ScrollLt.xbm'.
].
RightArrowForm isNil ifTrue:[
- RightArrowFormFile := StyleSheet at:'arrowButtonRightFormFile' default:'ScrollRt.xbm'.
+ RightArrowFormFile := StyleSheet at:'arrowButton.rightFormFile' default:'ScrollRt.xbm'.
].
"
@@ -664,7 +666,7 @@
"
"Modified: 31.8.1995 / 03:01:14 / claus"
- "Modified: 1.3.1996 / 13:45:57 / cg"
+ "Modified: 20.10.1997 / 13:50:57 / cg"
! !
!ArrowButton methodsFor:'accessing'!
@@ -868,5 +870,5 @@
!ArrowButton class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/ArrButton.st,v 1.44 1997-09-10 21:07:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/ArrButton.st,v 1.45 1997-10-21 18:27:09 cg Exp $'
! !
--- a/ArrowButton.st Tue Oct 21 20:15:06 1997 +0200
+++ b/ArrowButton.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:08:27 pm' !
+
Button subclass:#ArrowButton
instanceVariableNames:'arrowStyle direction'
classVariableNames:'DownArrowForm UpArrowForm LeftArrowForm RightArrowForm
@@ -615,48 +617,48 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#arrowButtonStyle
- #arrowButtonActiveLevel #arrowButtonPassiveLevel
- #arrowButtonBackgroundColor #arrowButtonForegroundColor
- #arrowButtonActiveBackgroundColor #arrowButtonActiveForegroundColor
- #arrowButtonEnteredBackgroundColor #arrowButtonEnteredForegroundColor
- #arrowButtonDisabledForegroundColor
- #arrowButtonDownForm #arrowButtonUpForm
- #arrowButtonLeftForm #arrowButtonRightForm
- #arrowButtonDownFormFile #arrowButtonUpFormFile
- #arrowButtonLeftFormFile #arrowButtonRightFormFile)>
+ <resource: #style (#'arrowButton.style'
+ #'arrowButton.activeLevel' #'arrowButton.passiveLevel'
+ #'arrowButton.backgroundColor' #'arrowButton.foregroundColor'
+ #'arrowButton.activeBackgroundColor' #'arrowButton.activeForegroundColor'
+ #'arrowButton.enteredBackgroundColor' #'arrowButton.enteredForegroundColor'
+ #'arrowButton.disabledForegroundColor'
+ #'arrowButton.downForm' #'arrowButton.upForm'
+ #'arrowButton.leftForm' #'arrowButton.rightForm'
+ #'arrowButton.downFormFile' #'arrowButton.upFormFile'
+ #'arrowButton.leftFormFile' #'arrowButton.rightFormFile')>
- DefaultArrowStyle := StyleSheet at:'arrowButtonStyle' default:StyleSheet name.
+ DefaultArrowStyle := StyleSheet at:'arrowButton.style' default:StyleSheet name.
DefaultArrowStyle := DefaultArrowStyle asSymbol.
- DefaultArrowButtonActiveLevel := StyleSheet at:'arrowButtonActiveLevel' default:nil.
- DefaultArrowButtonPassiveLevel := StyleSheet at:'arrowButtonPassiveLevel' default:nil.
+ DefaultArrowButtonActiveLevel := StyleSheet at:'arrowButton.activeLevel' default:nil.
+ DefaultArrowButtonPassiveLevel := StyleSheet at:'arrowButton.passiveLevel' default:nil.
- DefaultBackgroundColor := StyleSheet colorAt:'arrowButtonBackgroundColor'.
- DefaultForegroundColor := StyleSheet colorAt:'arrowButtonForegroundColor'.
- DefaultActiveBackgroundColor := StyleSheet colorAt:'arrowButtonActiveBackgroundColor'.
- DefaultActiveForegroundColor := StyleSheet colorAt:'arrowButtonActiveForegroundColor'.
- DefaultEnteredBackgroundColor := StyleSheet colorAt:'arrowButtonEnteredBackgroundColor'.
- DefaultEnteredForegroundColor := StyleSheet colorAt:'arrowButtonEnteredForegroundColor'.
- DefaultDisabledForegroundColor := StyleSheet colorAt:'arrowButtonDisabledForegroundColor'.
+ DefaultBackgroundColor := StyleSheet colorAt:'arrowButton.backgroundColor'.
+ DefaultForegroundColor := StyleSheet colorAt:'arrowButton.foregroundColor'.
+ DefaultActiveBackgroundColor := StyleSheet colorAt:'arrowButton.activeBackgroundColor'.
+ DefaultActiveForegroundColor := StyleSheet colorAt:'arrowButton.activeForegroundColor'.
+ DefaultEnteredBackgroundColor := StyleSheet colorAt:'arrowButton.enteredBackgroundColor'.
+ DefaultEnteredForegroundColor := StyleSheet colorAt:'arrowButton.enteredForegroundColor'.
+ DefaultDisabledForegroundColor := StyleSheet colorAt:'arrowButton.disabledForegroundColor'.
- DownArrowForm := StyleSheet at:'arrowButtonDownForm' default:nil.
- UpArrowForm := StyleSheet at:'arrowButtonUpForm' default:nil.
- LeftArrowForm := StyleSheet at:'arrowButtonLeftForm' default:nil.
- RightArrowForm := StyleSheet at:'arrowButtonRightForm' default:nil.
+ DownArrowForm := StyleSheet at:'arrowButton.downForm' default:nil.
+ UpArrowForm := StyleSheet at:'arrowButton.upForm' default:nil.
+ LeftArrowForm := StyleSheet at:'arrowButton.leftForm' default:nil.
+ RightArrowForm := StyleSheet at:'arrowButton.rightForm' default:nil.
UpArrowFormFile := DownArrowFormFile := LeftArrowFormFile := RightArrowFormFile := nil.
UpArrowForm isNil ifTrue:[
- UpArrowFormFile := StyleSheet at:'arrowButtonUpFormFile' default:'ScrollUp.xbm'.
+ UpArrowFormFile := StyleSheet at:'arrowButton.upFormFile' default:'ScrollUp.xbm'.
].
DownArrowForm isNil ifTrue:[
- DownArrowFormFile := StyleSheet at:'arrowButtonDownFormFile' default:'ScrollDn.xbm'.
+ DownArrowFormFile := StyleSheet at:'arrowButton.downFormFile' default:'ScrollDn.xbm'.
].
LeftArrowForm isNil ifTrue:[
- LeftArrowFormFile := StyleSheet at:'arrowButtonLeftFormFile' default:'ScrollLt.xbm'.
+ LeftArrowFormFile := StyleSheet at:'arrowButton.leftFormFile' default:'ScrollLt.xbm'.
].
RightArrowForm isNil ifTrue:[
- RightArrowFormFile := StyleSheet at:'arrowButtonRightFormFile' default:'ScrollRt.xbm'.
+ RightArrowFormFile := StyleSheet at:'arrowButton.rightFormFile' default:'ScrollRt.xbm'.
].
"
@@ -664,7 +666,7 @@
"
"Modified: 31.8.1995 / 03:01:14 / claus"
- "Modified: 1.3.1996 / 13:45:57 / cg"
+ "Modified: 20.10.1997 / 13:50:57 / cg"
! !
!ArrowButton methodsFor:'accessing'!
@@ -868,5 +870,5 @@
!ArrowButton class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.44 1997-09-10 21:07:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ArrowButton.st,v 1.45 1997-10-21 18:27:09 cg Exp $'
! !
--- a/Button.st Tue Oct 21 20:15:06 1997 +0200
+++ b/Button.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:08:44 pm' !
+
Label subclass:#Button
instanceVariableNames:'activeLogo passiveLogo disabledLogo focusLogo onLevel offLevel
disabledFgColor activeFgColor activeBgColor enteredFgColor
@@ -960,16 +962,16 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#buttonEdgeStyle #buttonFont #buttonBorderWidth
- #buttonActiveLevel #buttonPassiveLevel
- #buttonBackgroundColor #buttonForegroundColor
- #buttonActiveBackgroundColor #buttonActiveForegroundColor
- #buttonEnteredBackgroundColor #buttonEnteredForegroundColor
- #buttonDisabledForegroundColor #buttonDisabledBackgroundColor
- #buttonReturnButtonHasImage
- #buttonReturnButtonHasBorder
- #buttonShadowColor #buttonLightColor
- #buttonHalfShadowColor #buttonHalfLightColor)>
+ <resource: #style (#'button.edgeStyle' #'button.font' #'button.borderWidth'
+ #'button.activeLevel' #'button.passiveLevel'
+ #'button.backgroundColor' #'button.foregroundColor'
+ #'button.activeBackgroundColor' #'button.activeForegroundColor'
+ #'button.enteredBackgroundColor' #'button.enteredForegroundColor'
+ #'button.disabledForegroundColor' #'button.disabledBackgroundColor'
+ #'button.returnButtonHasImage'
+ #'button.returnButtonHasBorder'
+ #'button.shadowColor' #'button.lightColor'
+ #'button.halfShadowColor' #'button.halfLightColor')>
|defaultLevel|
@@ -978,28 +980,28 @@
] ifFalse:[
defaultLevel := 0
].
- DefaultActiveLevel := StyleSheet at:'buttonActiveLevel' default:(defaultLevel negated).
- DefaultPassiveLevel := StyleSheet at:'buttonPassiveLevel' default:defaultLevel.
-
- DefaultEdgeStyle := StyleSheet at:'buttonEdgeStyle'.
- DefaultFont := StyleSheet fontAt:'buttonFont'.
- DefaultBorderWidth := StyleSheet at:'buttonBorderWidth'.
- DefaultForegroundColor := StyleSheet colorAt:'buttonForegroundColor'.
- DefaultBackgroundColor := StyleSheet colorAt:'buttonBackgroundColor'.
- DefaultDisabledForegroundColor := StyleSheet colorAt:'buttonDisabledForegroundColor' default:Color gray.
- DefaultDisabledBackgroundColor := StyleSheet colorAt:'buttonDisabledBackgroundColor'.
- DefaultEnteredForegroundColor := StyleSheet colorAt:'buttonEnteredForegroundColor'.
- DefaultEnteredBackgroundColor := StyleSheet colorAt:'buttonEnteredBackgroundColor'.
- DefaultActiveForegroundColor := StyleSheet colorAt:'buttonActiveForegroundColor'.
- DefaultActiveBackgroundColor := StyleSheet colorAt:'buttonActiveBackgroundColor'.
- DefaultReturnButtonHasImage := StyleSheet at:'buttonReturnButtonHasImage' default:true.
- DefaultReturnButtonHasBorder := StyleSheet at:'buttonReturnButtonHasBorder' default:false.
- DefaultShadowColor := StyleSheet colorAt:'buttonShadowColor'.
- DefaultLightColor := StyleSheet colorAt:'buttonLightColor'.
- DefaultHalfShadowColor := StyleSheet colorAt:'buttonHalfShadowColor'.
- DefaultHalfLightColor := StyleSheet colorAt:'buttonHalfLightColor'.
-
- "Modified: 2.5.1996 / 11:37:43 / cg"
+ DefaultActiveLevel := StyleSheet at:'button.activeLevel' default:(defaultLevel negated).
+ DefaultPassiveLevel := StyleSheet at:'button.passiveLevel' default:defaultLevel.
+
+ DefaultEdgeStyle := StyleSheet at:'button.edgeStyle'.
+ DefaultFont := StyleSheet fontAt:'button.font'.
+ DefaultBorderWidth := StyleSheet at:'button.borderWidth'.
+ DefaultForegroundColor := StyleSheet colorAt:'button.foregroundColor'.
+ DefaultBackgroundColor := StyleSheet colorAt:'button.backgroundColor'.
+ DefaultDisabledForegroundColor := StyleSheet colorAt:'button.disabledForegroundColor' default:Color gray.
+ DefaultDisabledBackgroundColor := StyleSheet colorAt:'button.disabledBackgroundColor'.
+ DefaultEnteredForegroundColor := StyleSheet colorAt:'button.enteredForegroundColor'.
+ DefaultEnteredBackgroundColor := StyleSheet colorAt:'button.enteredBackgroundColor'.
+ DefaultActiveForegroundColor := StyleSheet colorAt:'button.activeForegroundColor'.
+ DefaultActiveBackgroundColor := StyleSheet colorAt:'button.activeBackgroundColor'.
+ DefaultReturnButtonHasImage := StyleSheet at:'button.returnButtonHasImage' default:true.
+ DefaultReturnButtonHasBorder := StyleSheet at:'button.returnButtonHasBorder' default:false.
+ DefaultShadowColor := StyleSheet colorAt:'button.shadowColor'.
+ DefaultLightColor := StyleSheet colorAt:'button.lightColor'.
+ DefaultHalfShadowColor := StyleSheet colorAt:'button.halfShadowColor'.
+ DefaultHalfLightColor := StyleSheet colorAt:'button.halfLightColor'.
+
+ "Modified: 20.10.1997 / 13:49:41 / cg"
! !
!Button methodsFor:'accessing-behavior'!
@@ -2179,5 +2181,5 @@
!Button class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.87 1997-07-24 12:59:37 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.88 1997-10-21 18:27:10 cg Exp $'
! !
--- a/ChckTggle.st Tue Oct 21 20:15:06 1997 +0200
+++ b/ChckTggle.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:09:21 pm' !
+
Toggle subclass:#CheckToggle
instanceVariableNames:''
classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
@@ -362,29 +364,29 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#checkToggleCheckColor
- #checkToggleBackgroundColor #checkToggleForegroundColor
- #checkToggleActiveBackgroundColor #checkToggleActiveForegroundColor
- #checkToggleActiveLevel #checkTogglePassiveLevel
- #checkToggleBorderWidth
- #checkToggleBitmapFile
- #checkToggleLabelOverMargin
- #checkToggleStyle)>
+ <resource: #style (#'checkToggle.checkColor'
+ #'checkToggle.backgroundColor' #'checkToggleForegroundColor'
+ #'checkToggle.activeBackgroundColor' #'checkToggleActiveForegroundColor'
+ #'checkToggle.activeLevel' #'checkTogglePassiveLevel'
+ #'checkToggle.borderWidth'
+ #'checkToggle.bitmapFile'
+ #'checkToggle.labelOverMargin'
+ #'checkToggle.style')>
|checkFileName checkStyle|
- DefaultCheckColor := StyleSheet colorAt:'checkToggleCheckColor'.
- DefaultFGColor := StyleSheet colorAt:'checkToggleForegroundColor'.
- DefaultBGColor := StyleSheet colorAt:'checkToggleBackgroundColor'.
- DefaultActiveFGColor := StyleSheet colorAt:'checkToggleActiveForegroundColor'.
- DefaultActiveBGColor := StyleSheet colorAt:'checkToggleActiveBackgroundColor'.
- DefaultActiveLevel := StyleSheet at:'checkToggleActiveLevel'.
- DefaultPassiveLevel := StyleSheet at:'checkTogglePassiveLevel'.
- DefaultBorderWidth := StyleSheet at:'checkToggleBorderWidth'.
- LabelOverMargin := StyleSheet at:'checkToggleLabelOverMargin' default:false.
+ DefaultCheckColor := StyleSheet colorAt:'checkToggle.checkColor'.
+ DefaultFGColor := StyleSheet colorAt:'checkToggle.foregroundColor'.
+ DefaultBGColor := StyleSheet colorAt:'checkToggle.backgroundColor'.
+ DefaultActiveFGColor := StyleSheet colorAt:'checkToggle.activeForegroundColor'.
+ DefaultActiveBGColor := StyleSheet colorAt:'checkToggle.activeBackgroundColor'.
+ DefaultActiveLevel := StyleSheet at:'checkToggle.activeLevel'.
+ DefaultPassiveLevel := StyleSheet at:'checkToggle.passiveLevel'.
+ DefaultBorderWidth := StyleSheet at:'checkToggle.borderWidth'.
+ LabelOverMargin := StyleSheet at:'checkToggle.labelOverMargin' default:false.
DefaultCheckForm := nil.
- checkFileName := StyleSheet at:'checkToggleBitmapFile' default:'CheckOn.xbm'.
+ checkFileName := StyleSheet at:'checkToggle.bitmapFile' default:'CheckOn.xbm'.
checkFileName notNil ifTrue:[
DefaultCheckForm := Image fromFile:checkFileName
resolution:100
@@ -396,7 +398,7 @@
]
].
DefaultCheckForm isNil ifTrue:[
- checkStyle := StyleSheet at:'checkToggleStyle' default:#check.
+ checkStyle := StyleSheet at:'checkToggle.style' default:#check.
DefaultCheckForm := self checkImageForStyle:checkStyle
]
@@ -404,7 +406,7 @@
self updateStyleCache
"
- "Modified: 7.3.1997 / 21:15:13 / cg"
+ "Modified: 20.10.1997 / 13:53:33 / cg"
! !
!CheckToggle methodsFor:'initialization'!
@@ -513,5 +515,5 @@
!CheckToggle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.38 1997-09-08 18:32:28 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.39 1997-10-21 18:27:22 cg Exp $'
! !
--- a/CheckToggle.st Tue Oct 21 20:15:06 1997 +0200
+++ b/CheckToggle.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:09:21 pm' !
+
Toggle subclass:#CheckToggle
instanceVariableNames:''
classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
@@ -362,29 +364,29 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#checkToggleCheckColor
- #checkToggleBackgroundColor #checkToggleForegroundColor
- #checkToggleActiveBackgroundColor #checkToggleActiveForegroundColor
- #checkToggleActiveLevel #checkTogglePassiveLevel
- #checkToggleBorderWidth
- #checkToggleBitmapFile
- #checkToggleLabelOverMargin
- #checkToggleStyle)>
+ <resource: #style (#'checkToggle.checkColor'
+ #'checkToggle.backgroundColor' #'checkToggleForegroundColor'
+ #'checkToggle.activeBackgroundColor' #'checkToggleActiveForegroundColor'
+ #'checkToggle.activeLevel' #'checkTogglePassiveLevel'
+ #'checkToggle.borderWidth'
+ #'checkToggle.bitmapFile'
+ #'checkToggle.labelOverMargin'
+ #'checkToggle.style')>
|checkFileName checkStyle|
- DefaultCheckColor := StyleSheet colorAt:'checkToggleCheckColor'.
- DefaultFGColor := StyleSheet colorAt:'checkToggleForegroundColor'.
- DefaultBGColor := StyleSheet colorAt:'checkToggleBackgroundColor'.
- DefaultActiveFGColor := StyleSheet colorAt:'checkToggleActiveForegroundColor'.
- DefaultActiveBGColor := StyleSheet colorAt:'checkToggleActiveBackgroundColor'.
- DefaultActiveLevel := StyleSheet at:'checkToggleActiveLevel'.
- DefaultPassiveLevel := StyleSheet at:'checkTogglePassiveLevel'.
- DefaultBorderWidth := StyleSheet at:'checkToggleBorderWidth'.
- LabelOverMargin := StyleSheet at:'checkToggleLabelOverMargin' default:false.
+ DefaultCheckColor := StyleSheet colorAt:'checkToggle.checkColor'.
+ DefaultFGColor := StyleSheet colorAt:'checkToggle.foregroundColor'.
+ DefaultBGColor := StyleSheet colorAt:'checkToggle.backgroundColor'.
+ DefaultActiveFGColor := StyleSheet colorAt:'checkToggle.activeForegroundColor'.
+ DefaultActiveBGColor := StyleSheet colorAt:'checkToggle.activeBackgroundColor'.
+ DefaultActiveLevel := StyleSheet at:'checkToggle.activeLevel'.
+ DefaultPassiveLevel := StyleSheet at:'checkToggle.passiveLevel'.
+ DefaultBorderWidth := StyleSheet at:'checkToggle.borderWidth'.
+ LabelOverMargin := StyleSheet at:'checkToggle.labelOverMargin' default:false.
DefaultCheckForm := nil.
- checkFileName := StyleSheet at:'checkToggleBitmapFile' default:'CheckOn.xbm'.
+ checkFileName := StyleSheet at:'checkToggle.bitmapFile' default:'CheckOn.xbm'.
checkFileName notNil ifTrue:[
DefaultCheckForm := Image fromFile:checkFileName
resolution:100
@@ -396,7 +398,7 @@
]
].
DefaultCheckForm isNil ifTrue:[
- checkStyle := StyleSheet at:'checkToggleStyle' default:#check.
+ checkStyle := StyleSheet at:'checkToggle.style' default:#check.
DefaultCheckForm := self checkImageForStyle:checkStyle
]
@@ -404,7 +406,7 @@
self updateStyleCache
"
- "Modified: 7.3.1997 / 21:15:13 / cg"
+ "Modified: 20.10.1997 / 13:53:33 / cg"
! !
!CheckToggle methodsFor:'initialization'!
@@ -513,5 +515,5 @@
!CheckToggle class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.38 1997-09-08 18:32:28 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.39 1997-10-21 18:27:22 cg Exp $'
! !
--- a/DialogBox.st Tue Oct 21 20:15:06 1997 +0200
+++ b/DialogBox.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,7 +10,7 @@
hereby transferred.
"
-'From Smalltalk/X, Version:3.1.9 on 8-sep-1997 at 12:44:02 am' !
+'From Smalltalk/X, Version:3.2.1 on 18-oct-1997 at 3:24:10 pm' !
ModalBox subclass:#DialogBox
instanceVariableNames:'buttonPanel okButton okAction abortButton abortAction
@@ -2691,10 +2691,22 @@
].
(aComponentOrSubcomponent isInputField) ifTrue:[
- self addToInputFieldGroup:aComponentOrSubcomponent
+ self addToInputFieldGroup:aComponentOrSubcomponent before:anotherComponent
].
- "Modified: 1.2.1997 / 12:05:10 / cg"
+ "Modified: 18.10.1997 / 03:08:20 / cg"
+!
+
+makeUntabable:aComponentOrSubcomponent
+ (tabableElements includesIdentical:aComponentOrSubcomponent) ifFalse:[
+ tabableElements removeIdentical:aComponentOrSubcomponent.
+
+ (aComponentOrSubcomponent isInputField) ifTrue:[
+ self removeFromInputFieldGroup:aComponentOrSubcomponent
+ ].
+ ].
+
+ "Modified: 18.10.1997 / 02:50:05 / cg"
!
okAction:aBlock
@@ -3289,12 +3301,23 @@
The argument, aComponentOrSubcomponent may even be a nested subcomponent of
a topLevel component."
+ self
+ addToInputFieldGroup:aComponentOrSubcomponent before:nil
+
+ "Modified: 18.10.1997 / 03:09:17 / cg"
+!
+
+addToInputFieldGroup:aComponentOrSubcomponent before:anotherComponent
+ "add a component to the input group.
+ The argument, aComponentOrSubcomponent may even be a nested subcomponent of
+ a topLevel component."
+
inputFieldGroup isNil ifTrue:[
inputFieldGroup := EnterFieldGroup new.
inputFieldGroup leaveAction:[self lastFieldLeft].
aComponentOrSubcomponent hasKeyboardFocus:true.
].
- inputFieldGroup add:aComponentOrSubcomponent.
+ inputFieldGroup add:aComponentOrSubcomponent before:anotherComponent.
self delegate:(KeyboardForwarder to:inputFieldGroup condition:#noFocus).
"/ inputFields isNil ifTrue:[
@@ -3310,8 +3333,19 @@
"/ ].
"/ inputFields add:aComponentOrSubcomponent
- "Created: 9.2.1996 / 20:23:04 / cg"
- "Modified: 31.5.1996 / 21:30:56 / cg"
+ "Modified: 18.10.1997 / 02:47:20 / cg"
+ "Created: 18.10.1997 / 03:08:51 / cg"
+!
+
+removeFromInputFieldGroup:aComponentOrSubcomponent
+ "remove a component from the input group.
+ The argument, aComponentOrSubcomponent may even be a nested subcomponent of
+ a topLevel component."
+
+ inputFieldGroup isNil ifTrue:[^ self].
+ inputFieldGroup remove:aComponentOrSubcomponent.
+
+ "Created: 18.10.1997 / 02:51:30 / cg"
! !
!DialogBox methodsFor:'construction-buttons'!
@@ -5482,6 +5516,6 @@
!DialogBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.107 1997-09-08 18:32:30 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.108 1997-10-21 18:27:24 cg Exp $'
! !
DialogBox initialize!
--- a/EFGroup.st Tue Oct 21 20:15:06 1997 +0200
+++ b/EFGroup.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 18-oct-1997 at 3:23:15 pm' !
+
Object subclass:#EnterFieldGroup
instanceVariableNames:'fields currentField leaveAction wrap leaveOnTabLast'
classVariableNames:''
@@ -17,7 +19,7 @@
category:'Interface-Support'
!
-!EnterFieldGroup class methodsFor:'documentation'!
+!EnterFieldGroup class methodsFor:'documentation'!
copyright
"
@@ -468,13 +470,30 @@
!EnterFieldGroup methodsFor:'adding / removing'!
add:aField
- |thisIndex|
+ "add another field to the group.
+ Cursor motion out of the previous field will lead to the next
+ one and vice versa."
+
+ self add:aField before:nil
+
+ "Modified: 18.10.1997 / 03:19:51 / cg"
+!
+
+add:aField before:anotherField
+ "add another field to the group into a particular position
+ within the tabbing order.
+ Cursor motion out of the previous field will lead to the next
+ one and vice versa."
fields isNil ifTrue:[
fields := OrderedCollection new
].
- fields add:aField.
- thisIndex := fields size.
+
+ anotherField isNil ifTrue:[
+ fields add:aField.
+ ] ifFalse:[
+ fields add:aField before:anotherField
+ ].
aField delegate:self.
aField hideCursor.
@@ -489,7 +508,7 @@
"set the fields leaveAction to enable next field"
aField leaveAction:[:key |
- self fieldLeft:aField index:thisIndex withKey:key
+ self fieldLeft:aField withKey:key
].
fields size == 1 ifTrue:[
@@ -497,7 +516,20 @@
self makeActive:aField
]
- "Modified: 21.5.1996 / 21:18:58 / cg"
+ "Created: 18.10.1997 / 03:06:00 / cg"
+ "Modified: 18.10.1997 / 03:20:36 / cg"
+!
+
+remove:aField
+ "remove a field from the group."
+
+ fields isNil ifTrue:[^ self].
+ (fields includesIdentical:aField) ifFalse:[^ self].
+
+ fields removeIdentical:aField.
+
+ "Created: 18.10.1997 / 02:53:29 / cg"
+ "Modified: 18.10.1997 / 03:21:09 / cg"
! !
!EnterFieldGroup methodsFor:'event forwarding'!
@@ -576,8 +608,8 @@
!EnterFieldGroup methodsFor:'group control'!
-fieldLeft:aField index:thisIndex withKey:key
- |action next wg explicit nFields nextField fs|
+fieldLeft:aField withKey:key
+ |thisIndex action next wg explicit nFields nextField fs|
"/ currentField notNil ifTrue:[
"/ currentField disable.
@@ -586,6 +618,7 @@
"/
action := key.
nFields := fields size.
+ thisIndex := fields indexOf:aField.
"/ if there is a windowGroup, which has a focusSequence,
"/ and the group is left, let it control who is going to get the
@@ -658,8 +691,8 @@
]
]
- "Created: 21.5.1996 / 21:18:08 / cg"
- "Modified: 31.5.1996 / 21:35:31 / cg"
+ "Created: 18.10.1997 / 03:03:34 / cg"
+ "Modified: 18.10.1997 / 03:22:19 / cg"
! !
!EnterFieldGroup methodsFor:'misc'!
@@ -725,8 +758,8 @@
"Created: 21.5.1996 / 21:20:57 / cg"
! !
-!EnterFieldGroup class methodsFor:'documentation'!
+!EnterFieldGroup class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.29 1997-07-25 14:20:49 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/EFGroup.st,v 1.30 1997-10-21 18:28:03 cg Exp $'
! !
--- a/ETxtView.st Tue Oct 21 20:15:06 1997 +0200
+++ b/ETxtView.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:09:41 pm' !
+
TextView subclass:#EditTextView
instanceVariableNames:'cursorLine cursorVisibleLine cursorCol cursorShown
prevCursorState readOnly modifiedChannel fixedSize exceptionBlock
@@ -336,18 +338,18 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#textCursorForegroundColor #textCursorBackgroundColor
- #textCursorNoFocusForegroundColor
- #textCursorType )>
-
- DefaultCursorForegroundColor := StyleSheet colorAt:'textCursorForegroundColor'.
- DefaultCursorBackgroundColor := StyleSheet colorAt:'textCursorBackgroundColor'.
- DefaultCursorNoFocusForegroundColor := StyleSheet colorAt:'textCursorNoFocusForegroundColor'.
- DefaultCursorType := StyleSheet at:'textCursorType' default:#block.
+ <resource: #style (#'textCursor.foregroundColor' #'textCursorBackgroundColor'
+ #'textCursor.noFocusForegroundColor'
+ #'textCursor.type' )>
+
+ DefaultCursorForegroundColor := StyleSheet colorAt:'textCursor.foregroundColor'.
+ DefaultCursorBackgroundColor := StyleSheet colorAt:'textCursor.backgroundColor'.
+ DefaultCursorNoFocusForegroundColor := StyleSheet colorAt:'textCursor.noFocusForegroundColor'.
+ DefaultCursorType := StyleSheet at:'textCursor.type' default:#block.
ST80Mode := false.
- "Modified: 13.8.1997 / 15:38:16 / cg"
+ "Modified: 20.10.1997 / 13:54:30 / cg"
! !
!EditTextView methodsFor:'ST-80 compatibility editing'!
@@ -4081,5 +4083,5 @@
!EditTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.138 1997-10-09 12:14:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.139 1997-10-21 18:28:05 cg Exp $'
! !
--- a/EditTextView.st Tue Oct 21 20:15:06 1997 +0200
+++ b/EditTextView.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 20-oct-1997 at 2:09:41 pm' !
+
TextView subclass:#EditTextView
instanceVariableNames:'cursorLine cursorVisibleLine cursorCol cursorShown
prevCursorState readOnly modifiedChannel fixedSize exceptionBlock
@@ -336,18 +338,18 @@
updateStyleCache
"extract values from the styleSheet and cache them in class variables"
- <resource: #style (#textCursorForegroundColor #textCursorBackgroundColor
- #textCursorNoFocusForegroundColor
- #textCursorType )>
-
- DefaultCursorForegroundColor := StyleSheet colorAt:'textCursorForegroundColor'.
- DefaultCursorBackgroundColor := StyleSheet colorAt:'textCursorBackgroundColor'.
- DefaultCursorNoFocusForegroundColor := StyleSheet colorAt:'textCursorNoFocusForegroundColor'.
- DefaultCursorType := StyleSheet at:'textCursorType' default:#block.
+ <resource: #style (#'textCursor.foregroundColor' #'textCursorBackgroundColor'
+ #'textCursor.noFocusForegroundColor'
+ #'textCursor.type' )>
+
+ DefaultCursorForegroundColor := StyleSheet colorAt:'textCursor.foregroundColor'.
+ DefaultCursorBackgroundColor := StyleSheet colorAt:'textCursor.backgroundColor'.
+ DefaultCursorNoFocusForegroundColor := StyleSheet colorAt:'textCursor.noFocusForegroundColor'.
+ DefaultCursorType := StyleSheet at:'textCursor.type' default:#block.
ST80Mode := false.
- "Modified: 13.8.1997 / 15:38:16 / cg"
+ "Modified: 20.10.1997 / 13:54:30 / cg"
! !
!EditTextView methodsFor:'ST-80 compatibility editing'!
@@ -4081,5 +4083,5 @@
!EditTextView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.138 1997-10-09 12:14:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.139 1997-10-21 18:28:05 cg Exp $'
! !
--- a/EnterFieldGroup.st Tue Oct 21 20:15:06 1997 +0200
+++ b/EnterFieldGroup.st Tue Oct 21 20:28:05 1997 +0200
@@ -10,6 +10,8 @@
hereby transferred.
"
+'From Smalltalk/X, Version:3.2.1 on 18-oct-1997 at 3:23:15 pm' !
+
Object subclass:#EnterFieldGroup
instanceVariableNames:'fields currentField leaveAction wrap leaveOnTabLast'
classVariableNames:''
@@ -17,7 +19,7 @@
category:'Interface-Support'
!
-!EnterFieldGroup class methodsFor:'documentation'!
+!EnterFieldGroup class methodsFor:'documentation'!
copyright
"
@@ -468,13 +470,30 @@
!EnterFieldGroup methodsFor:'adding / removing'!
add:aField
- |thisIndex|
+ "add another field to the group.
+ Cursor motion out of the previous field will lead to the next
+ one and vice versa."
+
+ self add:aField before:nil
+
+ "Modified: 18.10.1997 / 03:19:51 / cg"
+!
+
+add:aField before:anotherField
+ "add another field to the group into a particular position
+ within the tabbing order.
+ Cursor motion out of the previous field will lead to the next
+ one and vice versa."
fields isNil ifTrue:[
fields := OrderedCollection new
].
- fields add:aField.
- thisIndex := fields size.
+
+ anotherField isNil ifTrue:[
+ fields add:aField.
+ ] ifFalse:[
+ fields add:aField before:anotherField
+ ].
aField delegate:self.
aField hideCursor.
@@ -489,7 +508,7 @@
"set the fields leaveAction to enable next field"
aField leaveAction:[:key |
- self fieldLeft:aField index:thisIndex withKey:key
+ self fieldLeft:aField withKey:key
].
fields size == 1 ifTrue:[
@@ -497,7 +516,20 @@
self makeActive:aField
]
- "Modified: 21.5.1996 / 21:18:58 / cg"
+ "Created: 18.10.1997 / 03:06:00 / cg"
+ "Modified: 18.10.1997 / 03:20:36 / cg"
+!
+
+remove:aField
+ "remove a field from the group."
+
+ fields isNil ifTrue:[^ self].
+ (fields includesIdentical:aField) ifFalse:[^ self].
+
+ fields removeIdentical:aField.
+
+ "Created: 18.10.1997 / 02:53:29 / cg"
+ "Modified: 18.10.1997 / 03:21:09 / cg"
! !
!EnterFieldGroup methodsFor:'event forwarding'!
@@ -576,8 +608,8 @@
!EnterFieldGroup methodsFor:'group control'!
-fieldLeft:aField index:thisIndex withKey:key
- |action next wg explicit nFields nextField fs|
+fieldLeft:aField withKey:key
+ |thisIndex action next wg explicit nFields nextField fs|
"/ currentField notNil ifTrue:[
"/ currentField disable.
@@ -586,6 +618,7 @@
"/
action := key.
nFields := fields size.
+ thisIndex := fields indexOf:aField.
"/ if there is a windowGroup, which has a focusSequence,
"/ and the group is left, let it control who is going to get the
@@ -658,8 +691,8 @@
]
]
- "Created: 21.5.1996 / 21:18:08 / cg"
- "Modified: 31.5.1996 / 21:35:31 / cg"
+ "Created: 18.10.1997 / 03:03:34 / cg"
+ "Modified: 18.10.1997 / 03:22:19 / cg"
! !
!EnterFieldGroup methodsFor:'misc'!
@@ -725,8 +758,8 @@
"Created: 21.5.1996 / 21:20:57 / cg"
! !
-!EnterFieldGroup class methodsFor:'documentation'!
+!EnterFieldGroup class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.29 1997-07-25 14:20:49 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.30 1997-10-21 18:28:03 cg Exp $'
! !