diff --git a/bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF
index 8f643bee466..502a77f3edd 100644
--- a/bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.ui.browser/META-INF/MANIFEST.MF
@@ -16,3 +16,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.browser
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_backward.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_backward.svg
new file mode 100644
index 00000000000..30aa082fda5
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_backward.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_forward.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_forward.svg
new file mode 100644
index 00000000000..fb2578fcad6
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_forward.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_go.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_go.svg
new file mode 100644
index 00000000000..5485876a79d
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_go.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_home.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_home.svg
new file mode 100644
index 00000000000..e2169efcec3
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_home.svg
@@ -0,0 +1,330 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_print.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_print.svg
new file mode 100644
index 00000000000..290088dbf08
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_print.svg
@@ -0,0 +1,375 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_refresh.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_refresh.svg
new file mode 100644
index 00000000000..5f69547f7ec
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_refresh.svg
@@ -0,0 +1,189 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/nav_stop.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_stop.svg
new file mode 100644
index 00000000000..e07e9020197
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/nav_stop.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/clcl16/synced.svg b/bundles/org.eclipse.ui.browser/icons/clcl16/synced.svg
new file mode 100644
index 00000000000..37c0b6ae3f3
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/clcl16/synced.svg
@@ -0,0 +1,184 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_backward.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_backward.svg
new file mode 100644
index 00000000000..5b8b3dd058a
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_backward.svg
@@ -0,0 +1,113 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_forward.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_forward.svg
new file mode 100644
index 00000000000..fb2578fcad6
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_forward.svg
@@ -0,0 +1,111 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_go.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_go.svg
new file mode 100644
index 00000000000..ad7fadba2c8
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_go.svg
@@ -0,0 +1,117 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_home.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_home.svg
new file mode 100644
index 00000000000..e2169efcec3
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_home.svg
@@ -0,0 +1,330 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_print.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_print.svg
new file mode 100644
index 00000000000..290088dbf08
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_print.svg
@@ -0,0 +1,375 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_refresh.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_refresh.svg
new file mode 100644
index 00000000000..5f69547f7ec
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_refresh.svg
@@ -0,0 +1,189 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/nav_stop.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_stop.svg
new file mode 100644
index 00000000000..def9e891f40
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/nav_stop.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/elcl16/synced.svg b/bundles/org.eclipse.ui.browser/icons/elcl16/synced.svg
new file mode 100644
index 00000000000..341c033f35e
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/elcl16/synced.svg
@@ -0,0 +1,184 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/obj16/external_browser.svg b/bundles/org.eclipse.ui.browser/icons/obj16/external_browser.svg
new file mode 100644
index 00000000000..25315edf82a
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/obj16/external_browser.svg
@@ -0,0 +1,349 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/icons/obj16/internal_browser.svg b/bundles/org.eclipse.ui.browser/icons/obj16/internal_browser.svg
new file mode 100644
index 00000000000..f54418d7a7c
--- /dev/null
+++ b/bundles/org.eclipse.ui.browser/icons/obj16/internal_browser.svg
@@ -0,0 +1,234 @@
+
+
+
+
diff --git a/bundles/org.eclipse.ui.browser/plugin.xml b/bundles/org.eclipse.ui.browser/plugin.xml
index 710b15fa3b0..fb1311ac06b 100644
--- a/bundles/org.eclipse.ui.browser/plugin.xml
+++ b/bundles/org.eclipse.ui.browser/plugin.xml
@@ -47,7 +47,7 @@
allowMultiple="true"
category="org.eclipse.ui"
class="org.eclipse.ui.internal.browser.WebBrowserView"
- icon="$nl$/icons/obj16/internal_browser.png"
+ icon="$nl$/icons/obj16/internal_browser.svg"
id="org.eclipse.ui.browser.view"
name="%viewWebBrowserTitle"/>
@@ -56,7 +56,7 @@
@@ -82,7 +82,7 @@
toolbarPath="browser"
label="%actionSetOpenWebBrowser"
tooltip="%actionSetOpenWebBrowser"
- icon="icons/obj16/internal_browser.png"
+ icon="icons/obj16/internal_browser.svg"
class="org.eclipse.ui.internal.browser.OpenBrowserWorkbenchAction"/>
@@ -247,7 +247,7 @@
point="org.eclipse.ui.commandImages">
+ icon="$nl$/icons/obj16/internal_browser.svg"/>
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserViewer.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserViewer.java
index ccd75e07f80..957d19408ca 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserViewer.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/BrowserViewer.java
@@ -167,7 +167,6 @@ public static interface IBackNextListener {
private static final String URL_PREFIX = "$nl$/icons/"; //$NON-NLS-1$
private static final String URL_ELCL = URL_PREFIX + "elcl16/"; //$NON-NLS-1$
private static final String URL_CLCL = URL_PREFIX + "clcl16/"; //$NON-NLS-1$
- private static final String URL_DLCL = URL_PREFIX + "dlcl16/"; //$NON-NLS-1$
/**
* Creates a new Web browser given its parent and a style value describing
@@ -782,9 +781,8 @@ private ToolBar createLocationBar(Composite parent) {
ToolBar toolbar = new ToolBar(parent, SWT.FLAT);
ToolItem go = new ToolItem(toolbar, SWT.NONE);
- go.setImage(getImage(URL_ELCL, "nav_go.png")); //$NON-NLS-1$
- go.setHotImage(getImage(URL_CLCL, "nav_go.png")); //$NON-NLS-1$
- go.setDisabledImage(getImage(URL_DLCL, "nav_go.png")); //$NON-NLS-1$
+ go.setImage(getImage(URL_ELCL, "nav_go.svg")); //$NON-NLS-1$
+ go.setHotImage(getImage(URL_CLCL, "nav_go.svg")); //$NON-NLS-1$
go.setToolTipText(Messages.actionWebBrowserGo);
go.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> setURL(combo.getText())));
@@ -796,31 +794,27 @@ private ToolBar createToolbar(Composite parent) {
// create back and forward actions
back = new ToolItem(toolbar, SWT.NONE);
- back.setImage(getImage(URL_ELCL, "nav_backward.png")); //$NON-NLS-1$
- back.setHotImage(getImage(URL_CLCL, "nav_backward.png")); //$NON-NLS-1$
- back.setDisabledImage(getImage(URL_DLCL, "nav_backward.png")); //$NON-NLS-1$
+ back.setImage(getImage(URL_ELCL, "nav_backward.svg")); //$NON-NLS-1$
+ back.setHotImage(getImage(URL_CLCL, "nav_backward.svg")); //$NON-NLS-1$
back.setToolTipText(Messages.actionWebBrowserBack);
back.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> back()));
forward = new ToolItem(toolbar, SWT.NONE);
- forward.setImage(getImage(URL_ELCL, "nav_forward.png")); //$NON-NLS-1$
- forward.setHotImage(getImage(URL_CLCL, "nav_forward.png")); //$NON-NLS-1$
- forward.setDisabledImage(getImage(URL_DLCL, "nav_forward.png")); //$NON-NLS-1$
+ forward.setImage(getImage(URL_ELCL, "nav_forward.svg")); //$NON-NLS-1$
+ forward.setHotImage(getImage(URL_CLCL, "nav_forward.svg")); //$NON-NLS-1$
forward.setToolTipText(Messages.actionWebBrowserForward);
forward.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> forward()));
// create refresh, stop, and print actions
ToolItem stop = new ToolItem(toolbar, SWT.NONE);
- stop.setImage(getImage(URL_ELCL, "nav_stop.png")); //$NON-NLS-1$
- stop.setHotImage(getImage(URL_CLCL, "nav_stop.png")); //$NON-NLS-1$
- stop.setDisabledImage(getImage(URL_DLCL, "nav_stop.png")); //$NON-NLS-1$
+ stop.setImage(getImage(URL_ELCL, "nav_stop.svg")); //$NON-NLS-1$
+ stop.setHotImage(getImage(URL_CLCL, "nav_stop.svg")); //$NON-NLS-1$
stop.setToolTipText(Messages.actionWebBrowserStop);
stop.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> stop()));
ToolItem refresh = new ToolItem(toolbar, SWT.DROP_DOWN);
- refresh.setImage(getImage(URL_ELCL, "nav_refresh.png")); //$NON-NLS-1$
- refresh.setHotImage(getImage(URL_CLCL, "nav_refresh.png")); //$NON-NLS-1$
- refresh.setDisabledImage(getImage(URL_DLCL, "nav_refresh.png")); //$NON-NLS-1$
+ refresh.setImage(getImage(URL_ELCL, "nav_refresh.svg")); //$NON-NLS-1$
+ refresh.setHotImage(getImage(URL_CLCL, "nav_refresh.svg")); //$NON-NLS-1$
refresh.setToolTipText(Messages.actionWebBrowserRefresh);
// create auto-refresh action
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
index 910755f3f2a..ddb79d58c52 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditor.java
@@ -186,7 +186,7 @@ public void init(IEditorSite site, IEditorInput input) throws PartInitException
if (url != null)
setTitleToolTip(url.getFile());
- imageDescriptor = ImageResourceManager.getImageDescriptor("$nl$/icons/obj16/" + "internal_browser.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ imageDescriptor = ImageResourceManager.getImageDescriptor("$nl$/icons/obj16/" + "internal_browser.svg"); //$NON-NLS-1$ //$NON-NLS-2$
//addResourceListener(file);
} else if (input instanceof WebBrowserEditorInput) {
WebBrowserEditorInput wbei = (WebBrowserEditorInput) input;
diff --git a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditorInput.java b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditorInput.java
index e5a27572b6f..5401bcd325c 100644
--- a/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditorInput.java
+++ b/bundles/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserEditorInput.java
@@ -236,7 +236,7 @@ public String getFactoryId() {
@Override
public ImageDescriptor getImageDescriptor() {
- return ImageResourceManager.getImageDescriptor("$nl$/icons/obj16/" + "internal_browser.png"); //$NON-NLS-1$ //$NON-NLS-2$
+ return ImageResourceManager.getImageDescriptor("$nl$/icons/obj16/" + "internal_browser.svg"); //$NON-NLS-1$ //$NON-NLS-2$
}
/**