hg/stx-libtool2: comparison Tools__ViewTreeApplication.st

equal deleted inserted replaced

-:4ba13182f80f
+:4d4297bad4fa
 	poolDictionaries:''
 	privateIn:ViewTreeInspectorApplication
 !
 HierarchicalItem subclass:#ViewTreeItem
-	instanceVariableNames:'widget isDrawnShown exists xOffsetAdditionalName'
+	instanceVariableNames:'widget menuItem isDrawnShown exists xOffsetAdditionalName'
 	classVariableNames:'HandleExtent'
 	poolDictionaries:''
 	privateIn:ViewTreeInspectorApplication
 !
 nil
 nil
 )
 !
+middleButtonMenuForMenuItems
+"This resource specification was automatically generated
+by the MenuEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the MenuEditor may not be able to read the specification."
+"
+MenuEditor new openOnClass:Tools::ViewTreeInspectorApplication andSelector:#middleButtonMenu
+(Menu new fromLiteralArrayEncoding:(Tools::ViewTreeInspectorApplication middleButtonMenu)) startUp
+"
+<resource: #menu>
+^
+#(Menu
+(
+(MenuItem
+label: 'Browse Menu Item''s Class'
+itemValue: doBrowseMenuItem:
+argument: view
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
+label: 'Inspect Menu Item'
+itemValue: doInspectMenuItem:
+argument: view
+)
+(MenuItem
+label: '-'
+)
+(MenuItem
+label: 'Interface'
+submenuChannel: submenuMenuItemInterface:
+keepLinkedMenu: true
+)
+)
+nil
+nil
+)
+"Created: / 16-08-2017 / 13:48:49 / cg"
+!
 toolbarMenu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 item := model selectedItem.
 item notNil ifTrue:[
 |state|
 view := item widget.
+view isNil ifTrue:[
-view id isNil ifTrue:[
+info := '%1 [%2]' bindWith:(item menuItem label asString)
-state := 'no ID'.
+with:(item menuItem value asString).
 ] ifFalse:[
-view shown ifTrue:[
+view id isNil ifTrue:[
-state := 'visible'.
+state := 'no ID'.
 ] ifFalse:[
-state := 'invisible'
+view shown ifTrue:[
+state := 'visible'.
+] ifFalse:[
+state := 'invisible'
+].
 ].
-].
+info := '%1 [%2] - %3' bindWith:(view class name)
-info := '%1 [%2] - %3' bindWith:(view class name)
+with:(view name ? '') with:state allBold.
-with:(view name ? '') with:state allBold.
+]
 ] ifFalse:[
 info := ''
 ].
 hasSingleSelectionHolder value:(view notNil).
 self updateInspector
-"Modified: / 30-07-2013 / 09:21:27 / cg"
+"Modified: / 16-08-2017 / 13:44:59 / cg"
 !
 update:something with:someArgument from:aModel
 |oldSelection|
 middleButtonMenu
 "returns the middleButton menu for the single selected item or nil"
 ^ [
-model selectedItem notNil
+model selectedItem notNil ifTrue:[
-ifTrue:[self class middleButtonMenu]
+model selectedItem isView ifTrue:[
-ifFalse:[nil]
+self class middleButtonMenu
+] ifFalse:[
+self class middleButtonMenuForMenuItems
+].
+] ifFalse:[
+nil
+]
 ]
+"Modified: / 16-08-2017 / 13:48:31 / cg"
 !
 submenuApplications:aMenu
 |applications menu item list addBlock|
 list last isSeparator ifTrue:[ list removeLast ].
 ^ MenuDesc buildFromList:list onGC:aMenu
 "Modified: / 31-07-2013 / 13:09:55 / cg"
+!
+submenuMenuItemInterface:aMenu
+"builds and returns the menuItem interface submenu"
+|item list|
+item := self selectedMenuItem.
+item isNil ifTrue:[^ nil].
+list := OrderedCollection new.
+list add:(MenuDesc title:'itemValue'  value:(item itemValue)).
+^ MenuDesc buildFromList:list onGC:aMenu
+"Created: / 16-08-2017 / 13:51:05 / cg"
 !
 submenuVisibility:aMenu
 "builds and returns the geometry submenu"
 max := 0.
 min := 9999999.
 rootItem recursiveEachVisibleItemDo:[:anItem|
-visState := (anItem widget shown).
+anItem widget notNil ifTrue:[
+visState := (anItem widget shown).
-visState ~~ anItem isDrawnShown ifTrue:[
-anItem isDrawnShown:visState.
+visState ~~ anItem isDrawnShown ifTrue:[
-listIdx := treeView identityIndexOf:anItem.
+anItem isDrawnShown:visState.
+listIdx := treeView identityIndexOf:anItem.
-listIdx > 0 ifTrue:[
-max := max max:listIdx.
+listIdx > 0 ifTrue:[
-min := min min:listIdx.
+max := max max:listIdx.
+min := min min:listIdx.
+].
 ].
 ].
 ].
 max < min ifTrue:[^ self].
 max := max + 1.
 treeView shown ifTrue:[
 damage := Rectangle left:0 top:visY0 width:(treeView width) height:height.
 treeView invalidateDeviceRectangle:damage repairNow:false.
 ].
 ].
+"Modified: / 16-08-2017 / 12:29:15 / cg"
 ! !
 !ViewTreeInspectorApplication methodsFor:'selection'!
+selectedMenuItem
+"answer the selected menuItem or nil"
+|item|
+item := model selectedItem.
+item notNil ifTrue:[ ^ item menuItem ].
+^ nil
+"Created: / 16-08-2017 / 13:50:35 / cg"
+!
 selectedView
 "answer the selected view or nil"
 |item|
 !
 doRedraw
 "redraw the app"
-model rootView notNil ifTrue:[
+|rootView|
-model rootView withAllSubViewsDo:[:v | v "redraw; "invalidate].
+(rootView := model rootView) notNil ifTrue:[
+rootView withAllSubViewsDo:[:v | v "redraw; "invalidate].
 ]
+"Modified: / 16-08-2017 / 12:02:11 / cg"
 !
 doSelectNextElementStartingIn:anItem forWhich:aBlock
 |startItem firstFound searchNext|
 ^ title widthOn:aGC
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem class methodsFor:'building'!
+buildMenuItemsFrom:aMenuItem
+"build the items starting from a source menu item;
+returns the anchor.
+"
+|item subMenu subItems|
+aMenuItem isNil ifTrue:[^ nil].
+item     := self forMenuItem:aMenuItem.
+subItems := OrderedCollection new.
+(subMenu := aMenuItem submenuOrNil) notNil ifTrue:[
+subMenu items do:[:eachMenuItem |
+subItems add:(self buildMenuItemsFrom:eachMenuItem)
+].
+].
+item children:subItems.
+^ item
+"Created: / 16-08-2017 / 12:23:02 / cg"
+!
 buildViewsFrom:aView
 "build the items starting from a source view;
-returns the anhor.
+returns the anchor.
 "
 |item subViews subItems|
 aView isNil ifTrue:[^ nil].
 item     := self forView:aView.
 subViews := aView subViews.
+subItems := OrderedCollection new.
 subViews notEmptyOrNil ifTrue:[
-subItems := OrderedCollection new.
 subViews do:[:aSubView|
 subItems add:(self buildViewsFrom:aSubView).
 ].
-item children:subItems.
+].
-].
+(aView isKindOf:MenuPanel) ifTrue:[
+(aView items ? #()) do:[:eachMenuItem |
+subItems add:(self buildMenuItemsFrom:eachMenuItem)
+].
+].
+item children:subItems.
 ^ item
+"Modified: / 16-08-2017 / 12:43:35 / cg"
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem class methodsFor:'documentation'!
 documentation
 HandleExtent := 6@6.
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem class methodsFor:'instance creation'!
+forMenuItem:aMenuItem
+|item|
+item := self basicNew initialize.
+item forMenuItem:aMenuItem.
+^ item
+"Created: / 16-08-2017 / 12:07:55 / cg"
+!
 forView:aView
 |item|
 item := self basicNew initialize.
 item forView:aView.
 ^ item
+"Modified (format): / 16-08-2017 / 12:07:40 / cg"
 !
 new
 self error:'not allowed'.
 ^ nil
 isDrawnShown:aBoolean
 isDrawnShown := aBoolean.
 !
+menuItem
+^ menuItem
+!
+parent:aParent
+super parent:aParent.
+"Created: / 16-08-2017 / 12:40:26 / cg"
+!
 rootView
 "returns the widget assigned to the root or nil
 "
 parent isNil ifTrue:[^ nil].
 !
 specClass
 "returns the spec-class assigned to the item
 "
+widget isNil ifTrue:[
+^ MenuPanelSpec
+].
 ^ widget specClass
+"Modified (format): / 16-08-2017 / 12:31:36 / cg"
 !
 treeModel
 "returns the assigned treeModel, an instance of ViewTreeModel
 "
 "
 ^ children
 !
 hasChildren
-|subViews list item|
+"not only a query; also builds"
-children size ~~ 0 ifTrue:[
+|subViews list item subMenu|
-^ true
-].
+children isNil ifTrue:[
 isExpanded := false.
-subViews   := widget subViews.
+list := OrderedCollection new.
-subViews size == 0 ifTrue:[^ false].
+"/ it's either a widget or a menuItem
-list := OrderedCollection new.
+widget notNil ifTrue:[
+subViews := widget subViews.
-subViews do:[:aSubView|
+subViews notEmptyOrNil ifTrue:[
-item := self class buildViewsFrom:aSubView.
+subViews do:[:aSubView|
-item parent:self.
+item := self class buildViewsFrom:aSubView.
-list add:item.
+item parent:self.
-].
+list add:item.
-children := list.
+].
-^ true
+].
+].
+menuItem notNil ifTrue:[
+(subMenu := menuItem submenuOrNil) notNil ifTrue:[
+subMenu items do:[:aSubItem|
+item := self class buildMenuItemsFrom:aSubItem.
+item parent:self.
+list add:item.
+].
+].
+].
+children := list.
+].
+^ children notEmpty
+"Modified: / 16-08-2017 / 12:27:23 / cg"
 !
 size
 "redefined: returns list of children
 "
 |labelHeight additionalName label isValidAndShown|
 label := self label.
 label isEmptyOrNil ifTrue:[^ self].
-widget id isNil ifTrue:[
+widget isNil ifTrue:[
-isDrawnShown := false.
+isValidAndShown := true.
-self exists ifFalse:[
-xOffsetAdditionalName := nil.
-].
-isValidAndShown := false.
 ] ifFalse:[
-isValidAndShown := widget shown.
+widget id isNil ifTrue:[
-].
+isDrawnShown := false.
+self exists ifFalse:[
+xOffsetAdditionalName := nil.
+].
+isValidAndShown := false.
+] ifFalse:[
+isValidAndShown := widget shown.
+].
+].
 isValidAndShown ifFalse:[
 label := Text string:label emphasis:#italic.
 label colorizeAllWith:Color gray.
 ].
 additionalName := self additionalLabelForItem:self.
 additionalName notNil ifTrue:[
 self displayLabel:additionalName
 h:labelHeight on:aGC
-x:(x + xOffsetAdditionalName)
+x:(x + xOffsetAdditionalName) y:y
-y:y
 h:h.
 ] ifFalse:[
 xOffsetAdditionalName := nil.
 ].
 ].
+"Modified (format): / 16-08-2017 / 12:57:39 / cg"
 !
 recursiveAdditionalNameBehaviourChanged
 width := xOffsetAdditionalName := nil.
 yB    "{ Class:SmallInteger }"
 |
 rootView := self rootView.
 rootView isNil ifTrue:[^ self ].
+widget isNil ifTrue:[^ self].
 relOrg   := widget originRelativeTo:rootView.
 relOrg isNil ifTrue:[ ^ self ].    "/ widget destroyed
 relOrg   := relOrg - (HandleExtent // 2).
 relCrn   := relOrg + widget extent.
 aTwoArgAction value:(Rectangle left:xR top:yC width:w height:h) value:#RC.
 aTwoArgAction value:(Rectangle left:xR top:yB width:w height:h) value:#RB.
 ^ self
 ].
 aTwoArgAction value:(Rectangle left:xR top:yB width:w height:h) value:nil.
+"Modified: / 16-08-2017 / 13:04:27 / cg"
 !
 recursiveEachVisibleItemDo:anOneArgBlock
 "recursive evaluate the block on each child which is visible
 "
 subViews do:aOneArgBlock
 ].
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem methodsFor:'initialization'!
+forMenuItem:aMenuItem
+menuItem := aMenuItem.
+"Created: / 16-08-2017 / 12:08:50 / cg"
+!
 forView:aView
 widget := aView.
 !
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem methodsFor:'printing & storing'!
 icon
-"get the icon used for presentation
+"get the icon used for presentation"
-"
 |specClass model|
+menuItem notNil ifTrue:[
+menuItem label isImage ifTrue:[
+^ menuItem label magnifiedTo:20@20.
+].
+].
 specClass := self specClass.
 specClass isNil ifTrue:[^ nil].
 model := self treeModel.
 model notNil ifTrue:[
 ^ model iconAt:specClass ifNonePut:[specClass icon]
 ].
 ^ specClass icon
+"Modified: / 16-08-2017 / 13:00:35 / cg"
 !
 label
 "get the label used for presentation
 "
 !
 string
 "get the string
 "
+widget isNil ifTrue:[
+^ menuItem class name
+].
 ^ widget class name.
+"Modified: / 16-08-2017 / 13:45:39 / cg"
 ! !
 !ViewTreeInspectorApplication::ViewTreeItem methodsFor:'queries'!
 canChangeLayout
 ].
 ^ false
 !
 exists
+widget isNil ifTrue:[^ menuItem notNil].
 widget id notNil ifTrue:[^ true ].
 exists ~~ false ifTrue:[
 exists := false.
 exists := (parent widget subViews includesIdentical:widget).
 ].
 ].
 ].
 ^ exists
+"Modified: / 16-08-2017 / 12:47:50 / cg"
 !
 isApplicationClass
 |cls|
 selection size ~~ 1 ifTrue:[ ^ nil ].
 view := selection anElement widget.
 ] ifFalse:[
 view := selection widget.
 ].
+view isNil ifTrue:[^ nil].
 views := OrderedCollection new.
 [ view notNil ] whileTrue:[
 views add: view.
 view := view superView.
 ].
 s nextPutAll: each name asString "storeString".
 ].
 ]
 "Created: / 19-05-2014 / 18:15:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+"Modified: / 16-08-2017 / 13:03:47 / cg"
 !
 rootItem
 "get the rootItem the event viewer is established on
 "
 additionalLabelForItem:anItem
 "answer the additional lable for an item or nil"
 |widget l applClass applClassName key|
-widget := anItem widget.
 l := nil.
 showWidgetNames == true ifTrue:[
-l := '"', widget name, '"'
+(widget := anItem widget) notNil ifTrue:[
+l := '"', widget name, '"'
+] ifFalse:[
+l := '"', anItem menuItem label asString, '"'
+].
 ].
 anItem isApplicationClass ifTrue:[
 applClass := anItem applicationClass.
 applClass notNil ifTrue:[
 l := l , ' #',key
 ].
 ].
 ^ l
+"Modified: / 16-08-2017 / 12:47:12 / cg"
 !
 showWidgetNames
 "answer true if the additional text is the widget name
 otherwise the name of the application"

changeset 3456	4d4297bad4fa
parent 3453	01e6b207c1b4
child 3457	3f3ea99e8af5