diff --git a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF index 52eee57bc2d..d753505b676 100644 --- a/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.navigator.resources/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.navigator.resources; singleton:=true -Bundle-Version: 3.9.600.qualifier +Bundle-Version: 3.9.700.qualifier Bundle-Activator: org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorPlugin Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin @@ -27,3 +27,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)", Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.ui.navigator.resources +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/collapseall.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/collapseall.svg new file mode 100644 index 00000000000..56c57cba014 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/collapseall.svg @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/synced.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/synced.svg new file mode 100644 index 00000000000..c17387643f7 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/clcl16/synced.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/cview16/filenav_nav.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/cview16/filenav_nav.svg new file mode 100644 index 00000000000..afa3a832e78 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/cview16/filenav_nav.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/collapseall.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/collapseall.svg new file mode 100644 index 00000000000..3dcb9a830bf --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/collapseall.svg @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/filter_ps.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/filter_ps.svg new file mode 100644 index 00000000000..67c16bb3096 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/filter_ps.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/synced.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/synced.svg new file mode 100644 index 00000000000..37c0b6ae3f3 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/elcl16/synced.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.svg new file mode 100644 index 00000000000..1c21916f91b --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/eview16/resource_persp.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/nested_projects.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/nested_projects.svg new file mode 100644 index 00000000000..afc16a24323 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/nested_projects.svg @@ -0,0 +1,835 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/otherprojects_workingsets.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/otherprojects_workingsets.svg new file mode 100644 index 00000000000..ab3963f0e92 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/otherprojects_workingsets.svg @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/workingsets.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/workingsets.svg new file mode 100644 index 00000000000..108c81429d4 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/obj16/workingsets.svg @@ -0,0 +1,391 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/error_co.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/error_co.svg new file mode 100644 index 00000000000..d615babe65e --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/error_co.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/warning_co.svg b/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/warning_co.svg new file mode 100644 index 00000000000..028d1be3817 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator.resources/icons/full/ovr16/warning_co.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator.resources/plugin.xml b/bundles/org.eclipse.ui.navigator.resources/plugin.xml index 958ecdd8777..7eec1464661 100644 --- a/bundles/org.eclipse.ui.navigator.resources/plugin.xml +++ b/bundles/org.eclipse.ui.navigator.resources/plugin.xml @@ -7,7 +7,7 @@ @@ -82,7 +82,7 @@ { selectFiltersAction.setImageDescriptor(d); selectFiltersAction.setHoverImageDescriptor(d); diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java index 5804c1d7241..69cfc04ca0d 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java @@ -252,7 +252,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { } }; refreshAction.setDisabledImageDescriptor(getImageDescriptor("dlcl16/refresh_nav.png"));//$NON-NLS-1$ - refreshAction.setImageDescriptor(getImageDescriptor("elcl16/refresh_nav.png"));//$NON-NLS-1$ + refreshAction.setImageDescriptor(getImageDescriptor("elcl16/refresh_nav.svg"));//$NON-NLS-1$ refreshAction.setActionDefinitionId(IWorkbenchCommandConstants.FILE_REFRESH); buildAction = new BuildAction(sp, IncrementalProjectBuilder.INCREMENTAL_BUILD); diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetRootModeActionGroup.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetRootModeActionGroup.java index 71a9252e0c8..6d565519e52 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetRootModeActionGroup.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetRootModeActionGroup.java @@ -197,7 +197,7 @@ private IAction[] createActions() { .setText(WorkbenchNavigatorMessages.WorkingSetRootModeActionGroup_Working_Set_); workingSetsAction.setImageDescriptor(WorkbenchNavigatorPlugin .getDefault().getImageRegistry().getDescriptor( - "full/obj16/workingsets.png")); //$NON-NLS-1$ + "full/obj16/workingsets.svg")); //$NON-NLS-1$ return new IAction[] { projectsAction, workingSetsAction }; } diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetsLabelProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetsLabelProvider.java index f96cfdc84b0..f3f0394dd6a 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetsLabelProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/workingsets/WorkingSetsLabelProvider.java @@ -49,7 +49,7 @@ public Image getImage(Object element) { private Image getWorkingSetImage() { if (workingSetImage == null) { URL iconUrl = FileLocator.find(WorkbenchNavigatorPlugin.getDefault().getBundle(), - IPath.fromPortableString("icons/full/obj16/otherprojects_workingsets.png"), //$NON-NLS-1$ + IPath.fromPortableString("icons/full/obj16/otherprojects_workingsets.svg"), //$NON-NLS-1$ Collections.emptyMap()); workingSetImage = ImageDescriptor.createFromURL(iconUrl).createImage(); } diff --git a/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF index da58af38efc..7dbaad8953e 100644 --- a/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.navigator/META-INF/MANIFEST.MF @@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.ui.navigator +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.ui.navigator/icons/full/clcl16/collapseall.svg b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/collapseall.svg new file mode 100644 index 00000000000..ba13bc8636e --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/collapseall.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/clcl16/elipses.svg b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/elipses.svg new file mode 100644 index 00000000000..4d84fc5efd1 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/elipses.svg @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/clcl16/pause.svg b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/pause.svg new file mode 100644 index 00000000000..8c239347171 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/pause.svg @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/clcl16/synced.svg b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/synced.svg new file mode 100644 index 00000000000..c17387643f7 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/clcl16/synced.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/elcl16/collapseall.svg b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/collapseall.svg new file mode 100644 index 00000000000..ce1e540b8aa --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/collapseall.svg @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/elcl16/content.svg b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/content.svg new file mode 100644 index 00000000000..110cabba512 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/content.svg @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/elcl16/filter_ps.svg b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/filter_ps.svg new file mode 100644 index 00000000000..67c16bb3096 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/filter_ps.svg @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/icons/full/elcl16/synced.svg b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/synced.svg new file mode 100644 index 00000000000..37c0b6ae3f3 --- /dev/null +++ b/bundles/org.eclipse.ui.navigator/icons/full/elcl16/synced.svg @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java index f5c0a1afb83..874b44c85f1 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorActionGroup.java @@ -112,7 +112,7 @@ private void makeActions() { .getBooleanConfigProperty(INavigatorViewerDescriptor.PROP_HIDE_LINK_WITH_EDITOR_ACTION); if (!hideLinkWithEditorAction) { toggleLinkingAction = new LinkEditorAction(commonNavigator, commonViewer, linkHelperService); - String imageFilePath = "icons/full/elcl16/synced.png"; //$NON-NLS-1$ + String imageFilePath = "icons/full/elcl16/synced.svg"; //$NON-NLS-1$ ResourceLocator.imageDescriptorFromBundle(getClass(), imageFilePath).ifPresent(d -> { toggleLinkingAction.setImageDescriptor(d); toggleLinkingAction.setHoverImageDescriptor(d); @@ -125,7 +125,7 @@ private void makeActions() { .getBooleanConfigProperty(INavigatorViewerDescriptor.PROP_HIDE_COLLAPSE_ALL_ACTION); if (!hideCollapseAllAction) { collapseAllAction = new CollapseAllAction(commonViewer); - String imageFilePath = "icons/full/elcl16/collapseall.png"; //$NON-NLS-1$ + String imageFilePath = "icons/full/elcl16/collapseall.svg"; //$NON-NLS-1$ ResourceLocator.imageDescriptorFromBundle(getClass(), imageFilePath).ifPresent(d -> { collapseAllAction.setImageDescriptor(d); collapseAllAction.setHoverImageDescriptor(d); diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java index a5f535ede99..75029c0e821 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/CommonFilterSelectionDialog.java @@ -48,8 +48,8 @@ */ public class CommonFilterSelectionDialog extends TrayDialog { - private static final String FILTER_ICON = "icons/full/elcl16/filter_ps.png"; //$NON-NLS-1$ - private static final String CONTENT_ICON = "icons/full/elcl16/content.png"; //$NON-NLS-1$ + private static final String FILTER_ICON = "icons/full/elcl16/filter_ps.svg"; //$NON-NLS-1$ + private static final String CONTENT_ICON = "icons/full/elcl16/content.svg"; //$NON-NLS-1$ private static final int TAB_WIDTH_IN_DLUS = 300; diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java index b6a9c10fd92..e12231935b5 100644 --- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java +++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/filters/FilterActionGroup.java @@ -141,7 +141,7 @@ private void makeActions() { .getBooleanConfigProperty(INavigatorViewerDescriptor.PROP_HIDE_AVAILABLE_CUSTOMIZATIONS_DIALOG); if (!hideAvailableCustomizationsDialog) { selectFiltersAction = new SelectFiltersAction(commonViewer, this); - String imageFilePath = "icons/full/elcl16/filter_ps.png"; //$NON-NLS-1$ + String imageFilePath = "icons/full/elcl16/filter_ps.svg"; //$NON-NLS-1$ ResourceLocator.imageDescriptorFromBundle(getClass(), imageFilePath).ifPresent(d -> { selectFiltersAction.setImageDescriptor(d); selectFiltersAction.setHoverImageDescriptor(d);