hg/stx-libtool2: comparison UIPainterView.st

equal deleted inserted replaced

-:d6dccf1ad344
+:35c5711729c2
 !
 pasteBuffer
 "add the objects in the paste-buffer to the object view
 "
+self pasteSpecifications:(self getSelection) keepLayout:false
+!
+pasteSpecifications:aSpecificationOrList keepLayout:keepLayout
+"add the specs to the object view
+"
 |paste frame pasteOrigin pasteOffset builder|
-paste := self getSelection.
+(self canPaste:aSpecificationOrList) ifFalse:[
+^ self
-(self canPaste:paste) ifFalse:[ ^ self].
+].
-(paste isCollection)  ifFalse:[ paste := Array with:paste].
+aSpecificationOrList isCollection ifTrue:[
+paste := aSpecificationOrList
+] ifFalse:[
+paste := Array with:aSpecificationOrList
+].
 frame := self singleSelection.
 (self canPasteInto:frame) ifFalse:[
 frame := self
 ].
 self unselect.
-selection   := OrderedCollection new.
+selection := OrderedCollection new.
-pasteOffset := 0@0.
+builder   := UIBuilder new.
-pasteOrigin := self sensor mousePoint.
-pasteOrigin := device translatePoint:pasteOrigin from:device rootView id to:frame id.
+keepLayout ifFalse:[
-builder     := UIBuilder new.
+pasteOffset := 0@0.
+pasteOrigin := self sensor mousePoint.
+pasteOrigin := device translatePoint:pasteOrigin from:device rootView id to:frame id.
+].
 paste do:[:aSpec|
 |view|
 view := self addSpec:aSpec builder:builder in:frame.
-(frame bounds containsPoint:pasteOrigin) ifFalse:[
+keepLayout ifFalse:[
-self moveObject:view to:pasteOffset.
+(frame bounds containsPoint:pasteOrigin) ifFalse:[
-] ifTrue:[
+self moveObject:view to:pasteOffset.
-self moveObject:view to:pasteOrigin + pasteOffset.
+] ifTrue:[
+self moveObject:view to:pasteOrigin + pasteOffset.
+].
+pasteOffset := pasteOffset + 4
 ].
 view realize.
 selection add:view.
-pasteOffset := pasteOffset + 4.
 ].
 self transaction:#paste selectionDo:[:v|
 self undoCreate:((self propertyOfView:v) identifier)
 ].
 self realizeAllSubViews.
 inputView raise.
 self elementChangedSize:frame.
 self changed:#tree
+!
+pasteWithLayout
+"add the objects in the paste-buffer to the object view; don't change the
+layout
+"
+self pasteSpecifications:(self getSelection) keepLayout:true
 ! !
 !UIPainterView methodsFor:'drag & drop'!
 canDrop:anObjectOrCollection
-Transcript showCR:'canDrop'.
+|spec|
-^ true
+testMode ifFalse:[
+anObjectOrCollection size == 1 ifTrue:[
+spec := (anObjectOrCollection at:1) theObject.
+^ (spec isKindOf:UISpecification)
+]
+].
+^ false
 !
 drop:anObjectOrCollection at:aPoint
-Transcript showCR:'drop:anObjectOrCollection at:aPoint'.
+|spec|
+spec := (anObjectOrCollection at:1) theObject.
+self pasteSpecifications:spec keepLayout:false.
 ! !
 !UIPainterView methodsFor:'generating output'!
 className isNil ifTrue:[
 self warn:'set the class first'.
 ^ code
 ].
+cls := Smalltalk classNamed:className.
 viewProperties do:[:aProp |
 |modelSelector menuSelector protoSpec thisCode|
 (modelSelector := aProp model) notNil ifTrue:[
 ]
 ]
 ].
 ^ code
-! !
+!
-!UIPainterView ignoredMethodsFor:'generating output'!
 generateClassDefinition
 |defCode|
 defCode := superclassName , ' subclass:#' , className , '\'.
 ^ defCode withCRs
-! !
+!
-!UIPainterView methodsFor:'generating output'!
 generateCode
 "generate code for the windowSpec method"
 |code|
 "/    code := code , self generateAspectMethods.
 ^ code withCRs
 "Modified: 5.9.1995 / 20:57:53 / claus"
-! !
+!
-!UIPainterView ignoredMethodsFor:'generating output'!
 generateInitCodeForGroup:aGroup
 |code c name p objects outlets moreCode sym typ val|
 " <name> := <GroupClass> in:<name-of-superview>"
 !
 generateOutlets
 ^ self
-! !
+!
-!UIPainterView methodsFor:'generating output'!
 generateWindowSpecMethodSource
 |t s spec specArray str code|
 specArray := OrderedCollection new.
 , '\\'.
 ^ code withCRs
 "Modified: 5.9.1995 / 21:01:35 / claus"
-! !
+!
-!UIPainterView ignoredMethodsFor:'generating output'!
 nameOfClass
 ^ 'NewView'
-! !
+!
-!UIPainterView methodsFor:'generating output'!
 outletValueOf:aSymbol for:aView
 "/    |c name p outlets moreCode sym typ val|
 "/
 "/    p := self propertyOfView:aView.
 selection isNil ifTrue:[
 undoIdx := 2.
 menu := PopUpMenu labels:( resources array:#('paste' 'undo') )
-selectors:#( #pasteBuffer #undoLast )
+selectors:#( #paste #undoLast )
-accelerators:#( #Paste       nil )
+receiver:self
-receiver:self.
-canPaste ifFalse:[menu disable:#pasteBuffer].
 ] ifFalse:[
 undoIdx := 4.
 menu := PopUpMenu labels:( resources array:#(
 'copy'
 'align'
 )
 )
 selectors:#(   #copySelection
 #deleteSelection
-#pasteBuffer
+#paste
 #undoLast
 nil
 #arrange
 #dimension
 #align
 )
 accelerators:#(#Copy
 #Cut
-#Paste
+nil
 nil
 nil
 nil
 nil
 nil
 )
 receiver:self.
-(canPaste and:[self canPasteInto:selection]) ifFalse:[
+canPaste := (canPaste and:[self canPasteInto:selection]).
-menu disable:#pasteBuffer
-].
 menu subMenuAt:#arrange   put:(self subMenuArrange).
 menu subMenuAt:#dimension put:(self subMenuDimension).
 menu subMenuAt:#align     put:(self subMenuAlign).
 ].
+menu subMenuAt:#paste put:(self subMenuPaste).
+canPaste ifFalse:[menu disable:#paste].
 undoText notNil ifTrue:[
 menu labelAt:undoIdx put:((menu labels at:undoIdx), ':  ', undoText)
 ] ifFalse:[
 menu disable:#undoLast
 'copy extent'
 '-'
 'paste extent'
 'paste width'
 'paste height'
+'-'
+'copy  layout'
+'paste layout'
 )
 )
 selectors:#(
 setToDefaultExtent
 setToDefaultWidth
 copyExtent
 nil
 pasteExtent
 pasteWidth
 pasteHeight
+nil
+copyLayout
+pasteLayout
 )
 receiver:self.
 ^ menu
 !
 nil
 showFontPanel
 )
 receiver:self.
 ^ menu
+!
+subMenuPaste
+"returns submenu Paste
+"
+|menu|
+menu := PopUpMenu labels:( resources array:#('paste' 'keep layout') )
+selectors:#( #pasteBuffer #pasteWithLayout )
+accelerators:#( #Paste       nil )
+receiver:self.
+^ menu
 ! !
 !UIPainterView methodsFor:'misc'!
 changeFontFamily:family face:face style:style size:size
 undoHistory reinitialize.
 self changed:#tree
 ! !
 !UIPainterView methodsFor:'searching'!
+findContainerViewAt:aPoint
+"find container view responds to aPoint.
+"
+|view|
+(view := self findObjectAt:aPoint) isNil ifTrue:[
+^ self
+].
+[(view specClass supportsSubComponents or:[(view := view superView) == self])
+] whileFalse:[
+[(self propertyOfView:view) isNil] whileTrue:[
+(view := view superView) == self ifTrue:[^ self]
+].
+].
+^ view
+!
 findObjectAt:aPoint
 "find the origin/corner of the currentWidget
 "
 |view|

changeset 89	35c5711729c2
parent 86	06bdbae8bd8e
child 96	73725336b4fe