Skip to content

Commit 9ce8469

Browse files
HeikoKlareHeikoKlare
committed
Remove explicit disabled icons from org.eclipse.ui.views bundles
Use on-the-fly-generated disabled version of SVG-rasterized icons instead.
1 parent b22a409 commit 9ce8469

File tree

4 files changed

+0
-27
lines changed

4 files changed

+0
-27
lines changed

‎bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/Activator.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,14 @@ protected void initializeImageRegistry(ImageRegistry registry) {
6565
registerImageDescriptor(registry, SharedImages.DESC_HIERARCHICAL_LAYOUT_OBJ);
6666

6767
registerImageDescriptor(registry, SharedImages.DESC_CLEAR);
68-
registerImageDescriptor(registry, SharedImages.DESC_CLEAR_DISABLED);
6968
registerImageDescriptor(registry, SharedImages.DESC_OPEN_CONSOLE);
7069
registerImageDescriptor(registry, SharedImages.DESC_REMOVE_LOG);
71-
registerImageDescriptor(registry, SharedImages.DESC_REMOVE_LOG_DISABLED);
7270
registerImageDescriptor(registry, SharedImages.DESC_EXPORT);
73-
registerImageDescriptor(registry, SharedImages.DESC_EXPORT_DISABLED);
7471
registerImageDescriptor(registry, SharedImages.DESC_FILTER);
75-
registerImageDescriptor(registry, SharedImages.DESC_FILTER_DISABLED);
7672
registerImageDescriptor(registry, SharedImages.DESC_IMPORT);
77-
registerImageDescriptor(registry, SharedImages.DESC_IMPORT_DISABLED);
7873
registerImageDescriptor(registry, SharedImages.DESC_OPEN_LOG);
79-
registerImageDescriptor(registry, SharedImages.DESC_OPEN_LOG_DISABLED);
8074
registerImageDescriptor(registry, SharedImages.DESC_PROPERTIES);
81-
registerImageDescriptor(registry, SharedImages.DESC_PROPERTIES_DISABLED);
8275
registerImageDescriptor(registry, SharedImages.DESC_READ_LOG);
83-
registerImageDescriptor(registry, SharedImages.DESC_READ_LOG_DISABLED);
8476
}
8577

8678
private void registerImageDescriptor(ImageRegistry registry, String id) {

‎bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogView.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ public void run() {
393393
}
394394
};
395395
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_CLEAR));
396-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_CLEAR_DISABLED));
397396
action.setToolTipText(Messages.LogView_clear_tooltip);
398397
action.setText(Messages.LogView_clear);
399398
return action;
@@ -419,7 +418,6 @@ public void run() {
419418
};
420419
action.setToolTipText(Messages.LogView_delete_tooltip);
421420
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_REMOVE_LOG));
422-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_REMOVE_LOG_DISABLED));
423421
action.setEnabled(fInputFile.exists() && fInputFile.equals(Platform.getLogFileLocation().toFile()));
424422
return action;
425423
}
@@ -433,7 +431,6 @@ public void run() {
433431
};
434432
action.setToolTipText(Messages.LogView_export_tooltip);
435433
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT));
436-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT_DISABLED));
437434
action.setEnabled(fInputFile.exists());
438435
return action;
439436
}
@@ -447,7 +444,6 @@ public void run() {
447444
};
448445
action.setToolTipText(Messages.LogView_exportEntry_tooltip);
449446
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT));
450-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_EXPORT_DISABLED));
451447
action.setEnabled(!fFilteredTree.getViewer().getSelection().isEmpty());
452448
return action;
453449
}
@@ -461,15 +457,13 @@ public void run() {
461457
};
462458
action.setToolTipText(Messages.LogView_filter);
463459
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_FILTER));
464-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_FILTER_DISABLED));
465460
return action;
466461
}
467462

468463
private Action createImportLogAction() {
469464
Action action = new ImportLogAction(this, Messages.LogView_import, fMemento);
470465
action.setToolTipText(Messages.LogView_import_tooltip);
471466
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_IMPORT));
472-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_IMPORT_DISABLED));
473467
return action;
474468
}
475469

@@ -497,7 +491,6 @@ public void run() {
497491
}
498492
action.setText(Messages.LogView_view_currentLog);
499493
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_OPEN_LOG));
500-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_OPEN_LOG_DISABLED));
501494
action.setEnabled(fInputFile.exists());
502495
action.setToolTipText(Messages.LogView_view_currentLog_tooltip);
503496
return action;
@@ -506,7 +499,6 @@ public void run() {
506499
private Action createPropertiesAction() {
507500
Action action = new EventDetailsDialogAction(this, fTree, fFilteredTree.getViewer(), fMemento);
508501
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_PROPERTIES));
509-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_PROPERTIES_DISABLED));
510502
action.setToolTipText(Messages.LogView_properties_tooltip);
511503
action.setEnabled(false);
512504
return action;
@@ -522,7 +514,6 @@ public void run() {
522514
};
523515
action.setToolTipText(Messages.LogView_readLog_restore_tooltip);
524516
action.setImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_READ_LOG));
525-
action.setDisabledImageDescriptor(SharedImages.getImageDescriptor(SharedImages.DESC_READ_LOG_DISABLED));
526517
return action;
527518
}
528519

‎bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/SharedImages.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,21 @@ private SharedImages() { // do nothing
2626

2727
private static final String PATH_OBJ = ICONS_PATH + "obj16/"; //$NON-NLS-1$
2828
private static final String PATH_LCL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$
29-
private static final String PATH_LCL_DISABLED = ICONS_PATH + "dlcl16/"; //$NON-NLS-1$
3029
private static final String PATH_EVENTS = ICONS_PATH + "eview16/"; //$NON-NLS-1$
3130

3231
/* Event Details */
3332
public static final String DESC_PREV_EVENT = PATH_EVENTS + "event_prev.svg"; //$NON-NLS-1$
3433
public static final String DESC_NEXT_EVENT = PATH_EVENTS + "event_next.svg"; //$NON-NLS-1$
3534

3635
public static final String DESC_CLEAR = PATH_LCL + "clear.svg"; //$NON-NLS-1$
37-
public static final String DESC_CLEAR_DISABLED = PATH_LCL_DISABLED + "clear.png"; //$NON-NLS-1$
3836
public static final String DESC_OPEN_CONSOLE = PATH_LCL + "open_console_obj.svg"; //$NON-NLS-1$
3937
public static final String DESC_REMOVE_LOG = PATH_LCL + "remove.svg"; //$NON-NLS-1$
40-
public static final String DESC_REMOVE_LOG_DISABLED = PATH_LCL_DISABLED + "remove.png"; //$NON-NLS-1$
4138
public static final String DESC_EXPORT = PATH_LCL + "export_log.svg"; //$NON-NLS-1$
42-
public static final String DESC_EXPORT_DISABLED = PATH_LCL_DISABLED + "export_log.png"; //$NON-NLS-1$
4339
public static final String DESC_FILTER = PATH_LCL + "filter_ps.svg"; //$NON-NLS-1$
44-
public static final String DESC_FILTER_DISABLED = PATH_LCL_DISABLED + "filter_ps.png"; //$NON-NLS-1$
4540
public static final String DESC_IMPORT = PATH_LCL + "import_log.svg"; //$NON-NLS-1$
46-
public static final String DESC_IMPORT_DISABLED = PATH_LCL_DISABLED + "import_log.png"; //$NON-NLS-1$
4741
public static final String DESC_OPEN_LOG = PATH_LCL + "open_log.svg"; //$NON-NLS-1$
48-
public static final String DESC_OPEN_LOG_DISABLED = PATH_LCL_DISABLED + "open_log.png"; //$NON-NLS-1$
4942
public static final String DESC_PROPERTIES = PATH_LCL + "properties.svg"; //$NON-NLS-1$
50-
public static final String DESC_PROPERTIES_DISABLED = PATH_LCL_DISABLED + "properties.png"; //$NON-NLS-1$
5143
public static final String DESC_READ_LOG = PATH_LCL + "restore_log.svg"; //$NON-NLS-1$
52-
public static final String DESC_READ_LOG_DISABLED = PATH_LCL_DISABLED + "restore_log.png"; //$NON-NLS-1$
5344

5445
public static final String DESC_ERROR_ST_OBJ = PATH_OBJ + "error_st_obj.svg"; //$NON-NLS-1$
5546
public static final String DESC_ERROR_STACK_OBJ = PATH_OBJ + "error_stack.svg"; //$NON-NLS-1$

‎bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheetPage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ private void makeActions() {
414414
defaultsAction.setText(PropertiesMessages.Defaults_text);
415415
defaultsAction.setToolTipText(PropertiesMessages.Defaults_toolTip);
416416
defaultsAction.setImageDescriptor(createImageDescriptor("elcl16/defaults_ps.svg")); //$NON-NLS-1$
417-
defaultsAction.setDisabledImageDescriptor(createImageDescriptor("dlcl16/defaults_ps.png")); //$NON-NLS-1$
418417
defaultsAction.setEnabled(false);
419418

420419
// Show Advanced Properties

0 commit comments

Comments
 (0)