diff --git a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF index 2059f7aab6d..f98167fde70 100644 --- a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-PlatformFilter: (osgi.os=win32) @@ -18,3 +18,4 @@ Bundle-Activator: org.eclipse.compare.internal.win32.Activator Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.compare.win32 +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.svg b/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.svg new file mode 100644 index 00000000000..0a7121ef805 --- /dev/null +++ b/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/editor_area.svg @@ -0,0 +1,432 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.svg b/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.svg new file mode 100644 index 00000000000..623531ded6a --- /dev/null +++ b/team/bundles/org.eclipse.compare.win32/icons/full/elcl16/save.svg @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare.win32/pom.xml b/team/bundles/org.eclipse.compare.win32/pom.xml index 573d996559c..f25c2d6cf3e 100644 --- a/team/bundles/org.eclipse.compare.win32/pom.xml +++ b/team/bundles/org.eclipse.compare.win32/pom.xml @@ -18,7 +18,7 @@ ../../ org.eclipse.compare.win32 - 1.3.400-SNAPSHOT + 1.3.500-SNAPSHOT eclipse-plugin diff --git a/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties b/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties index bfbb33d1d4b..fb374ca51e2 100644 --- a/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties +++ b/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties @@ -14,8 +14,8 @@ action.save.label=Save action.save.tooltip=Save the changes to the Word document comparison -action.save.image=save.png +action.save.image=save.svg action.inplace.label=Edit Inplace action.inplace.tooltip=Toggle whether the word document is edited in-place or in a separate window -action.inplace.image=editor_area.png +action.inplace.image=editor_area.svg diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index 091ddff385e..ec3108b1e7c 100644 --- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -28,3 +28,4 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.206.0,4.0.0)", Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.compare +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java index 882a159a15e..eb1dcfb0c73 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java @@ -91,36 +91,49 @@ public class CompareConfiguration { static { // Not swapped (a.k.a. left is local) - fgImages[Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outadd_ov.png"); //$NON-NLS-1$ - - fgImages[Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/r_outdel_ov.png"); //$NON-NLS-1$ - - fgImages[Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.png"); //$NON-NLS-1$ - - fgImages[Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$ - fgImages[Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$ + fgImages[Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/add_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.LEFT + Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/r_inadd_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.RIGHT + Differencer.ADDITION] = CompareUIPlugin + .getImageDescriptor("ovr16/r_outadd_ov.svg"); //$NON-NLS-1$ + + fgImages[Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/del_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.LEFT + Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/r_indel_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.RIGHT + Differencer.DELETION] = CompareUIPlugin + .getImageDescriptor("ovr16/r_outdel_ov.svg"); //$NON-NLS-1$ + + fgImages[Differencer.LEFT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/r_inchg_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.RIGHT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/r_outchg_ov.svg"); //$NON-NLS-1$ + + fgImages[Differencer.CONFLICTING + Differencer.ADDITION] = CompareUIPlugin + .getImageDescriptor("ovr16/confadd_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.CONFLICTING + Differencer.DELETION] = CompareUIPlugin + .getImageDescriptor("ovr16/confdel_ov.svg"); //$NON-NLS-1$ + fgImages[Differencer.CONFLICTING + Differencer.CHANGE] = CompareUIPlugin + .getImageDescriptor("ovr16/confchg_ov.svg"); //$NON-NLS-1$ // Mirrored (a.k.a. right is local) - fgImages[16 + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/add_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.LEFT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/inadd_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.RIGHT + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/outadd_ov.png"); //$NON-NLS-1$ - - fgImages[16 + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/del_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.LEFT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/indel_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.RIGHT + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/outdel_ov.png"); //$NON-NLS-1$ - - fgImages[16 + Differencer.LEFT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.RIGHT + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/outchg_ov.png"); //$NON-NLS-1$ - - fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION]= CompareUIPlugin.getImageDescriptor("ovr16/confadd_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION]= CompareUIPlugin.getImageDescriptor("ovr16/confdel_ov.png"); //$NON-NLS-1$ - fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE]= CompareUIPlugin.getImageDescriptor("ovr16/confchg_ov.png"); //$NON-NLS-1$ + fgImages[16 + Differencer.ADDITION] = CompareUIPlugin.getImageDescriptor("ovr16/add_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.LEFT + Differencer.ADDITION] = CompareUIPlugin + .getImageDescriptor("ovr16/inadd_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.RIGHT + Differencer.ADDITION] = CompareUIPlugin + .getImageDescriptor("ovr16/outadd_ov.svg"); //$NON-NLS-1$ + + fgImages[16 + Differencer.DELETION] = CompareUIPlugin.getImageDescriptor("ovr16/del_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.LEFT + Differencer.DELETION] = CompareUIPlugin + .getImageDescriptor("ovr16/indel_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.RIGHT + Differencer.DELETION] = CompareUIPlugin + .getImageDescriptor("ovr16/outdel_ov.svg"); //$NON-NLS-1$ + + fgImages[16 + Differencer.LEFT + Differencer.CHANGE] = CompareUIPlugin.getImageDescriptor("ovr16/inchg_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.RIGHT + Differencer.CHANGE] = CompareUIPlugin + .getImageDescriptor("ovr16/outchg_ov.svg"); //$NON-NLS-1$ + + fgImages[16 + Differencer.CONFLICTING + Differencer.ADDITION] = CompareUIPlugin + .getImageDescriptor("ovr16/confadd_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.CONFLICTING + Differencer.DELETION] = CompareUIPlugin + .getImageDescriptor("ovr16/confdel_ov.svg"); //$NON-NLS-1$ + fgImages[16 + Differencer.CONFLICTING + Differencer.CHANGE] = CompareUIPlugin + .getImageDescriptor("ovr16/confchg_ov.svg"); //$NON-NLS-1$ } private final IPreferenceStore fPreferenceStore; diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index 2e0d608463c..c0fb75282fc 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -176,7 +176,7 @@ public abstract class CompareEditorInput extends PlatformObject implements IEdit */ public static final String PROP_SELECTED_EDITION= ICompareUIConstants.PROP_SELECTED_EDITION; - private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.png"; //$NON-NLS-1$ + private static final String COMPARE_EDITOR_IMAGE_NAME = "eview16/compare_view.svg"; //$NON-NLS-1$ private static Image fgTitleImage; private Splitter fComposite; diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java index b061b8abdd7..aa30fe724cc 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java @@ -727,7 +727,7 @@ protected Image getEditionImage(ITypedElement selectedEdition, ITypedElement ite return selectedEdition.getImage(); if (selectedEdition instanceof HistoryItem) { if (fTimeImage == null) { - String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.png"); //$NON-NLS-1$ //$NON-NLS-2$ + String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$ ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName); if (id != null) fTimeImage= id.createImage(); @@ -1031,7 +1031,7 @@ private void addEdition(Pair pair) { if (lastDay == null || day != dayNumber(((Date)lastDay.getData()).getTime())) { lastDay= new TreeItem(fEditionTree, SWT.NONE); if (fDateImage == null) { - String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.png"); //$NON-NLS-2$ //$NON-NLS-1$ + String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$ ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName); if (id != null) fDateImage= id.createImage(); diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties index 94e8032ef5a..a3187af4220 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewerResources.properties @@ -32,53 +32,53 @@ tooComplexError.message= Too many differences. Turn on the 'Ignore White Space' action.CopyLeftToRight.label=Copy Left to Right action.CopyLeftToRight.tooltip=Copy All Non-Conflicting Changes from Left to Right -action.CopyLeftToRight.image=copy_r_co.png +action.CopyLeftToRight.image=copy_r_co.svg action.CopyRightToLeft.label=Copy Right to Left action.CopyRightToLeft.tooltip=Copy All Non-Conflicting Changes from Right to Left -action.CopyRightToLeft.image=copy_l_co.png +action.CopyRightToLeft.image=copy_l_co.svg action.CopyDiffLeftToRight.label=Copy Current Change to Right action.CopyDiffLeftToRight.tooltip=Copy Current Change from Left to Right -action.CopyDiffLeftToRight.image=copycont_r_co.png +action.CopyDiffLeftToRight.image=copycont_r_co.svg action.CopyDiffRightToLeft.label=Copy Current Change to Left action.CopyDiffRightToLeft.tooltip=Copy Current Change from Right to Left -action.CopyDiffRightToLeft.image=copycont_l_co.png +action.CopyDiffRightToLeft.image=copycont_l_co.svg action.NextDiff.label=Next Difference action.NextDiff.tooltip=Next Difference -action.NextDiff.image=next_diff_nav.png +action.NextDiff.image=next_diff_nav.svg action.PrevDiff.label=Previous Difference action.PrevDiff.tooltip=Previous Difference -action.PrevDiff.image=prev_diff_nav.png +action.PrevDiff.image=prev_diff_nav.svg action.NextChange.label=Next Change action.NextChange.tooltip=Next Change -action.NextChange.image=next_change_nav.png +action.NextChange.image=next_change_nav.svg action.PrevChange.label=Previous Change action.PrevChange.tooltip=Previous Change -action.PrevChange.image=prev_change_nav.png +action.PrevChange.image=prev_change_nav.svg action.EnableAncestor.label=Enable Ancestor Pane action.EnableAncestor.tooltip.unchecked=Show Ancestor Pane action.EnableAncestor.tooltip.checked=Hide Ancestor Pane action.EnableAncestor.description.unchecked=Show Ancestor Pane action.EnableAncestor.description.checked=Hide Ancestor Pane -action.EnableAncestor.image=ancestorpane_co.png +action.EnableAncestor.image=ancestorpane_co.svg action.IgnoreAncestor.label=Ignore Ancestor action.IgnoreAncestor.tooltip.unchecked=Two-Way Compare (Ignore Ancestor) action.IgnoreAncestor.tooltip.checked=Three-Way Compare action.IgnoreAncestor.description.unchecked=Two-Way Compare (Ignore Ancestor) action.IgnoreAncestor.description.checked=Three-Way Compare -action.IgnoreAncestor.image=twowaycompare_co.png +action.IgnoreAncestor.image=twowaycompare_co.svg action.SwitchLeftAndRight.label=Swap Left and Right View action.SwitchLeftAndRight.tooltip=Swap Left and Right View -action.SwitchLeftAndRight.image=switch.png +action.SwitchLeftAndRight.image=switch.svg ##################################################### # Context menu actions diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties index 9a98e7cd33d..80bd12929cc 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties @@ -21,8 +21,8 @@ title= Restore from Local History memberPaneTitle= {0} - Available Files in Local History: treeTitleFormat= Local History of ''{0}'' -dateIcon= obj16/day_obj.png -timeIcon= obj16/resource_obj.png +dateIcon= obj16/day_obj.svg +timeIcon= obj16/resource_obj.svg memberDescription= Check files to restore from local history: editionDescription= Select an edition of a file: diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java index aad362f5afe..a89ecd589f1 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java @@ -164,11 +164,11 @@ boolean isSelected(int index) { public AddFromHistoryDialog(Shell parent, ResourceBundle bundle) { super(parent, bundle); - String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.png"); //$NON-NLS-2$ //$NON-NLS-1$ + String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$ ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName); if (id != null) fDateImage= id.createImage(); - iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.png"); //$NON-NLS-1$ //$NON-NLS-2$ + iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$ id= CompareUIPlugin.getImageDescriptor(iconName); if (id != null) fTimeImage= id.createImage(); diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java index d620ca73f51..72d5c8aa57e 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContentViewerSwitchingPane.java @@ -52,7 +52,7 @@ import org.eclipse.swt.widgets.ToolItem; public class CompareContentViewerSwitchingPane extends CompareViewerSwitchingPane { - private static final String OPTIMIZED_INFO_IMAGE_NAME = "obj16/message_info.png"; //$NON-NLS-1$ + private static final String OPTIMIZED_INFO_IMAGE_NAME = "obj16/message_info.svg"; //$NON-NLS-1$ public static final String OPTIMIZED_ALGORITHM_USED = "OPTIMIZED_ALGORITHM_USED"; //$NON-NLS-1$ public static final String DISABLE_CAPPING_TEMPORARILY = "DISABLE_CAPPING_TEMPORARILY"; //$NON-NLS-1$ diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties index f8436e09b2a..2e1ddf15306 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties @@ -19,8 +19,8 @@ title= Compare with Local History treeTitleFormat= Local History of ''{0}'' -dateIcon= obj16/day_obj.png -timeIcon= obj16/resource_obj.png +dateIcon= obj16/day_obj.svg +timeIcon= obj16/resource_obj.svg treeFormat= {0} workspaceTreeFormat= {0} (Workspace File) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java index 96c6347a9ac..8a4b4d74831 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ICompareUIConstants.java @@ -18,23 +18,23 @@ public interface ICompareUIConstants { public final String PREFIX = CompareUIPlugin.getPluginId() + "."; //$NON-NLS-1$ public static final String DTOOL_NEXT= "dlcl16/next_nav.png"; //$NON-NLS-1$ - public static final String ETOOL_NEXT= "elcl16/next_nav.png"; //$NON-NLS-1$ + public static final String ETOOL_NEXT = "elcl16/next_nav.svg"; //$NON-NLS-1$ public static final String CTOOL_NEXT= ETOOL_NEXT; public static final String DTOOL_PREV= "dlcl16/prev_nav.png"; //$NON-NLS-1$ - public static final String ETOOL_PREV= "elcl16/prev_nav.png"; //$NON-NLS-1$ + public static final String ETOOL_PREV = "elcl16/prev_nav.svg"; //$NON-NLS-1$ public static final String CTOOL_PREV= ETOOL_PREV; - public static final String HUNK_OBJ = "obj16/hunk_obj.png"; //$NON-NLS-1$ + public static final String HUNK_OBJ = "obj16/hunk_obj.svg"; //$NON-NLS-1$ - public static final String ERROR_OVERLAY= "ovr16/error_ov.png"; //$NON-NLS-1$ - public static final String IS_MERGED_OVERLAY= "ovr16/merged_ov.png"; //$NON-NLS-1$ - public static final String REMOVED_OVERLAY= "ovr16/removed_ov.png"; //$NON-NLS-1$ - public static final String WARNING_OVERLAY= "ovr16/warning_ov.png"; //$NON-NLS-1$ + public static final String ERROR_OVERLAY = "ovr16/error_ov.svg"; //$NON-NLS-1$ + public static final String IS_MERGED_OVERLAY = "ovr16/merged_ov.svg"; //$NON-NLS-1$ + public static final String REMOVED_OVERLAY = "ovr16/removed_ov.svg"; //$NON-NLS-1$ + public static final String WARNING_OVERLAY = "ovr16/warning_ov.svg"; //$NON-NLS-1$ - public static final String RETARGET_PROJECT= "eview16/compare_view.png"; //$NON-NLS-1$ + public static final String RETARGET_PROJECT = "eview16/compare_view.svg"; //$NON-NLS-1$ - public static final String IGNORE_WHITESPACE_ENABLED= "etool16/ignorews_edit.png"; //$NON-NLS-1$ + public static final String IGNORE_WHITESPACE_ENABLED = "etool16/ignorews_edit.svg"; //$NON-NLS-1$ public static final String IGNORE_WHITESPACE_DISABLED= "dtool16/ignorews_edit.png"; //$NON-NLS-1$ public static final String PROP_ANCESTOR_VISIBLE = PREFIX + "AncestorVisible"; //$NON-NLS-1$ diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties index a5ad20b250d..3a9e7925693 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewerResources.properties @@ -27,16 +27,16 @@ saveDialog.message= Resource has been modified. Save changes? action.CopyLeftToRight.label= Copy Left to Right action.CopyLeftToRight.tooltip= Copy Image from Left to Right -action.CopyLeftToRight.image= elcl16/copy_r_co.png +action.CopyLeftToRight.image= elcl16/copy_r_co.svg action.CopyRightToLeft.label= Copy Right to Left action.CopyRightToLeft.tooltip= Copy Image from Right to Left -action.CopyRightToLeft.image= elcl16/copy_l_co.png +action.CopyRightToLeft.image= elcl16/copy_l_co.svg action.EnableAncestor.label= Enable Ancestor Pane action.EnableAncestor.tooltip= Control Visibility of Ancestor Pane -action.EnableAncestor.image= elcl16/ancestorpane_co.png +action.EnableAncestor.image= elcl16/ancestorpane_co.svg action.SwitchLeftAndRight.label=Swap Left and Right View action.SwitchLeftAndRight.tooltip=Swap Left and Right View -action.SwitchLeftAndRight.image=switch.png +action.SwitchLeftAndRight.image=switch.svg diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties index a6b0c2ae7d2..20d517b7084 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ReplaceWithEditionAction.properties @@ -19,8 +19,8 @@ title= Replace from Local History treeTitleFormat= Local History of ''{0}'' -dateIcon= obj16/day_obj.png -timeIcon= obj16/resource_obj.png +dateIcon= obj16/day_obj.svg +timeIcon= obj16/resource_obj.svg treeFormat= {0} workspaceTreeFormat= {0} (Workspace File) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 89928a876f9..6dc04996f87 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -914,7 +914,7 @@ public static void setMenuImage(final Item item) { image = PlatformUI.getWorkbench().getSharedImages().getImage( /* IWorkbenchGraphicConstants */"IMG_LCL_VIEW_MENU"); //$NON-NLS-1$ } else { - image = CompareUIPlugin.getImageDescriptor("elcl16/view_menu.png").createImage(); //$NON-NLS-1$ + image = CompareUIPlugin.getImageDescriptor("elcl16/view_menu.svg").createImage(); //$NON-NLS-1$ item.addDisposeListener(e -> { Image img = item.getImage(); if ((img != null) && (!img.isDisposed())) { diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java index 209464b2f86..3c591a95a15 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java @@ -58,7 +58,7 @@ public class PatchWizard extends Wizard { public PatchWizard(IStorage patch, IResource target, CompareConfiguration configuration) { Assert.isNotNull(configuration); this.fConfiguration = configuration; - setDefaultPageImageDescriptor(CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.png")); //$NON-NLS-1$ + setDefaultPageImageDescriptor(CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.svg")); //$NON-NLS-1$ setWindowTitle(PatchMessages.PatchWizard_title); initializeDialogSettings(); fPatcher= new WorkspacePatcher(target); diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties index fb908786d1d..8af5e0d5705 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewerResources.properties @@ -31,7 +31,7 @@ emptyMenuItem= action.Smart.label=Smart action.Smart.tooltip=Guess Similar Elements -action.Smart.image=smartmode_co.png +action.Smart.image=smartmode_co.svg action.ExpandAll.label=Expand All action.ExpandAll.tooltip=Expand All Nodes @@ -41,16 +41,16 @@ action.CompareContents.tooltip= Show Content Comparison action.NextDiff.label=Next action.NextDiff.tooltip=Select Next Change -action.NextDiff.image=next_nav.png +action.NextDiff.image=next_nav.svg action.PrevDiff.label=Previous action.PrevDiff.tooltip=Select Previous Change -action.PrevDiff.image=prev_nav.png +action.PrevDiff.image=prev_nav.svg action.TakeLeft.label=Copy Left to Right action.TakeLeft.tooltip=Copy Selected Nodes from Left to Right -action.TakeLeft.image=copycont_r_co.png +action.TakeLeft.image=copycont_r_co.svg action.TakeRight.label=Copy Right to Left action.TakeRight.tooltip=Copy Selected Nodes from Right to Left -action.TakeRight.image=copycont_l_co.png +action.TakeRight.image=copycont_l_co.svg diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.svg new file mode 100644 index 00000000000..e55a7a830da --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/ancestorpane_co.svg @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.svg new file mode 100644 index 00000000000..18119ec6b04 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_l_co.svg @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.svg new file mode 100644 index 00000000000..317f6e7469c --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/copy_r_co.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.svg new file mode 100644 index 00000000000..db37d80f40e --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_l_co.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.svg new file mode 100644 index 00000000000..9195b7909c9 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/copycont_r_co.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.svg new file mode 100644 index 00000000000..e4e66711eeb --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_change_nav.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.svg new file mode 100644 index 00000000000..4965b3e6b00 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_diff_nav.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.svg new file mode 100644 index 00000000000..973c4eda7b6 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.svg new file mode 100644 index 00000000000..3abdfeff473 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/next_nav_into.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.svg new file mode 100644 index 00000000000..8b755d2f978 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_change_nav.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.svg new file mode 100644 index 00000000000..dcef90b4c04 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_diff_nav.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.svg new file mode 100644 index 00000000000..1faf803af31 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.svg new file mode 100644 index 00000000000..4f9a7f90889 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/prev_nav_into.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.svg new file mode 100644 index 00000000000..25ac71db87e --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/smartmode_co.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/switch.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/switch.svg new file mode 100644 index 00000000000..9c3327a2ec2 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/switch.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.svg new file mode 100644 index 00000000000..e8b30712de8 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/syncpane_co.svg @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.svg new file mode 100644 index 00000000000..ab7b89ff200 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/twowaycompare_co.svg @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/elcl16/view_menu.svg b/team/bundles/org.eclipse.compare/icons/full/elcl16/view_menu.svg new file mode 100644 index 00000000000..00b6dba2591 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/elcl16/view_menu.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + image/svg+xml + + + + + Remain BV, W.S. Jongman + + + + + Eclipse Foundation + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.svg b/team/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.svg new file mode 100644 index 00000000000..3fed65f7b6c --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/etool16/conflict_edit.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.svg b/team/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.svg new file mode 100644 index 00000000000..9a2ff296e4e --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/etool16/ignorews_edit.svg @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/eview16/compare_view.svg b/team/bundles/org.eclipse.compare/icons/full/eview16/compare_view.svg new file mode 100644 index 00000000000..fbe8e700433 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/eview16/compare_view.svg @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/obj16/date_obj.svg b/team/bundles/org.eclipse.compare/icons/full/obj16/date_obj.svg new file mode 100644 index 00000000000..189c745e3b1 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/obj16/date_obj.svg @@ -0,0 +1,332 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.svg b/team/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.svg new file mode 100644 index 00000000000..dab675d3c8b --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/obj16/hunk_obj.svg @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/obj16/message_info.svg b/team/bundles/org.eclipse.compare/icons/full/obj16/message_info.svg new file mode 100644 index 00000000000..555542493b3 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/obj16/message_info.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Kozuka Mincho Pr6N H + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.svg b/team/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.svg new file mode 100644 index 00000000000..c25d1d3c22e --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/obj16/resource_obj.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.svg new file mode 100644 index 00000000000..500be89c3a0 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/add_ov.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.svg new file mode 100644 index 00000000000..93b755fb6d6 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/chg_ov.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.svg new file mode 100644 index 00000000000..df1575c0725 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/confadd_ov.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.svg new file mode 100644 index 00000000000..78d534cda1a --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/confchg_ov.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.svg new file mode 100644 index 00000000000..a1d0f9e9bc0 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/confdel_ov.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.svg new file mode 100644 index 00000000000..fcbe09cce77 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/del_ov.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.svg new file mode 100644 index 00000000000..652482d1942 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/error_ov.svg @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.svg new file mode 100644 index 00000000000..50e071fd94f --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/inadd_ov.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.svg new file mode 100644 index 00000000000..98a8d5363bc --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/inchg_ov.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.svg new file mode 100644 index 00000000000..9358bb897fa --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/indel_ov.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.svg new file mode 100644 index 00000000000..6ee3fa70143 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/merged_ov.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.svg new file mode 100644 index 00000000000..1e1fd664a15 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/outadd_ov.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.svg new file mode 100644 index 00000000000..9749db73032 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/outchg_ov.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.svg new file mode 100644 index 00000000000..59fc8dce7f7 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/outdel_ov.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.svg new file mode 100644 index 00000000000..c644048084e --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inadd_ov.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.svg new file mode 100644 index 00000000000..576f916b8ad --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_inchg_ov.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.svg new file mode 100644 index 00000000000..0dfe1341013 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_indel_ov.svg @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.svg new file mode 100644 index 00000000000..537a0614f0f --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outadd_ov.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.svg new file mode 100644 index 00000000000..72530a817cc --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outchg_ov.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.svg new file mode 100644 index 00000000000..faa20454e6d --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/r_outdel_ov.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.svg new file mode 100644 index 00000000000..ad3535a29d0 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/removed_ov.svg @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.svg b/team/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.svg new file mode 100644 index 00000000000..6a838a793e9 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/ovr16/warning_ov.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.svg b/team/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.svg new file mode 100644 index 00000000000..51e41cc9d22 --- /dev/null +++ b/team/bundles/org.eclipse.compare/icons/full/wizban/applypatch_wizban.svg @@ -0,0 +1,1180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/team/bundles/org.eclipse.compare/plugin.properties b/team/bundles/org.eclipse.compare/plugin.properties index 3f69d48b3a5..493df3f9a36 100644 --- a/team/bundles/org.eclipse.compare/plugin.properties +++ b/team/bundles/org.eclipse.compare/plugin.properties @@ -193,15 +193,15 @@ CompareEditorInput.defaultTitle= Compare # action.IgnoreWhiteSpace.label=Ignore White Space action.IgnoreWhiteSpace.tooltip=Ignore White Space Where Applicable -action.IgnoreWhiteSpace.image=etool16/ignorews_edit.png +action.IgnoreWhiteSpace.image=etool16/ignorews_edit.svg action.Next.label=Next Difference action.Next.tooltip=Next Difference -action.Next.image=elcl16/next_diff_nav.png +action.Next.image=elcl16/next_diff_nav.svg action.Previous.label=Previous Difference action.Previous.tooltip=Previous Difference -action.Previous.image=elcl16/prev_diff_nav.png +action.Previous.image=elcl16/prev_diff_nav.svg # # Built in Structure Creators diff --git a/team/bundles/org.eclipse.compare/plugin.xml b/team/bundles/org.eclipse.compare/plugin.xml index d5f1bc180e3..525290ad943 100644 --- a/team/bundles/org.eclipse.compare/plugin.xml +++ b/team/bundles/org.eclipse.compare/plugin.xml @@ -120,7 +120,7 @@ point="org.eclipse.ui.editors"> diff --git a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF index 51c9b69c062..13f74645a13 100644 --- a/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF +++ b/team/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF @@ -28,3 +28,4 @@ Export-Package: org.eclipse.compare.tests, org.eclipse.compare.tests.performance Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.compare.tests +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java index 985bf91313c..7892750424e 100644 --- a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java +++ b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java @@ -201,7 +201,7 @@ private void saveValue(Preferences preferences, String val) throws BackingStoreE } private void openPatchWizard() { - ImageDescriptor patchWizardImage = CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.png"); + ImageDescriptor patchWizardImage = CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.svg"); String patchWizardTitle = PatchMessages.PatchWizard_title; IStorage patch = null;