changed: #basicFlyByHelpTextForKey:
authorClaus Gittinger <cg@exept.de>
Fri, 22 Jul 2011 10:59:43 +0200
changeset 2930 5f7129ba1255
parent 2929 fcf03ac9e8f5
child 2931 0163ade8b5d8
changed: #basicFlyByHelpTextForKey: allow for helpSpec to be placed into bindings (for SimpleDialogs)
ApplicationModel.st
--- a/ApplicationModel.st	Mon Jul 18 09:48:05 2011 +0200
+++ b/ApplicationModel.st	Fri Jul 22 10:59:43 2011 +0200
@@ -1575,11 +1575,17 @@
      key is the symbol associated with some widget or menu item.
      Return the original (english) text; needs to be translated as per language"
 
-    |helpText helpSpec "resourceArgs"|
-
-    helpSpec := self flyByHelpSpec.
-    helpSpec notNil ifTrue:[
-        helpText := helpSpec at:aKey ifAbsent:nil.
+    |helpSpecFromBindings helpText helpSpec "resourceArgs"|
+
+    helpSpecFromBindings := self aspectFor:#helpSpec.
+    helpSpecFromBindings notNil ifTrue:[
+        helpText := helpSpecFromBindings at:aKey ifAbsent:nil.
+    ].
+    helpText isNil ifTrue:[
+        helpSpec := self flyByHelpSpec.
+        helpSpec notNil ifTrue:[
+            helpText := helpSpec at:aKey ifAbsent:nil.
+        ].
     ].
 
     "/ new: allow for a collection (resource-key arg1 arg2...)
@@ -1588,6 +1594,8 @@
 "/        resourceArgs := helpText copyFrom:2.
     ].
     ^ helpText
+
+    "Modified: / 22-07-2011 / 10:47:35 / cg"
 !
 
 basicHelpTextForKey:aKey
@@ -3855,7 +3863,7 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.318 2011-07-18 07:35:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.319 2011-07-22 08:59:43 cg Exp $'
 ! !
 
 ApplicationModel initialize!