hg/stx-libtool2: comparison MenuEditor.st

equal deleted inserted replaced

-:fbf082828db6
+:32befdc61270
 hideMenuOnActivated
 auxValue
 activeHelpKey
 resourceRetriever
 sendToOriginator
+ignoreMnemonicKeys
+ignoreShortcutKeys
 )
 ! !
 !MenuEditor class methodsFor:'defaults'!
 #browseResource
 'Search for methods with image resource.'
 #detailsAccelerator
 'Accelerator key to select the menu item from the keyboard (Cmdx or Ctrlx).'
+#detailsIgnoreAcceleratorKeys
+'Ignore accelerator keys in submenu(s).'
+#detailsIgnoreMnemonicKeys
+'Ignore mnemonic keys (access characters) in submenu(s).'
 #detailsAccessCharaterPosition
 'Index of the access character position of the textual label (obsolete, VW compatibility).'
 #detailsAuxValue
 window:
 (WindowSpec
 label: 'Details Edit'
 name: 'Details Edit'
 min: (Point 10 10)
-bounds: (Rectangle 14 46 274 291)
+bounds: (Rectangle 12 22 419 313)
 )
 component:
 (SpecCollection
 collection: (
 (LabelSpec
 )
 (LabelSpec
 label: 'Access Character Position:'
 name: 'accessCharLabel'
 layout: (AlignmentOrigin 217 0 170 0 1 0.5)
-activeHelpKey: detailsAccessCharaterPosition
 resizeForLabel: true
 adjust: right
 )
 (InputFieldSpec
 name: 'accessCharField'
 acceptOnTab: true
 acceptChannel: acceptChannel
 modifiedChannel: modifiedChannel
 acceptOnPointerLeave: false
 )
+(CheckBoxSpec
+label: 'Ignore Accelerators in Submenu'
+name: 'ignoreShortcutKeys'
+layout: (AlignmentOrigin 42 0 204 0 0 0.5)
+activeHelpKey: detailsIgnoreAcceleratorKeys
+visibilityChannel: hasSubmenu
+model: ignoreShortcutKeys
+translateLabel: true
+resizeForLabel: true
+)
+(CheckBoxSpec
+label: 'Ignore Mnemonics in Submenu'
+name: 'ignoreMnemonicKeys'
+layout: (AlignmentOrigin 42 0 232 0 0 0.5)
+activeHelpKey: detailsIgnoreMnemonicKeys
+visibilityChannel: hasSubmenu
+model: ignoreMnemonicKeys
+translateLabel: true
+resizeForLabel: true
+)
 (LabelSpec
 label: 'Font:'
 name: 'fontLabel'
-layout: (AlignmentOrigin 75 0 219 0 1 0.5)
+layout: (AlignmentOrigin 75 0 271 0 1 0.5)
 resizeForLabel: true
 adjust: right
 )
 (FontMenuSpec
 attributes:
 (tabable
 true
 )
 name: 'fontMenu'
-layout: (LayoutFrame 78 0 208 0 -5 1.0 230 0)
+layout: (LayoutFrame 78 0 260 0 -5 1.0 282 0)
 activeHelpKey: fontMenu
 model: font
 )
 )
 addBindingsTo:aspects for:aMenuEditor
 "add additional bindings to the aspects
 "
 aspects at:#notDelayedMenu ifAbsentPut:[
 true asValue
+].
+aspects at:#hasSubmenu ifAbsentPut:[
+false asValue
 ].
 ! !
 !MenuEditor::Item class methodsFor:'testing'!
 "
 MenuEditor aspects do:[:aKey|
 (aspects at:aKey) value:(menuItem perform:aKey)
 ].
 (aspects at:#notDelayedMenu) value:(self isDelayedMenu not).
+(aspects at:#hasSubmenu)     value:(self isKindOfMenu or:[self children size ~~ 0]).
 ! !
 !MenuEditor::Item methodsFor:'displaying'!
 displayLabel
 children first argument:aValue
 ].
 menuItem argument:aValue.
 ^ self
 ].
 aKey == #triggerOnDown ifTrue:[
 self hasDelayedMenu ifTrue:[
 menuItem triggerOnDown:false
 ] ifFalse:[
 menuItem triggerOnDown:aValue

changeset 1778	32befdc61270
parent 1775	695f10f213d1
child 1780	5f831e1fc839