Attachment 54428 Details for Bug 46469 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

46469_Toolbar_Tooltip_Keybindings_patch.txt (text/plain), 2.06 KB, created by Markus Keller

on 2006-11-23 14:10:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2006-11-23 14:10:23 EST

Size: 2.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/messages.properties,v
>retrieving revision 1.21
>diff -u -r1.21 messages.properties
>--- src/org/eclipse/jface/messages.properties	7 Jul 2006 01:18:01 -0000	1.21
>+++ src/org/eclipse/jface/messages.properties	23 Nov 2006 19:02:54 -0000
>@@ -107,6 +107,7 @@
> #############################################################
> Cancel_Current_Operation = Cancel Current Operation
> Set_SubTask = {0} {1}
>+Toolbar_Tooltip_Accelerator = {0} ({1})
> 
> #############################################################
> # org.eclipse.jface.dialog
>Index: src/org/eclipse/jface/action/ActionContributionItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java,v
>retrieving revision 1.76
>diff -u -r1.76 ActionContributionItem.java
>--- src/org/eclipse/jface/action/ActionContributionItem.java	10 Nov 2006 17:42:07 -0000	1.76
>+++ src/org/eclipse/jface/action/ActionContributionItem.java	23 Nov 2006 19:02:54 -0000
>@@ -729,6 +729,19 @@
> 					if ((toolTip == null) || (toolTip.length() == 0)) {
> 						toolTip = text;
> 					}
>+					
>+					ExternalActionManager.ICallback callback = ExternalActionManager
>+							.getInstance().getCallback();
>+					String commandId = action.getActionDefinitionId();
>+					if ((callback != null) && (commandId != null) && (toolTip != null)) {
>+						String acceleratorText = callback.getAcceleratorText(commandId);
>+						if (acceleratorText != null && acceleratorText.length() != 0) {
>+							toolTip = JFaceResources.format(
>+									"Toolbar_Tooltip_Accelerator", //$NON-NLS-1$
>+									new Object[] { toolTip, acceleratorText });
>+						}
>+					}
>+
> 					// if the text is showing, then only set the tooltip if
> 					// different
> 					if (!showText || toolTip != null && !toolTip.equals(text)) {

Actions: View | Diff

Attachments on bug 46469: 54428