# HG changeset patch # User Claus Gittinger # Date 1516137261 -3600 # Node ID eceffed47e1c911bd266172198548f375d89588f # Parent 8076ba6a362ddc1c96d517666127fcd1eddfdb88 #OTHER by cg big refactoring: replaced all flyByHelpXXX sends and implementations by helpXXX. This should remove the confusion on where the tooltips should be stored and which methods need to be redefined. ATTENTION: May introduce temporary inconveniences until all other applications (in exept:xxx packages) are changed. diff -r 8076ba6a362d -r eceffed47e1c FlyByHelp.st --- a/FlyByHelp.st Tue Jan 16 22:14:16 2018 +0100 +++ b/FlyByHelp.st Tue Jan 16 22:14:21 2018 +0100 @@ -172,12 +172,12 @@ |text| - (aPointOrNil notNil and:[aModel respondsTo:#flyByHelpTextFor:at:]) ifTrue:[ - text := aModel flyByHelpTextFor:aView at:aPointOrNil. + (aPointOrNil notNil and:[aModel respondsTo:#helpTextFor:at:]) ifTrue:[ + text := aModel helpTextFor:aView at:aPointOrNil. text notNil ifTrue:[^ text]. ]. - (aModel respondsTo:#flyByHelpTextFor:) ifTrue:[ - text := aModel flyByHelpTextFor:aView. + (aModel respondsTo:#helpTextFor:) ifTrue:[ + text := aModel helpTextFor:aView. text notNil ifTrue:[^ text]. ]. ^ nil @@ -190,18 +190,18 @@ |text key app| - (aPointOrNil notNil and:[aView respondsTo:#flyByHelpTextAt:]) ifTrue:[ - text := aView flyByHelpTextAt:aPointOrNil. + (aPointOrNil notNil and:[aView respondsTo:#helpTextAt:]) ifTrue:[ + text := aView helpTextAt:aPointOrNil. text notNil ifTrue:[^ text]. ]. - (aView respondsTo:#flyByHelpText) ifTrue:[ - text := aView flyByHelpText. + (aView respondsTo:#helpText) ifTrue:[ + text := aView helpText. text notNil ifTrue:[^ text]. ]. "/ to be enabled in next release... "/ (aView superView notNil -"/ and:[aView superView respondsTo:#flyByHelpTextFor:]) ifTrue:[ -"/ text := aView superView flyByHelpTextFor:aView. +"/ and:[aView superView respondsTo:#helpTextFor:]) ifTrue:[ +"/ text := aView superView helpTextFor:aView. "/ text notNil ifTrue:[^ text]. "/ ]. (aView respondsTo:#helpKey) ifTrue:[ @@ -210,8 +210,8 @@ app := aView application. app isNil ifTrue:[ "/ special case for oldStyle Dialog subclasses. - aView topView flyByHelpSpec notNil ifTrue:[ - text := aView topView flyByHelpSpec at:key ifAbsent:nil. + aView topView helpSpec notNil ifTrue:[ + text := aView topView helpSpec at:key ifAbsent:nil. text notNil ifTrue:[ ^ aView topView resources stringWithCRs:text. ]. @@ -219,7 +219,7 @@ app := Error handle:[:ex | nil] do:[ aView windowGroup mainGroup application ]. ]. app notNil ifTrue:[ - ^ app flyByHelpTextForKey:key + ^ app helpTextForKey:key ]. ^ aView resources string:key ].