hg/stx-libtool2: comparison UIPainterView.st

equal deleted inserted replaced

-:7276365d9311
+:5af567f52811
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 Object subclass:#ViewProperty
-	instanceVariableNames:'aspectSelector changeSelector name nameIndex view elementClass
+	instanceVariableNames:'aspectSelector changeSelector nameIndex view elementClass
-		labelSelector identifier'
+		labelSelector identifier tabable'
 	classVariableNames:'Identifier'
 	poolDictionaries:''
 	privateIn:UIPainterView
 !
 ]
 ].
 coll size == 1 ifTrue:[ ^ self select:(coll at:1) ].
 coll size == 0 ifTrue:[ ^ self unselect ].
-self hideSelection.
+^ self select:coll.
-selection := coll.
-self showSelection.
-^ self changed:#selection
 ]
 ].
 prop := self propertyOfName:s.
 prop isNil ifTrue:[^ self unselect]
 props := self addProperties:nil for:anObject.
 undoHistory transaction:#create text:(props name) do:[
 self undoCreate:(props identifier).
 ].
+! !
+!UIPainterView methodsFor:'drag & drop'!
+canDrop:anObjectOrCollection
+Transcript showCR:'canDrop'.
+^ true
+!
+drop:anObjectOrCollection at:aPoint
+Transcript showCR:'drop:anObjectOrCollection at:aPoint'.
+! !
+!UIPainterView methodsFor:'event handling'!
+keyPress:key x:x y:y
+<resource: #keyboard ( #Copy #Paste) >
+key == #Copy ifTrue:[
+^ self copySelection
+].
+key == #Paste ifTrue:[
+^ self pasteBuffer
+].
+super keyPress:key x:x y:y
 ! !
 !UIPainterView ignoredMethodsFor:'generating output'!
 generateClassDefinition
 ^ self
 ! !
 !UIPainterView methodsFor:'generating output'!
 generateSpecFor:something
 "generate a spec for a view or collection of views
 "
 |spec views|
 something notNil ifTrue:[
 something isCollection ifTrue:[views := something]
 ifFalse:[views := Array with:something].
 spec := views collect:[:aView||topSpec|
+aView specClass isNil ifTrue:[^ nil].
 topSpec := aView specClass
 fromView:aView
-callBack:[:spec :aSubView |
+callBack:[:newSpec :view | self stuffPropertiesFrom:view intoSpec:newSpec].
-"/                                aSubView geometryLayout:(aSubView geometryLayout copy)
-].
 topSpec
 ]
 ].
 ^ spec
 !
 generateWindowSpecMethodSource
 |spec specArray str code|
 , methodName , '\'
 , '    "this window spec was automatically generated by the ST/X UIPainter"\\'
 , '    "do not manually edit this - the painter/builder may not be able to\'
 , '     handle the specification if its corrupted."\\'
-, '    "UIPainter new openOnClass:' , className , ' andSelector:#' , methodName , '"\'
+, '    "\'
-, '    "' , className , ' new openInterface:#' , methodName , '"\'.
+, '     UIPainter new openOnClass:' , className , ' andSelector:#' , methodName , '\'
+, '     ' , className , ' new openInterface:#' , methodName , '\'
+, '    "\'.
 methodName = 'windowSpec' ifTrue:[
 code := code , '    "' , className , ' open"\'
 ].
 code := code
 stuffPropertiesFrom:view intoSpec:newSpec
 "stuff any additional information (held in the properties) into the spec
 which was just created from view"
-|props aspectSelector changeSelector labelSelector name|
+|props aspectSelector changeSelector labelSelector name tabable|
 props := self propertyOfView:view.
 props isNil ifTrue:[^ self].
 (aspectSelector := props aspectSelector) notNil ifTrue:[
 (changeSelector := props changeSelector) notNil ifTrue:[
 newSpec change:changeSelector
 ].
 (labelSelector := props labelSelector) notNil ifTrue:[
 newSpec label:labelSelector
+].
+(tabable := props tabable) notNil ifTrue:[
+newSpec tabable:tabable
 ].
 (name := props name) notNil ifTrue:[
 newSpec name:name
 ].
 spec := UISpecification from:specOrSpecArray.
 builder := UIBuilder new.
 builder componentCreationHook:[:view :spec :aBuilder |
-self createdComponent:view forSpec:spec
+self createdComponent:view forSpec:spec builder:aBuilder
 ].
 builder applicationClass:(Smalltalk classNamed:className).
 spec setupView:self for:builder.
 self realizeAllSubViews.
 inputView raise.
 "/    viewProperties := OrderedCollection new.
 "/    self generatePropertiesFor:(self subViews select:[:v | v ~~ inputView]).
 props isNil ifTrue:[^ nil].
 "/    ^ props changeSelector
 ^ nil
 !
-createdComponent:newView forSpec:aSpec
+createdComponent:newView forSpec:aSpec builder:aBuilder
 "callBack from UISpec view building"
 |props|
 props := self propertiesForNewView:newView.
 ]
 ].
 props labelSelector:(aSpec labelSelector).
 props aspectSelector:(aSpec modelSelector).
+props tabable:(aSpec tabable).
 viewProperties add:props.
 !
 generatePropertiesFor:aCollectionOfViews
 |p|
 self singleSelectionDo:[:aView |
 p := self propertyOfView:aView.
 p inspect
+]
+!
+inspectSpec
+|s|
+self singleSelectionDo:[:aView |
+s := self generateSpecFor:aView.
+s first inspect
 ]
 !
 setAspectSelector:aspectSymbol forView:aView
 |props|
 menu := PopUpMenu labels:(
 resources array:#(
 'paste'
 '-'
 'undo'
+'delete undo history'
+'-'
 'grid'
 )
 )
 selectors:#(
 #pasteBuffer
 nil
 #undo
+#undoDeleteAll
+nil
 #grid
 )
+accelerators:#(
+#Paste
+nil
+nil
+nil
+nil
+nil
+)
 receiver:self.
+(self canPaste:(self getSelection)) ifFalse:[
+menu disable:#pasteBuffer
+].
 undoHistory isEmpty ifTrue:[
 menu disable:#undo
 ] ifFalse:[
 menu subMenuAt:#undo put:(undoHistory popupMenu)
 !
 menuSelection
 "menu in case of non empty selection; for views
 "
-|menu arrangeMenu subMenuAlign|
+|menu|
 menu := PopUpMenu labels:( resources array:#(
 'copy'
 'cut'
 'paste'
 '-'
 'arrange'
 'dimension'
+'align'
 )
 )
 selectors:#(   #copySelection
 #deleteSelection
 #pasteBuffer
 nil
 #arrange
 #dimension
+#align
+)
+accelerators:#(#Copy
+#Cut
+#Paste
+nil
+nil
+nil
+nil
 )
 receiver:self.
-(self supportsSubComponents:selection) ifFalse:[
+(    (self canPaste:(self getSelection))
+and:[self supportsSubComponents:selection]
+) ifFalse:[
 menu disable:#pasteBuffer
 ].
-arrangeMenu := PopUpMenu labels:#( 'to front' 'to back' )
+menu subMenuAt:#arrange   put:(self subMenuArrange).
-selectors:#( #raiseSelection  #lowerSelection )
-receiver:self.
-menu subMenuAt:#arrange put:arrangeMenu.
 menu subMenuAt:#dimension put:(self subMenuDimension).
+menu subMenuAt:#align     put:(self subMenuAlign).
-selection size > 1 ifTrue:[
-menu addLabels:( resources array:#('align') )
-selectors:#( align ).
-menu subMenuAt:#align put:self subMenuAlign
-].
 ^ menu
 !
 subMenuAlign
 "returns submenu alignment
 centerSelectionVer
 )
 receiver:self.
 ^ menu
+!
+subMenuArrange
+"returns submenu arrange
+"
+|menu|
+menu := PopUpMenu labels:(
+resources array:#(
+'to front'
+'to back'
+)
+)
+selectors:#(
+raiseSelection
+lowerSelection
+)
+receiver:self.
+^ menu
 !
 subMenuDimension
 "returns submenu dimension
 "
 pasteWidth
 pasteHeight
 )
 receiver:self.
 ^ menu
+!
+subMenuFont
+"returns submenu dimension
+"
+|menu|
+menu := PopUpMenu labels:(
+resources array:#(
+'larger'
+'smaller'
+'-'
+'normal'
+'bold'
+'italic'
+'bold italic'
+'-'
+'font panel'
+)
+)
+selectors:#(
+largerFont
+smallerFont
+nil
+normalFont
+boldFont
+italicFont
+boldItalicFont
+nil
+showFontPanel
+)
+receiver:self.
+^ menu
 ! !
 !UIPainterView methodsFor:'menu actions'!
 copySelection
 deleteSelection
 "delete the selection
 "
 |specs text|
-selection notNil ifTrue:[
+self numberOfSelections ~~ 0 ifTrue:[
 specs := self generateSpecFor:selection.
-text := self transactionTextFor:selection.
+text  := self transactionTextFor:selection.
 undoHistory transaction:#cut text:text do:[
 super deleteSelection
 ].
 self setSelection:specs
 !
 pasteBuffer
 "add the objects in the paste-buffer
 "
-|sel firstEntry builder frame|
+|paste builder frame pasteOrigin pasteOffset|
-sel   := self getSelection.
+paste := self getSelection.
-frame := self.
+(self canPaste:paste) ifFalse:[ ^ self].
-selection notNil ifTrue:[
+(paste isCollection)  ifFalse:[ paste := Array with:paste].
-(self supportsSubComponents:selection) ifTrue:[
-frame := selection
+frame := self singleSelection.
-].
-self unselect
+(self supportsSubComponents:frame) ifFalse:[
-].
+frame := self
+].
-sel size == 0 ifTrue:[firstEntry := sel]
+self unselect.
-ifFalse:[firstEntry := sel at:1].
+builder     := UIBuilder new.
-(firstEntry isKindOf:UISpecification) ifFalse:[
+selection   := OrderedCollection new.
-^ self
+pasteOffset := 0@0.
-].
+pasteOrigin := self sensor mousePoint.
-builder   := UIBuilder new.
+pasteOrigin := device translatePoint:pasteOrigin from:device rootView id to:frame id.
-selection := OrderedCollection new.
+paste do:[:aSpec|
-sel do:[:aSpec||v|
+|v org|
-builder componentCreationHook:[:view :spec :aBuilder |
-self createdComponent:view forSpec:spec
+builder componentCreationHook:[:view :spec :aBuilder |
+self createdComponent:view forSpec:spec builder:aBuilder.
 ].
 builder applicationClass:(Smalltalk classNamed:className).
 v := aSpec buildViewWithLayoutFor:builder in:frame.
+(frame bounds containsPoint:pasteOrigin) ifFalse:[
+self moveObject:v to:pasteOffset.
+] ifTrue:[
+self moveObject:v to:pasteOrigin + pasteOffset.
+].
 v realize.
 selection add:v.
+pasteOffset := pasteOffset + 4.
 ].
 self transaction:#paste selectionDo:[:v|
 self undoCreate:((self propertyOfView:v) identifier)
 ].
 !
 transactionTextFor:anElementOrCollection
 "returns text used by transaction or nil
 "
-|props|
+|props size|
 anElementOrCollection notNil ifTrue:[
-anElementOrCollection size > 1 ifTrue:[
+anElementOrCollection isCollection ifTrue:[
-^ 'a collection'
+size := anElementOrCollection.
+size == 0 ifTrue:[^ nil].
+size ~~ 1 ifTrue:[^ 'a collection'].
+props := self propertyOfView:(anElementOrCollection at:1).
+] ifFalse:[
+props := self propertyOfView:anElementOrCollection
 ].
+props notNil ifTrue:[ ^ props name ]
-anElementOrCollection isCollection ifFalse:[
-props := self propertyOfView:anElementOrCollection
-] ifTrue:[
-anElementOrCollection notEmpty ifTrue:[
-props := self propertyOfView:(anElementOrCollection at:1)
-]
-].
-props notNil ifTrue:[
-^ props name
-]
 ].
 ^ nil
 !
 undoCreate:aViewIdentifier
 ].
 aView := nil.
 ! !
+!UIPainterView methodsFor:'update from Specification'!
+updateFromSpec:aSpec
+"update current selected view from specification
+"
+self singleSelection notNil ifTrue:[
+self selectionHiddenDo:[
+self transaction:#specification selectionDo:[:aView|
+|spec builder|
+spec := (self generateSpecFor:aView) first.
+undoHistory addUndoBlock:[
+builder := UIBuilder new.
+spec setAttributesIn:aView with:builder.
+aView superView sizeChanged:nil
+].
+builder := UIBuilder new.
+aSpec setAttributesIn:aView with:builder.
+aView superView sizeChanged:nil.
+(self propertyOfView:aView) tabable:aSpec tabable.
+].
+self changed:#tree
+]
+]
+! !
 !UIPainterView::ViewProperty class methodsFor:'instance creation'!
 new
 Identifier notNil ifTrue:[Identifier := Identifier + 1]
 ifFalse:[Identifier := 1].
 labelSelector := something.!
 name
 "return the value of the instance variable 'name' (automatically generated)"
-^ name!
+^ view name
+!
 name:something
 "set the value of the instance variable 'name' (automatically generated)"
-name := something.!
+view name:something
+!
 nameIndex
 "return the value of the instance variable 'nameIndex' (automatically generated)"
 ^ nameIndex!
 nameIndex:something
 "set the value of the instance variable 'nameIndex' (automatically generated)"
 nameIndex := something.!
+tabable
+"return the value of the instance variable 'tabable' (automatically generated)"
+^ tabable!
+tabable:something
+"set the value of the instance variable 'tabable' (automatically generated)"
+tabable := something.!
 view
 "return the value of the instance variable 'view' (automatically generated)"
 ^ view!

changeset 57	5af567f52811
parent 55	19e021c8f1ef
child 59	0a2b2ff030a0