--- a/MenuEditor.st Fri Mar 06 15:35:09 1998 +0100
+++ b/MenuEditor.st Fri Mar 06 16:45:37 1998 +0100
@@ -240,7 +240,6 @@
'Selector returning an image.'
)
-
! !
!MenuEditor class methodsFor:'interface specs'!
@@ -264,11 +263,11 @@
#window:
#(#WindowSpec
#name: 'unnamed canvas'
- #layout: #(#LayoutFrame 429 0 338 0 695 0 656 0)
+ #layout: #(#LayoutFrame 302 0 220 0 568 0 538 0)
#label: 'unnamed canvas'
#min: #(#Point 10 10)
#max: #(#Point 1160 870)
- #bounds: #(#Rectangle 429 338 696 657)
+ #bounds: #(#Rectangle 302 220 569 539)
#usePreferredExtent: false
)
#component:
@@ -1515,10 +1514,11 @@
^menu
!
-useHelpDictionary:aDictionary
+useHelpDictionary:dictionaries
self noteBookView.
- self helpTool helpSpecFrom: specClass
+ self helpTool helpSpecFrom: specClass.
+ self helpTool dictionaries: dictionaries
! !
!MenuEditor methodsFor:'aspects'!
@@ -1861,7 +1861,7 @@
self askForModification
ifTrue:
[
- specClass := specSelector := nil.
+ self isStandAlone ifTrue: [specClass := specSelector := nil].
self buildFromClass: nil andSelector: #menu
]
!
--- a/UIHelpTool.st Fri Mar 06 15:35:09 1998 +0100
+++ b/UIHelpTool.st Fri Mar 06 16:45:37 1998 +0100
@@ -321,13 +321,29 @@
!UIHelpTool methodsFor:'accessing'!
+dictionaries
+ "return dictionaries"
+
+ ^dictionaries
+!
+
+dictionaries:aDictionaryOfDictionaries
+ "set dictionaries"
+
+ (dictionaries := aDictionaryOfDictionaries) isNil ifTrue:[
+ dictionaries := Dictionary new.
+ ].
+ self updateList
+!
+
dictionary
- "return the value of the instance variable 'dictionary' (automatically generated)"
+ "return dictionary"
- ^ dictionary!
+ ^ dictionary
+!
dictionary:aDictionary
- "set the value of the instance variable 'dictionary' (automatically generated)"
+ "set dictionary"
(dictionary := aDictionary) isNil ifTrue:[
dictionary := Dictionary new.
@@ -530,7 +546,8 @@
[DialogBox confirm: 'Class ', cls name asBoldText, ' already implements\a menu spec!!\\Do only replace, if you have removed\help keys in an existing help spec.\' withCRs yesLabel: ' Merge ' noLabel: ' Replace ']])
ifTrue:
[
- implementedHelpSpec associationsDo: [:h| helpSpec at: h key put: h value].
+ implementedHelpSpec associationsDo: [:h| (helpSpec includesKey: h key)
+ ifFalse: [helpSpec at: h key put: h value]].
]
].