Skip to content

Commit bcd6dd1

Browse files
committed
Remove explicit disabled icons from org.eclipse.e4.ui bundles
Use on-the-fly-generated disabled version of SVG-rasterized icons instead.
1 parent 3921bcc commit bcd6dd1

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ public class ProgressInfoItem extends Composite {
6868

6969
static String STOP_IMAGE_KEY = "org.eclipse.ui.internal.progress.PROGRESS_STOP"; //$NON-NLS-1$
7070

71-
static String DISABLED_STOP_IMAGE_KEY = "org.eclipse.ui.internal.progress.DISABLED_PROGRESS_STOP"; //$NON-NLS-1$
72-
7371
static String CLEAR_FINISHED_JOB_KEY = "org.eclipse.ui.internal.progress.CLEAR_FINISHED_JOB"; //$NON-NLS-1$
7472

75-
static String DISABLED_CLEAR_FINISHED_JOB_KEY = "org.eclipse.ui.internal.progress.DISABLED_CLEAR_FINISHED_JOB"; //$NON-NLS-1$
76-
7773
static String DEFAULT_JOB_KEY = "org.eclipse.ui.internal.progress.PROGRESS_DEFAULT"; //$NON-NLS-1$
7874

7975
static String DARK_COLOR_KEY = "org.eclipse.ui.internal.progress.PROGRESS_DARK_COLOR"; //$NON-NLS-1$
@@ -138,14 +134,10 @@ interface IndexListener {
138134
static {
139135
ImageTools.getInstance().putIntoRegistry(STOP_IMAGE_KEY,
140136
"elcl16/progress_stop.svg");//$NON-NLS-1$
141-
ImageTools.getInstance().putIntoRegistry(DISABLED_STOP_IMAGE_KEY,
142-
"dlcl16/progress_stop.png");//$NON-NLS-1$
143137
ImageTools.getInstance().putIntoRegistry(DEFAULT_JOB_KEY,
144138
"progress/progress_task.svg"); //$NON-NLS-1$
145139
ImageTools.getInstance().putIntoRegistry(CLEAR_FINISHED_JOB_KEY,
146140
"elcl16/progress_rem.svg"); //$NON-NLS-1$
147-
ImageTools.getInstance().putIntoRegistry(
148-
DISABLED_CLEAR_FINISHED_JOB_KEY, "dlcl16/progress_rem.png"); //$NON-NLS-1$
149141

150142
// Mac has different Gamma value
151143
int shift = Util.isMac() ? -25 : -10;
@@ -645,15 +637,10 @@ private void updateToolBarValues() {
645637
if (isCompleted()) {
646638
actionButton.setImage(JFaceResources
647639
.getImage(CLEAR_FINISHED_JOB_KEY));
648-
actionButton.setDisabledImage(JFaceResources
649-
.getImage(DISABLED_CLEAR_FINISHED_JOB_KEY));
650640
actionButton
651641
.setToolTipText(ProgressMessages.NewProgressView_ClearJobToolTip);
652642
} else {
653643
actionButton.setImage(JFaceResources.getImage(STOP_IMAGE_KEY));
654-
actionButton.setDisabledImage(JFaceResources
655-
.getImage(DISABLED_STOP_IMAGE_KEY));
656-
657644
}
658645
JobInfo[] infos = getJobInfos();
659646

0 commit comments

Comments
 (0)