From 382e4d0783beeefc3eb650d0f0cce2950fd00be4 Mon Sep 17 00:00:00 2001 From: Dima Golovkov Date: Thu, 7 Aug 2025 16:51:40 +0300 Subject: [PATCH] Add pluginModule, legacyPluginModule and pluginV2 icons for UX-3565 (cherry picked from commit 19a3d5a5a3f167781fbc6e760b39df23e4b91ef1) IJ-CR-171953 GitOrigin-RevId: 1aecf9c32a7c56add53830e5d8b5486b977654aa --- .../org/jetbrains/idea/devkit/DevKitIcons.java | 4 +++- .../resources/icons/expui/legacyPluginModule.svg | 15 +++++++++++++++ .../icons/expui/legacyPluginModule_dark.svg | 15 +++++++++++++++ .../resources/icons/expui/pluginModule.svg | 7 +++++++ .../resources/icons/expui/pluginModule_dark.svg | 7 +++++++ .../resources/icons/expui/pluginV2.svg | 8 +++++--- .../resources/icons/expui/pluginV2_dark.svg | 8 +++++--- .../src/ScaffoldingDirectoryIconProvider.kt | 14 ++------------ 8 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule.svg create mode 100644 plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule_dark.svg create mode 100644 plugins/devkit/devkit-core/resources/icons/expui/pluginModule.svg create mode 100644 plugins/devkit/devkit-core/resources/icons/expui/pluginModule_dark.svg diff --git a/plugins/devkit/devkit-core/gen/org/jetbrains/idea/devkit/DevKitIcons.java b/plugins/devkit/devkit-core/gen/org/jetbrains/idea/devkit/DevKitIcons.java index 37323b198ca0..fef289a34844 100644 --- a/plugins/devkit/devkit-core/gen/org/jetbrains/idea/devkit/DevKitIcons.java +++ b/plugins/devkit/devkit-core/gen/org/jetbrains/idea/devkit/DevKitIcons.java @@ -27,7 +27,9 @@ public final class DevKitIcons { } /** 8x8 */ public static final @NotNull Icon LegacyPlugin = load("icons/expui/legacyPlugin.svg", -1032566629, 2); - /** 16x16 */ public static final @NotNull Icon PluginV2 = load("icons/expui/pluginV2.svg", 1719825147, 2); + /** 16x16 */ public static final @NotNull Icon LegacyPluginModule = load("icons/expui/legacyPluginModule.svg", 1708808352, 2); + /** 16x16 */ public static final @NotNull Icon PluginModule = load("icons/expui/pluginModule.svg", 1662209782, 2); + /** 16x16 */ public static final @NotNull Icon PluginV2 = load("icons/expui/pluginV2.svg", -654258637, 2); /** 16x16 */ public static final @NotNull Icon ProjectService = load("icons/expui/projectService.svg", -1874664689, 2); /** 16x16 */ public static final @NotNull Icon ProjectState = load("icons/expui/projectState.svg", 329241222, 2); /** 16x16 */ public static final @NotNull Icon RemoteMapping = load("icons/expui/remoteMapping.svg", "icons/remoteMapping.svg", 1371307852, 2); diff --git a/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule.svg b/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule.svg new file mode 100644 index 000000000000..6e82db34dc36 --- /dev/null +++ b/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule_dark.svg b/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule_dark.svg new file mode 100644 index 000000000000..4883bc49502e --- /dev/null +++ b/plugins/devkit/devkit-core/resources/icons/expui/legacyPluginModule_dark.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/plugins/devkit/devkit-core/resources/icons/expui/pluginModule.svg b/plugins/devkit/devkit-core/resources/icons/expui/pluginModule.svg new file mode 100644 index 000000000000..41430190b602 --- /dev/null +++ b/plugins/devkit/devkit-core/resources/icons/expui/pluginModule.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/devkit/devkit-core/resources/icons/expui/pluginModule_dark.svg b/plugins/devkit/devkit-core/resources/icons/expui/pluginModule_dark.svg new file mode 100644 index 000000000000..bbf0ba770ed3 --- /dev/null +++ b/plugins/devkit/devkit-core/resources/icons/expui/pluginModule_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/devkit/devkit-core/resources/icons/expui/pluginV2.svg b/plugins/devkit/devkit-core/resources/icons/expui/pluginV2.svg index ac012415c963..3578b97cd542 100644 --- a/plugins/devkit/devkit-core/resources/icons/expui/pluginV2.svg +++ b/plugins/devkit/devkit-core/resources/icons/expui/pluginV2.svg @@ -1,5 +1,7 @@ - + - - + + + + diff --git a/plugins/devkit/devkit-core/resources/icons/expui/pluginV2_dark.svg b/plugins/devkit/devkit-core/resources/icons/expui/pluginV2_dark.svg index 635532fcfa14..1661e2800606 100644 --- a/plugins/devkit/devkit-core/resources/icons/expui/pluginV2_dark.svg +++ b/plugins/devkit/devkit-core/resources/icons/expui/pluginV2_dark.svg @@ -1,5 +1,7 @@ - + - - + + + + diff --git a/plugins/devkit/intellij.devkit.scaffolding/src/ScaffoldingDirectoryIconProvider.kt b/plugins/devkit/intellij.devkit.scaffolding/src/ScaffoldingDirectoryIconProvider.kt index 2d3b6b5bccc0..3e37c405f2eb 100644 --- a/plugins/devkit/intellij.devkit.scaffolding/src/ScaffoldingDirectoryIconProvider.kt +++ b/plugins/devkit/intellij.devkit.scaffolding/src/ScaffoldingDirectoryIconProvider.kt @@ -7,12 +7,10 @@ import com.intellij.openapi.project.IntelliJProjectUtil import com.intellij.openapi.util.registry.Registry import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement -import com.intellij.ui.LayeredIcon import com.intellij.ui.icons.IconWrapperWithToolTip import org.jetbrains.idea.devkit.DevKitIcons import java.util.function.Supplier import javax.swing.Icon -import javax.swing.SwingConstants internal class ScaffoldingDirectoryIconProvider : IconProvider() { @@ -39,18 +37,10 @@ internal class ScaffoldingDirectoryIconProvider : IconProvider() { private val pluginDirectoryIcon = AllIcons.Nodes.Plugin .withTooltip(messagePointer("plugin.directory.tooltip")) -private val moduleDirectoryIcon = LayeredIcon(2) - .apply { - setIcon(AllIcons.Nodes.Plugin, 0) - setIcon(AllIcons.Nodes.Module8x8, 1, SwingConstants.SOUTH_EAST) - } +private val moduleDirectoryIcon = DevKitIcons.PluginModule .withTooltip(messagePointer("module.directory.tooltip")) -private val legacyPluginWithModuleIcon = LayeredIcon(2) - .apply { - setIcon(AllIcons.Nodes.Plugin, 0) - setIcon(DevKitIcons.LegacyPlugin, 1, SwingConstants.SOUTH_EAST) - } +private val legacyPluginWithModuleIcon = DevKitIcons.LegacyPluginModule .withTooltip(messagePointer("plugin.and.module.directory.tooltip")) private fun Icon.withTooltip(message: Supplier): Icon {