--- a/InfoBox.st Fri May 07 14:12:57 2004 +0200
+++ b/InfoBox.st Tue May 11 18:36:39 2004 +0200
@@ -147,7 +147,7 @@
|box|
box := InfoBox title:'hello world '.
- box image:(Image fromFile:'bitmaps/SBrowser.xbm' inPackage:'stx:libtool').
+ box image:(Image fromFile:'libtool/bitmaps/SBrowser.xbm' inPackage:'stx:libtool').
box okText:'wow'.
box open
[exEnd]
@@ -253,6 +253,8 @@
form:aFormOrImage
"historical leftover - define a form to be displayed left of the title"
+ <resource:#obsolete>
+
self image:aFormOrImage
!
@@ -265,10 +267,10 @@
image:aForm
"define a form to be displayed left of the title
- usually left as defaulted:
- an exclamation-mark here, warn-sign in warningBox,
- others in other subclasses."
+ an exclamation-mark here, warn-sign in warningBox,
+ others in other subclasses."
- formLabel form:aForm.
+ formLabel label:aForm.
formLabel forceResize.
shown ifTrue:[self resize]
!
@@ -316,7 +318,7 @@
extracted into a separate method for easier redefinition
in subclasses"
- formLabel form:(self class iconBitmap)
+ formLabel label:(self class iconBitmap)
!
initFormLabel
@@ -408,5 +410,5 @@
!InfoBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/InfoBox.st,v 1.42 2003-09-10 15:13:27 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/InfoBox.st,v 1.43 2004-05-11 16:35:53 stefan Exp $'
! !
--- a/Label.st Fri May 07 14:12:57 2004 +0200
+++ b/Label.st Tue May 11 18:36:39 2004 +0200
@@ -825,7 +825,7 @@
<resource:#obsolete>
self obsoleteMethodWarning:'use #label:'.
- ^ (self onDevice:Screen current) form:aForm
+ ^ (self onDevice:Screen current) label:aForm
"Modified: 16.6.1997 / 11:47:38 / cg"
!
@@ -837,7 +837,7 @@
<resource:#obsolete>
self obsoleteMethodWarning:'use #label:in:'.
- ^ (self in:aView) form:aForm
+ ^ (self in:aView) label:aForm
"Modified: 16.6.1997 / 11:47:57 / cg"
! !
@@ -1004,6 +1004,8 @@
"set the labels form; adjust extent if not already realized.
OBSOLETE: you should now use #label: for both strings and images"
+ <resource:#obsolete>
+
self label:aForm
!
@@ -1086,7 +1088,9 @@
logo:something
"set the labels form or string.
OBSOLETE: the old version used #form: for images and #label: for strings.
- you should now use #label: for any."
+ you should now use #label: for any."
+
+ <resource:#obsolete>
self label:something
! !
@@ -1831,5 +1835,5 @@
!Label class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.124 2004-05-07 12:12:57 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.125 2004-05-11 16:35:38 stefan Exp $'
! !
--- a/OptionBox.st Fri May 07 14:12:57 2004 +0200
+++ b/OptionBox.st Tue May 11 18:36:39 2004 +0200
@@ -103,7 +103,7 @@
what := OptionBox
request:('text has not been accepted.\\Your modifications will be lost when continuing.') withCRs
label:' Attention'
- form:(WarningBox iconBitmap)
+ image:(WarningBox iconBitmap)
buttonLabels:#('abort' 'accept' 'continue')
values:#(#abort #accept #continue).
Transcript showCR:what.
@@ -127,7 +127,7 @@
!OptionBox class methodsFor:'easy startup'!
-forRequest:title label:label form:aForm buttonLabels:labels values:values default:defaultValue
+forRequest:title label:label image:anImage buttonLabels:labels values:values default:defaultValue
"create a new optionBox and return it.
Does not open the box."
@@ -136,7 +136,7 @@
box := OptionBox title:title numberOfOptions:(labels size).
box buttonTitles:labels.
box defaultButtonIndex:(values indexOf:defaultValue).
- box label:label; form:aForm.
+ box label:label; image:anImage.
values keysAndValuesDo:[:idx :val |
val == false ifTrue:[
(box buttons at:idx) cursor:(Cursor thumbsDown).
@@ -170,7 +170,7 @@
the corresponding values collection. Return nil if cancelled."
^ self
- request:title label:title form:(YesNoBox iconBitmap) buttonLabels:labels values:values
+ request:title label:title image:(YesNoBox iconBitmap) buttonLabels:labels values:values
default:defaultValue onCancel:nil
"
@@ -187,7 +187,7 @@
the corresponding values collection. Return nil if cancelled"
^ self
- request:title label:label form:(YesNoBox iconBitmap)
+ request:title label:label image:(YesNoBox iconBitmap)
buttonLabels:labels values:values default:nil onCancel:nil
"
@@ -204,7 +204,7 @@
the corresponding values collection. Return nil if cancelled"
^ self
- request:title label:label form:(YesNoBox iconBitmap) buttonLabels:labels values:values
+ request:title label:label image:(YesNoBox iconBitmap) buttonLabels:labels values:values
default:defaultValue onCancel:nil
"
@@ -222,7 +222,7 @@
the corresponding values collection. Return cancelValue if cancelled."
^ self
- request:title label:label form:(YesNoBox iconBitmap) buttonLabels:labels values:values
+ request:title label:label image:(YesNoBox iconBitmap) buttonLabels:labels values:values
default:defaultValue onCancel:cancelValue
"
@@ -236,44 +236,44 @@
"
!
-request:title label:label form:aForm buttonLabels:labels values:values
+request:title label:label image:anImage buttonLabels:labels values:values
"create a new optionBox, open it modal and return the value of
the corresponding values collection. Return nil, if cancelled."
^ self
- request:title label:label form:aForm buttonLabels:labels values:values
+ request:title label:label image:anImage buttonLabels:labels values:values
default:nil onCancel:nil
"
OptionBox
request:'please select'
label:'select any'
- form:(WarningBox iconBitmap)
+ image:(WarningBox iconBitmap)
buttonLabels:#('one' 'two' 'three')
values:#(1 2 3)
"
!
-request:title label:label form:aForm buttonLabels:labels values:values default:defaultValue
+request:title label:label image:anImage buttonLabels:labels values:values default:defaultValue
"create a new optionBox, open it modal and return the value of
the corresponding values collection. Return nil if cancelled."
^ self
- request:title label:label form:aForm buttonLabels:labels values:values
+ request:title label:label image:anImage buttonLabels:labels values:values
default:defaultValue onCancel:nil
"
OptionBox
request:'please select'
label:'select any'
- form:(WarningBox iconBitmap)
+ image:(WarningBox iconBitmap)
buttonLabels:#('one' 'two' 'three')
values:#(1 2 3)
default:3
"
!
-request:title label:label form:aForm buttonLabels:labels values:values default:defaultValue onCancel:cancelValue
+request:title label:label image:anImage buttonLabels:labels values:values default:defaultValue onCancel:cancelValue
"create a new optionBox, open it modal and return the value of
the corresponding values collection. Return cancelValue if cancelled."
@@ -283,7 +283,7 @@
box := self
forRequest:title
label:label
- form:aForm
+ image:anImage
buttonLabels:labels
values:values
default:defaultValue.
@@ -298,7 +298,7 @@
OptionBox
request:'please select'
label:'select any'
- form:(WarningBox iconBitmap)
+ image:(WarningBox iconBitmap)
buttonLabels:#('one' 'two' 'three')
values:#(1 2 3)
default:3
@@ -308,6 +308,48 @@
"Modified: / 23.2.2000 / 11:59:32 / cg"
! !
+!OptionBox class methodsFor:'obsolete'!
+
+forRequest:title label:label form:anImage buttonLabels:labels values:values default:defaultValue
+ "create a new optionBox and return it.
+ Does not open the box."
+
+ <resource:#obsolete>
+
+ self forRequest:title label:label image:anImage buttonLabels:labels values:values default:defaultValue
+!
+
+request:title label:label form:aForm buttonLabels:labels values:values
+ "create a new optionBox, open it modal and return the value of
+ the corresponding values collection. Return nil, if cancelled."
+
+ <resource:#obsolete>
+
+ ^ self
+ request:title label:label image:aForm buttonLabels:labels values:values
+ default:nil onCancel:nil
+!
+
+request:title label:label form:aForm buttonLabels:labels values:values default:defaultValue
+ "create a new optionBox, open it modal and return the value of
+ the corresponding values collection. Return nil if cancelled."
+
+ <resource:#obsolete>
+
+ ^ self
+ request:title label:label image:aForm buttonLabels:labels values:values
+ default:defaultValue onCancel:nil
+!
+
+request:title label:label form:aForm buttonLabels:labels values:values default:defaultValue onCancel:cancelValue
+ "create a new optionBox, open it modal and return the value of
+ the corresponding values collection. Return cancelValue if cancelled."
+
+ <resource:#obsolete>
+
+ ^ self request:title label:label image:aForm buttonLabels:labels values:values default:defaultValue onCancel:cancelValue
+! !
+
!OptionBox methodsFor:'accessing'!
action:actionBlock
@@ -390,14 +432,11 @@
!
form:aFormOrImage
- "set the image shown in the label-view"
-
- |mm|
+ "historical leftover - define a form to be displayed left of the title"
- mm := ViewSpacing.
- formLabel form:aFormOrImage.
- textLabel origin:((mm + formLabel width + mm) @ mm).
+ <resource:#obsolete>
+ self image:aFormOrImage
!
formLabel
@@ -409,9 +448,11 @@
image:aFormOrImage
"set the image shown in the label-view"
- self form:aFormOrImage
+ |mm|
- "Created: / 16.11.2001 / 15:20:02 / cg"
+ mm := ViewSpacing.
+ formLabel label:aFormOrImage.
+ textLabel origin:((mm + formLabel width + mm) @ mm).
!
textLabel
@@ -468,7 +509,7 @@
WarnBitmap := WarningBox iconBitmap.
"/ WarnBitmap := Image fromFile:'bitmaps/Warning.xbm' resolution:100 on:Display
].
- formLabel form:WarnBitmap
+ formLabel label:WarnBitmap
"Modified: / 25.5.1999 / 16:08:06 / cg"
!
@@ -569,5 +610,5 @@
!OptionBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/OptionBox.st,v 1.57 2004-02-20 16:43:55 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/OptionBox.st,v 1.58 2004-05-11 16:35:00 stefan Exp $'
! !
--- a/Workspace.st Fri May 07 14:12:57 2004 +0200
+++ b/Workspace.st Tue May 11 18:36:39 2004 +0200
@@ -459,7 +459,7 @@
lbl := lbl , ' Error'.
].
box label:lbl.
- box form:(WarningBox iconBitmap).
+ box image:(WarningBox iconBitmap).
aCompiler class doNotShowCompilerWarningAgainActionQuery isHandled ifTrue:[
doNotShowAgainHolder := false asValue.
@@ -1177,5 +1177,5 @@
!Workspace class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.138 2004-03-03 16:51:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.139 2004-05-11 16:36:39 stefan Exp $'
! !