diff --git a/debug/org.eclipse.ui.console/META-INF/MANIFEST.MF b/debug/org.eclipse.ui.console/META-INF/MANIFEST.MF
index 5f5e57ad94c..724fbc642dc 100644
--- a/debug/org.eclipse.ui.console/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.ui.console/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.console; singleton:=true
-Bundle-Version: 3.14.200.qualifier
+Bundle-Version: 3.14.300.qualifier
Bundle-Activator: org.eclipse.ui.console.ConsolePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,3 +19,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.ui.console
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"
diff --git a/debug/org.eclipse.ui.console/icons/full/clcl16/clear_co.svg b/debug/org.eclipse.ui.console/icons/full/clcl16/clear_co.svg
new file mode 100644
index 00000000000..9fc6462b642
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/clcl16/clear_co.svg
@@ -0,0 +1,480 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/clcl16/lock_co.svg b/debug/org.eclipse.ui.console/icons/full/clcl16/lock_co.svg
new file mode 100644
index 00000000000..c344c2e266f
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/clcl16/lock_co.svg
@@ -0,0 +1,663 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/clcl16/pin.svg b/debug/org.eclipse.ui.console/icons/full/clcl16/pin.svg
new file mode 100644
index 00000000000..1b1325cdd01
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/clcl16/pin.svg
@@ -0,0 +1,329 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/clcl16/wordwrap.svg b/debug/org.eclipse.ui.console/icons/full/clcl16/wordwrap.svg
new file mode 100644
index 00000000000..d064ae2226d
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/clcl16/wordwrap.svg
@@ -0,0 +1,427 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/cview16/console_view.svg b/debug/org.eclipse.ui.console/icons/full/cview16/console_view.svg
new file mode 100644
index 00000000000..80a403125a0
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/cview16/console_view.svg
@@ -0,0 +1,550 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/clear_co.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/clear_co.svg
new file mode 100644
index 00000000000..9fc6462b642
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/clear_co.svg
@@ -0,0 +1,480 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/lock_co.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/lock_co.svg
new file mode 100644
index 00000000000..c344c2e266f
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/lock_co.svg
@@ -0,0 +1,663 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/new_con.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/new_con.svg
new file mode 100644
index 00000000000..20f32439dfa
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/new_con.svg
@@ -0,0 +1,365 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/pin.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/pin.svg
new file mode 100644
index 00000000000..3af395b9696
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/pin.svg
@@ -0,0 +1,329 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/rem_co.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/rem_co.svg
new file mode 100644
index 00000000000..646eabf6710
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/rem_co.svg
@@ -0,0 +1,115 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/elcl16/wordwrap.svg b/debug/org.eclipse.ui.console/icons/full/elcl16/wordwrap.svg
new file mode 100644
index 00000000000..c1f5d88809d
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/elcl16/wordwrap.svg
@@ -0,0 +1,403 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/icons/full/eview16/console_view.svg b/debug/org.eclipse.ui.console/icons/full/eview16/console_view.svg
new file mode 100644
index 00000000000..80a403125a0
--- /dev/null
+++ b/debug/org.eclipse.ui.console/icons/full/eview16/console_view.svg
@@ -0,0 +1,550 @@
+
+
+
+
diff --git a/debug/org.eclipse.ui.console/plugin.xml b/debug/org.eclipse.ui.console/plugin.xml
index 42db8096343..cf75e8936ce 100644
--- a/debug/org.eclipse.ui.console/plugin.xml
+++ b/debug/org.eclipse.ui.console/plugin.xml
@@ -26,7 +26,7 @@
@@ -107,7 +107,7 @@ M4 = Platform-specific fourth key
point="org.eclipse.ui.console.consoleFactories">
diff --git a/debug/org.eclipse.ui.console/schema/consoleFactories.exsd b/debug/org.eclipse.ui.console/schema/consoleFactories.exsd
index 0a2ac53918b..cd0a193dc6e 100644
--- a/debug/org.eclipse.ui.console/schema/consoleFactories.exsd
+++ b/debug/org.eclipse.ui.console/schema/consoleFactories.exsd
@@ -94,7 +94,7 @@
<consoleFactory
label="Command Console"
class="com.example.CommandConsoleFactory"
- icon="icons/cmd_console.png">
+ icon="icons/cmd_console.svg">
</consoleFactory>
</extension>
</pre>
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java
index 31686d0dd00..437d5edee3a 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/ClearOutputAction.java
@@ -49,7 +49,6 @@ private ClearOutputAction() {
super(ConsoleMessages.ClearOutputAction_title);
setToolTipText(ConsoleMessages.ClearOutputAction_toolTipText);
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IConsoleConstants.IMG_LCL_CLEAR));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_CLEAR));
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLEAR));
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CLEAR_CONSOLE_ACTION);
}
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java
index 72f1c01eb8a..4a17e572892 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/console/actions/CloseConsoleAction.java
@@ -34,7 +34,6 @@ public class CloseConsoleAction extends Action {
public CloseConsoleAction(IConsole console) {
super(ConsoleMessages.CloseConsoleAction_0, ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_CLOSE));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_CLOSE));
setToolTipText(ConsoleMessages.CloseConsoleAction_1);
fConsole = console;
}
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java
index 7cf2e76f505..ae73f60cd55 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePluginImages.java
@@ -44,7 +44,6 @@ public class ConsolePluginImages {
// Use IPath and toOSString to build the names to ensure they have the slashes correct
private final static String LOCALTOOL= "clcl16/"; //basic colors - size 16x16 //$NON-NLS-1$
- private final static String DLCL= "dlcl16/"; //disabled - size 16x16 //$NON-NLS-1$
private final static String ELCL= "elcl16/"; //enabled - size 16x16 //$NON-NLS-1$
private final static String VIEW= "cview16/"; // views //$NON-NLS-1$
@@ -55,29 +54,21 @@ private static void declareImages() {
// Actions
//local toolbars
- declareRegistryImage(IConsoleConstants.IMG_LCL_CLEAR, LOCALTOOL + "clear_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_LCL_PIN, LOCALTOOL + "pin.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_LCL_LOCK, LOCALTOOL + "lock_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_LCL_WRAP, LOCALTOOL + "wordwrap.png"); //$NON-NLS-1$
-
- // disabled local toolbars
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_CLEAR, DLCL + "clear_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_PIN, DLCL + "pin.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_LOCK, DLCL + "lock_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_WRAP, DLCL + "wordwrap.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_CLOSE, DLCL + "rem_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_DLCL_NEW_CON, DLCL + "new_con.png"); //$NON-NLS-1$
+ declareRegistryImage(IConsoleConstants.IMG_LCL_CLEAR, LOCALTOOL + "clear_co.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_LCL_PIN, LOCALTOOL + "pin.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_LCL_LOCK, LOCALTOOL + "lock_co.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_LCL_WRAP, LOCALTOOL + "wordwrap.svg"); //$NON-NLS-1$
// enabled local toolbars
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLEAR, ELCL + "clear_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_PIN, ELCL + "pin.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_LOCK, ELCL + "lock_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_WRAP, ELCL + "wordwrap.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLOSE, ELCL + "rem_co.png"); //$NON-NLS-1$
- declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_NEW_CON, ELCL + "new_con.png"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLEAR, ELCL + "clear_co.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_PIN, ELCL + "pin.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_LOCK, ELCL + "lock_co.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_WRAP, ELCL + "wordwrap.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_CLOSE, ELCL + "rem_co.svg"); //$NON-NLS-1$
+ declareRegistryImage(IInternalConsoleConstants.IMG_ELCL_NEW_CON, ELCL + "new_con.svg"); //$NON-NLS-1$
// Views
- declareRegistryImage(IConsoleConstants.IMG_VIEW_CONSOLE, VIEW + "console_view.png"); //$NON-NLS-1$
+ declareRegistryImage(IConsoleConstants.IMG_VIEW_CONSOLE, VIEW + "console_view.svg"); //$NON-NLS-1$
}
/**
@@ -131,7 +122,7 @@ public static ImageRegistry getImageRegistry() {
* Misc images MISC_
*
* Where are the images?
- * The images (typically pngs) are found in the same location as this plugin class.
+ * The images (typically svgs) are found in the same location as this plugin class.
* This may mean the same package directory as the package holding this class.
* The images are declared using this.getClass() to ensure they are looked up via
* this plugin class.
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java
index 5ef64bea89a..6b6c77a904a 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/IInternalConsoleConstants.java
@@ -21,14 +21,6 @@ public interface IInternalConsoleConstants {
String IMG_LCL_LOCK = "IMG_LCL_LOCK"; //$NON-NLS-1$
String IMG_LCL_WRAP = "IMG_LCL_WRAP"; //$NON-NLS-1$
- // disabled local tool images
- String IMG_DLCL_PIN = "IMG_DLCL_PIN"; //$NON-NLS-1$
- String IMG_DLCL_CLEAR= "IMG_DLCL_CLEAR"; //$NON-NLS-1$
- String IMG_DLCL_LOCK = "IMG_DLCL_LOCK"; //$NON-NLS-1$
- String IMG_DLCL_WRAP = "IMG_DLCL_WRAP"; //$NON-NLS-1$
- String IMG_DLCL_CLOSE = "IMG_DLCL_CLOSE"; //$NON-NLS-1$
- String IMG_DLCL_NEW_CON = "IMG_DLCL_NEW_CON"; //$NON-NLS-1$
-
// enabled local tool images
String IMG_ELCL_PIN = "IMG_ELCL_PIN"; //$NON-NLS-1$
String IMG_ELCL_CLEAR= "IMG_ELCL_CLEAR"; //$NON-NLS-1$
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
index df293a8b68d..f575ff5e3d6 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/OpenConsoleAction.java
@@ -45,7 +45,6 @@ public OpenConsoleAction() {
fFactoryExtensions = getSortedFactories();
setToolTipText(ConsoleMessages.OpenConsoleAction_1);
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_NEW_CON));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_NEW_CON));
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_OPEN_CONSOLE_ACTION);
}
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java
index 13aa4a0949b..123a7bb8749 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PinConsoleAction.java
@@ -35,7 +35,6 @@ public PinConsoleAction(IConsoleView view) {
super(ConsoleMessages.PinConsoleAction_0, IAction.AS_CHECK_BOX);
setToolTipText(ConsoleMessages.PinConsoleAction_1);
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_PIN));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_PIN));
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_PIN));
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_PIN_CONSOLE_ACITON);
fView = view;
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java
index ae5b4a5f0a9..cb9847db151 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ScrollLockAction.java
@@ -32,7 +32,6 @@ public ScrollLockAction(IConsoleView consoleView) {
setToolTipText(ConsoleMessages.ScrollLockAction_1);
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_LOCK));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_LOCK));
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_LOCK));
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_SCROLL_LOCK_ACTION);
boolean checked = fConsoleView.getScrollLock();
diff --git a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java
index 05b197480ee..983ed401dbc 100644
--- a/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java
+++ b/debug/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/WordWrapAction.java
@@ -40,7 +40,6 @@ public WordWrapAction(IConsoleView consoleView) {
setToolTipText(ConsoleMessages.WordWrapAction_1);
setHoverImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_LCL_WRAP));
- setDisabledImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_DLCL_WRAP));
setImageDescriptor(ConsolePluginImages.getImageDescriptor(IInternalConsoleConstants.IMG_ELCL_WRAP));
PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IConsoleHelpContextIds.CONSOLE_WORD_WRAP_ACTION);