hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:e12f82d3afb7
+:d5ab85ec27fd
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 Object subclass:#UndoHistory
-	instanceVariableNames:'history transaction enabled'
+	instanceVariableNames:'startIdentifier identifier painter history transaction enabled'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:UIObjectView
 !
 Object subclass:#Transaction
-	instanceVariableNames:'type text actions'
+	instanceVariableNames:'identifier type text actions'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:UIObjectView::UndoHistory
 !
 !
+resetModification
+"set modification state to false
+"
+undoHistory resetModification
+!
 testMode
 "returns true if running test
 "
 ^ enableChannel value not
 inputView enableButtonEvents.
 inputView enableButtonMotionEvents.
 self setDefaultActions.
-undoHistory          := UndoHistory new.
+undoHistory          := UndoHistory on:self.
 enableChannel        := true asValue.
 clipChildren         := true.
 selectionHiddenLevel := 0.
 (self class gridShown) ifTrue:[
 delta := aPoint - org.
 delta := (self alignToGrid:aPoint) - org.
 dX := delta x.
 dY := delta y.
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:anObject top:dY bottom:dY left:dX right:dX
 ]
 ]
 !
 aPoint - aView computeOrigin
 ].
 self transaction:#move objects:movedObject do:[:aView|
 self invertOutlineOf:aView.
-self undoLayoutView:aView
+self createUndoLayout:aView
 ].
 !
 startSelectMoreOrMove:aPoint
 object := self singleSelection.
 self actionResize:object selector:b.
 self transaction:#resize selectionDo:[:aView|
-self undoLayoutView:aView
+self createUndoLayout:aView
 ].
 self setSelection:nil withRedraw:true.
 motionAction  := [:movePoint | self doDragResize:movePoint].
 releaseAction := [self endResize].
 !UIObjectView methodsFor:'private resizing-subviews'!
 resize:aView bottom:aPoint
 "resize a views bottom
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
 ]
 !
 resize:aView bottomLeft:aPoint
 "resize a views bottom and left
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:0
 bottom:((aPoint y) - (aView computeCorner y))
 left:((aPoint x) - (aView computeOrigin x))
 right:0
 "
 |delta|
 delta := aPoint - aView computeCorner.
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
 ]
 !
 resize:aView left:aPoint
 "resize a views left
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView left:((aPoint x) - (aView computeOrigin x)) right:0
 ]
 !
 "
 |delta|
 delta := aPoint - aView computeOrigin.
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:(delta y) bottom:0 left:(delta x) right:0
 ]
 !
 resize:aView right:aPoint
 "resize a views right
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
 ]
 !
 resize:aView top:aPoint
 "resize a views top
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
 ]
 !
 resize:aView topRight:aPoint
 "resize a views top and right
 "
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y))
 bottom:0
 left:0
 right:((aPoint x) - (aView computeCorner x))
 |type layout oldExt|
 type := self class layoutType:aView.
 type notNil ifTrue:[
-self undoLayoutView:aView.
+self createUndoLayout:aView.
 type == #Extent ifTrue:[
 oldExt := aView extent.
 aView extent:(oldExt + ((r-l) @ (b-t))).
 ^ self
 "
 ^ self numberOfSelections ~~ 0
 !
-hasUndos
-"returns true if undoHistory not empty
-"
-^ undoHistory notEmpty
-!
 isHorizontalResizable:aComponent
 "returns true if instance is horizontal resizeable
 "
 ^ self subclassResponsibility
 !
+isModified
+"returns true if painter is modified
+"
+^ undoHistory isModified
+!
 isSelected:anObject
 "return true, if the argument, anObject is selected
 "
 anObject notNil ifTrue:[
 self selectionDo:[:el| el == anObject ifTrue:[^ true]]
 ! !
 !UIObjectView methodsFor:'transaction'!
+createUndoLayout:aView
+"prepare undo action for a view changing its layout
+"
+self subclassResponsibility
+!
 transaction:aType objects:something do:aOneArgBlock
 "opens a transaction and evaluates a block within the transaction; the
 argument to the block is a view from derived from something
 "
 "opens a transaction and evaluates a block within the transaction; the
 argument to the block is a view from the selection
 "
 self transaction:aType objects:(self selection) do:aOneArgBlock
-!
-undoLayoutView:aView
-"prepare undo action for a view changing its layout
-"
-self subclassResponsibility
 ! !
 !UIObjectView methodsFor:'user actions - arrange'!
 pasteExtent
 "paste the copied extent to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transition:#pasteExtent dimensionDo:[:v|
+self transaction:#pasteExtent dimensionDo:[:v|
 self resize:v corner:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 pasteHeight
 "paste the copied extent height to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transition:#pasteHeight dimensionDo:[:v|
+self transaction:#pasteHeight dimensionDo:[:v|
 self resize:v bottom:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 pasteLayout
 "paste layout to all objects in the selection
 "
 copiedLayout notNil ifTrue:[
-self transition:#pasteLayout dimensionDo:[:v|
+self transaction:#pasteLayout dimensionDo:[:v|
 v geometryLayout:(copiedLayout copy)
 ]
 ]
 !
 pasteWidth
 "paste the copied extent width to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transition:#pasteWidth dimensionDo:[:v|
+self transaction:#pasteWidth dimensionDo:[:v|
 self resize:v right:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 setDimension:aLayout
 "change layout for all selected objects
 "
-self transition:#layout dimensionDo:[:v|
+self transaction:#layout dimensionDo:[:v|
 v geometryLayout:(aLayout copy)
 ].
 !
 setExtent:anExtent
 "change extent for all selected objects
 "
-self transition:#extent dimensionDo:[:v|
+self transaction:#extent dimensionDo:[:v|
 v geometryLayout:nil.
 v extent:anExtent.
 ].
 "Modified: 28.2.1997 / 12:49:00 / cg"
 !
 setToDefaultExtent
 "change extent of all selected views to their default extent
 "
-self transition:#defaultExtent dimensionDo:[:v|
+self transaction:#defaultExtent dimensionDo:[:v|
 self resize:v corner:(v computeOrigin + (v preferredExtent))
 ]
 !
 setToDefaultHeight
 "change height of all selected views to their default height
 "
-self transition:#defaultHeight dimensionDo:[:v|
+self transaction:#defaultHeight dimensionDo:[:v|
 self resize:v bottom:(v computeOrigin + (v preferredExtent))
 ]
 !
 setToDefaultWidth
 "change width of all selected views to their default width
 "
-self transition:#defaultWidth dimensionDo:[:v|
+self transaction:#defaultWidth dimensionDo:[:v|
 self resize:v right:(v computeOrigin + (v preferredExtent))
 ]
 !
-transition:aType dimensionDo:aOneArgBlock
+transaction:aType dimensionDo:aOneArgBlock
 "change dimension within a transaction for the selected elements by evaluating
 the block with the argument a view.
 "
 self withSelectionHiddenDo:[
 self transaction:aType selectionDo:[:aView|
 (self class layoutType:aView) notNil ifTrue:[
-self undoLayoutView:aView.
+self createUndoLayout:aView.
 aOneArgBlock value:aView.
 self elementChangedSize:aView.
 ]
 ]
 ].
 self transaction:#alignLeftRight selectionDo:[:aView|
 |layout|
 layout := self class asLayoutFrameFromView:aView.
 layout notNil ifTrue:[
-self undoLayoutView:aView.
+self createUndoLayout:aView.
 aView geometryLayout:layout.
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView left:(lmost - (aView computeOrigin x))
 right:(rmost - (aView computeCorner x)).
 ].
 self elementChangedSize:aView
 ]
 self transaction:#alignTopBottom selectionDo:[:aView|
 |layout|
 layout := self class asLayoutFrameFromView:aView.
 layout notNil ifTrue:[
-self undoLayoutView:aView.
+self createUndoLayout:aView.
 aView geometryLayout:layout.
-undoHistory disabledTransitionDo:[
+undoHistory withoutTransactionDo:[
 self shiftLayout:aView top:(tmost - (aView computeOrigin y))
 bottom:(bmost - (aView computeCorner y)).
 ].
 self elementChangedSize:aView
 ]
 self transaction:type selectionDo:[:aView|
 layout := self class asLayoutFrameFromView:aView.
 layout notNil ifTrue:[
-self undoLayoutView:aView.
+self createUndoLayout:aView.
 aBlock value:layout.
 aView geometryLayout:layout.
 self elementChangedSize:aView.
 ]
 ]
 !
 openUndoMenu
 "open undo menu
 "
-self select:nil.
+undoHistory isEmpty ifFalse:[
+self select:nil.
-self withSelectionHiddenDo:[
-undoHistory openUndoMenu
+self withSelectionHiddenDo:[
+undoHistory openUndoMenu
+]
 ].
 !
 removeUndoHistory
 "delete total undo history
 "
-undoHistory reinitialize
+undoHistory on:self
 !
 undoLast
 "undo last action
 "
-self select:nil.
+undoHistory isEmpty ifFalse:[
+self select:nil.
-self withSelectionHiddenDo:[
-undoHistory undoLast:1
+self withSelectionHiddenDo:[
+undoHistory undoLast:1
+]
 ].
 ! !
 !UIObjectView::UndoHistory class methodsFor:'constants'!
 maxHistorySize
 "returns maximum size of history before removing oldest
 record
 "
-^ 50
+^ 100
 ! !
 !UIObjectView::UndoHistory class methodsFor:'documentation'!
 ! !
 !UIObjectView::UndoHistory class methodsFor:'instance creation'!
-new
+on:aPainter
-^ self basicNew initialize
+|history|
+history := self new.
+history on:aPainter.
+^ history
 ! !
 !UIObjectView::UndoHistory methodsFor:'accessing'!
+addUndoSelector:aSelector withArgs:anArray
+"add a selector with arguments to the current opened transaction; in case that no
+transaction is opened or disabled the block will not be kept in the history.
+"
+self isTransactionOpen ifTrue:[
+transaction add:(Association key:aSelector value:anArray)
+]
+! !
+!UIObjectView::UndoHistory methodsFor:'accessing behavior'!
 enabled
 ^ enabled
 !
 enabled:aState
 enabled := aState
 !
-historySize
+resetModification
-^ history size
+"set modification state to false
-!
+"
+startIdentifier := identifier
-lastTypeAsString
+! !
-"returns type of last undo asString or nil
-"
+!UIObjectView::UndoHistory methodsFor:'activation'!
-history notEmpty ifTrue:[
-^ history last typeAsString
+withinTransaction:aType text:aTextOrNil do:aBlock
-].
+"open a transaction; perform the block; at least close the transaction
-^ nil
+"
+(enabled and:[transaction isNil]) ifTrue:[
+transaction := Transaction type:aType text:aTextOrNil.
+aBlock value.
+transaction isEmpty ifFalse:[
+identifier := identifier + 1.
+transaction identifier:identifier.
+history addLast:transaction.
+history size > (self class maxHistorySize) ifTrue:[history removeFirst]
+].
+transaction := nil
+] ifFalse:[
+aBlock value
+]
+!
+withoutTransactionDo:aNoneArgBlock
+"evaluate the block without opening a transaction or keeping changes
+within a still opened transaction
+"
+|oldState|
+oldState := enabled.
+enabled  := false.
+aNoneArgBlock value.
+enabled  := oldState.
 ! !
 !UIObjectView::UndoHistory methodsFor:'initialization'!
-initialize
+on:aPainter
-super initialize.
+"setup for a painter and delete all existing history records
-self  reinitialize.
+"
+identifier      := 0.
+startIdentifier := 0.
-!
+painter     := aPainter.
-reinitialize
-"reinitialize all attributes
-"
 history     := OrderedCollection new.
 transaction := nil.
 enabled     := true.
 ^ history isEmpty
 !
+isModified
+"returns true if history is modified
+"
+self isEmpty ifTrue:[
+^ false
+].
+^ history last identifier ~~ startIdentifier
+!
 isTransactionOpen
 ^ (enabled and:[transaction notNil])
-!
-notEmpty
-"returns true if undo history is not empty
-"
-^ history notEmpty
-! !
-!UIObjectView::UndoHistory methodsFor:'transaction'!
-addUndoBlock:anUndoBlock
-"undo block to restore changes; add block to current transaction
-"
-self isTransactionOpen ifTrue:[
-transaction add:anUndoBlock
-]
-!
-disabledTransitionDo:aBlock
-"disable transitions during evaluating the block
-"
-|oldState|
-oldState := enabled.
-enabled  := false.
-aBlock value.
-enabled  := oldState.
-!
-transaction:aType do:aBlock
-self transaction:aType text:nil do:aBlock
-!
-transaction:aType text:aTextOrNil do:aBlock
-"open a transaction; perform the block; at least close the transaction
-"
-(enabled and:[transaction isNil]) ifTrue:[
-transaction := Transaction type:aType text:aTextOrNil.
-aBlock value.
-transaction isEmpty ifFalse:[
-history addLast:transaction.
-history size > (self class maxHistorySize) ifTrue:[history removeFirst]
-].
-transaction := nil
-] ifFalse:[
-aBlock value
-]
 ! !
 !UIObjectView::UndoHistory methodsFor:'undo'!
 undoLast:nTransactions
 "undo last n transactions; an open transaction will be closed;
 transactions during undo are disabled
 "
-|n|
+|repeatTimes transaction actions|
 transaction := nil.
-n := nTransactions min:(history size).
+enabled     := false.
+repeatTimes := nTransactions min:(history size).
-n ~~ 0 ifTrue:[
-enabled := false.
+repeatTimes timesRepeat:[
-n timesRepeat:[ (history removeLast) undo ].
+transaction := history removeLast.
-enabled := true.
+actions     := transaction actions.
-]
+actions isCollection ifTrue:[
+actions reverseDo:[:aBlock|
+painter perform:(aBlock key) with:(aBlock value)
+]
+] ifFalse:[
+painter perform:(actions key) with:(actions value)
+]
+].
+enabled := true.
 ! !
 !UIObjectView::UndoHistory::Transaction class methodsFor:'documentation'!
 documentation
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'accessing'!
+actions
+"returns actions associated with transaction
+"
+^ actions
+!
+identifier
+"gets my identifier
+"
+^ identifier
+!
+identifier:anIdentifier
+"sets my identifier
+"
+identifier := anIdentifier
+!
 text
-"returns text or nil assigned to transition
+"returns text or nil assigned to transaction
 "
 ^ text
 !
 type
-"returns type assigned to transition
+"returns type assigned to transaction
 "
 ^ type
 !
 type:aType
-"change type assigned to transition
+"change type assigned to transaction
 "
 type := aType
 !
 typeAsString
 size := size + 1
 ].
 ^ name
 ! !
-!UIObjectView::UndoHistory::Transaction methodsFor:'add & undo'!
+!UIObjectView::UndoHistory::Transaction methodsFor:'adding'!
 add:anUndoBlock
-"add an undo action to the transition
+"add an undo action to the current transaction
 "
 actions isNil ifTrue:[
 actions := anUndoBlock
 ] ifFalse:[
 actions isCollection ifFalse:[
-|temp|
+actions := OrderedCollection with:actions
-temp := OrderedCollection new.
-temp add:actions.
-actions := temp.
 ].
 actions add:anUndoBlock.
 ]
-!
-undo
-"undo transition
-"
-actions notNil ifTrue:[
-actions isCollection ifFalse:[
-actions value
-] ifTrue:[
-actions reverseDo:[:anUndoBlock| anUndoBlock value ]
-]
-]
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'initialization'!
 type:aType text:aTextOrNil
-"initialize transition
+"initialize transaction
 "
 type := aType.
 text := aTextOrNil.
 ! !
 isEmpty
 "returns true if no undo action is registered
 "
 ^ actions isNil
-!
-notEmpty
-"returns true if any undo action is registered
-"
-^ actions notNil
 ! !
 !UIObjectView class methodsFor:'documentation'!
 version

changeset 134	d5ab85ec27fd
parent 132	8649766ce095
child 138	035c98964c38