diff --git a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF index 2a20ced09c4..a1676b4a655 100644 --- a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.ui.dialogs -Bundle-Version: 1.6.0.qualifier +Bundle-Version: 1.6.100.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,3 +12,4 @@ Export-Package: org.eclipse.e4.ui.dialogs.filteredtree, Require-Bundle: org.eclipse.jface;bundle-version="3.11.0", org.eclipse.core.runtime;bundle-version="3.29.0" Automatic-Module-Name: org.eclipse.e4.ui.dialogs +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.e4.ui.dialogs/icons/full/etool16/clear_co.svg b/bundles/org.eclipse.e4.ui.dialogs/icons/full/etool16/clear_co.svg new file mode 100644 index 00000000000..8a0f5991ac3 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.dialogs/icons/full/etool16/clear_co.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF index 35c9b4571fa..5d23feb14ef 100644 --- a/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.progress/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.progress;singleton:=true -Bundle-Version: 0.4.700.qualifier +Bundle-Version: 0.4.800.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -23,3 +23,4 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.e4.ui.progress Service-Component: OSGI-INF/org.eclipse.e4.ui.progress.internal.ProgressServiceCreationFunction.xml Automatic-Module-Name: org.eclipse.e4.ui.progress +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi b/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi index c18dff97915..60a3b2d6ad5 100644 --- a/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi +++ b/bundles/org.eclipse.e4.ui.progress/examples/programmatic_progress_view.e4xmi @@ -4,7 +4,7 @@ - + View categoryTag:General active diff --git a/bundles/org.eclipse.e4.ui.progress/examples/progress_view.e4xmi b/bundles/org.eclipse.e4.ui.progress/examples/progress_view.e4xmi index a35c8be0c95..61544a225c1 100644 --- a/bundles/org.eclipse.e4.ui.progress/examples/progress_view.e4xmi +++ b/bundles/org.eclipse.e4.ui.progress/examples/progress_view.e4xmi @@ -4,7 +4,7 @@ - + View categoryTag:General active @@ -12,11 +12,11 @@ ViewMenu - + - + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_rem.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_rem.svg new file mode 100644 index 00000000000..646eabf6710 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_rem.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.svg new file mode 100644 index 00000000000..d3414206f16 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_stop.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_stop.svg new file mode 100644 index 00000000000..4bd3f207b1b --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_stop.svg @@ -0,0 +1,4572 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/errorstate.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/errorstate.svg new file mode 100644 index 00000000000..52b2e9c3c89 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/errorstate.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/lockedstate.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/lockedstate.svg new file mode 100644 index 00000000000..7767244e411 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/lockedstate.svg @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_error.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_error.svg new file mode 100644 index 00000000000..6837ddc567f --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_error.svg @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_none.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_none.svg new file mode 100644 index 00000000000..4b58ffe0bd4 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_none.svg @@ -0,0 +1,602 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_ok.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_ok.svg new file mode 100644 index 00000000000..7aeac6764d3 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_ok.svg @@ -0,0 +1,481 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_task.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_task.svg new file mode 100644 index 00000000000..e9b82e109c8 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/progress_task.svg @@ -0,0 +1,527 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/pview.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/pview.svg new file mode 100644 index 00000000000..52d9348e1ac --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/pview.svg @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/sleeping.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/sleeping.svg new file mode 100644 index 00000000000..ddac8b192ab --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/sleeping.svg @@ -0,0 +1,74 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/icons/full/progress/waiting.svg b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/waiting.svg new file mode 100644 index 00000000000..fc8cebbb4ca --- /dev/null +++ b/bundles/org.eclipse.e4.ui.progress/icons/full/progress/waiting.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java index 2e1baa573a9..7b8dfea292a 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/ProgrammaticProgressView.java @@ -44,7 +44,7 @@ */ public class ProgrammaticProgressView { - private static final String CLEAR_ALL_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.png"; //$NON-NLS-1$ + private static final String CLEAR_ALL_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.progress/icons/full/elcl16/progress_remall.svg"; //$NON-NLS-1$ DetailedProgressViewer viewer; diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java index 4f4a3da6296..b156480c076 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressAnimationItem.java @@ -239,9 +239,9 @@ protected Control createAnimationItem(Composite parent) { Display display = parent.getDisplay(); ImageTools imageTools = ImageTools.getInstance(); - noneImage = imageTools.getImage("progress/progress_none.png", display); //$NON-NLS-1$ - okImage = imageTools.getImage("progress/progress_ok.png", display); //$NON-NLS-1$ - errorImage = imageTools.getImage("progress/progress_error.png", display); //$NON-NLS-1$ + noneImage = imageTools.getImage("progress/progress_none.svg", display); //$NON-NLS-1$ + okImage = imageTools.getImage("progress/progress_ok.svg", display); //$NON-NLS-1$ + errorImage = imageTools.getImage("progress/progress_error.svg", display); //$NON-NLS-1$ } top = new Composite(parent, SWT.NULL); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java index 26616bf0fcc..b1e8f797024 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressInfoItem.java @@ -68,12 +68,8 @@ public class ProgressInfoItem extends Composite { static String STOP_IMAGE_KEY = "org.eclipse.ui.internal.progress.PROGRESS_STOP"; //$NON-NLS-1$ - static String DISABLED_STOP_IMAGE_KEY = "org.eclipse.ui.internal.progress.DISABLED_PROGRESS_STOP"; //$NON-NLS-1$ - static String CLEAR_FINISHED_JOB_KEY = "org.eclipse.ui.internal.progress.CLEAR_FINISHED_JOB"; //$NON-NLS-1$ - static String DISABLED_CLEAR_FINISHED_JOB_KEY = "org.eclipse.ui.internal.progress.DISABLED_CLEAR_FINISHED_JOB"; //$NON-NLS-1$ - static String DEFAULT_JOB_KEY = "org.eclipse.ui.internal.progress.PROGRESS_DEFAULT"; //$NON-NLS-1$ static String DARK_COLOR_KEY = "org.eclipse.ui.internal.progress.PROGRESS_DARK_COLOR"; //$NON-NLS-1$ @@ -137,15 +133,11 @@ interface IndexListener { static { ImageTools.getInstance().putIntoRegistry(STOP_IMAGE_KEY, - "elcl16/progress_stop.png");//$NON-NLS-1$ - ImageTools.getInstance().putIntoRegistry(DISABLED_STOP_IMAGE_KEY, - "dlcl16/progress_stop.png");//$NON-NLS-1$ + "elcl16/progress_stop.svg");//$NON-NLS-1$ ImageTools.getInstance().putIntoRegistry(DEFAULT_JOB_KEY, - "progress/progress_task.png"); //$NON-NLS-1$ + "progress/progress_task.svg"); //$NON-NLS-1$ ImageTools.getInstance().putIntoRegistry(CLEAR_FINISHED_JOB_KEY, - "elcl16/progress_rem.png"); //$NON-NLS-1$ - ImageTools.getInstance().putIntoRegistry( - DISABLED_CLEAR_FINISHED_JOB_KEY, "dlcl16/progress_rem.png"); //$NON-NLS-1$ + "elcl16/progress_rem.svg"); //$NON-NLS-1$ // Mac has different Gamma value int shift = Util.isMac() ? -25 : -10; @@ -645,15 +637,10 @@ private void updateToolBarValues() { if (isCompleted()) { actionButton.setImage(JFaceResources .getImage(CLEAR_FINISHED_JOB_KEY)); - actionButton.setDisabledImage(JFaceResources - .getImage(DISABLED_CLEAR_FINISHED_JOB_KEY)); actionButton .setToolTipText(ProgressMessages.NewProgressView_ClearJobToolTip); } else { actionButton.setImage(JFaceResources.getImage(STOP_IMAGE_KEY)); - actionButton.setDisabledImage(JFaceResources - .getImage(DISABLED_STOP_IMAGE_KEY)); - } JobInfo[] infos = getJobInfos(); diff --git a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java index 917d8817ad1..54a7dfd0d34 100644 --- a/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java +++ b/bundles/org.eclipse.e4.ui.progress/src/org/eclipse/e4/ui/progress/internal/ProgressManager.java @@ -70,7 +70,7 @@ public class ProgressManager extends ProgressProvider { @Deprecated public static final QualifiedName PROPERTY_IN_DIALOG = IProgressConstants.PROPERTY_IN_DIALOG; - private static final String ERROR_JOB = "errorstate.png"; //$NON-NLS-1$ + private static final String ERROR_JOB = "errorstate.svg"; //$NON-NLS-1$ static final String ERROR_JOB_KEY = "ERROR_JOB"; //$NON-NLS-1$ @@ -93,11 +93,11 @@ public class ProgressManager extends ProgressProvider { static final String PROGRESS_FOLDER = "progress/"; //$NON-NLS-1$ - private static final String SLEEPING_JOB = "sleeping.png"; //$NON-NLS-1$ + private static final String SLEEPING_JOB = "sleeping.svg"; //$NON-NLS-1$ - private static final String WAITING_JOB = "waiting.png"; //$NON-NLS-1$ + private static final String WAITING_JOB = "waiting.svg"; //$NON-NLS-1$ - private static final String BLOCKED_JOB = "lockedstate.png"; //$NON-NLS-1$ + private static final String BLOCKED_JOB = "lockedstate.svg"; //$NON-NLS-1$ /** * The key for the sleeping job icon. diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF index 668668154eb..b483c5fb3c1 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/META-INF/MANIFEST.MF @@ -35,3 +35,4 @@ Export-Package: org.eclipse.e4.ui.workbench.addons.cleanupaddon;x-internal:=true org.eclipse.e4.ui.workbench.addons.splitteraddon;x-friends:="org.eclipse.ui.workbench", org.eclipse.e4.ui.workbench.addons.swt;x-internal:=true Automatic-Module-Name: org.eclipse.e4.ui.workbench.addons.swt +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/etool16/fastview_restore.svg b/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/etool16/fastview_restore.svg new file mode 100644 index 00000000000..c08fe480809 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/etool16/fastview_restore.svg @@ -0,0 +1,85 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/obj16/layout_co.svg b/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/obj16/layout_co.svg new file mode 100644 index 00000000000..35c8cdbc341 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/icons/full/obj16/layout_co.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java index 917cb66e96e..39f31cd59ef 100644 --- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java +++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/minmax/TrimStack.java @@ -85,9 +85,9 @@ public class TrimStack { */ public static String CONTRIBUTION_URI = "bundleclass://org.eclipse.e4.ui.workbench.addons.swt/org.eclipse.e4.ui.workbench.addons.minmax.TrimStack"; //$NON-NLS-1$ - private static final String LAYOUT_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.workbench.addons.swt/icons/full/obj16/layout_co.png"; //$NON-NLS-1$ + private static final String LAYOUT_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.workbench.addons.swt/icons/full/obj16/layout_co.svg"; //$NON-NLS-1$ - private static final String RESTORE_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.workbench.addons.swt/icons/full/etool16/fastview_restore.png"; //$NON-NLS-1$ + private static final String RESTORE_ICON_URI = "platform:/plugin/org.eclipse.e4.ui.workbench.addons.swt/icons/full/etool16/fastview_restore.svg"; //$NON-NLS-1$ public static final String USE_OVERLAYS_KEY = "UseOverlays"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF index cb4ef940ce1..1f50906976a 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.renderers.swt;singleton:=true -Bundle-Version: 0.16.700.qualifier +Bundle-Version: 0.16.800.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -31,3 +31,4 @@ Import-Package: jakarta.annotation;version="[2.1.0,3.0.0)", jakarta.inject;version="[2.0.0,3.0.0)", org.osgi.service.event;version="[1.3.0,2.0.0)" Automatic-Module-Name: org.eclipse.e4.ui.workbench.renderers.swt +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg new file mode 100644 index 00000000000..e77339156f6 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg @@ -0,0 +1,113 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/ovr16/pinned_ovr.svg b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/ovr16/pinned_ovr.svg new file mode 100644 index 00000000000..efb92d3a99e --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/ovr16/pinned_ovr.svg @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java index 523277f75bd..7a51b0b8ad4 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java @@ -48,7 +48,7 @@ public abstract class SWTPartRenderer extends AbstractPartRenderer { private static final String ADORN_ICON_IMAGE_KEY = "previouslyAdorned"; //$NON-NLS-1$ - private String pinURI = "platform:/plugin/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/ovr16/pinned_ovr.png"; //$NON-NLS-1$ + private String pinURI = "platform:/plugin/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/ovr16/pinned_ovr.svg"; //$NON-NLS-1$ private Image pinImage; private ISWTResourceUtilities resUtils; diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java index 9d5eb842923..cf96e9c1ceb 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java @@ -203,7 +203,7 @@ public class StackRenderer extends LazyStackRenderer { private MPerspective currentPerspectiveForOnboarding; private Image viewMenuImage; - private String viewMenuURI = "platform:/plugin/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.png"; //$NON-NLS-1$ + private String viewMenuURI = "platform:/plugin/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg"; //$NON-NLS-1$ @Inject private IEventBroker eventBroker; diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF index 175e82f9866..dbe37ac0bc0 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF @@ -29,7 +29,10 @@ Require-Bundle: org.eclipse.e4.ui.workbench;bundle-version="0.10.0", org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0", org.eclipse.e4.core.di.extensions, org.eclipse.urischeme;bundle-version="1.1.0" -Require-Capability: osgi.extender; filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))" +Require-Capability: osgi.extender; + filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))", + eclipse.swt; + filter:="(image.format=svg)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.e4.ui.internal.workbench.swt; diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/etool16/clear_co.svg b/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/etool16/clear_co.svg new file mode 100644 index 00000000000..8a0f5991ac3 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/etool16/clear_co.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/obj16/fldr_obj.svg b/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/obj16/fldr_obj.svg new file mode 100644 index 00000000000..69ca231f5be --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.swt/icons/full/obj16/fldr_obj.svg @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.svg b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.svg new file mode 100644 index 00000000000..cc30e1e37ff --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle-rotated.svg @@ -0,0 +1,145 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.svg b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.svg new file mode 100644 index 00000000000..db83c13ae1e --- /dev/null +++ b/bundles/org.eclipse.e4.ui.workbench.swt/images/dragHandle.svg @@ -0,0 +1,151 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java index 4c40163dd2f..417dae9d3e2 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/CSSRenderingUtils.java @@ -129,12 +129,12 @@ public Control frameMeIfPossible(Control toFrame, String classId, private void initDragHandleResource() { Bundle bundle = FrameworkUtil.getBundle(getClass()); - IPath path = IPath.fromOSString("$ws$/images/dragHandle.png"); + IPath path = IPath.fromOSString("$ws$/images/dragHandle.svg"); URL url = FileLocator.find(bundle, path, null); ImageDescriptor desc = ImageDescriptor.createFromURL(url); if (desc != null) JFaceResources.getImageRegistry().put(DRAG_HANDLE, desc); - path = IPath.fromOSString("$ws$/images/dragHandle-rotated.png"); + path = IPath.fromOSString("$ws$/images/dragHandle-rotated.svg"); url = FileLocator.find(bundle, path, null); ImageDescriptor desc_rotated = ImageDescriptor.createFromURL(url); if (desc_rotated != null) diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewLabelProvider.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewLabelProvider.java index 337b959d202..5f4a63f08ea 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewLabelProvider.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewLabelProvider.java @@ -47,7 +47,7 @@ public class ViewLabelProvider extends ColumnLabelProvider { static { Bundle bundle = org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator .getDefault().getBundle(); - IPath path = IPath.fromOSString("$nl$/icons/full/obj16/fldr_obj.png"); + IPath path = IPath.fromOSString("$nl$/icons/full/obj16/fldr_obj.svg"); URL url = FileLocator.find(bundle, path, null); ImageDescriptor enabledDesc = ImageDescriptor.createFromURL(url); if (enabledDesc != null) diff --git a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF index 6b92d47db28..0b2cce81a11 100644 --- a/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.e4.ui.tests;singleton:=true -Bundle-Version: 0.15.700.qualifier +Bundle-Version: 0.15.800.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", @@ -41,4 +41,4 @@ Import-Package: jakarta.annotation, org.osgi.service.event Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.e4.ui.tests - +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/tests/org.eclipse.e4.ui.tests/icons/filenav_nav.svg b/tests/org.eclipse.e4.ui.tests/icons/filenav_nav.svg new file mode 100644 index 00000000000..b807be35b21 --- /dev/null +++ b/tests/org.eclipse.e4.ui.tests/icons/filenav_nav.svg @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.e4.ui.tests/icons/pinned_ovr.svg b/tests/org.eclipse.e4.ui.tests/icons/pinned_ovr.svg new file mode 100644 index 00000000000..c8e9925b36a --- /dev/null +++ b/tests/org.eclipse.e4.ui.tests/icons/pinned_ovr.svg @@ -0,0 +1,277 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java index 6be060611fc..d137d5c92e0 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java @@ -238,7 +238,7 @@ private MWindow createWindowWithOneView(String partName, String toolTip) { stack.getChildren().add(contributedPart); contributedPart.setLabel(partName); contributedPart.setTooltip(toolTip); - contributedPart.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.png"); + contributedPart.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.svg"); contributedPart.setContributionURI( "bundleclass://org.eclipse.e4.ui.tests/org.eclipse.e4.ui.tests.workbench.SampleView"); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java index dd6f8311b89..bce03c4bbc0 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java @@ -391,7 +391,7 @@ public void testDetachedWindow() { assertEquals("Detached should have same image", topShell.getImage(), detachedShell.getImage()); // now set icon on top-level window; detached window should inherit it - window.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.png"); + window.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.svg"); while (topShell.getDisplay().readAndDispatch()) { } assertNotNull("Should have shell image", topShell.getImage()); @@ -405,7 +405,7 @@ public void testDetachedWindow() { assertEquals("Detached should have same image", topShell.getImage(), detachedShell.getImage()); // turn detached into top-level window; inherited icon should be removed - window.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.png"); + window.setIconURI("platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.svg"); application.getChildren().add(detachedWindow); while (topShell.getDisplay().readAndDispatch()) { } diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java index f4f0382841c..d4645c2602e 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java @@ -63,8 +63,8 @@ public class StackRendererTest { - private static final String PART_DESC_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/pinned_ovr.png"; - private static final String PART_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.png"; + private static final String PART_DESC_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/pinned_ovr.svg"; + private static final String PART_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.svg"; @Rule public WorkbenchContextRule contextRule = new WorkbenchContextRule();