hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:23712b1d3f3d
+:1ecabfd468dc
 "
 ApplicationModel subclass:#MenuEditor
-	instanceVariableNames:'specClass tabSelection aspects slices activeHelpTool didInstall'
+	instanceVariableNames:'specClass specCanvas helpCanvas tabSelection aspects slices
+		didInstall'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'ClassAndMethodSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'Painter'
 #'bounds:' #(#Rectangle 0 0 391 170)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'ClassDefineSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'Painter'
 #'bounds:' #(#Rectangle 0 0 383 128)
 )
 #'component:'
 #'value:' #doNew
 )
 #(#MenuItem
 #'label:' 'from class ...'
 #'value:' #doFromClass
-#'enabled:' #isOwnerOfHelpTool
+#'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' 'pick a menu'
 #'value:' #doPickAMenu
-#'enabled:' #isOwnerOfHelpTool
+#'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' '='
 )
 #(#MenuItem
 #(
 #(#MenuItem
 #'label:' 'class'
 #'value:' #doDefineClass
-#'enabled:' #isOwnerOfHelpTool
+#'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' '-'
 )
 #(#MenuItem
 #'value:' #doInstallSpec
 )
 #(#MenuItem
 #'label:' 'install help spec.'
 #'value:' #doInstallHelp
-#'enabled:' #isOwnerOfHelpTool
+#'enabled:' #isStandAlone
 )
 #(#MenuItem
 #'label:' '='
 )
 #(#MenuItem
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'MenuEditor'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'Menu Builder'
 #'bounds:' #(#Rectangle 0 0 580 384)
 )
 #'component:'
 #'tabable:' true
 #'menu:' #tabList
 #'model:' #tabModel
 #'tabWidget:' #Window
 #'useIndex:' true
-#'canvas:' #tabCanvas
+#'canvas:' #noteBookView
 )
 #(#HorizontalPanelViewSpec
 #'name:' 'confirmationPanel'
 #'layout:' #(#LayoutFrame 0 0.5 -24 1.0 0 1.0 0 1.0)
 #'component:'
 slicesItem
 ^#(
 (Basics     basicsItemSpec)
 (Details    detailsEditSpec)
 (Misc       miscEditSpec)
-(Help       help)
 )
 !
 slicesLink
 ^#(
 (Basics     basicsLinkSpec)
 (Details    detailsEditSpec)
 (Misc       miscEditSpec)
-(Help       help)
 )
 !
 slicesMenu
 ^#(
 (Basics     basicsMenuSpec)
 (Details    detailsEditSpec)
 (Misc       miscEditSpec)
-(Help       help)
 )
 !
 slicesRootMenu
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'BasicsItemSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 267 319)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'BasicsLinkSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 267 319)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'BasicsMenuSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 267 319)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'BasicsRootSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 267 319)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'BasicsSeparatorSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 267 319)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'DetailsEditSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 259 288)
 )
 #'component:'
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
-#'name:' 'uIPainterView'
+#'name:' 'MiscEditSpec'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #'label:' 'unnamed canvas'
 #'bounds:' #(#Rectangle 0 0 245 142)
 )
 #'component:'
 menu allItemsDo:[:anItem|
 anItem value:nil.
 anItem enabled:true.
 ].
 ^ menu
+!
+useHelpDictionary:aDictionary
+|tool|
+self noteBookView.
+self helpTool dictionary:aDictionary.
 ! !
 !MenuEditor methodsFor:'accessing menu'!
 menuButtons
 painter := self painter.
 node := painter selectedNode.
 node notNil ifTrue:[
 self isHelpToolSelected ifTrue:[
-self activeHelpTool accept
+self helpTool accept.
-].
+node contents activeHelpKey:(self helpTool helpKey)
-cont := node contents buildFromAspects:aspects.
+] ifFalse:[
-painter selectedNodeChanged
+cont := node contents buildFromAspects:aspects.
+painter selectedNodeChanged
+]
 ].
 self modifiedChannel value:false.
 didInstall := true
-"Modified: 31.7.1997 / 14:25:34 / cg"
 !
 cancel
 |node|
 (node := self painter selectedNode) notNil ifTrue:[
+self helpTool helpKey:(self helpKey).
 aspects do:[:anAspect| anAspect value:nil ].
 node contents toAspects:aspects.
 ].
 self modifiedChannel value:false.
 ! !
-!MenuEditor methodsFor:'active help'!
-activeHelpTool
-"access current active help editor
-"
-activeHelpTool isNil ifTrue:[
-self activeHelpTool:(UIHelpTool new)
-].
-^ activeHelpTool
-!
-activeHelpTool:anApplication
-"change current active help editor
-"
-activeHelpTool := anApplication.
-activeHelpTool masterApplication isNil ifTrue:[
-activeHelpTool masterApplication:self.
-].
-!
-isOwnerOfHelpTool
-"returns true in case of owner of the helptool
-"
-^ self activeHelpTool masterApplication == self
-! !
 !MenuEditor methodsFor:'aspects'!
 aspectFor:aKey
 "returns aspect for a key or nil
 "
 ^ builder booleanValueAspectFor:#hasValidSingleSelection
 "Modified: 28.7.1997 / 12:52:13 / cg"
 !
-menuPullDown
-|menu|
-menu := Menu new.
-menu fromLiteralArrayEncoding:(self class menuPullDown).
-menu receiver:self.
-^ menu
-!
 modifiedChannel
 "automatically generated by UIPainter ..."
 ^ builder booleanValueAspectFor:#modifiedChannel
 "Modified: 28.7.1997 / 12:52:14 / cg"
 !
-tabCanvas
+noteBookView
 "automatically generated by UIPainter ..."
-|holder|
+|noteBook helpTool|
-(holder := builder bindingAt:#tabCanvas) isNil ifTrue:[
+(noteBook := builder bindingAt:#noteBookView) isNil ifTrue:[
-builder aspectAt:#tabCanvas put:(holder :=  SubCanvas new).
+noteBook := View new.
-].
+helpTool := UIHelpTool new.
-^ holder
+helpTool masterApplication:self.
+helpCanvas := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+specCanvas := SubCanvas origin:0.0@0.0 corner:1.0@1.0 in:noteBook.
+helpCanvas client:helpTool.
+helpTool   masterApplication:self.
+helpTool   modifiedHolder:(self modifiedChannel).
+builder aspectAt:#noteBookView put:noteBook.
+].
+^ noteBook
 !
 tabList
 "automatically generated by UIPainter ..."
 super doesNotUnderstand:aMessage
 ! !
+!MenuEditor methodsFor:'interface specs'!
+menuPullDown
+"this window spec was automatically generated by the ST/X MenuEditor"
+"do not manually edit this - the builder may not be able to
+handle the specification if its corrupted."
+"
+MenuEditor new openOnClass:MenuEditor andSelector:#menuPullDown
+(Menu new fromLiteralArrayEncoding:(MenuEditor menuPullDown)) startUp
+"
+<resource: #menu>
+^
+#(#Menu
+#(
+#(#MenuItem
+#'label:' 'file'
+#'value:' #file
+#'submenu:'
+#(#Menu
+#(
+#(#MenuItem
+#'label:' 'new'
+#'value:' #doNew
+)
+#(#MenuItem
+#'label:' 'from class ...'
+#'value:' #doFromClass
+#'enabled:' #isStandAlone
+)
+#(#MenuItem
+#'label:' 'pick a menu'
+#'value:' #doPickAMenu
+#'enabled:' #isStandAlone
+)
+#(#MenuItem
+#'label:' '='
+)
+#(#MenuItem
+#'label:' 'quit'
+#'value:' #closeRequest
+)
+) nil
+nil
+)
+)
+#(#MenuItem
+#'label:' 'edit'
+#'submenu:'
+#(#Menu
+#(
+#(#MenuItem
+#'label:' 'cut'
+#'value:' #doCut
+)
+#(#MenuItem
+#'label:' '='
+)
+#(#MenuItem
+#'label:' 'create submenu static'
+#'value:' #doCreateMenu
+)
+#(#MenuItem
+#'label:' 'create summenu dynamic'
+#'value:' #doCreateLink
+)
+#(#MenuItem
+#'label:' '-'
+)
+#(#MenuItem
+#'label:' 'create item'
+#'value:' #doCreateItem
+)
+#(#MenuItem
+#'label:' 'create separator'
+#'value:' #doCreateSep
+)
+) nil
+nil
+)
+)
+#(#MenuItem
+#'label:' 'code'
+#'value:' #code
+#'submenu:'
+#(#Menu
+#(
+#(#MenuItem
+#'label:' 'class'
+#'value:' #doDefineClass
+#'enabled:' #isStandAlone
+)
+#(#MenuItem
+#'label:' '-'
+)
+#(#MenuItem
+#'label:' 'install menu spec.'
+#'value:' #doInstallSpec
+)
+#(#MenuItem
+#'label:' 'install help spec.'
+#'value:' #doInstallHelp
+#'enabled:' #isStandAlone
+)
+#(#MenuItem
+#'label:' '='
+)
+#(#MenuItem
+#'label:' 'browse application'
+#'value:' #doBrowseAppClass
+)
+) nil
+nil
+)
+)
+#(#MenuItem
+#'label:' 'test'
+#'submenuChannel:' #submenuTest
+)
+) nil
+nil
+)
+"Modified: 28.7.1997 / 18:12:10 / cg"
+! !
+!MenuEditor methodsFor:'private'!
+helpKey
+|node|
+(node := self painter selectedNode) notNil ifTrue:[
+^ node contents activeHelpKey
+].
+^ nil
+!
+helpTool
+^ helpCanvas application
+! !
 !MenuEditor methodsFor:'queries'!
 didInstall
 "returns true if the menu was installed
 "
 !
 isHelpToolSelected
 "returns true if current selection is help tool
 "
-(slices notNil and:[tabSelection notNil]) ifTrue:[
+slices notNil ifTrue:[
-^ (slices at:tabSelection) last == #help
+^ (slices at:tabSelection) first = UIHelpTool label
 ].
 ^ false
+!
+isStandAlone
+"returns true in case of owner of the helptool
+"
+^ self masterApplication isNil
 ! !
 !MenuEditor methodsFor:'selection'!
 menuChanged
-|node item slc sel|
+|node item slc sel old|
 (node := self painter selectedNode) notNil ifTrue:[
 aspects do:[:anAspect| anAspect value:nil ].
 item := node contents.
 item toAspects:aspects.
 slc := #slicesMenu
 ] ifFalse:[
 item submenuChannel isNil ifTrue:[slc := #slicesItem]
 ifFalse:[slc := #slicesLink]
 ].
+slc := (self class perform:slc) copyWith:#( 'Help' #dummy ).
 ] ifTrue:[
-slc := #slicesRootMenu
+slc := self class perform:#slicesRootMenu
-]
+].
 ] ifTrue:[
-slc := #slicesSeparatorMenu
+slc := self class perform:#slicesSeparatorMenu.
+]
+].
+self helpTool helpKey:(self helpKey).
+self modifiedChannel value:false.
+slc ~= slices  ifTrue:[
+tabSelection notNil ifTrue:[
+old := (slices at:tabSelection) first
 ].
-slc := self class perform:slc.
-].
-self modifiedChannel value:false.
-slc ~= slices  ifTrue:[
 (slices := slc) notNil ifTrue:[
-tabSelection notNil ifTrue:[sel := tabSelection min:(slices size)]
+sel := slices collect:[:s| s first].
-ifFalse:[sel := 1].
+tabSelection := nil.
+self tabList value:sel.
-self tabList value:(slices collect:[:s| s first]).
-self tabModel setValue:nil.
+(old notNil and:[(sel := sel findFirst:[:n|n = old]) ~~ 0]) ifFalse:[
-self tabModel value:sel.
+sel := 1
+].
+self tabModel value:sel
 ] ifFalse:[
 self tabList value:nil.
 self tabSelection:nil.
 ]
 ].
 !
 tabSelection:aSelection
 |tool sel|
-tabSelection == aSelection ifTrue:[
+tabSelection = aSelection ifTrue:[
 ^ self
 ].
 (tabSelection := aSelection) isNil ifTrue:[
-^ self tabCanvas client:nil
+slices isNil ifTrue:[
-].
+specCanvas client:nil.
+^ specCanvas raise.
+].
+tabSelection == 1 ifTrue:[^ self].
+tabSelection := 1
+].
 self isHelpToolSelected ifTrue:[
-self tabCanvas client:(tool := self activeHelpTool).
+self helpTool helpKey:(self helpKey).
-tool model:(self aspectFor:#activeHelpKey)
+helpCanvas raise.
 ] ifFalse:[
 sel := (slices at:tabSelection) last.
-self tabCanvas client:self spec:(self class perform:sel) builder:builder
+specCanvas client:self spec:(self class perform:sel) builder:builder.
+specCanvas raise.
 ]
 ! !
 !MenuEditor methodsFor:'startup / release'!
 oldClass := self specClass.
 self specClass:aClass.
 newClass := self specClass.
-(self isOwnerOfHelpTool and:[oldClass ~= newClass]) ifTrue:[
+(self isStandAlone and:[oldClass ~= newClass]) ifTrue:[
-self activeHelpTool helpSpecFrom:newClass
+self helpTool helpSpecFrom:newClass
 ].
 self painter buildFrom:newClass andSelector:aSelector.
 !
 initialize
 #(
 label
 accessCharaterPos
 submenuChannel
-activeHelpKey
 enabled
 value
 nameKey
 indication
 shortcutKey
 !
 doInstallHelp
 "install help text
 "
-self activeHelpTool installHelpSpecInto:(self specClass)
+self isStandAlone ifTrue:[
+self helpTool installHelpSpecInto:(self specClass)
+]
 !
 doInstallSpec
 |cls selector painter menu spec mthd category code|
 ! !
 !MenuEditor::Item methodsFor:'accessing'!
+activeHelpKey
+^ activeHelpKey
+!
+activeHelpKey:aKey
+activeHelpKey := aKey
+!
 label
 "return the value of the instance variable 'label' (automatically generated)"
 ^ label!
 (label isNil or:[self isSeparator]) ifTrue:[
 (aspects at:#label) value:(label := name)
 ].
-activeHelpKey       := (aspects at:#activeHelpKey) value.
 enabled             := (aspects at:#enabled) value.
 value               := (aspects at:#value) value.
 nameKey             := (aspects at:#nameKey) value.
 indication          := (aspects at:#indication) value.
 shortcutKey         := (aspects at:#shortcutKey) value.
 (type := self separatorType) notNil ifTrue:[
 type := self class separatorSlices findFirst:[:el| el first == type ].
 (aspects at:#seperatorSelection) selectionIndex:type.
 ] ifFalse:[
 (aspects at:#label)                 value:label.
-(aspects at:#activeHelpKey)         value:activeHelpKey.
 (aspects at:#enabled)               value:enabled.
 (aspects at:#value)                 value:value.
 (aspects at:#nameKey)               value:nameKey.
 (aspects at:#indication)            value:indication.
 (aspects at:#shortcutKey)           value:shortcutKey.

changeset 287	1ecabfd468dc
parent 275	cdecb5b5d356
child 290	1428bab2aa68