Skip to content

Commit f35c81b

Browse files
committed
Don't populate disabled images from dcl16
- There are no svg images in that folder because the disabled image is synthesized from the regular image. #1852
1 parent 86aa0ac commit f35c81b

File tree

1 file changed

+2
-8
lines changed
  • team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui

1 file changed

+2
-8
lines changed

team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ public static void initAction(IAction a, String prefix, ResourceBundle bundle, S
555555
descriptionKey = prefix + descriptionKey;
556556
}
557557
String s = null;
558-
if(bindings != null) {
558+
if (bindings != null) {
559559
s = NLS.bind(getString(labelKey, bundle), bindings);
560560
} else {
561561
s = getString(labelKey, bundle);
@@ -570,20 +570,14 @@ public static void initAction(IAction a, String prefix, ResourceBundle bundle, S
570570
a.setDescription(s);
571571
String relPath = getString(imageKey, bundle);
572572
if (relPath != null && !relPath.equals(imageKey) && relPath.trim().length() > 0) {
573-
String dPath;
574573
String ePath;
575574
if (relPath.contains("/")) { //$NON-NLS-1$
576575
String path = relPath.substring(1);
577-
dPath = 'd' + path;
578576
ePath = 'e' + path;
579577
} else {
580-
dPath = "dlcl16/" + relPath; //$NON-NLS-1$
581578
ePath = "elcl16/" + relPath; //$NON-NLS-1$
582579
}
583-
ImageDescriptor id = TeamImages.getImageDescriptor(dPath);
584-
if (id != null)
585-
a.setDisabledImageDescriptor(id);
586-
id = TeamUIPlugin.getImageDescriptor(ePath);
580+
ImageDescriptor id = TeamImages.getImageDescriptor(ePath);
587581
if (id != null)
588582
a.setImageDescriptor(id);
589583
}

0 commit comments

Comments
 (0)