--- a/DebugView.st Tue Jan 16 22:12:49 2018 +0100
+++ b/DebugView.st Tue Jan 16 22:12:55 2018 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1989 by Claus Gittinger
All Rights Reserved
@@ -2833,12 +2831,13 @@
flyByHelpDependsOnPositionIn:aView
"subclasses where the help-text depends upon the pointer position might
- want to redefine this"
+ want to redefine this.
+ In the codeView, we follow the token under the mouse pointer..."
^ aView == codeView
!
-flyByHelpTextFor:aComponent
+helpTextFor:aComponent
|s|
aComponent == codeView ifTrue:[
@@ -2849,15 +2848,17 @@
((localPoint x between:0 and:codeView width)
and:[localPoint y between:0 and:codeView height])
ifTrue:[
- ^ self flyByHelpTextFor:codeView at:localPoint
+ ^ self helpTextFor:codeView at:localPoint
].
^ nil
].
- aComponent == abortButton ifTrue:[
- s := 'Abort (unwind to eventLoop)'
+ aComponent == abortButton ifTrue:[
+ "/ s := 'Abort (unwind to eventLoop)'
+ s := 'HELP_ABORT'
].
aComponent == terminateButton ifTrue:[
+ "/ s := 'HELP_TERMINATE'
Processor activeProcess isGUIProcess ifTrue:[
s := 'Terminate the process.\Attention: closes view and shuts down application.'
] ifFalse:[
@@ -2866,69 +2867,109 @@
].
aComponent == continueButton ifTrue:[
continueButton label = (resources string:'Stop') ifTrue:[
- s := 'Stop'
+ "/ s := 'Stop'
+ s := 'HELP_STOP'
] ifFalse:[
- s := 'Continue execution'
+ "/ s := 'Continue execution'
+ s := 'HELP_CONTINUE'
]
].
aComponent == stepButton ifTrue:[
- s := 'Step to next send in selected context (don''t enter into called methods)'
+ "/ s := 'Step to next send in selected context (don''t enter into called methods)'
+ s := 'HELP_STEP'
].
aComponent == nextButton ifTrue:[
- s := 'Step to next line in selected context (don''t enter into called methods)'
+ "/ s := 'Step to next line in selected context (don''t enter into called methods)'
+ s := 'HELP_NEXT'
].
aComponent == nextOverButton ifTrue:[
- s := 'Step over to cursor-line'
+ "/ s := 'Step over to cursor-line'
+ s := 'HELP_NEXTOVER'
].
aComponent == nextOutButton ifTrue:[
- s := 'Step out to caller'
+ "/ s := 'Step out to caller'
+ s := 'HELP_NEXTOUT'
+ ].
+ aComponent == stepButton ifTrue:[
+ s := 'HELP_STEP'
].
aComponent == sendButton ifTrue:[
- s := 'Send next message (enter into called methods)'
+ "/ s := 'Send next message (enter into called methods)'
+ s := 'HELP_SEND'
].
aComponent == returnButton ifTrue:[
- restartButton enabled ifTrue:[
- s := 'Return from the selected method'
+ returnButton enabled ifTrue:[
+ "/ s := 'Return from the selected method'
+ s := 'HELP_RETURN'
] ifFalse:[
- s := 'Return from the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
- ]
+ "/ s := 'Return from the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
+ s := 'HELP_RETURN_DISABLED'
+ ].
].
aComponent == restartButton ifTrue:[
restartButton enabled ifTrue:[
- s := 'Restart the selected method.\If the code was changed in the meanwhile, the original method will be executed again'
+ "/ s := 'Restart the selected method.\If the code was changed in the meanwhile, the original method will be executed again'
+ s := 'HELP_RESTART'
] ifFalse:[
- s := 'Restart the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
- ]
+ "/ s := 'Restart the selected method.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
+ s := 'HELP_RESTART_DISABLED'
+ ].
].
aComponent == resendButton ifTrue:[
resendButton enabled ifTrue:[
- s := 'Resend the selected method''s message.\If the code was changed in the meanwhile, the new method will be called with the original arguments.'
+ "/ s := 'Resend the selected method''s message.\If the code was changed in the meanwhile, the new method will be called with the original arguments.'
+ s := 'HELP_RESEND'
] ifFalse:[
- s := 'Resend the selected method''s message.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
- ]
+ "/ s := 'Resend the selected method''s message.\Disabled, because this method was compiled with context optimization, and cannot be returned from.' withCRs
+ s := 'HELP_RESEND_DISABLED'
+ ].
+ ].
+ aComponent == contextView ifTrue:[
+ s := 'HELP_WALKBACK'
+ ].
+ aComponent == codeView ifTrue:[
+ s := 'HELP_CODEVIEW'
].
aComponent == monitorToggle ifTrue:[
- s := 'Toggle monitoring'
+ "/ s := 'Toggle monitoring'
+ s := 'HELP_MONITOR'
].
aComponent == updateButton ifTrue:[
- s := 'Update'
- ].
+ "/ s := 'Update'
+ s := 'HELP_UPDATE'
+ ].
+ aComponent == gotoDialogOpenerButton ifTrue:[
+ s := 'HELP_GOTO_DIALOG_OPENER'
+ ].
+ aComponent == gotoApplicationActionMethodButton ifTrue:[
+ s := 'HELP_GOTO_APPLICATION_ACTION'
+ ].
+"/ aComponent == stopButton ifTrue:[
+"/ s := 'HELP_STOP'
+"/ ].
aComponent == defineButton ifTrue:[
s := 'Define the missing method (as halting) and proceed into it.\A debugger will reopen there, so you can add the code then'
].
aComponent == reportButton ifTrue:[
s := 'Send a defect report via eMail'
].
+ (aComponent isComponentOf:receiverInspector) ifTrue:[
+ s := 'HELP_REC_INSP'
+ ].
+ (aComponent isComponentOf:contextInspector) ifTrue:[
+ s := 'HELP_CON_INSP'
+ ].
+
s notNil ifTrue:[
^ resources stringWithCRs:s
].
^ nil
- "Modified: / 29-08-1995 / 23:38:54 / claus"
- "Modified: / 18-06-2010 / 11:34:51 / cg"
-!
-
-flyByHelpTextFor:aComponent at:aPointOrNil
+ "Modified: 29.8.1995 / 23:38:54 / claus"
+ "Modified: 4.3.1997 / 01:54:03 / cg"
+!
+
+helpTextFor:aComponent at:aPointOrNil
|s vline line col pos interval|
aComponent == codeView ifFalse:[^ nil].
@@ -2989,98 +3030,6 @@
^ s
"Modified: / 27-04-2010 / 17:51:53 / cg"
-!
-
-helpTextFor:aComponent
- |s|
-
- aComponent == abortButton ifTrue:[
- s := 'HELP_ABORT'
- ].
- aComponent == terminateButton ifTrue:[
- s := 'HELP_TERMINATE'
- ].
- aComponent == continueButton ifTrue:[
- continueButton label = (resources string:'Stop') ifTrue:[
- s := 'HELP_STOP'
- ] ifFalse:[
- s := 'HELP_CONTINUE'
- ]
- ].
- aComponent == stepButton ifTrue:[
- s := 'HELP_STEP'
- ].
- aComponent == nextButton ifTrue:[
- s := 'HELP_NEXT'
- ].
- aComponent == nextOverButton ifTrue:[
- s := 'HELP_NEXTOVER'
- ].
- aComponent == nextOutButton ifTrue:[
- s := 'HELP_NEXTOUT'
- ].
- aComponent == stepButton ifTrue:[
- s := 'HELP_STEP'
- ].
- aComponent == sendButton ifTrue:[
- s := 'HELP_SEND'
- ].
- aComponent == returnButton ifTrue:[
- returnButton enabled ifTrue:[
- s := 'HELP_RETURN'
- ] ifFalse:[
- s := 'HELP_RETURN_DISABLED'
- ].
- ].
- aComponent == restartButton ifTrue:[
- restartButton enabled ifTrue:[
- s := 'HELP_RESTART'
- ] ifFalse:[
- s := 'HELP_RESTART_DISABLED'
- ].
- ].
- aComponent == resendButton ifTrue:[
- resendButton enabled ifTrue:[
- s := 'HELP_RESEND'
- ] ifFalse:[
- s := 'HELP_RESEND_DISABLED'
- ].
- ].
- aComponent == contextView ifTrue:[
- s := 'HELP_WALKBACK'
- ].
- aComponent == codeView ifTrue:[
- s := 'HELP_CODEVIEW'
- ].
- aComponent == monitorToggle ifTrue:[
- s := 'HELP_MONITOR'
- ].
- aComponent == updateButton ifTrue:[
- s := 'HELP_UPDATE'
- ].
- aComponent == gotoDialogOpenerButton ifTrue:[
- s := 'HELP_GOTO_DIALOG_OPENER'
- ].
- aComponent == gotoApplicationActionMethodButton ifTrue:[
- s := 'HELP_GOTO_APPLICATION_ACTION'
- ].
-"/ aComponent == stopButton ifTrue:[
-"/ s := 'HELP_STOP'
-"/ ].
- (aComponent isComponentOf:receiverInspector) ifTrue:[
- s := 'HELP_REC_INSP'
- ].
- (aComponent isComponentOf:contextInspector) ifTrue:[
- s := 'HELP_CON_INSP'
- ].
-
- s notNil ifTrue:[
- ^ resources stringWithCRs:s
- ].
- ^ nil
-
- "Modified: 29.8.1995 / 23:38:54 / claus"
- "Modified: 4.3.1997 / 01:54:03 / cg"
! !
!DebugView methodsFor:'initialization & release'!
@@ -3901,7 +3850,7 @@
with:(osPidString ? '')).
exceptionInfoLabel
- flyByHelpText:(((resources stringWithCRs:'Error description:\') withColor:Color gray)
+ helpText:(((resources stringWithCRs:'Error description:\') withColor:Color gray)
,(lines asStringWith:Character cr)).
].
@@ -7148,7 +7097,7 @@
!
withNodeValueAtInterval:interval do:aBlock
- "helper for flyByHelp and explan-selection"
+ "helper for tooltops and explan-selection"
|node definingNode nm nmBold nameSymbol
varIdx parentNode receiver con receiversNonMetaClass|
@@ -9805,7 +9754,7 @@
printConditionOn:aStream
ignoredSendingClassAndSelectors notEmptyOrNil ifTrue:[
- aStream nextPutAll:(' if called from %1 » %2'
+ aStream nextPutAll:(' if called from %1 » %2'
bindWith:ignoredSendingClassAndSelectors first first
with:ignoredSendingClassAndSelectors first second).
^ self.