hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:9add9e2609d9
+:bca8b1953ee8
 ApplicationModel subclass:#UIPainter
-	instanceVariableNames:'objectList currentView selectionPanel tabSelection lastSlice
+	instanceVariableNames:'objectList selectionPanel tabSelection lastSlice specView
-		specView layoutTool fileName specClass specSelector
+		layoutTool fileName specClass specSelector specSuperclass aspects'
-		specSuperclass aspects'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 #'collection:'
 #(
 #(#MenuPanelSpec
 #'name:' 'menuPullDown'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 24 0)
+#'tabable:' true
 #'menu:' #menuPullDown
 )
 #(#MenuPanelSpec
 #'name:' 'menuAlignment'
 #'layout:' #(#LayoutFrame 0 0.0 29 0 233 0 54 0)
+#'tabable:' true
 #'menu:' #menuAlignment
 #'showSeparatingLines:' true
 )
 #(#PanelViewSpec
 #'name:' 'panelViewButtons'
-#'layout:' #(#LayoutFrame -125 1.0 25 0.0 0 1.0 58 0.0)
+#'layout:' #(#LayoutFrame -125 1.0 25 0.0 0 1.0 -372 1.0)
 #'component:'
 #(#SpecCollection
 #'collection:'
 #(
 #(#ActionButtonSpec
 #'name:' 'moveLeft'
 #'label:' ''
 #'translateLabel:' true
 #'labelChannel:' #'LABELb_moveLeft.xbm'
+#'tabable:' true
 #'defaultable:' true
 #'model:' #moveSelectionLeft
 #'isTriggerOnDown:' true
 #'enableChannel:' #enableChannel
 #'autoRepeat:' false
 #(#ActionButtonSpec
 #'name:' 'moveRight'
 #'label:' ''
 #'translateLabel:' true
 #'labelChannel:' #'LABELb_moveRight.xbm'
+#'tabable:' true
 #'defaultable:' true
 #'model:' #moveSelectionRight
 #'isTriggerOnDown:' true
 #'enableChannel:' #enableChannel
 #'autoRepeat:' false
 #(#ActionButtonSpec
 #'name:' 'moveUp'
 #'label:' ''
 #'translateLabel:' true
 #'labelChannel:' #'LABELb_moveUp.xbm'
+#'tabable:' true
 #'defaultable:' true
 #'model:' #moveSelectionUp
 #'isTriggerOnDown:' true
 #'enableChannel:' #enableChannel
 #'autoRepeat:' false
 #(#ActionButtonSpec
 #'name:' 'moveDown'
 #'label:' ''
 #'translateLabel:' true
 #'labelChannel:' #'LABELb_moveDown.xbm'
+#'tabable:' true
 #'defaultable:' true
 #'model:' #moveSelectionDown
 #'isTriggerOnDown:' true
 #'enableChannel:' #enableChannel
 #'autoRepeat:' false
 )
 #(#SequenceViewSpec
 #'name:' 'objectTree'
 #'layout:' #(#LayoutFrame 0 0.0 59 0.0 0 0.35 0 1.0)
 #'enableChannel:' #enableChannel
+#'tabable:' true
 #'menu:' #objectListMenu
 #'model:' #objectList
 #'hasHorizontalScrollBar:' true
 #'hasVerticalScrollBar:' true
 #'miniScrollerHorizontal:' true
 )
 #(#NoteBookViewSpec
 #'name:' 'noteBook'
 #'layout:' #(#LayoutFrame 0 0.35 59 0.0 0 1.0 -30 1.0)
 #'enableChannel:' #enableChannel
+#'tabable:' true
 #'menu:' #tabList
 #'style:'
 #(#FontDescription
-#fixed #medium
+#helvetica #medium
 #roman #'10'
 )
 #'model:' #tabModel
 #'tabWidget:' #Window
-#'level:' 0
 #'canvas:' #noteBookView
 )
 #(#HorizontalPanelViewSpec
 #'name:' 'modifyPanel'
 #'layout:' #(#LayoutFrame 0 0.35 -30 1.0 0 1.0 0 1.0)
 #'collection:'
 #(
 #(#ActionButtonSpec
 #'name:' 'cancelButton'
 #'label:' 'cancel'
+#'tabable:' true
 #'model:' #cancel
 #'isTriggerOnDown:' false
 #'enableChannel:' #modifiedChannel
 #'autoRepeat:' false
 #'extent:' #(#Point 151 24)
 )
 #(#ActionButtonSpec
 #'name:' 'acceptButton'
 #'label:' 'ok'
+#'tabable:' true
 #'model:' #accept
 #'isTriggerOnDown:' false
 #'enableChannel:' #modifiedChannel
 #'autoRepeat:' false
 #'extent:' #(#Point 151 24)
 accept
 "automatically generated by UIPainter ..."
 |layout|
-currentView notNil ifTrue:[
+tabSelection = 'Dimension' ifTrue:[
-tabSelection = 'Dimension' ifTrue:[
+(layout := layoutTool layout) notNil ifTrue:[
-(layout := layoutTool layout) notNil ifTrue:[
+layoutTool layoutType == #Extent ifTrue:[
-layoutTool layoutType == #Extent ifTrue:[
+self painter setExtent:layout
-self painter setExtent:layout
+] ifFalse:[
-] ifFalse:[
+self painter setDimension:layout
-self painter setDimension:layout
-]
 ]
-] ifFalse:[
+]
-self painter updateFromSpec:(specView specEdited).
+] ifFalse:[
-].
+self painter updateFromSpec:(specView specEdited).
-self cancel
+].
-]
+self cancel
 !
 cancel
 "cancel all changes and read back attributes from current view
 "
-specView specEdited:(self painter specFor:currentView).
+specView specEdited:(self painter specForSelection).
-layoutTool forView:currentView.
+layoutTool update.
 self modifiedChannel value:false.
 !
 doubleClick
 objectList selectGroup
 (noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
 noteBook   := View origin:0.0 @0.0 corner:1.0@1.0.
 layoutTool := UIPropertyView for:#Dimension     in:noteBook.
 specView   := UIPropertyView for:#Specification in:noteBook.
+channel    := self modifiedChannel.
-channel := self modifiedChannel.
 layoutTool modifiedHolder:channel.
 specView   modifiedHolder:channel.
-specView   viewBackground:(layoutTool viewBackground).
 builder aspectAt:#noteBookView put:noteBook.
 ].
 ^ noteBook
 !
 |holder|
 (holder := builder bindingAt:#tabList) isNil ifTrue:[
 builder aspectAt:#tabList put:(holder :=  ValueHolder new).
-holder value:#( '  ' '  ' ).
+holder value:#( 'Properties' ).
 ].
 ^ holder
 !
 tabModel
 (someObject == objectList and:[something ~~ #list]) ifTrue:[
 something ~~ #layout ifTrue:[
 self objectListChanged
 ] ifFalse:[
 (self modifiedChannel value) ifFalse:[
-layoutTool forView:currentView
+layoutTool update
 ]
 ]
 ]
 ! !
 !
 objectListChanged
 "something changed in the painter view
 "
-|setSel slices list spec props size|
+|setSel view slices list spec props size same|
 props := objectList selectedProperty.
 tabSelection := nil.
 props isNil ifFalse:[
-currentView := props view.
+view := props view.
+spec := props spec copy.
-(currentView == layoutTool forView) ifTrue:[
-^ self
+layoutTool forView == view ifFalse:[
+slices := spec class slices.
+size   := slices size + 1.
+list   := Array new:size.
+slices keysAndValuesDo:[:i :s|list at:i put:(s first asString)].
+list at:size put:'Dimension'.
+(self tabList) value:list.
+] ifTrue:[
+list := self tabList value
 ].
-layoutTool forView:currentView.
-spec   := props spec copy.
-slices := spec class slices.
-size   := slices size + 1.
-list   := Array new:size.
-slices keysAndValuesDo:[:i :s|list at:i put:(s first asString)].
-list at:size put:'Dimension'.
-(self tabList) value:list.
 (list findFirst:[:aName| aName = lastSlice]) ~~ 0 ifTrue:[
 setSel := lastSlice
 ]
-] ifTrue:[
+].
-layoutTool forView:nil
+layoutTool forView:view.
-].
 specView specEdited:spec.
 self tabModel value:setSel.
 ! !
 !UIPainter methodsFor:'file access'!
 slices    := specEdited class slices.
 lastSlice := tabSelection.
 idx:= slices findFirst:[:aSlice| aSlice first = tabSelection ].
 idx == 0 ifTrue:[
-layoutTool forView:currentView.
+layoutTool update.
 ^ layoutTool raise.
 ].
 spec := specEdited class perform:((slices at:idx) last).
 ].
 specView raise.

changeset 144	bca8b1953ee8
parent 142	75f927b856f6
child 149	e652608690b1