Skip to content

Commit 9c3a830

Browse files
committed
Remove explicit disabled icons from org.eclipse.ui.console
Use on-the-fly-generated disabled version of SVG-rasterized icons instead.
1 parent 77cfb89 commit 9c3a830

File tree

8 files changed

+0
-23
lines changed

8 files changed

+0
-23
lines changed

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ private ClearOutputAction() {
4949
super(ConsoleMessages.ClearOutputAction_title);
5050
setToolTipText(ConsoleMessages.ClearOutputAction_toolTipText);
5151
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_LCL_CLEAR));
52-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_CLEAR));
5352
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLEAR));
5453
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CLEAR_CONSOLE_ACTION);
5554
}

debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public class CloseConsoleAction extends Action {
3434

3535
public CloseConsoleAction(IConsole console) {
3636
super(ConsoleMessages.CloseConsoleAction_0, ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLOSE));
37-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_CLOSE));
3837
setToolTipText(ConsoleMessages.CloseConsoleAction_1);
3938
fConsole = console;
4039
}

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public class ConsolePluginImages {
4444

4545
// Use IPath and toOSString to build the names to ensure they have the slashes correct
4646
private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
47-
private final static String DLCL= "dlcl16/"; //disabled - size 16x16 //$NON-NLS-1$
4847
private final static String ELCL= "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
4948
private final static String VIEW= "cview16/"; // views //$NON-NLS-1$
5049

@@ -60,14 +59,6 @@ private static void declareImages() {
6059
declareRegistryImage(IInternalConsoleConstants.IMG_LCL_LOCK, LOCALTOOL + "lock_co.svg"); //$NON-NLS-1$
6160
declareRegistryImage(IInternalConsoleConstants.IMG_LCL_WRAP, LOCALTOOL + "wordwrap.svg"); //$NON-NLS-1$
6261

63-
// disabled local toolbars
64-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_CLEAR, DLCL + "clear_co.png"); //$NON-NLS-1$
65-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_PIN, DLCL + "pin.png"); //$NON-NLS-1$
66-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_LOCK, DLCL + "lock_co.png"); //$NON-NLS-1$
67-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_WRAP, DLCL + "wordwrap.png"); //$NON-NLS-1$
68-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_CLOSE, DLCL + "rem_co.png"); //$NON-NLS-1$
69-
declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_NEW_CON, DLCL + "new_con.png"); //$NON-NLS-1$
70-
7162
// enabled local toolbars
7263
declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLEAR, ELCL + "clear_co.svg"); //$NON-NLS-1$
7364
declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_PIN, ELCL + "pin.svg"); //$NON-NLS-1$

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ public interface IInternalConsoleConstants {
2121
String IMG_LCL_LOCK = "IMG_LCL_LOCK"; //$NON-NLS-1$
2222
String IMG_LCL_WRAP = "IMG_LCL_WRAP"; //$NON-NLS-1$
2323

24-
// disabled local tool images
25-
String IMG_DLCL_PIN = "IMG_DLCL_PIN"; //$NON-NLS-1$
26-
String IMG_DLCL_CLEAR= "IMG_DLCL_CLEAR"; //$NON-NLS-1$
27-
String IMG_DLCL_LOCK = "IMG_DLCL_LOCK"; //$NON-NLS-1$
28-
String IMG_DLCL_WRAP = "IMG_DLCL_WRAP"; //$NON-NLS-1$
29-
String IMG_DLCL_CLOSE = "IMG_DLCL_CLOSE"; //$NON-NLS-1$
30-
String IMG_DLCL_NEW_CON = "IMG_DLCL_NEW_CON"; //$NON-NLS-1$
31-
3224
// enabled local tool images
3325
String IMG_ELCL_PIN = "IMG_ELCL_PIN"; //$NON-NLS-1$
3426
String IMG_ELCL_CLEAR= "IMG_ELCL_CLEAR"; //$NON-NLS-1$

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public OpenConsoleAction() {
4545
fFactoryExtensions = getSortedFactories();
4646
setToolTipText(ConsoleMessages.OpenConsoleAction_1);
4747
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_NEW_CON));
48-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_NEW_CON));
4948
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_OPEN_CONSOLE_ACTION);
5049
}
5150

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public PinConsoleAction(IConsoleView view) {
3535
super(ConsoleMessages.PinConsoleAction_0, IAction.AS_CHECK_BOX);
3636
setToolTipText(ConsoleMessages.PinConsoleAction_1);
3737
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_PIN));
38-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_PIN));
3938
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_PIN));
4039
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_PIN_CONSOLE_ACITON);
4140
fView = view;

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public ScrollLockAction(IConsoleView consoleView) {
3232

3333
setToolTipText(ConsoleMessages.ScrollLockAction_1);
3434
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_LOCK));
35-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_LOCK));
3635
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_LOCK));
3736
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_SCROLL_LOCK_ACTION);
3837
boolean checked = fConsoleView.getScrollLock();

debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public WordWrapAction(IConsoleView consoleView) {
4040

4141
setToolTipText(ConsoleMessages.WordWrapAction_1);
4242
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_WRAP));
43-
setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_WRAP));
4443
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_WRAP));
4544
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_WORD_WRAP_ACTION);
4645

0 commit comments

Comments
 (0)