From 08844f654a4935c830aa37d60dc720348c6b5447 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Thu, 7 May 2015 13:49:17 +0200 Subject: [PATCH] Control: Fix Bug 367855 - TerminalActionPaste uses wrong icon for disabled state --- .../control/actions/TerminalActionPaste.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java index 7876e68371e..ca1011c3be2 100644 --- a/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java +++ b/plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/control/actions/TerminalActionPaste.java @@ -31,20 +31,22 @@ public class TerminalActionPaste extends AbstractTerminalAction { super(TerminalActionPaste.class.getName()); setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); - setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), false); + setupAction(ActionMessages.PASTE, ActionMessages.PASTE, + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), + false); } public TerminalActionPaste(ITerminalViewControl target) { super(target, TerminalActionPaste.class.getName()); setActionDefinitionId("org.eclipse.tm.terminal.paste"); //$NON-NLS-1$ ISharedImages si = PlatformUI.getWorkbench().getSharedImages(); - setupAction(ActionMessages.PASTE, ActionMessages.PASTE, si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), si - .getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), false); + setupAction(ActionMessages.PASTE, ActionMessages.PASTE, + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE), + si.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE_DISABLED), + false); } public void run() {