hg/stx-libtool2: comparison UILayoutTool.st

equal deleted inserted replaced

-:560a9eb1a5d8
+:84ae04e0af72
 ApplicationModel subclass:#UILayoutTool
-	instanceVariableNames:'modifiedHolder aspects selection layoutView tabList'
+	instanceVariableNames:'modifiedHolder aspects selection layoutView tabList layoutSpec'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 "returns current edited view
 "
 ^ layoutView
 !
-layoutView:aView
+layoutView:aView type:aTypeOrNil spec:aSpec
 "change current edited view
 "
-self layoutView:aView type:nil
-!
-layoutView:aView type:aTypeOrNil
-"change current edited view
-"
 |type name list|
 layoutView := aView.
+layoutSpec := aSpec.
 aTypeOrNil notNil ifTrue:[
 self class slices findFirst:[:e|
 e last == aTypeOrNil ifTrue:[name := e first. true]
 ].
 "update from view
 "
 |view appl|
 selection notNil ifTrue:[
-(view := self layoutView) notNil ifTrue:[
+(view := layoutView) notNil ifTrue:[
 (appl := self noteBookView application) notNil ifTrue:[
-appl fetch:view
+appl fetch:view spec:layoutSpec
 ]
 ]
 ].
 ! !
 aspectFor:aKey
 "returns aspect for a key or nil
 "
 ^ aspects at:aKey ifAbsent:[ super aspectFor:aKey ]
+!
+notUsingDefaultExtent
+|holder|
+(holder := builder bindingAt:#notUsingDefaultExtent) isNil ifTrue:[
+holder := BlockValue forLogicalNot:(self aspectFor:#useDefaultExtent).
+builder aspectAt:#notUsingDefaultExtent put:holder.
+].
+^ holder
 !
 noteBookList
 "returns list of tab labels
 #(  bottomFraction          bottomOffset
 leftFraction            leftOffset
 topFraction             topOffset
 rightFraction           rightOffset
 leftAlignmentFraction   topAlignmentFraction
+useDefaultExtent
 )
 do:[:aKey||holder|
 holder := ValueHolder new.
 holder addDependent:self.
 #activeHelpKey: #alignHorizontal
 #tabable: true
 #model: #leftAlignmentFraction
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#InputFieldSpec
 #name: 'topAlignmentFractionField'
 #activeHelpKey: #alignVertical
 #tabable: true
 #model: #topAlignmentFraction
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#DividerSpec
 #name: 'separator1'
 "Modified: / 13.8.1998 / 19:57:47 / cg"
 ! !
 !UILayoutTool::AlignmentOrigin methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 "fetch alignmentOrigin
 "
 |layout type|
 type   := UIPainterView layoutType:aView.
 <resource: #canvas>
 ^
 #(#FullSpec
+#name: #windowSpec
 #window:
 #(#WindowSpec
 #name: 'UILayoutTool-Extent'
-#layout: #(#LayoutFrame 291 0 130 0 616 0 278 0)
+#layout: #(#LayoutFrame 20 0 61 0 345 0 209 0)
+#level: 0
 #label: 'UILayoutTool-Extent'
 #min: #(#Point 10 10)
 #max: #(#Point 1152 900)
-#bounds: #(#Rectangle 291 130 617 279)
+#bounds: #(#Rectangle 20 61 346 210)
 #usePreferredExtent: false
+#returnIsOKInDialog: true
+#escapeIsCancelInDialog: true
 )
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#FramedBoxSpec
 #name: 'FramedBox'
-#layout: #(#LayoutFrame 0 0.0 6 0.0 0 1.0 100 0)
+#layout: #(#LayoutFrame 0 0.0 6 0.0 0 1.0 137 0)
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#LabelSpec
 )
 #(#InputFieldSpec
 #name: 'fieldLeftOffset'
 #layout: #(#LayoutFrame 90 0 13 0 140 0 35 0)
 #activeHelpKey: #hrzExtent
+#enableChannel: #notUsingDefaultExtent
 #tabable: true
 #model: #leftOffset
 #group: #inputGroup
 #type: #numberOrNil
-#acceptChannel: #acceptChannel
+#acceptOnLostFocus: true
-#modifiedChannel: #modifiedChannel
+#acceptChannel: #acceptChannel
+#modifiedChannel: #modifiedChannel
 )
 #(#LabelSpec
 #name: 'labelHeight'
 #layout: #(#AlignmentOrigin 89 0 49 0 1 0.5)
 #label: 'Height:'
 )
 #(#InputFieldSpec
 #name: 'fieldRightOffset'
 #layout: #(#LayoutFrame 90 0 38 0 140 0 60 0)
 #activeHelpKey: #vrtExtent
+#enableChannel: #notUsingDefaultExtent
 #tabable: true
 #model: #rightOffset
 #group: #inputGroup
 #type: #numberOrNil
-#acceptChannel: #acceptChannel
+#acceptOnLostFocus: true
-#modifiedChannel: #modifiedChannel
+#acceptChannel: #acceptChannel
+#modifiedChannel: #modifiedChannel
+)
+#(#CheckBoxSpec
+#name: 'useDefaultExtentCheckBox'
+#layout: #(#LayoutFrame -1 0 75 0 135 0 97 0)
+#model: #useDefaultExtent
+#label: 'Use Widgets Default Extent'
+#translateLabel: true
 )
 )
 )
 #label: 'Extent'
 #labelPosition: #topLeft
 )
 )
 )
 )
-"Modified: / 13.8.1998 / 19:58:04 / cg"
 ! !
 !UILayoutTool::Extent methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 "fetch extent
 "
 |extent|
 extent  := aView computeExtent.
 (self aspectFor:#leftOffset)  value:(extent x).
 (self aspectFor:#rightOffset) value:(extent y).
+(self aspectFor:#useDefaultExtent) value:aSpec useDefaultExtent
 !
 layout
 "returns current extent
 "
 #layout: #(#LayoutFrame 90 0 14 0 140 0 36 0)
 #activeHelpKey: #rightRelative
 #model: #rightFraction
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#ActionButtonSpec
 #name: 'actionRelativeRight'
 #layout: #(#LayoutFrame 190 0 14 0 240 0 36 0)
 #activeHelpKey: #rightAbsolute
 #model: #rightOffset
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#ActionButtonSpec
 #name: 'actionAbsoluteRight'
 #layout: #(#LayoutFrame 90 0 42 0 140 0 64 0)
 #activeHelpKey: #bottomRelative
 #model: #bottomFraction
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#ActionButtonSpec
 #name: 'actionRelativeBottom'
 #layout: #(#LayoutFrame 190 0 42 0 240 0 64 0)
 #activeHelpKey: #bottomAbsolute
 #model: #bottomOffset
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#ActionButtonSpec
 #name: 'actionAbsoluteBottom'
 )
 ! !
 !UILayoutTool::LayoutFrame methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 |layout|
 layout  := UIPainterView asLayoutFrameFromView:aView.
 (self aspectFor:#leftOffset)     value:(layout leftOffset).
 )
 ! !
 !UILayoutTool::LayoutOrigin methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 "fetch layoutOrigin
 "
 |layout|
 layout  := UIPainterView asLayoutFrameFromView:aView.
 )
 ! !
 !UILayoutTool::Point methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 "fetch point
 "
 |origin|
 origin  := aView computeOrigin.
 #activeHelpKey: #cornerX
 #tabable: true
 #model: #rightOffset
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 #(#LabelSpec
 #name: 'labelCornerX'
 #activeHelpKey: #cornerY
 #tabable: true
 #model: #bottomOffset
 #group: #inputGroup
 #type: #numberOrNil
+#acceptOnLostFocus: true
 #acceptChannel: #acceptChannel
 #modifiedChannel: #modifiedChannel
 )
 )
 )
 "Modified: / 13.8.1998 / 19:59:16 / cg"
 ! !
 !UILayoutTool::Rectangle methodsFor:'accessing'!
-fetch:aView
+fetch:aView spec:aSpec
 "fetch rectangle
 "
 |origin corner|
 origin := aView computeOrigin.

changeset 1072	84ae04e0af72
parent 1070	1735e40c6825
child 1074	49ef9991d1d5