hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:638ae95885e1
+:12f157d5e017
 ToolApplicationModel subclass:#UIPainter
 	instanceVariableNames:'treeView selectionPanel tabSelection specClass specSelector
 		specSuperclass aspects layoutCanvas helpCanvas specCanvas
-		transcript'
+		transcript modified'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 #testStartApplication
 'Starts current application on current window spec.'
 )
 ! !
 !UIPainter class methodsFor:'helpers'!
 convertString:aString maxLineSize:maxCharactersPerLine skipLineFeed:skipLineFeed
 )
 #(#MenuItem
 #label: 'Paste With Layout'
 #value: #pasteWithLayout
 #activeHelpKey: #pasteWithLayout
-#enabled: #canKeepLayoutInSelection
+#enabled: #valueOfCanPasteWithKeepingLayout
 )
 #(#MenuItem
 #label: '-'
 )
 #(#MenuItem
 #activeHelpKey: #editCopy
 #enabled: #valueOfCanCopy
 #labelImage: #(#ResourceRetriever nil #copyIcon)
 )
 #(#MenuItem
-#label: 'Paste'
+#label: 'Paste With Layout'
 #isButton: true
-#value: #pasteBuffer
+#value: #pasteWithLayout
 #activeHelpKey: #editPaste
-#enabled: #valueOfCanPaste
+#enabled: #valueOfCanPasteWithKeepingLayout
 #labelImage: #(#ResourceRetriever nil #pasteIcon)
 )
 #(#MenuItem
 #label: 'Delete'
 #isButton: true
 ].
 spec activeHelpKey:key.
 ] ifFalse:[
 self painter updateFromSpec:spec.
 ]
 ].
 self modifiedChannel value:false.
+modified := true.
 !
 addWidget: aSpecClass
 self addWidgetOfSpec: (Array with: (Smalltalk at: aSpecClass) new)
 self setViewInLayoutTool:view.
 spec class == DataSetSpec ifTrue:[
 view columnDescriptors:(spec columns)
 ].
 self modifiedChannel value:false.
+modified := false
 ]
 !
 inspectSpec
 "inspect the selected specification"
 treeView
 "returns the selection tree view which holds all widget identifiers
 "
 ^ treeView
+!
+valueOfCanPasteWithKeepingLayout
+|holder|
+(holder := builder bindingAt:#valueOfCanPasteWithKeepingLayout) isNil ifTrue:[
+builder aspectAt:#valueOfCanPasteWithKeepingLayout put:(holder :=  false asValue).
+].
+^ holder
 ! !
 !UIPainter methodsFor:'building editors'!
 openDataSetColumnEditor
 !
 openEditMenu
 "opens a menu editor on current widget
 "
-|cls aspect editor|
+|cls selectorOrMenu editor selectedSpec|
 cls := self resolveName:specClass.
 cls isNil ifTrue:[
 ^ self warn:'No application class defined yet!!'
 ].
 cls notNil ifTrue:[
-(aspect := self specTool specification menuSelector) notNil ifTrue:[
+(selectorOrMenu := self specTool specification menuSelector) notNil ifTrue:[
-aspect := aspect asSymbol
+selectorOrMenu := selectorOrMenu asSymbol
 ] ifFalse:[
 "/ cg: q&d hack ...
-aspect := treeView propertySelected.
+(selectedSpec := treeView propertySelected) notNil ifTrue:[
-aspect notNil ifTrue:[
 Object errorSignal handle:[:ex |
-aspect := nil.
+selectorOrMenu := nil.
 ] do:[
-aspect := aspect view asMenu.
+selectorOrMenu := selectedSpec view asMenu.
 ]
 ].
 ].
 editor := MenuEditor new.
 editor masterApplication:self.
 editor specClass: cls.
 editor useHelpTool: self helpTool.
-editor openModalOnClass:cls andSelector:aspect.
+selectorOrMenu class ~~ Menu
+ifTrue:  [editor openModalOnClass:cls andSelector:selectorOrMenu]
+ifFalse: [editor openModalOnMenu:selectorOrMenu].
 self helpTool updateList.
-editor selectorName ~= aspect ifTrue:[
+editor selectorName ~= selectorOrMenu ifTrue:[
 editor didInstall ifTrue:[
 self specTool specification menuSelector:editor selectorName asSymbol.
 self modifiedChannel value:true.
 self accept
 ]
 self accept
 ]
 ]
 !
-openSubSpecGuiPainter
+openSubSpecGUIPainter
 "opens a GUI Painter on the current subspecification"
 |spec cls meta sel|
 spec := self specTool specification.
 cls := spec majorKey.
 cls isNil ifTrue:[
-cls := self specClass.
+cls := specClass.
 ].
 (cls isNil or:[(cls := self resolveName:cls) isNil]) ifTrue:[
 spec majorKey isNil ifTrue:[
 ^ self warn:'Cannot find class (no majorKey specified)'.
 ].
 ! !
 !UIPainter methodsFor:'private'!
+askForModification
+"check interface modification
+"
+self treeSelection. "accept modifications"
+(modified or: [self painter isModified or: [self helpTool isModified]])
+ifTrue:
+[
+((YesNoBox title:'Window Spec was modified!!')
+noText:'Cancel';
+yesText:'Waste it and proceed';
+showAtPointer;
+accepted) ifFalse: [^false].
+modified := false.
+self painter resetModification
+].
+^true
+!
 checkModified
 "check interface modification
 "
-(self painter isModified or: [self helpTool isModified])
+(self isModified and: [self isModified or: [self helpTool isModified]])
 ifTrue:
 [
 ((YesNoBox title:'Window Spec was modified!!')
 noText:'Cancel';
 yesText:'Waste it and proceed';
 aView bePartner.
 !
 resourceMessage: aString
-aString notNil "and: [self askForModification])"
+(aString notNil and: [self askForModification])
 ifTrue:
 [
 |msg cls sel|
 msg := aString asCollectionOfWords.
 (msg size == 2 and:
 "
 ^ tabSelection = UILayoutTool label
 !
 isModified
-"returns true if current specification or layout is modified
+"return true if current specification or layout is modified
 "
 ^ self modifiedChannel value
 !
 isPainterEnabled
 or: [self canPasteInto: treeView selectedNode contents view]]]
 ].
 self valueOfCanCut value: canCutOrCopy.
 self valueOfCanCopy value: canCutOrCopy.
-self valueOfCanPaste value: canPaste
+self valueOfCanPaste value: canPaste.
+self valueOfCanPasteWithKeepingLayout value: (canPaste &  self canKeepLayoutInSelection)
 ! !
 !UIPainter methodsFor:'startup / release'!
 closeRequest
 "close all windows open by builder
 "
-self checkModified ifFalse:[^self].
+self askForModification ifFalse:[^self].
 treeView model removeDependent:self.
 self painter release.
 ColorMenu releaseResources.
 openInterface:aSymbol
 "open interfaces
 "
 |painterView painter cls topView|
+modified := false.
 aspects := IdentityDictionary new.
 aspects at:#classNameChannel put:(
 (specClass notNil ifTrue:[specClass]
 ifFalse:['NewApplication']) asValue
 doInstallAspects
 "install aspects and actions
 "
 |code|
+self treeSelection. "accept modifications"
 self hasSpecClassAndSelector ifFalse:[
 self defineClassAndSelector
 ].
 self checkClassAndSelector ifFalse:[
 doInstallHooks
 "install application hooks
 "
 |code|
+self treeSelection. "accept modifications"
 self hasSpecClassAndSelector ifFalse:[
 self defineClassAndSelector
 ].
 self checkClassAndSelector ifFalse:[
 "Created: / 31.10.1997 / 17:37:54 / cg"
 !
 doLoad
+self askForModification ifFalse: [^nil].
 self loadFromMessage:
 (ResourceSelectionBrowser
 request: 'Load Window Spec From Class'
 onSuperclass: nil
 !
 doLoadSubspec
 |subSpecMessage|
+self treeSelection. "ask for modification"
 (subSpecMessage := ResourceSelectionBrowser
 request: 'Load Subspec From Class'
 onSuperclass: nil
 andClass: specClass
 andSelector: specSelector
 !
 doNew
 "remove all components and associated resources
 "
-self painter isModified ifTrue:[
-(self confirm:'Edit a new window spec without saving current?') ifFalse:[
+self askForModification ifFalse: [^nil].
-^ self
+specClass := specSelector := nil.
-]
-].
 self painter removeAll.
+treeView canvas topView name:  UIPainter defaultNameOfCanvas.
+treeView canvas topView label: UIPainter defaultNameOfCanvas.
+treeView selection:#(1).
+self treeSelection.
+self updateInfoLabel.
 !
 doPickAView
 "pick a view and setup specifications
 "
 |painter view cls spec app|
-self painter isModified ifTrue:[
+self askForModification ifFalse: [^nil].
-(self confirm:'Pick another window spec without saving your modifications?') ifFalse:[
-^ self
-]
-].
 (view := Screen current viewFromUser) notNil ifTrue:[
 view == Screen current rootView ifFalse:[
 painter := self painter.
 spec    := UISpecification fromView:view topView.
 "/ ok, got it
-(app := view application) notNil ifTrue:[
+"   (app := view application) notNil ifTrue:[
 cls := app class
 ] ifFalse:[
 cls := view class
 ].
 self setClass:cls selector:nil.
+"
 painter setupFromSpec:spec.
 ]
-]
+].
-"Modified: / 1.11.1997 / 13:47:49 / cg"
+self updateInfoLabel
 !
 doRedefineMethods
 "redefine methods yes or no. If a method is defined in super class
 should the message be reinstalled ?
 doSave
 "install window spec
 "
 |code painter|
+self treeSelection. "ask for modification"
 self hasSpecClassAndSelector ifFalse:[
-self defineClassAndSelector
+(self defineClassAndSelector) isNil ifTrue: [^nil]
 ].
 (specClass notNil and: [(Smalltalk at: specClass asSymbol) isClass])
 ifFalse:
 [
 (ReadStream on:code) fileIn.
 self helpTool installHelpSpecsOnClass:specClass.
 self updateInfoLabel.
+modified := false.
 self painter resetModification.
 ((Smalltalk at: specClass asSymbol) class implements: specSelector)
 ifTrue:
 [
 doSaveAs
 "launch a dialog to define class, superclass and method"
 |resourceMessage|
+self treeSelection. "ask for modification"
 (resourceMessage := ResourceSelectionBrowser
 request: 'Save In Class'
 onSuperclass: #Object
 andClass: specClass ? #ApplicationModel
 doStartApplication
 "start current edited application
 "
 |cls app infoMessage|
+self treeSelection. "accept modifications"
 (specClass isNil or:[specSelector size < 2]) ifTrue:[
 self painter isModified ifTrue:[
 infoMessage := 'Class and selector must be defined,\and the window spec must be saved first!!' withCRs.
 ] ifFalse:[
 infoMessage := 'No class and selector defined!!'.
 "create the window specification but do not write to application; instead
 open a view
 "
 |code v|
+self treeSelection. "accept modifications"
 code := self painter generateWindowSpecMethodSource.
 v := CodeView open.
 v contents:code.
 v label:'windowSpec'.
 !
 loadFromMessage: aMessage
-((aMessage size > 0) and: [self checkModified])
+((aMessage size > 0) and: [self askForModification])
 ifTrue:
 [
 |readStream aClass aSelector|
 readStream := aMessage readStream.
 (aClass := Smalltalk at: (readStream upTo: $ ) asSymbol) notNil
 superclass isNil ifTrue:[
 self warn:'No class named ' , specSuperclass , ' exists!!'.
 ^ false.
 ].
-(self confirm:'Create ' , specClass , '?') ifTrue:[
+(self confirm:'Create class ' , specClass asBoldText, '?') ifTrue:[
 superclass subclass:(specClass asSymbol)
 instanceVariableNames:''
 classVariableNames:''
 poolDictionaries:''
 category:'Applications'.
 self painter className:specClass
 superclassName:specSuperclass
 selector:specSelector.
 ]
 ]
+ifFalse:
+[
+^nil
+]
 ] doWhile:[again].
 self specClass:specClass.
 self helpTool isModified: true
 self canvas subViews copy do:[:aView|
 (aView isKindOf:InputView) ifFalse:[aView destroy]
 ].
 model root name: UIPainter defaultNameOfCanvas asBoldText.
 model root children:(OrderedCollection new).
 model recomputeList.
-self selection:nil.
 !
 removeView:aView
 "remove a view

changeset 729	12f157d5e017
parent 724	7c7fb3f3a927
child 735	29c8681ce68d