hg/stx-libtool2: comparison UIPainterView.st

equal deleted inserted replaced

-:85ef247db6b1
+:0e8573b4329a
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
-'From Smalltalk/X, Version:3.1.4 on 25-feb-1997 at 2:17:29 pm'                  !
 UIObjectView subclass:#UIPainterView
 	instanceVariableNames:'fontPanel viewProperties superclassName className methodName
 		categoryName'
 	classVariableNames:'HandCursor'
 	poolDictionaries:''
 ].
 self unselect.
 !
 deleteSelection
-"delete the selection; not into the paste buffer (undo)
+"delete the selection; copy the selection into the cut&paste-buffer
-"
+and open a transaction
-|text|
+"
+|text specs|
 self numberOfSelections ~~ 0 ifTrue:[
-text := self transactionTextFor:selection.
+specs := self generateSpecFor:selection.
+text  := self transactionTextFor:selection.
 undoHistory transaction:#cut text:text do:[
 super deleteSelection
 ].
+self setSelection:specs
 ]
 !
 pasteBuffer
-"add the objects in the paste-buffer
+"add the objects in the paste-buffer to the object view
 "
 |paste builder frame pasteOrigin pasteOffset|
 paste := self getSelection.
 (self canPaste:paste) ifFalse:[ ^ self].
 (paste isCollection)  ifFalse:[ paste := Array with:paste].
 frame := self singleSelection.
-(self supportsSubComponents:frame) ifFalse:[
+(self canPasteInto:frame) ifFalse:[
 frame := self
 ].
 self unselect.
 builder     := UIBuilder new.
 selection := selection at:1
 ].
 self showSelection.
 self realizeAllSubViews.
 inputView raise.
+self elementChangedSize:frame.
 self changed:#tree
 ! !
 !UIPainterView methodsFor:'creating subviews'!
 ].
 viewProperties add:props.
 name := props name.
-aView specClass basicNew supportsLabel ifTrue:[
+aView specClass supportsLabel ifTrue:[
 aView label:name
 ].
 aView name:name.
 ^ props
 !
 propertiesForNewView:aView
+"generate property for a view and return properties
+"
 |cls props index|
 cls := aView class.
 props := ViewProperty new.
 ! !
 !UIPainterView methodsFor:'event handling'!
 keyPress:key x:x y:y
+"any key pressed
+"
 <resource: #keyboard ( #Copy #Paste) >
 key == #Copy ifTrue:[
 ^ self copySelection
 ].
 ].
 code := ''.
 viewProperties do:[:aProp |
-|modelSelector protoSpec thisCode|
+|modelSelector menuSelector protoSpec thisCode|
 (modelSelector := aProp aspectSelector) notNil ifTrue:[
 (cls implements:modelSelector asSymbol) ifFalse:[
 protoSpec := aProp view specClass basicNew.
 "/ kludge ..
 (protoSpec isMemberOf:ActionButtonSpec) ifTrue:[
 thisCode := (self generateActionMethodFor:modelSelector spec:protoSpec inClass:cls).
 ] ifFalse:[
 thisCode := (self generateAspectMethodFor:modelSelector spec:protoSpec inClass:cls).
 ].
+code := code , thisCode
+].
+].
+(menuSelector := aProp menuSelector) notNil ifTrue:[
+(cls implements:menuSelector asSymbol) ifFalse:[
+protoSpec := aProp view specClass basicNew.
+"/ kludge ..
+thisCode := (self generateAspectMethodFor:menuSelector spec:protoSpec inClass:cls).
 code := code , thisCode
 ]
 ]
 ].
 ^ code
 newSpec menu:menuSelector
 ].
 (labelSelector := props labelSelector) notNil ifTrue:[
 newSpec label:labelSelector
 ].
-(tabable := props tabable) notNil ifTrue:[
+(tabable := props tabable) == true ifTrue:[
 newSpec tabable:tabable
 ].
 (defaultable := props defaultable) notNil ifTrue:[
 newSpec defaultable:defaultable
 ].
 (aView isKindOf:EditField) ifFalse:[
 self warn:'select EditFields only !!'.
 ^ self
 ]
 ].
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 group := EnterFieldGroup new.
 props := GroupProperties new.
 props elementClass:EnterFieldGroup.
 props group:group.
 (aView isKindOf:RadioButton) ifFalse:[
 self warn:'select RadioButtons only !!'.
 ^ self
 ]
 ].
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 group := RadioButtonGroup new.
 props := GroupProperties new.
 props elementClass:RadioButtonGroup.
 props group:group.
 ! !
 !UIPainterView methodsFor:'initialization'!
 initialize
+"setup attributes
+"
 super initialize.
 superclassName := 'ApplicationModel'.
 className      := 'NewApplication'.
 methodName     := 'windowSpec'.
 ! !
 !UIPainterView methodsFor:'menus'!
 menu
+"returns middle-button menu dependent on the selection
+"
 |menu canPaste|
 testMode ifTrue:[^ nil ].
 canPaste := self canPaste:(self getSelection).
 nil
 nil
 )
 receiver:self.
-(canPaste and:[self supportsSubComponents:selection]) ifFalse:[
+(canPaste and:[self canPasteInto:selection]) ifFalse:[
 menu disable:#pasteBuffer
 ].
 menu subMenuAt:#arrange   put:(self subMenuArrange).
 menu subMenuAt:#dimension put:(self subMenuDimension).
 menu subMenuAt:#align     put:(self subMenuAlign).
 ^ menu
 !
 subMenuAlign
 "returns submenu alignment
 'align centered vertical'
 'align centered horizontal'
 '-'
 'spread horizontal'
 'spread vertical'
+'-'
 'center horizontal in frame'
 'center vertical in frame'
 )
 )
 alignSelectionCenterHor
 alignSelectionCenterVer
 nil
 spreadSelectionHor
 spreadSelectionVer
+nil
 centerSelectionHor
 centerSelectionVer
 )
 receiver:self.
 ^ menu
 face:face
 style:style
 size:size.
 f notNil ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self selectionDo:[:aView |
 aView font:f.
-self elementChanged:aView.
+self elementChangedSize:aView.
 ]
-]
+].
+self changed:#any.
 ]
 "Modified: 5.9.1995 / 12:13:27 / claus"
 !
 prop isNil ifTrue:[
 ^ self error:'no such view'
 ].
 ((aView respondsTo:#label:) and:[aView label = prop name]) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 |layout|
 layout := aView geometryLayout copy.
 aView label:newName.
 aView geometryLayout:layout.
 ]
 !
 removeAll
-"remove the argument, anObject"
+"remove all objects and properties
+"
 self unselect.
+viewProperties := OrderedCollection new.
 subViews notNil ifTrue:[
 subViews copy do:[:sub |
 sub ~~ inputView ifTrue:[
 self removeTreeFrom:sub
 ]
 ]
 ].
-viewProperties := OrderedCollection new.
 undoHistory reinitialize.
 self changed:#tree
 !
 removeObject:anObject
 self removeTreeFrom:anObject.
 self changed:#tree
 !
 removeTreeFrom:anObject
-"remove the argument, anObject and all of its children
+"remove the argument, anObject and all of its subviews
 "
 |props|
 anObject notNil ifTrue:[
 (anObject subViews notNil) ifTrue:[
 ].
 ^ view
 !
 findViewWithId:aViewId
-"finds view assigned to id and returns the view or nil
+"finds view assigned to identifier and returns the view or nil
 "
 |prop|
 prop := self propertyOfIdentifier:aViewId.
 ! !
 !UIPainterView methodsFor:'seraching property'!
 propertyOf:something
+"returns property assigned to group or view
+"
 ^ viewProperties detect:[:p| (p view == something or:[p group == something])]
 ifNone:nil
 !
 propertyOfGroup:aGroup
+"returns property assigned to group
+"
 ^ viewProperties detect:[:p| p group == aGroup] ifNone:nil
 !
 propertyOfIdentifier:anId
+"returns property assigned to unique identifier
+"
 anId notNil ifTrue:[
 ^ viewProperties detect:[:p| p identifier == anId] ifNone:nil.
 ].
 ^ nil
 !
 propertyOfName:aString
+"returns property assigned to name
+"
 aString = 'self' ifFalse:[
 ^ viewProperties detect:[:p| p name = aString] ifNone:nil
 ].
 ^ nil
 !
 propertyOfView:aView
+"returns property assigned to view
+"
 (aView isNil or:[aView == self]) ifFalse:[
 ^ viewProperties detect:[:p| p view == aView] ifNone:nil
 ].
 ^ nil
 ! !
 !UIPainterView methodsFor:'testing'!
 isHorizontalResizable:aComponent
+"returns true if instance is horizontal resizeable
+"
 (aComponent isKindOf:ScrollBar) ifTrue:[
 ^ aComponent orientation == #horizontal
 ].
 (aComponent isKindOf:Scroller) ifTrue:[
 ^ aComponent orientation == #horizontal
 !
 isVerticalResizable:aComponent
+"returns true if instance is vertical resizeable
+"
 (aComponent isKindOf:EditField) ifTrue:[
 ^ false
 ].
 (aComponent isKindOf:ComboBoxView) ifTrue:[
 ^ false
 ! !
 !UIPainterView methodsFor:'undo actions'!
 undoCreate:aViewId
+"undo method when creating or pasting an object
+"
 |view|
 undoHistory addUndoBlock:[
 (view := self findViewWithId:aViewId) notNil ifTrue:[
 self removeObject:view
 ]
 !
 undoLayout:aViewId
-"undo method layout
+"undo method when changing the layout (position or dimension)
 "
-|view layout|
+|view layout extent|
 (view := self findViewWithId:aViewId) notNil ifTrue:[
-layout := view geometryLayout copy.
+(layout := view geometryLayout copy) isNil ifTrue:[
-view   := nil.
+extent := view extent copy
+].
-layout notNil ifTrue:[
+undoHistory addUndoBlock:[
-undoHistory addUndoBlock:[
+(view := self findViewWithId:aViewId) notNil ifTrue:[
-(view := self findViewWithId:aViewId) notNil ifTrue:[
+layout notNil ifTrue:[view geometryLayout:layout]
-view geometryLayout:layout
+ifFalse:[view extent:extent]
-]
 ]
-] ifFalse:[
+]
-layout := view pixelOrigin.
+].
+view := nil
-undoHistory addUndoBlock:[
-(view := self findViewWithId:aViewId) notNil ifTrue:[
-view pixelOrigin:layout
-]
-]
-]
-]
 !
 undoLayoutView:aView
 "undo method for changing layout on a view
 "
 ]
 ]
 !
 undoRemove:aViewId
-"prepare undo method
+"undo method when removing an object
 "
 |view prop spec parentId|
 (view := self findViewWithId:aViewId) notNil ifTrue:[
 spec := (self generateSpecFor:view) first.
 view := view superView.
-(self supportsSubComponents:view) ifTrue:[
+(self canPasteInto:view) ifTrue:[
-prop := self propertyOfView:view.
+(prop := self propertyOfView:view) notNil ifTrue:[
-prop notNil ifTrue:[
 parentId := prop identifier
 ]
 ].
 view := nil.
 prop := nil.
 ].
 ]
 !
 undoSpecModify:aViewId
-"undo for updateFromSpec
+"undo method when changing the specification for an object
 "
 |builder view spec|
 (view := self findViewWithId:aViewId) notNil ifTrue:[
 spec := (self generateSpecFor:view) first.
 undoHistory addUndoBlock:[
 (view := self findViewWithId:aViewId) notNil ifTrue:[
 builder := UIBuilder new.
 spec setAttributesIn:view with:builder.
-view superView sizeChanged:nil
+self elementChangedSize:view.
 ]
 ]
 ].
 "update current selected view from specification
 "
 |props name builder|
 self singleSelection notNil ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self transaction:#specification selectionDo:[:aView|
 builder := UIBuilder new.
 props   := self propertyOfView:aView.
 name    := aSpec name.
 aSpec name:(aView name).
 ]
 ].
 aSpec setAttributesIn:aView with:builder.
-aView superView sizeChanged:nil.
+self elementChangedSize:aView.
 props tabable:aSpec tabable.
 props defaultable:aSpec defaultable.
 props initiallyInvisible:aSpec initiallyInvisible.
 props aspectSelector:aSpec modelSelector.
 props changeSelector:aSpec changeSelector.
 props labelSelector:aSpec labelSelector.
 props menuSelector:aSpec menuSelector.
-].
+]
-self changed:#tree
+].
-]
+self changed:#tree
 ].
 ! !
 !UIPainterView::ViewProperty class methodsFor:'documentation'!

changeset 62	0e8573b4329a
parent 60	7542ab7fbbfe
child 69	e533f77871dd