Skip to content

Commit cf161ce

Browse files
HeikoKlareHeikoKlare
committed
Replace disabled PNGs with runtime disablement in org.eclipse.debug.ui
In org.eclipse.debug.ui, several disabled images are still retrieved from PNGs. This change replaces those images with ones that are disabled on-the-fly. To this end, image descriptors based on the original image descriptors applying the SWT.IMAGE_DISABLE are used.
1 parent acaeb9b commit cf161ce

File tree

4 files changed

+109
-149
lines changed

4 files changed

+109
-149
lines changed

‎debug/org.eclipse.debug.ui/plugin.xml

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@
241241
definitionId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
242242
label="%ToggleBreakpointAction.label"
243243
icon="$nl$/icons/full/obj16/brkp_obj.svg"
244-
disabledIcon="$nl$/icons/full/obj16/brkpd_obj.png"
245244
helpContextId="toggle_breakpoint_action_context"
246245
class="org.eclipse.debug.internal.ui.actions.breakpoints.RetargetToggleBreakpointAction"
247246
menubarPath="org.eclipse.ui.run/lineBreakpointBeforeGroup"
@@ -250,7 +249,6 @@
250249
<action
251250
class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllBreakpointsAction"
252251
definitionId="org.eclipse.debug.ui.commands.RemoveAllBreakpoints"
253-
disabledIcon="$nl$/icons/full/dlcl16/rem_all_co.png"
254252
helpContextId="remove_all_breakpoints_action_context"
255253
icon="$nl$/icons/full/elcl16/rem_all_co.svg"
256254
id="org.eclipse.debug.ui.actions.RemoveAllBreakpoints"
@@ -273,7 +271,6 @@
273271
definitionId="org.eclipse.debug.ui.commands.ToggleMethodBreakpoint"
274272
label="%ToggleMethodBreakpointAction.label"
275273
icon="$nl$/icons/full/obj16/brkp_obj.svg"
276-
disabledIcon="$nl$/icons/full/obj16/brkpd_obj.png"
277274
helpContextId="toggle_method_breakpoint_action_context"
278275
class="org.eclipse.debug.internal.ui.actions.breakpoints.RetargetMethodBreakpointAction"
279276
menubarPath="org.eclipse.ui.run/lineBreakpointAfterGroup"
@@ -283,7 +280,6 @@
283280
definitionId="org.eclipse.debug.ui.commands.ToggleWatchpoint"
284281
label="%ToggleWatchpointAction.label"
285282
icon="$nl$/icons/full/obj16/readwrite_obj.svg"
286-
disabledIcon="$nl$/icons/full/obj16/readwrite_obj_disabled.png"
287283
helpContextId="toggle_watchpoint_action_context"
288284
class="org.eclipse.debug.internal.ui.actions.breakpoints.RetargetWatchpointAction"
289285
menubarPath="org.eclipse.ui.run/lineBreakpointAfterGroup"
@@ -293,7 +289,6 @@
293289
definitionId="org.eclipse.debug.ui.commands.ToggleLineBreakpoint"
294290
label="%ToggleLineBreakpointAction.label"
295291
icon="$nl$/icons/full/obj16/brkp_obj.svg"
296-
disabledIcon="$nl$/icons/full/obj16/brkpd_obj.png"
297292
helpContextId="toggle_line_breakpoint_action_context"
298293
class="org.eclipse.debug.internal.ui.actions.breakpoints.RetargetToggleLineBreakpointAction"
299294
menubarPath="org.eclipse.ui.run/lineBreakpointAfterGroup"
@@ -328,7 +323,6 @@
328323
id="org.eclipse.debug.ui.actions.ToggleStepFilters"
329324
class="org.eclipse.debug.internal.ui.commands.actions.ToggleStepFiltersCommandActionDelegate"
330325
definitionId="org.eclipse.debug.ui.commands.ToggleStepFilters"
331-
disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.png"
332326
icon="$nl$/icons/full/elcl16/stepbystep_co.svg"
333327
helpContextId="org.eclipse.debug.ui.step_with_filters_action_context"
334328
label="%StepWithFiltersAction.label"
@@ -353,7 +347,6 @@
353347
class="org.eclipse.debug.internal.ui.actions.RetargetRunToLineAction"
354348
definitionId="org.eclipse.debug.ui.commands.RunToLine"
355349
helpContextId="run_to_line_action_context"
356-
disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.png"
357350
icon="$nl$/icons/full/elcl16/runtoline_co.svg"
358351
label="%RunToLine.label"
359352
menubarPath="org.eclipse.ui.run/emptyStepGroup"
@@ -364,7 +357,6 @@
364357
id="org.eclipse.debug.ui.actions.StepReturn"
365358
class="org.eclipse.debug.internal.ui.commands.actions.StepReturnCommandActionDelegate"
366359
definitionId="org.eclipse.debug.ui.commands.StepReturn"
367-
disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.png"
368360
icon="$nl$/icons/full/elcl16/stepreturn_co.svg"
369361
helpContextId="step_return_action_context"
370362
label="%StepReturnAction.label"
@@ -376,7 +368,6 @@
376368
id="org.eclipse.debug.ui.actions.StepOver"
377369
class="org.eclipse.debug.internal.ui.commands.actions.StepOverCommandActionDelegate"
378370
definitionId="org.eclipse.debug.ui.commands.StepOver"
379-
disabledIcon="$nl$/icons/full/dlcl16/stepover_co.png"
380371
icon="$nl$/icons/full/elcl16/stepover_co.svg"
381372
helpContextId="step_over_action_context"
382373
label="%StepOverAction.label"
@@ -388,7 +379,6 @@
388379
id="org.eclipse.debug.ui.actions.StepInto"
389380
class="org.eclipse.debug.internal.ui.commands.actions.StepIntoCommandActionDelegate"
390381
definitionId="org.eclipse.debug.ui.commands.StepInto"
391-
disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.png"
392382
icon="$nl$/icons/full/elcl16/stepinto_co.svg"
393383
helpContextId="step_into_action_context"
394384
label="%StepIntoAction.label"
@@ -400,7 +390,6 @@
400390
id="org.eclipse.debug.ui.actions.toolbar.Disconnect"
401391
class="org.eclipse.debug.internal.ui.commands.actions.DisconnectCommandActionDelegate"
402392
definitionId="org.eclipse.debug.ui.commands.Disconnect"
403-
disabledIcon="$nl$/icons/full/dlcl16/disconnect_co.png"
404393
icon="$nl$/icons/full/elcl16/disconnect_co.svg"
405394
helpContextId="disconnect_action_context"
406395
label="%Disconnect.label"
@@ -412,7 +401,6 @@
412401
id="org.eclipse.debug.ui.actions.Terminate"
413402
class="org.eclipse.debug.internal.ui.commands.actions.TerminateCommandActionDelegate"
414403
definitionId="org.eclipse.debug.ui.commands.Terminate"
415-
disabledIcon="$nl$/icons/full/dlcl16/terminate_co.png"
416404
icon="$nl$/icons/full/elcl16/terminate_co.svg"
417405
helpContextId="terminate_action_context"
418406
label="%TerminateAction.label"
@@ -424,7 +412,6 @@
424412
id="org.eclipse.debug.ui.actions.Suspend"
425413
class="org.eclipse.debug.internal.ui.commands.actions.SuspendCommandActionDelegate"
426414
definitionId="org.eclipse.debug.ui.commands.Suspend"
427-
disabledIcon="$nl$/icons/full/dlcl16/suspend_co.png"
428415
icon="$nl$/icons/full/elcl16/suspend_co.svg"
429416
helpContextId="suspend_action_context"
430417
label="%SuspendAction.label"
@@ -436,7 +423,6 @@
436423
id="org.eclipse.debug.ui.actions.Resume"
437424
class="org.eclipse.debug.internal.ui.commands.actions.ResumeCommandActionDelegate"
438425
definitionId="org.eclipse.debug.ui.commands.Resume"
439-
disabledIcon="$nl$/icons/full/dlcl16/resume_co.png"
440426
icon="$nl$/icons/full/elcl16/resume_co.svg"
441427
helpContextId="resume_action_context"
442428
label="%ResumeAction.label"
@@ -476,7 +462,6 @@
476462
</action>
477463
<action
478464
class="org.eclipse.debug.internal.ui.actions.RunAsAction"
479-
disabledIcon="$nl$/icons/full/dtool16/run_exc.png"
480465
helpContextId="run_with_configuration_action_context"
481466
icon="$nl$/icons/full/etool16/run_exc.svg"
482467
id="org.eclipse.debug.internal.ui.actions.RunWithConfigurationAction"
@@ -496,7 +481,6 @@
496481
id="org.eclipse.debug.ui.actions.DebugLast"
497482
class="org.eclipse.debug.internal.ui.actions.DebugLastAction"
498483
definitionId="org.eclipse.debug.ui.commands.DebugLast"
499-
disabledIcon="$nl$/icons/full/dlcl16/debuglast_co.png"
500484
icon="$nl$/icons/full/elcl16/debuglast_co.svg"
501485
helpContextId="debug_last_action_context"
502486
label="%ContextLaunchingDebugMenu.name"
@@ -506,7 +490,6 @@
506490
id="org.eclipse.debug.ui.actions.RunLast"
507491
class="org.eclipse.debug.internal.ui.actions.RunLastAction"
508492
definitionId="org.eclipse.debug.ui.commands.RunLast"
509-
disabledIcon="$nl$/icons/full/dlcl16/runlast_co.png"
510493
icon="$nl$/icons/full/elcl16/runlast_co.svg"
511494
helpContextId="run_last_action_context"
512495
label="%ContextLaunchingRunMenu.name"
@@ -516,7 +499,6 @@
516499
id="org.eclipse.debug.internal.ui.actions.RunDropDownAction"
517500
toolbarPath="org.eclipse.debug.ui.launchActionSet/debug"
518501
class="org.eclipse.debug.internal.ui.actions.RunToolbarAction"
519-
disabledIcon="$nl$/icons/full/dtool16/run_exc.png"
520502
icon="$nl$/icons/full/etool16/run_exc.svg"
521503
helpContextId="run_action_context"
522504
label="%RunDropDownAction.label"
@@ -532,7 +514,6 @@
532514
</action>
533515
<action
534516
class="org.eclipse.debug.internal.ui.actions.DebugAsAction"
535-
disabledIcon="$nl$/icons/full/dtool16/debug_exc.png"
536517
helpContextId="debug_with_configuration_action_context"
537518
icon="$nl$/icons/full/etool16/debug_exc.svg"
538519
id="org.eclipse.debug.internal.ui.actions.DebugWithConfigurationAction"
@@ -552,7 +533,6 @@
552533
id="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"
553534
toolbarPath="org.eclipse.debug.ui.launchActionSet/debug"
554535
class="org.eclipse.debug.internal.ui.actions.DebugToolbarAction"
555-
disabledIcon="$nl$/icons/full/dtool16/debug_exc.png"
556536
icon="$nl$/icons/full/etool16/debug_exc.svg"
557537
helpContextId="debug_action_context"
558538
label="%DebugDropDownAction.label"
@@ -578,7 +558,6 @@
578558
id="org.eclipse.debug.internal.ui.actions.ProfileDropDownAction"
579559
toolbarPath="org.eclipse.debug.ui.launchActionSet/debug"
580560
class="org.eclipse.debug.internal.ui.actions.ProfileToolbarAction"
581-
disabledIcon="$nl$/icons/full/dtool16/profile_exc.png"
582561
icon="$nl$/icons/full/etool16/profile_exc.svg"
583562
helpContextId="profile_action_context"
584563
label="%ProfileDropDownAction.label"
@@ -599,7 +578,6 @@
599578
class="org.eclipse.debug.internal.ui.actions.ProfileAsAction"
600579
menubarPath="org.eclipse.ui.run/profileGroup"
601580
icon="$nl$/icons/full/etool16/profile_exc.svg"
602-
disabledIcon="$nl$/icons/full/dtool16/profile_exc.png"
603581
id="org.eclipse.debug.internal.ui.actions.ProfileWithConfigurationAction">
604582
</action>
605583
<action
@@ -614,7 +592,6 @@
614592
id="org.eclipse.debug.ui.actions.ProfileLast"
615593
class="org.eclipse.debug.internal.ui.actions.ProfileLastAction"
616594
definitionId="org.eclipse.debug.ui.commands.ProfileLast"
617-
disabledIcon="$nl$/icons/full/dtool16/profile_exc.png"
618595
icon="$nl$/icons/full/etool16/profile_exc.svg"
619596
helpContextId="profile_last_action_context"
620597
label="%ProfileLastAction.label"
@@ -787,7 +764,6 @@
787764
id="org.eclipse.debug.ui.debugview.toolbar.removeAllTerminated"
788765
toolbarPath="threadGroup"
789766
class="org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction"
790-
disabledIcon="$nl$/icons/full/dlcl16/rem_all_co.png"
791767
icon="$nl$/icons/full/elcl16/rem_all_co.svg"
792768
helpContextId="remove_all_terminated_action_context"
793769
label="%RemoveAllTerminatedAction.label"
@@ -797,7 +773,6 @@
797773
id="org.eclipse.debug.ui.debugview.toolbar.collapseAll"
798774
toolbarPath="threadGroup"
799775
class="org.eclipse.debug.internal.ui.actions.LaunchCollapseAllAction"
800-
disabledIcon="$nl$/icons/full/dlcl16/collapseall.png"
801776
icon="$nl$/icons/full/elcl16/collapseall.svg"
802777
helpContextId="collapse_all_action_context"
803778
label="%CollapseAllAction.label"
@@ -813,7 +788,6 @@
813788
id="org.eclipse.debug.ui.breakpointsView.toolbar.removeAll"
814789
toolbarPath="breakpointGroup"
815790
class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveAllBreakpointsAction"
816-
disabledIcon="$nl$/icons/full/dlcl16/rem_all_co.png"
817791
icon="$nl$/icons/full/elcl16/rem_all_co.svg"
818792
helpContextId="remove_all_breakpoints_action_context"
819793
label="%RemoveAllAction.label"
@@ -824,7 +798,6 @@
824798
definitionId="org.eclipse.ui.edit.delete"
825799
toolbarPath="breakpointGroup"
826800
class="org.eclipse.debug.internal.ui.actions.breakpoints.RemoveBreakpointAction"
827-
disabledIcon="$nl$/icons/full/dlcl16/rem_co.png"
828801
icon="$nl$/icons/full/elcl16/rem_co.svg"
829802
helpContextId="remove_breakpoint_action_context"
830803
label="%RemoveAction.label"
@@ -912,7 +885,6 @@
912885
id="org.eclipse.debug.ui.expresssionsView.toolbar.removeAll"
913886
toolbarPath="expressionGroup"
914887
class="org.eclipse.debug.internal.ui.actions.expressions.RemoveAllExpressionsAction"
915-
disabledIcon="$nl$/icons/full/dlcl16/rem_all_co.png"
916888
icon="$nl$/icons/full/elcl16/rem_all_co.svg"
917889
helpContextId="remove_all_expressions_action_context"
918890
label="%RemoveAllAction.label"
@@ -923,7 +895,6 @@
923895
toolbarPath="expressionGroup"
924896
definitionId="org.eclipse.ui.edit.delete"
925897
class="org.eclipse.debug.internal.ui.actions.expressions.RemoveExpressionAction"
926-
disabledIcon="$nl$/icons/full/dlcl16/rem_co.png"
927898
icon="$nl$/icons/full/elcl16/rem_co.svg"
928899
helpContextId="remove_expression_action_context"
929900
label="%RemoveAction.label"
@@ -968,7 +939,6 @@
968939
toolbarPath="additions"
969940
tooltip="%NewMemoryViewAction.tooltip"/>
970941
<action
971-
disabledIcon="$nl$/icons/full/dlcl16/var_cntnt_prvdr.png"
972942
toolbarPath="MemoryMonitorsGroup"
973943
label="%ToggleMemoryMonitorsPaneAction.name"
974944
tooltip="%ToggleMemoryMonitorsPaneAction.tooltip"
@@ -977,7 +947,6 @@
977947
style="toggle"
978948
id="org.eclipse.debug.ui.togglemonitors"/>
979949
<action
980-
disabledIcon="$nl$/icons/full/dlcl16/synced.png"
981950
toolbarPath="RenderingPanesGroup"
982951
label="%LinkRenderingPanesAction.name"
983952
tooltip="%LinkRenderingPanesAction.tooltip"
@@ -994,7 +963,6 @@
994963
style="push"
995964
tooltip="%TableRenderingPrefActionName"/>
996965
<action
997-
disabledIcon="$nl$/icons/full/dlcl16/det_pane_right.png"
998966
toolbarPath="RenderingPanesGroup"
999967
label="%ToggleSplitPaneAction.name"
1000968
tooltip="%ToggleSplitPaneAction.tooltip"
@@ -1004,7 +972,6 @@
1004972
id="org.eclipse.debug.ui.togglesplitpane"/>
1005973
<action
1006974
class="org.eclipse.debug.internal.ui.views.memory.SwitchMemoryBlockAction"
1007-
disabledIcon="$nl$/icons/full/dlcl16/display_selected_mb.png"
1008975
helpContextId="switchMemoryBlockAction_context"
1009976
icon="$nl$/icons/full/elcl16/display_selected_mb.svg"
1010977
id="org.eclipse.debug.ui.switchMemoryBlock"
@@ -2279,56 +2246,45 @@ M4 = Platform-specific fourth key
22792246
<extension point="org.eclipse.ui.commandImages">
22802247
<image
22812248
commandId="org.eclipse.debug.ui.commands.ToggleStepFilters"
2282-
icon="$nl$/icons/full/elcl16/stepbystep_co.svg"
2283-
disabledIcon="$nl$/icons/full/dlcl16/stepbystep_co.png"/>
2249+
icon="$nl$/icons/full/elcl16/stepbystep_co.svg" />
22842250
<image
22852251
commandId="org.eclipse.debug.ui.commands.StepInto"
2286-
disabledIcon="$nl$/icons/full/dlcl16/stepinto_co.png"
22872252
icon="$nl$/icons/full/elcl16/stepinto_co.svg">
22882253
</image>
22892254
<image
22902255
commandId="org.eclipse.debug.ui.commands.StepOver"
2291-
disabledIcon="$nl$/icons/full/dlcl16/stepover_co.png"
22922256
icon="$nl$/icons/full/elcl16/stepover_co.svg">
22932257
</image>
22942258
<image
22952259
commandId="org.eclipse.debug.ui.commands.StepReturn"
2296-
disabledIcon="$nl$/icons/full/dlcl16/stepreturn_co.png"
22972260
icon="$nl$/icons/full/elcl16/stepreturn_co.svg">
22982261
</image>
22992262
<image
23002263
commandId="org.eclipse.debug.ui.commands.Resume"
2301-
disabledIcon="$nl$/icons/full/dlcl16/resume_co.png"
23022264
icon="$nl$/icons/full/elcl16/resume_co.svg">
23032265
</image>
23042266
<image
23052267
commandId="org.eclipse.debug.ui.commands.Terminate"
2306-
disabledIcon="$nl$/icons/full/dlcl16/terminate_co.png"
23072268
icon="$nl$/icons/full/elcl16/terminate_co.svg">
23082269
</image>
23092270
<image
23102271
commandId="org.eclipse.debug.ui.commands.DebugLast"
2311-
disabledIcon="$nl$/icons/full/dlcl16/debuglast_co.png"
23122272
icon="$nl$/icons/full/elcl16/debuglast_co.svg">
23132273
</image>
23142274
<image
23152275
commandId="org.eclipse.debug.ui.commands.RunLast"
2316-
disabledIcon="$nl$/icons/full/dlcl16/runlast_co.png"
23172276
icon="$nl$/icons/full/elcl16/runlast_co.svg">
23182277
</image>
23192278
<image
23202279
commandId="org.eclipse.debug.ui.commands.RunToLine"
2321-
disabledIcon="$nl$/icons/full/dlcl16/runtoline_co.png"
23222280
icon="$nl$/icons/full/elcl16/runtoline_co.svg">
23232281
</image>
23242282
<image
23252283
commandId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
2326-
disabledIcon="$nl$/icons/full/obj16/brkpd_obj.png"
23272284
icon="$nl$/icons/full/obj16/brkp_obj.svg">
23282285
</image>
23292286
<image
23302287
commandId="org.eclipse.debug.ui.commands.Suspend"
2331-
disabledIcon="$nl$/icons/full/dlcl16/suspend_co.png"
23322288
icon="$nl$/icons/full/elcl16/suspend_co.svg">
23332289
</image>
23342290
</extension>

0 commit comments

Comments
 (0)