--- a/DialogBox.st Fri May 30 14:25:56 2008 +0200
+++ b/DialogBox.st Fri May 30 14:26:03 2008 +0200
@@ -5878,7 +5878,7 @@
"/ tabableElements add:subComponent
].
^ self addComponent:aComponent
- withHeight:(aComponent preferredExtent y).
+ withHeight:(aComponent preferredHeight).
"Modified: 9.2.1996 / 22:23:07 / cg"
!
@@ -5969,34 +5969,34 @@
y := self yPosition.
lbl := Label label:labelString.
- max := lbl preferredExtent y max:(aView preferredExtent y).
+ max := lbl preferredHeight max:(aView preferredHeight).
relW := rightX - leftX.
self addComponent:lbl indent:leftIndent withHeight:max.
lbl rightInset:0.
lbl
- width:(relW*relativeX);
- left:leftX;
- adjust:labelAdjust; borderWidth:0.
+ width:(relW*relativeX);
+ left:leftX;
+ adjust:labelAdjust; borderWidth:0.
self yPosition:y.
self addComponent:aView tabable:tabable.
aView
- leftInset:ViewSpacing;
- rightInset:ViewSpacing.
+ leftInset:ViewSpacing;
+ rightInset:ViewSpacing.
aView
- width:relW*(1.0 - relativeX);
- left:leftX+(relW*relativeX).
+ width:relW*(1.0 - relativeX);
+ left:leftX+(relW*relativeX).
aView isInputField ifTrue:[
- self addToInputFieldGroup:aView
+ self addToInputFieldGroup:aView
].
aName notNil ifTrue:[
- self name:lbl as:(aName , '.label').
- self name:aView as:aName
+ self name:lbl as:(aName , '.label').
+ self name:aView as:aName
].
^ aView
@@ -6008,11 +6008,11 @@
dialog := DialogBox new.
field := dialog
- addLabelledField:(EditField on:model)
- label:'input here:'
- adjust:#left
- tabable:true
- separateAtX:0.3.
+ addLabelledField:(EditField on:model)
+ label:'input here:'
+ adjust:#left
+ tabable:true
+ separateAtX:0.3.
dialog addAbortButton; addOkButton.
dialog open.
@@ -6027,11 +6027,11 @@
dialog := DialogBox new.
field := dialog
- addLabelledField:((ComboListView on:model) list:#('foo' 'bar' 'baz'))
- label:'select foo:'
- adjust:#left
- tabable:true
- separateAtX:0.3.
+ addLabelledField:((ComboListView on:model) list:#('foo' 'bar' 'baz'))
+ label:'select foo:'
+ adjust:#left
+ tabable:true
+ separateAtX:0.3.
dialog addAbortButton; addOkButton.
dialog open.
@@ -6048,11 +6048,11 @@
dialog := DialogBox new.
field := dialog
- addLabelledField:(PopUpList on:model)
- label:'select here:'
- adjust:#left
- tabable:true
- separateAtX:0.3.
+ addLabelledField:(PopUpList on:model)
+ label:'select here:'
+ adjust:#left
+ tabable:true
+ separateAtX:0.3.
dialog addAbortButton; addOkButton.
dialog open.
@@ -7737,24 +7737,24 @@
l model:aModel.
(vs or:[hs]) ifTrue:[
- hs ifTrue:[
- scr := HVScrollableView forView:l miniScrollerH:true .
- ] ifFalse:[
- scr := ScrollableView forView:l
- ].
- scr resize.
- "/ Transcript show:scr height; show:' '; showCR:l height.
- dH := scr height - l height.
+ hs ifTrue:[
+ scr := HVScrollableView forView:l miniScrollerH:true .
+ ] ifFalse:[
+ scr := ScrollableView forView:l
+ ].
+ scr resize.
+ "/ Transcript show:scr height; show:' '; showCR:l height.
+ dH := scr height - l height.
] ifFalse:[
- l level:-1.
- scr := l.
- dH := 0.
+ l level:-1.
+ scr := l.
+ dH := 0.
].
numLines notNil ifTrue:[
- h := l heightForLines:numLines.
+ h := l heightForLines:numLines.
] ifFalse:[
- h := l preferredExtent y
+ h := l preferredHeight
].
self addComponent:scr withHeight:(h + dH).
^ scr
@@ -7766,11 +7766,11 @@
(dialog addTextLabel:'select any') adjust:#left.
listView := dialog
- addTextBoxOn:nil
- class:EditTextView
- withNumberOfLines:10
- hScrollable:true
- vScrollable:true.
+ addTextBoxOn:nil
+ class:EditTextView
+ withNumberOfLines:10
+ hScrollable:true
+ vScrollable:true.
dialog addAbortButton; addOkButton.
@@ -7940,23 +7940,23 @@
helper := VerticalPanelView new.
aRow do:[:el |
- component := aBlock value:el.
- helper add:component.
- component resize.
- tabable ifTrue:[self makeTabable:component].
+ component := aBlock value:el.
+ helper add:component.
+ component resize.
+ tabable ifTrue:[self makeTabable:component].
].
helper resize.
self addComponent:helper.
- width < helper preferredExtent x ifTrue:[
- self width:helper preferredExtent x.
- "/ Transcript show:'w now: '; showCR:helper preferredExtent x
+ width < helper preferredWidth ifTrue:[
+ self width:helper preferredWidth.
+ "/ Transcript show:'w now: '; showCR:helper preferredExtent x
].
helper horizontalLayout:hLayout.
helper left:leftX asFloat;
- right:rightX asFloat;
- leftInset:leftIndent;
- rightInset:rightIndent.
+ right:rightX asFloat;
+ leftInset:leftIndent;
+ rightInset:rightIndent.
"
|dialog y values|
@@ -7966,24 +7966,24 @@
dialog := Dialog new.
y := dialog yPosition.
dialog
- addColumn:#('one' 'two' 'three' 'four')
- fromX:0
- toX:0.3
- collect:[:label | Label label:label].
+ addColumn:#('one' 'two' 'three' 'four')
+ fromX:0
+ toX:0.3
+ collect:[:label | Label label:label].
dialog yPosition:y.
dialog
- addColumn:values
- fromX:0.3
- toX:1.0
- collect:[:value | EditField on:value]
- tabable:true.
+ addColumn:values
+ fromX:0.3
+ toX:1.0
+ collect:[:value | EditField on:value]
+ tabable:true.
dialog addOkButton.
dialog open.
dialog accepted ifTrue:[
- Transcript showCR:(values collect:[:holder | holder value])
+ Transcript showCR:(values collect:[:holder | holder value])
]
"
@@ -7995,24 +7995,24 @@
dialog := Dialog new.
y := dialog yPosition.
dialog
- addColumn:(1 to:4)
- fromX:0
- toX:0.5
- collect:[:idx | CheckToggle on:(values at:idx)].
+ addColumn:(1 to:4)
+ fromX:0
+ toX:0.5
+ collect:[:idx | CheckToggle on:(values at:idx)].
dialog yPosition:y.
dialog
- addColumn:(5 to:8)
- fromX:0.5
- toX:1.0
- collect:[:idx | CheckToggle on:(values at:idx)]
- tabable:true.
+ addColumn:(5 to:8)
+ fromX:0.5
+ toX:1.0
+ collect:[:idx | CheckToggle on:(values at:idx)]
+ tabable:true.
dialog addOkButton.
dialog open.
dialog accepted ifTrue:[
- Transcript showCR:(values collect:[:holder | holder value])
+ Transcript showCR:(values collect:[:holder | holder value])
]
"
@@ -8176,39 +8176,39 @@
helper borderWidth:0.
aCol do:[:el |
- component := aBlock value:el.
- component resize.
- helper add:component.
- tabable ifTrue:[self makeTabable:component]
+ component := aBlock value:el.
+ component resize.
+ helper add:component.
+ tabable ifTrue:[self makeTabable:component]
].
helper resize.
self addComponent:helper.
- width < helper preferredExtent x ifTrue:[
- self width:helper preferredExtent x.
- "/ Transcript show:'w now: '; showCR:helper preferredExtent x
+ width < helper preferredWidth ifTrue:[
+ self width:helper preferredWidth.
+ "/ Transcript show:'w now: '; showCR:helper preferredWidth
].
hLayout notNil ifTrue:[
- helper horizontalLayout:hLayout.
+ helper horizontalLayout:hLayout.
].
vLayout notNil ifTrue:[
- helper verticalLayout:vLayout.
+ helper verticalLayout:vLayout.
].
helper left:leftX asFloat;
- right:rightX asFloat.
+ right:rightX asFloat.
"
|dialog|
dialog := Dialog new.
dialog
- addRow:#('a' 'b' 'c' 'd')
- fromX:0
- toX:1
- collect:[:label | Label label:label]
- tabable:false
- horizontalLayout:#fit.
+ addRow:#('a' 'b' 'c' 'd')
+ fromX:0
+ toX:1
+ collect:[:label | Label label:label]
+ tabable:false
+ horizontalLayout:#fit.
dialog addOkButton.
dialog open.
@@ -8219,12 +8219,12 @@
dialog := Dialog new.
dialog
- addRow:#('one' 'two' 'three' 'four')
- fromX:0
- toX:1
- collect:[:label | Button label:label]
- tabable:false
- horizontalLayout:#fit.
+ addRow:#('one' 'two' 'three' 'four')
+ fromX:0
+ toX:1
+ collect:[:label | Button label:label]
+ tabable:false
+ horizontalLayout:#fit.
dialog addOkButton.
dialog open.
@@ -8235,22 +8235,22 @@
dialog := Dialog new.
dialog
- addRow:#('a1' 'b1' 'c1' 'd1')
- fromX:0
- toX:1
- collect:[:label | Label label:label].
+ addRow:#('a1' 'b1' 'c1' 'd1')
+ fromX:0
+ toX:1
+ collect:[:label | Label label:label].
dialog
- addRow:#('a2' 'b2' 'c2' 'd2')
- fromX:0
- toX:0.5
- collect:[:label | Label label:label].
+ addRow:#('a2' 'b2' 'c2' 'd2')
+ fromX:0
+ toX:0.5
+ collect:[:label | Label label:label].
dialog
- addRow:#('a3' 'b3' 'c3' 'd3')
- fromX:0.5
- toX:1
- collect:[:label | Label label:label].
+ addRow:#('a3' 'b3' 'c3' 'd3')
+ fromX:0.5
+ toX:1
+ collect:[:label | Label label:label].
dialog addOkButton.
dialog open.
@@ -8436,7 +8436,7 @@
into:[:max :element |
|eExt prefWidth scale rel relX|
- prefWidth := element preferredExtent x.
+ prefWidth := element preferredWidth.
"/ special (for your convenience)
"/ if the element has been added with a relative width,
@@ -8504,7 +8504,7 @@
addedComponents notNil ifTrue:[
w := self maxPreferredWidthOfAddedComponents.
] ifFalse:[
- w := super preferredExtent x.
+ w := super preferredWidth.
].
w := w max:width.
h := yPosition + ViewSpacing.
@@ -8663,7 +8663,7 @@
!DialogBox class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.268 2008-04-22 10:53:11 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.269 2008-05-30 12:26:03 cg Exp $'
! !
DialogBox initialize!