From f80960b5617be16e52385a3d8a544edecc401aab Mon Sep 17 00:00:00 2001 From: Michael Bangas Date: Mon, 14 Apr 2025 13:24:41 +0200 Subject: [PATCH 1/3] add all svgs to org.eclipse.ui.genericeditor bundles This commit adds SVGs for all icons in the bundles `org.eclipse.ui.genericeditor` and `org.eclipse.ui.genericeditor.tests` . --- .../META-INF/MANIFEST.MF | 1 + .../icons/full/etool16/mark_occurrences.svg | 224 ++++ .../icons/full/obj16/generic_editor.svg | 993 ++++++++++++++++++ .../org.eclipse.ui.genericeditor/plugin.xml | 4 +- .../schema/icons.exsd | 4 +- .../META-INF/MANIFEST.MF | 1 + .../icons/newfile_wiz.svg | 418 ++++++++ .../icons/newfolder_wiz.svg | 350 ++++++ .../plugin.xml | 6 +- 9 files changed, 1994 insertions(+), 7 deletions(-) create mode 100644 bundles/org.eclipse.ui.genericeditor/icons/full/etool16/mark_occurrences.svg create mode 100644 bundles/org.eclipse.ui.genericeditor/icons/full/obj16/generic_editor.svg create mode 100644 tests/org.eclipse.ui.genericeditor.tests/icons/newfile_wiz.svg create mode 100644 tests/org.eclipse.ui.genericeditor.tests/icons/newfolder_wiz.svg diff --git a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF index 6f5dd6b08a1..1a26692dbe9 100644 --- a/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.ui.genericeditor/META-INF/MANIFEST.MF @@ -25,3 +25,4 @@ Bundle-Activator: org.eclipse.ui.internal.genericeditor.GenericEditorPlugin Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.ui.genericeditor +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/bundles/org.eclipse.ui.genericeditor/icons/full/etool16/mark_occurrences.svg b/bundles/org.eclipse.ui.genericeditor/icons/full/etool16/mark_occurrences.svg new file mode 100644 index 00000000000..d533a162b3c --- /dev/null +++ b/bundles/org.eclipse.ui.genericeditor/icons/full/etool16/mark_occurrences.svg @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.genericeditor/icons/full/obj16/generic_editor.svg b/bundles/org.eclipse.ui.genericeditor/icons/full/obj16/generic_editor.svg new file mode 100644 index 00000000000..68cc1ebbd6e --- /dev/null +++ b/bundles/org.eclipse.ui.genericeditor/icons/full/obj16/generic_editor.svg @@ -0,0 +1,993 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.eclipse.ui.genericeditor/plugin.xml b/bundles/org.eclipse.ui.genericeditor/plugin.xml index 1711b4d58c4..8b9c50664b7 100644 --- a/bundles/org.eclipse.ui.genericeditor/plugin.xml +++ b/bundles/org.eclipse.ui.genericeditor/plugin.xml @@ -33,7 +33,7 @@ class="org.eclipse.ui.internal.genericeditor.ExtensionBasedTextEditor" contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor" default="true" - icon="icons/full/obj16/generic_editor.png" + icon="icons/full/obj16/generic_editor.svg" id="org.eclipse.ui.genericeditor.GenericEditor" name="%genericEditor_name"> + icon="icons/full/etool16/mark_occurrences.svg"> diff --git a/bundles/org.eclipse.ui.genericeditor/schema/icons.exsd b/bundles/org.eclipse.ui.genericeditor/schema/icons.exsd index 2e1ca42d636..abac7e9fb8e 100644 --- a/bundles/org.eclipse.ui.genericeditor/schema/icons.exsd +++ b/bundles/org.eclipse.ui.genericeditor/schema/icons.exsd @@ -99,7 +99,7 @@ point="org.eclipse.ui.genericeditor.icons"> <icon contentType="org.eclipse.core.runtime.xml" - icon="icons/xml_content.png" /> + icon="icons/xml_content.svg" /> </extension> </pre> <pre> @@ -107,7 +107,7 @@ point="org.eclipse.ui.genericeditor.icons"> <icon contentType="org.eclipse.core.runtime.text" - icon="platform:/plugin/org.eclipse.ui.test/icons/text_content.png" /> + icon="platform:/plugin/org.eclipse.ui.test/icons/text_content.svg" /> </extension> </pre> diff --git a/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF index 5076d85e656..d62bf36af54 100644 --- a/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF @@ -27,3 +27,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.ui.genericeditor.tests +Require-Capability: eclipse.swt;filter:="(image.format=svg)" diff --git a/tests/org.eclipse.ui.genericeditor.tests/icons/newfile_wiz.svg b/tests/org.eclipse.ui.genericeditor.tests/icons/newfile_wiz.svg new file mode 100644 index 00000000000..2043b8ebc18 --- /dev/null +++ b/tests/org.eclipse.ui.genericeditor.tests/icons/newfile_wiz.svg @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.ui.genericeditor.tests/icons/newfolder_wiz.svg b/tests/org.eclipse.ui.genericeditor.tests/icons/newfolder_wiz.svg new file mode 100644 index 00000000000..f7a7ca5d4a5 --- /dev/null +++ b/tests/org.eclipse.ui.genericeditor.tests/icons/newfolder_wiz.svg @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/tests/org.eclipse.ui.genericeditor.tests/plugin.xml b/tests/org.eclipse.ui.genericeditor.tests/plugin.xml index 0cf5d1d012b..2b90e3c5e52 100644 --- a/tests/org.eclipse.ui.genericeditor.tests/plugin.xml +++ b/tests/org.eclipse.ui.genericeditor.tests/plugin.xml @@ -271,13 +271,13 @@ point="org.eclipse.ui.genericeditor.icons"> + icon="icons/newfile_wiz.svg"/> + icon="icons/newfolder_wiz.svg"/> + icon="platform:/plugin/org.eclipse.ui.ide/icons/full/etool16/newprj_wiz.svg"/> From 2f8ed2460eaaff7ca967130cab4f3c5bc0133a90 Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Tue, 15 Apr 2025 13:19:46 +0000 Subject: [PATCH 2/3] Version bump(s) for 4.36 stream --- tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF index d62bf36af54..c7a166b53c1 100644 --- a/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.genericeditor.tests;singleton:=true -Bundle-Version: 1.3.700.qualifier +Bundle-Version: 1.3.800.qualifier Bundle-Vendor: %Plugin.providerName Bundle-Localization: plugin Export-Package: org.eclipse.ui.genericeditor.tests, From 9e8e31f78c94896cea71d1ee92fd601bd01d904f Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Thu, 24 Apr 2025 13:59:10 +0200 Subject: [PATCH 3/3] Remove explicit disabled icons from org.eclipse.ui.genericeditor Use on-the-fly-generated disabled version of SVG-rasterized icons instead. --- bundles/org.eclipse.ui.genericeditor/plugin.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/bundles/org.eclipse.ui.genericeditor/plugin.xml b/bundles/org.eclipse.ui.genericeditor/plugin.xml index 8b9c50664b7..c685404c056 100644 --- a/bundles/org.eclipse.ui.genericeditor/plugin.xml +++ b/bundles/org.eclipse.ui.genericeditor/plugin.xml @@ -167,7 +167,6 @@ point="org.eclipse.ui.commandImages">