Skip to content

Commit 90762d0

Browse files
Michael5601HeikoKlare
Michael5601
authored and
HeikoKlare
committed
add all svgs to all org.eclipse.compare bundles
This commit adds SVGs for all icons in the bundles `org.eclipse.compare`, `org.eclipse.compare.tests` and `org.eclipse.compare.win32`.
1 parent e16edfe commit 90762d0

File tree

71 files changed

+10816
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+10816
-78
lines changed

‎team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ Bundle-Activator: org.eclipse.compare.internal.win32.Activator
1818
Bundle-ActivationPolicy: lazy
1919
Bundle-Localization: plugin
2020
Automatic-Module-Name: org.eclipse.compare.win32
21+
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

‎team/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.svg

Lines changed: 432 additions & 0 deletions
Loading

‎team/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.svg

Lines changed: 256 additions & 0 deletions
Loading

‎team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
action.save.label=Save
1616
action.save.tooltip=Save the changes to the Word document comparison
17-
action.save.image=save.png
17+
action.save.image=save.svg
1818

1919
action.inplace.label=Edit Inplace
2020
action.inplace.tooltip=Toggle whether the word document is edited in-place or in a separate window
21-
action.inplace.image=editor_area.png
21+
action.inplace.image=editor_area.svg

‎team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)",
2828
Bundle-ActivationPolicy: lazy
2929
Bundle-RequiredExecutionEnvironment: JavaSE-17
3030
Automatic-Module-Name: org.eclipse.compare
31+
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -91,36 +91,49 @@ public class CompareConfiguration {
9191

9292
static {
9393
// Not swapped (a.k.a. left is local)
94-
fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$
95-
fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.png"); //$NON-NLS-1$
96-
fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.png"); //$NON-NLS-1$
97-
98-
fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$
99-
fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.png"); //$NON-NLS-1$
100-
fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.png"); //$NON-NLS-1$
101-
102-
fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.png"); //$NON-NLS-1$
103-
fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.png"); //$NON-NLS-1$
104-
105-
fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$
106-
fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$
107-
fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$
94+
fgImages[Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/add_ov.svg"); //$NON-NLS-1$
95+
fgImages[Differencer.LEFT + Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.svg"); //$NON-NLS-1$
96+
fgImages[Differencer.RIGHT + Differencer.ADDITION] = CompareUIPlugin
97+
.getImageDescriptor("ovr16/r_outadd_ov.svg"); //$NON-NLS-1$
98+
99+
fgImages[Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/del_ov.svg"); //$NON-NLS-1$
100+
fgImages[Differencer.LEFT + Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.svg"); //$NON-NLS-1$
101+
fgImages[Differencer.RIGHT + Differencer.DELETION] = CompareUIPlugin
102+
.getImageDescriptor("ovr16/r_outdel_ov.svg"); //$NON-NLS-1$
103+
104+
fgImages[Differencer.LEFT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.svg"); //$NON-NLS-1$
105+
fgImages[Differencer.RIGHT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.svg"); //$NON-NLS-1$
106+
107+
fgImages[Differencer.CONFLICTING + Differencer.ADDITION] = CompareUIPlugin
108+
.getImageDescriptor("ovr16/confadd_ov.svg"); //$NON-NLS-1$
109+
fgImages[Differencer.CONFLICTING + Differencer.DELETION] = CompareUIPlugin
110+
.getImageDescriptor("ovr16/confdel_ov.svg"); //$NON-NLS-1$
111+
fgImages[Differencer.CONFLICTING + Differencer.CHANGE] = CompareUIPlugin
112+
.getImageDescriptor("ovr16/confchg_ov.svg"); //$NON-NLS-1$
108113

109114
// Mirrored (a.k.a. right is local)
110-
fgImages[16 + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$
111-
fgImages[16 + Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.png"); //$NON-NLS-1$
112-
fgImages[16 + Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.png"); //$NON-NLS-1$
113-
114-
fgImages[16 + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$
115-
fgImages[16 + Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.png"); //$NON-NLS-1$
116-
fgImages[16 + Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.png"); //$NON-NLS-1$
117-
118-
fgImages[16 + Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.png"); //$NON-NLS-1$
119-
fgImages[16 + Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.png"); //$NON-NLS-1$
120-
121-
fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$
122-
fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$
123-
fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$
115+
fgImages[16 + Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/add_ov.svg"); //$NON-NLS-1$
116+
fgImages[16 + Differencer.LEFT + Differencer.ADDITION] = CompareUIPlugin
117+
.getImageDescriptor("ovr16/inadd_ov.svg"); //$NON-NLS-1$
118+
fgImages[16 + Differencer.RIGHT + Differencer.ADDITION] = CompareUIPlugin
119+
.getImageDescriptor("ovr16/outadd_ov.svg"); //$NON-NLS-1$
120+
121+
fgImages[16 + Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/del_ov.svg"); //$NON-NLS-1$
122+
fgImages[16 + Differencer.LEFT + Differencer.DELETION] = CompareUIPlugin
123+
.getImageDescriptor("ovr16/indel_ov.svg"); //$NON-NLS-1$
124+
fgImages[16 + Differencer.RIGHT + Differencer.DELETION] = CompareUIPlugin
125+
.getImageDescriptor("ovr16/outdel_ov.svg"); //$NON-NLS-1$
126+
127+
fgImages[16 + Differencer.LEFT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.svg"); //$NON-NLS-1$
128+
fgImages[16 + Differencer.RIGHT + Differencer.CHANGE] = CompareUIPlugin
129+
.getImageDescriptor("ovr16/outchg_ov.svg"); //$NON-NLS-1$
130+
131+
fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION] = CompareUIPlugin
132+
.getImageDescriptor("ovr16/confadd_ov.svg"); //$NON-NLS-1$
133+
fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION] = CompareUIPlugin
134+
.getImageDescriptor("ovr16/confdel_ov.svg"); //$NON-NLS-1$
135+
fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE] = CompareUIPlugin
136+
.getImageDescriptor("ovr16/confchg_ov.svg"); //$NON-NLS-1$
124137
}
125138

126139
private final IPreferenceStore fPreferenceStore;

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit
176176
*/
177177
public static final String PROP_SELECTED_EDITION= ICompareUIConstants.PROP_SELECTED_EDITION;
178178

179-
private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.png"; //$NON-NLS-1$
179+
private static final String COMPARE_EDITOR_IMAGE_NAME = "eview16/compare_view.svg"; //$NON-NLS-1$
180180
private static Image fgTitleImage;
181181

182182
private Splitter fComposite;

‎team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ protected Image getEditionImage(ITypedElement selectedEdition, ITypedElement ite
727727
return selectedEdition.getImage();
728728
if (selectedEdition instanceof HistoryItem) {
729729
if (fTimeImage == null) {
730-
String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.png"); //$NON-NLS-1$ //$NON-NLS-2$
730+
String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$
731731
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
732732
if (id != null)
733733
fTimeImage= id.createImage();
@@ -1031,7 +1031,7 @@ private void addEdition(Pair pair) {
10311031
if (lastDay == null || day != dayNumber(((Date)lastDay.getData()).getTime())) {
10321032
lastDay= new TreeItem(fEditionTree, SWT.NONE);
10331033
if (fDateImage == null) {
1034-
String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.png"); //$NON-NLS-2$ //$NON-NLS-1$
1034+
String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$
10351035
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
10361036
if (id != null)
10371037
fDateImage= id.createImage();

0 commit comments

Comments
 (0)