hg/stx-libtool2: comparison TabListEditor.st

equal deleted inserted replaced

-:623e692f53fc
+:635e878e5c09
 #(#WindowSpec
 #label: 'Tab List Editor'
 #name: 'Tab List Editor'
 #min: #(#Point 440 280)
 #max: #(#Point 1152 900)
-#bounds: #(#Rectangle 17 449 488 816)
+#bounds: #(#Rectangle 12 22 548 391)
 #menu: #menu
 )
 #component:
 #(#SpecCollection
 #collection: #(
 #(#SelectionInListModelViewSpec
 #attributes:
 #(#vpext
 #(#Array
+#Array #Array
+#Array #Array
 #Point 0.264414
 1.0
 )
 )
 #name: 'ListOfLabels'
 #(#SpecCollection
 #collection: #(
 #(#NoteBookViewSpec
 #name: 'NoteBook'
 #layout: #(#LayoutFrame 1 0.0 0 0.0 0 1.0 -30 1.0)
+#visibilityChannel: #hasSelectionHolder
+#tabable: true
 #model: #noteBookModel
 #menu: #noteBookTabList
 #useIndex: true
 #keepCanvasAlive: true
 )
 )
 #(#NoteBookViewSpec
 #name: 'TestNoteBook'
 #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #visibilityChannel: #testMode
+#tabable: true
 #menu: #testItemList
 #useIndex: true
 )
 )
 (Menu new fromLiteralArrayEncoding:(TabListEditor menuEdit)) startUp
 "
 <resource: #menu>
 ^
+#(#Menu
-#(#Menu
+#(
+#(#MenuItem
-#(
+#label: 'Cut'
-#(#MenuItem
+#value: #doCut
-#label: 'Cut'
+#activeHelpKey: #editCut
-#value: #doCut
+#enabled: #hasSelectionHolder
-#activeHelpKey: #editCut
+#shortcutKeyCharacter: #Cut
-#enabled: #valueOfCanCut
+)
-)
+#(#MenuItem
-#(#MenuItem
+#label: 'Copy'
-#label: 'Copy'
+#value: #doCopy
-#value: #doCopy
+#activeHelpKey: #editCopy
-#activeHelpKey: #editCopy
+#enabled: #hasSelectionHolder
-#enabled: #valueOfCanCopy
+#shortcutKeyCharacter: #Copy
 )
 #(#MenuItem
 #label: 'Paste'
 #value: #doPaste
 #activeHelpKey: #editPaste
 #enabled: #valueOfCanPaste
-)
+#shortcutKeyCharacter: #Paste
-#(#MenuItem
+)
-#label: 'Delete'
+#(#MenuItem
-#value: #doDelete
+#label: 'Delete'
-#activeHelpKey: #editPaste
+#value: #doDelete
-#enabled: #valueOfCanCut
+#activeHelpKey: #editPaste
-)
+#enabled: #hasSelectionHolder
-#(#MenuItem
+#shortcutKeyCharacter: #Delete
-#label: '-'
+)
-)
+#(#MenuItem
-#(#MenuItem
+#label: '-'
-#label: 'Move Up'
+)
-#value: #doMoveTabUpOrDown:
+#(#MenuItem
-#activeHelpKey: #editMoveUp
+#label: 'Move Up'
-#enabled: #canMoveTabItemUpOrDown
+#value: #doMoveTabUpOrDown:
-#argument: #up
+#activeHelpKey: #editMoveUp
-#labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
+#enabled: #canMoveTabItemUpOrDown
-)
+#argument: #up
-#(#MenuItem
+#labelImage: #(#ResourceRetriever #Icon #upIcon 'Move Up')
-#label: 'Move Down'
+)
-#value: #doMoveTabUpOrDown:
+#(#MenuItem
-#activeHelpKey: #editMoveDown
+#label: 'Move Down'
-#enabled: #canMoveTabItemUpOrDown
+#value: #doMoveTabUpOrDown:
-#argument: #down
+#activeHelpKey: #editMoveDown
-#labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
+#enabled: #canMoveTabItemUpOrDown
-)
+#argument: #down
-) nil
+#labelImage: #(#ResourceRetriever #Icon #downIcon 'Move Down')
-nil
+)
+#(#MenuItem
+#label: '-'
+#isVisible: #hiddenAccelerator
+)
+#(#MenuItem
+#label: 'Accept'
+#translateLabel: true
+#isVisible: #hiddenAccelerator
+#value: #accept
+#enabled: #valueOfEnablingCommitButtons
+#shortcutKeyCharacter: #Accept
+)
+)
+nil
+nil
 )
 !
 menuToolbar
 "This resource specification was automatically generated
 #(#MenuItem
 #label: 'Cut'
 #isButton: true
 #value: #doCut
 #activeHelpKey: #editCut
-#enabled: #valueOfCanCut
+#enabled: #hasSelectionHolder
 #labelImage: #(#ResourceRetriever #Icon #cutIcon)
 )
 #(#MenuItem
 #label: 'Copy'
 #isButton: true
 #value: #doCopy
 #activeHelpKey: #editCopy
-#enabled: #valueOfCanCopy
+#enabled: #hasSelectionHolder
 #labelImage: #(#ResourceRetriever #Icon #copyIcon)
 )
 #(#MenuItem
 #label: 'Paste'
 #isButton: true
 #(#MenuItem
 #label: 'Delete'
 #isButton: true
 #value: #doDelete
 #activeHelpKey: #editDelete
-#enabled: #valueOfCanCut
+#enabled: #hasSelectionHolder
 #labelImage: #(#ResourceRetriever #Icon #deleteIcon)
 )
 #(#MenuItem
 #label: ''
 )
 "/        holder addDependent:self.
 ].
 ^ holder.
 !
+hasSelectionHolder
+^ builder booleanValueAspectFor:#hasSelectionHolder
+!
 hasVerticalScrollBar
 "automatically generated by UIPainter ..."
 "*** the code below creates a default model when invoked."
 "*** (which may not be the one you wanted)"
 holder := true asValue.
 builder aspectAt:#hasVerticalScrollBar put:holder.
 "/        holder addDependent:self.
 ].
 ^ holder.
+!
+hiddenAccelerator
+"used to set menu entries with an accelerator not visible to the operator
+"
+^ false
 !
 inputGroup
 |holder|
 ]
 ]
 ].
 modified := false.
+listOfTabs notEmpty ifTrue:[ self selection:1 ].
-listOfTabs notEmpty ifTrue:[
-self selection:1
-].
-self updateInfoLabel
 !
 buildFromResourceSpec:aListSpec
 self buildFromTabList:aListSpec
 !
 "build from a aTabList"
 self selection:0.
 listOfTabs removeAll.
-aTabList do:[:aTabItem|
+aTabList do:[:aTabItem| listOfTabs add: aTabItem ].
-listOfTabs add: aTabItem.
-].
 modified := false.
+listOfTabs notEmpty ifTrue:[ self selection:1 ].
-listOfTabs notEmpty ifTrue:[
-self selection:1
-].
-self updateInfoLabel
 ! !
 !TabListEditor methodsFor:'change & update'!
 update:something with:aParameter from:someObject
 "one of my aspects has changed; update modified channel
 "
-|list size index|
+|list|
 someObject = self selectionHolder ifTrue:[
 ^ self selectionChanged
 ].
 someObject = self testMode ifFalse:[
 ^ super update:something with:aParameter from:someObject.
 ].
-size := listOfTabs size.
 someObject value ifTrue:[
-index := 0.
+listOfTabs notEmpty ifTrue:[
-size ~~ 0 ifTrue:[
 list := listOfTabs collect:[:aTab| |tab|
 tab := aTab copy.
 tab setAttributesFromClass:specClass.
 tab
-].
+]
-]
+].
-] ifFalse:[
+self selection:0.
-index := 1 min:size
+].
-].
-self selectionHolder value:index.
 self testItemList value:list.
 self updateInfoLabel.
 ! !
 noteBookModel value == 0 ifTrue:[noteBookModel value:1]
 ] ifFalse:[
 noteBookModel value:0
 ].
 self cancel.
-self valueOfCanCut  value:hasSelection.
+self hasSelectionHolder value:hasSelection.
-self valueOfCanCopy value:hasSelection.
 self valueOfCanPaste.
 !
 setSelection:anIndex
-self selectionHolder value:(anIndex ? 0) withoutNotifying:self
+|index|
+index := anIndex ? 0.
+self selectionHolder value:index withoutNotifying:self
 ! !
 !TabListEditor methodsFor:'startup / release'!
 initialize
 !
 doDelete
 "delete selected tab
 "
-|index|
+|index size|
 (index := self selection) ~~ 0 ifTrue:[
 self testMode value: false.
-self setSelection:0.
+(size := listOfTabs size) == 1 ifTrue:[
+self selection:0
+] ifFalse:[
+self setSelection:0
+].
 listOfTabs removeIndex:index.
-index > listOfTabs size ifTrue:[index := index - 1].
+index < size ifFalse:[
+index := index - 1
+].
 self selection:index.
 self updateAllToolInstances.
 modified := true.
 ].

changeset 1374	635e878e5c09
parent 1373	623e692f53fc
child 1375	bab043fa81fa