hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:ae6fe65e9f33
+:77cf7ecc9ecf
 "
 "{ Package: 'stx:libtool2' }"
-ToolApplicationModel subclass:#UIPainter
+ResourceSpecEditor subclass:#UIPainter
-	instanceVariableNames:'specClassName specSelector specSuperclassName aspects treeView
+	instanceVariableNames:'specSuperclassName treeView selectionPanel specTool layoutTool
-		selectionPanel tabSelection modified specTool layoutTool helpTool'
+		helpTool'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 ((YesNoBox title:(resources string:'Window spec was modified. Exit anyway?'))
 noText:(resources string:'Cancel');
 yesText:(resources string:'Discard Changes and Exit');
 showAtPointer;
 accepted) ifFalse: [^false].
-modified := false.
+self clearModified.
 painter resetModification
 ].
 ^true
 "Modified: / 20.5.1998 / 02:03:16 / cg"
 closeRequest
 "close request"
 self askForModification ifFalse:[^self].
+super closeRequest.
 treeView model removeDependent:self.
-self painter release.
+"/ self painter release.
 selectionPanel notNil ifTrue:[
-	selectionPanel masterApplication:nil.
+selectionPanel masterApplication:nil.
-	selectionPanel closeRequest
+selectionPanel closeRequest
 ].
 selectionPanel := nil.
 treeView       := nil.
-super closeRequest.
 !
 closeRequestFor:aTopView
 "handles a close request for a specific view"
 myWindow := self window.
 canvasWindow := self painter topView.
 [selectionPanel isNil] whileTrue:[
 Delay waitForSeconds:0.1.
 ].
 galleryWindow := selectionPanel window.
 myOrg := myWindow origin.
 myCorner := myWindow corner.
 "/ try to lay out things non-overlapping
+true
 "/ but only, if the window manager placed all windows
 "/ on top of each other
-myOrg = canvasWindow origin ifTrue:[
+"/ myOrg = canvasWindow origin
+ifTrue:[
 canvasOrg := 10@20.
 "/        myOrg := (device width - myWindow width - 20) @ 20.
 galleryOrg := (device width - galleryWindow width - 20)
 @
 spec activeHelpKey:self helpTool helpKey.
 ].
 painter updateFromSpec:spec
 ].
-modified := false.
+self clearModified
 !
 addWidget: aSpecClass
 "adds a widget from aSpecClass to the current widget"
 view notNil ifTrue:[
 view columnDescriptors:(spec columns)
 ]
 ].
 self clearModifiedFlag.
-modified := false.
+self clearModified.
 ]
 !
 doAskAndReplaceWidgetBy
 |widgetClass|
 code := painter generateWindowSpecMethodSource withCRs.
 (ReadStream on:code) fileIn.
 self doGenerateAspectSelectorsMethod.
 self helpTool doSave.
 self updateInfoLabel.
-modified := false.
+self clearModified.
 painter resetModification.
 (specClass respondsTo:specSelector) ifTrue:[
 self addHistoryEntryForClass:specClass selector:specSelector.
 ].
 !
 andSelector: specSelector ? #windowSpec
 withResourceTypes: #(canvas).
 classAndSelector isNil ifTrue:[^ false].
-modified := false.
+self clearModified.
 self painter resetModification.
 specClassName := classAndSelector methodClass.
 specSelector := classAndSelector methodSelector.
 specSuperclassName := specClassName superclass name.

changeset 2007	77cf7ecc9ecf
parent 2001	b12d9b4dd6f2
child 2012	3a3b694c8288