diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt index b9b8cfe01b2e..7e22d738d9d1 100644 --- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt +++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt @@ -190,6 +190,11 @@ class IntellijIconClassGeneratorConfig : IconClasses() { packageName = "com.intellij.java.ultimate.icons", ) + "intellij.uiDesigner" -> IntellijIconClassGeneratorModuleConfig( + className = "UiDesignerIcons", + packageName = "com.intellij.designer", + ) + else -> super.getConfigForModule(moduleName) } } diff --git a/platform/icons/compatibilityResources/ide/runAnything/openRecentProject.svg b/platform/icons/compatibilityResources/ide/runAnything/openRecentProject.svg deleted file mode 100644 index 87e7a16da99d..000000000000 --- a/platform/icons/compatibilityResources/ide/runAnything/openRecentProject.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/platform/icons/compatibilityResources/nodes/cvs_global.svg b/platform/icons/compatibilityResources/nodes/cvs_global.svg deleted file mode 100644 index 91b40ad7dda1..000000000000 --- a/platform/icons/compatibilityResources/nodes/cvs_global.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/platform/icons/compatibilityResources/nodes/cvs_roots.svg b/platform/icons/compatibilityResources/nodes/cvs_roots.svg deleted file mode 100644 index f0cc755432ee..000000000000 --- a/platform/icons/compatibilityResources/nodes/cvs_roots.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/platform/icons/compatibilityResources/nodes/jsf/renderer.svg b/platform/icons/compatibilityResources/nodes/jsf/renderer.svg deleted file mode 100644 index ac8ebf04c174..000000000000 --- a/platform/icons/compatibilityResources/nodes/jsf/renderer.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/platform/icons/compatibilityResources/nodes/pluginLogo.svg b/platform/icons/compatibilityResources/nodes/pluginLogo.svg deleted file mode 100644 index 36ae4075be19..000000000000 --- a/platform/icons/compatibilityResources/nodes/pluginLogo.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/platform/icons/src/ide/runAnything/icon-robots.txt b/platform/icons/src/ide/runAnything/icon-robots.txt deleted file mode 100644 index f6eeafd66916..000000000000 --- a/platform/icons/src/ide/runAnything/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -deprecated: openRecentProject.svg; to be removed without replacement \ No newline at end of file diff --git a/platform/icons/src/nodes/icon-robots.txt b/platform/icons/src/nodes/icon-robots.txt index dc0595fd616d..d87e6e653923 100644 --- a/platform/icons/src/nodes/icon-robots.txt +++ b/platform/icons/src/nodes/icon-robots.txt @@ -1,6 +1,3 @@ deprecated: j2eeParameter.svg; to be removed (Use AllIcons.Nodes.ClassInitializer instead) -deprecated: cvs_global.svg; to be removed without replacement -deprecated: cvs_roots.svg; to be removed without replacement deprecated: inspectionResults.svg; to be removed without replacement -deprecated: pluginLogo.svg; to be removed without replacement deprecated: weblistener.svg; to be removed without replacement \ No newline at end of file diff --git a/platform/icons/src/nodes/jsf/icon-robots.txt b/platform/icons/src/nodes/jsf/icon-robots.txt deleted file mode 100644 index b7defaee3c1a..000000000000 --- a/platform/icons/src/nodes/jsf/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -deprecated: renderer.svg; to be removed (Use AllIcons.Actions.Edit instead) \ No newline at end of file diff --git a/platform/icons/src/toolwindows/icon-robots.txt b/platform/icons/src/toolwindows/icon-robots.txt index af854fef4444..16b6d02ff9b1 100644 --- a/platform/icons/src/toolwindows/icon-robots.txt +++ b/platform/icons/src/toolwindows/icon-robots.txt @@ -1,2 +1 @@ deprecated: toolWindowFavorites.svg; to be removed without replacement -deprecated: toolWindowUIDesigner.svg; to be removed without replacement \ No newline at end of file diff --git a/platform/jewel/ui/api-dump.txt b/platform/jewel/ui/api-dump.txt index 5336784c8442..9cb03daae9a9 100644 --- a/platform/jewel/ui/api-dump.txt +++ b/platform/jewel/ui/api-dump.txt @@ -2997,9 +2997,6 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Ide$RoundShadow - sf:TopLeft:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:TopRight:org.jetbrains.jewel.ui.icon.IntelliJIconKey - ():V -f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Ide$RunAnything -- sf:OpenRecentProject:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- ():V f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Ide$Shadow - sf:Bottom:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:BottomLeft:org.jetbrains.jewel.ui.icon.IntelliJIconKey @@ -3131,8 +3128,6 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Nodes - sf:Controller:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:CopyOfFolder:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:CustomRegion:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- sf:Cvs_global:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- sf:Cvs_roots:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:DataColumn:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:DataSchema:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:DataTables:org.jetbrains.jewel.ui.icon.IntelliJIconKey @@ -3198,7 +3193,6 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Nodes - sf:Parameter:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:Plugin:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:PluginJB:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- sf:PluginLogo:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:PluginRestart:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:Pluginnotinstalled:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:Pluginobsolete:org.jetbrains.jewel.ui.icon.IntelliJIconKey @@ -3262,9 +3256,6 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Nodes - sf:Workspace:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:WriteAccess:org.jetbrains.jewel.ui.icon.IntelliJIconKey - ():V -f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Nodes$Jsf -- sf:Renderer:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- ():V f:org.jetbrains.jewel.ui.icons.AllIconsKeys$ObjectBrowser - sf:AbbreviatePackageNames:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:CompactEmptyPackages:org.jetbrains.jewel.ui.icon.IntelliJIconKey @@ -3573,7 +3564,6 @@ f:org.jetbrains.jewel.ui.icons.AllIconsKeys$Toolwindows - sf:ToolWindowServices:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:ToolWindowStructure:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:ToolWindowTodo:org.jetbrains.jewel.ui.icon.IntelliJIconKey -- sf:ToolWindowUIDesigner:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:ToolWindowVariableView:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:WarningEvents:org.jetbrains.jewel.ui.icon.IntelliJIconKey - sf:WebToolWindow:org.jetbrains.jewel.ui.icon.IntelliJIconKey diff --git a/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java b/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java index 1bb129319944..358810a5ae77 100644 --- a/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java +++ b/platform/jewel/ui/generated/org/jetbrains/jewel/ui/icons/AllIconsKeys.java @@ -773,15 +773,6 @@ public final class AllIconsKeys { /** 18x14 */ public static final @NotNull IntelliJIconKey TopRight = new IntelliJIconKey("ide/roundShadow/topRight.svg", "ide/roundShadow/topRight.svg", AllIconsKeys.class); } - public static final class RunAnything { - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey OpenRecentProject = new IntelliJIconKey("ide/runAnything/openRecentProject.svg", "ide/runAnything/openRecentProject.svg", AllIconsKeys.class); - } - public static final class Shadow { /** 4x14 */ public static final @NotNull IntelliJIconKey Bottom = new IntelliJIconKey("ide/shadow/bottom.svg", "ide/shadow/bottom.svg", AllIconsKeys.class); /** 18x22 */ public static final @NotNull IntelliJIconKey BottomLeft = new IntelliJIconKey("ide/shadow/bottomLeft.svg", "ide/shadow/bottomLeft.svg", AllIconsKeys.class); @@ -964,16 +955,6 @@ public final class AllIconsKeys { /** 16x16 */ public static final @NotNull IntelliJIconKey JarDirectory = new IntelliJIconKey("nodes/jarDirectory.svg", "nodes/jarDirectory.svg", AllIconsKeys.class); /** 16x16 */ public static final @NotNull IntelliJIconKey JavaDocFolder = new IntelliJIconKey("nodes/javaDocFolder.svg", "nodes/javaDocFolder.svg", AllIconsKeys.class); /** 16x16 */ public static final @NotNull IntelliJIconKey JavaModule = new IntelliJIconKey("nodes/javaModule.svg", "expui/nodes/moduleJava.svg", AllIconsKeys.class); - - public static final class Jsf { - - /** @deprecated to be removed (Use AllIcons.Actions.Edit instead) */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey Renderer = new IntelliJIconKey("nodes/jsf/renderer.svg", "nodes/jsf/renderer.svg", AllIconsKeys.class); - } - /** 16x16 */ public static final @NotNull IntelliJIconKey JunitTestMark = new IntelliJIconKey("nodes/junitTestMark.svg", "expui/nodes/junitTestMark.svg", AllIconsKeys.class); /** 16x16 */ public static final @NotNull IntelliJIconKey KeymapAnt = new IntelliJIconKey("nodes/keymapAnt.svg", "expui/nodes/folder.svg", AllIconsKeys.class); /** 16x16 */ public static final @NotNull IntelliJIconKey KeymapEditor = new IntelliJIconKey("nodes/keymapEditor.svg", "expui/nodes/folder.svg", AllIconsKeys.class); @@ -1066,18 +1047,6 @@ public final class AllIconsKeys { /** 16x16 */ public static final @NotNull IntelliJIconKey Workspace = new IntelliJIconKey("expui/nodes/workspace.svg", "expui/nodes/workspace.svg", AllIconsKeys.class); /** 16x16 */ public static final @NotNull IntelliJIconKey WriteAccess = new IntelliJIconKey("nodes/write-access.svg", "expui/actions/showWriteAccess.svg", AllIconsKeys.class); - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey Cvs_global = new IntelliJIconKey("nodes/cvs_global.svg", "nodes/cvs_global.svg", AllIconsKeys.class); - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey Cvs_roots = new IntelliJIconKey("nodes/cvs_roots.svg", "nodes/cvs_roots.svg", AllIconsKeys.class); - /** @deprecated to be removed without replacement */ @SuppressWarnings("unused") @Deprecated @@ -1090,12 +1059,6 @@ public final class AllIconsKeys { @ScheduledForRemoval public static final @NotNull IntelliJIconKey J2eeParameter = new IntelliJIconKey("nodes/j2eeParameter.svg", "nodes/j2eeParameter.svg", AllIconsKeys.class); - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey PluginLogo = new IntelliJIconKey("nodes/pluginLogo.svg", "nodes/pluginLogo.svg", AllIconsKeys.class); - /** @deprecated to be removed without replacement */ @SuppressWarnings("unused") @Deprecated @@ -1439,12 +1402,6 @@ public final class AllIconsKeys { @Deprecated @ScheduledForRemoval public static final @NotNull IntelliJIconKey ToolWindowFavorites = new IntelliJIconKey("toolwindows/toolWindowFavorites.svg", "toolwindows/toolWindowFavorites.svg", AllIconsKeys.class); - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull IntelliJIconKey ToolWindowUIDesigner = new IntelliJIconKey("toolwindows/toolWindowUIDesigner.svg", "toolwindows/toolWindowUIDesigner.svg", AllIconsKeys.class); } public static final class TransferSettings { diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt index 1655d948a846..e0493df2ed45 100644 --- a/platform/util/ui/api-dump.txt +++ b/platform/util/ui/api-dump.txt @@ -739,9 +739,6 @@ f:com.intellij.icons.AllIcons$Ide$RoundShadow - sf:TopLeft:javax.swing.Icon - sf:TopRight:javax.swing.Icon - ():V -f:com.intellij.icons.AllIcons$Ide$RunAnything -- sf:OpenRecentProject:javax.swing.Icon -- ():V f:com.intellij.icons.AllIcons$Ide$Shadow - sf:Bottom:javax.swing.Icon - sf:BottomLeft:javax.swing.Icon @@ -873,8 +870,6 @@ f:com.intellij.icons.AllIcons$Nodes - sf:Controller:javax.swing.Icon - sf:CopyOfFolder:javax.swing.Icon - sf:CustomRegion:javax.swing.Icon -- sf:Cvs_global:javax.swing.Icon -- sf:Cvs_roots:javax.swing.Icon - sf:DataColumn:javax.swing.Icon - sf:DataSchema:javax.swing.Icon - sf:DataTables:javax.swing.Icon @@ -940,7 +935,6 @@ f:com.intellij.icons.AllIcons$Nodes - sf:Parameter:javax.swing.Icon - sf:Plugin:javax.swing.Icon - sf:PluginJB:javax.swing.Icon -- sf:PluginLogo:javax.swing.Icon - sf:PluginRestart:javax.swing.Icon - sf:Pluginnotinstalled:javax.swing.Icon - sf:Pluginobsolete:javax.swing.Icon @@ -1004,9 +998,6 @@ f:com.intellij.icons.AllIcons$Nodes - sf:Workspace:javax.swing.Icon - sf:WriteAccess:javax.swing.Icon - ():V -f:com.intellij.icons.AllIcons$Nodes$Jsf -- sf:Renderer:javax.swing.Icon -- ():V f:com.intellij.icons.AllIcons$ObjectBrowser - sf:AbbreviatePackageNames:javax.swing.Icon - sf:CompactEmptyPackages:javax.swing.Icon @@ -1315,7 +1306,6 @@ f:com.intellij.icons.AllIcons$Toolwindows - sf:ToolWindowServices:javax.swing.Icon - sf:ToolWindowStructure:javax.swing.Icon - sf:ToolWindowTodo:javax.swing.Icon -- sf:ToolWindowUIDesigner:javax.swing.Icon - sf:ToolWindowVariableView:javax.swing.Icon - sf:WarningEvents:javax.swing.Icon - sf:WebToolWindow:javax.swing.Icon diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java index 1e559fabcaca..a843147d03b3 100644 --- a/platform/util/ui/src/com/intellij/icons/AllIcons.java +++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java @@ -780,15 +780,6 @@ public class AllIcons { /** 18x14 */ public static final @NotNull Icon TopRight = load("ide/roundShadow/topRight.svg", 2056222615, 0); } - public static final class RunAnything { - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon OpenRecentProject = load("ide/runAnything/openRecentProject.svg", 0, 0); - } - public static final class Shadow { /** 4x14 */ public static final @NotNull Icon Bottom = load("ide/shadow/bottom.svg", 840768513, 0); /** 18x22 */ public static final @NotNull Icon BottomLeft = load("ide/shadow/bottomLeft.svg", -1321651824, 0); @@ -971,16 +962,6 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon JarDirectory = load("nodes/jarDirectory.svg", -692661187, 0); /** 16x16 */ public static final @NotNull Icon JavaDocFolder = load("nodes/javaDocFolder.svg", 135532303, 0); /** 16x16 */ public static final @NotNull Icon JavaModule = load("expui/nodes/moduleJava.svg", "nodes/javaModule.svg", 2003423238, 0); - - public static final class Jsf { - - /** @deprecated to be removed (Use AllIcons.Actions.Edit instead) */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon Renderer = load("nodes/jsf/renderer.svg", 0, 0); - } - /** 16x16 */ public static final @NotNull Icon JunitTestMark = load("expui/nodes/junitTestMark.svg", "nodes/junitTestMark.svg", -1344036663, 0); /** 16x16 */ public static final @NotNull Icon KeymapAnt = load("expui/nodes/folder.svg", "nodes/keymapAnt.svg", 1301975081, 0); /** 16x16 */ public static final @NotNull Icon KeymapEditor = load("expui/nodes/folder.svg", "nodes/keymapEditor.svg", 1477064864, 0); @@ -1073,18 +1054,6 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon Workspace = load("expui/nodes/workspace.svg", -251479768, 2); /** 16x16 */ public static final @NotNull Icon WriteAccess = load("expui/actions/showWriteAccess.svg", "nodes/write-access.svg", 735088822, 0); - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon Cvs_global = load("nodes/cvs_global.svg", 0, 0); - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon Cvs_roots = load("nodes/cvs_roots.svg", 0, 0); - /** @deprecated to be removed without replacement */ @SuppressWarnings("unused") @Deprecated @@ -1097,12 +1066,6 @@ public class AllIcons { @ScheduledForRemoval public static final @NotNull Icon J2eeParameter = load("nodes/j2eeParameter.svg", 0, 0); - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon PluginLogo = load("nodes/pluginLogo.svg", 0, 0); - /** @deprecated to be removed without replacement */ @SuppressWarnings("unused") @Deprecated @@ -1446,12 +1409,6 @@ public class AllIcons { @Deprecated @ScheduledForRemoval public static final @NotNull Icon ToolWindowFavorites = load("toolwindows/toolWindowFavorites.svg", 0, 0); - - /** @deprecated to be removed without replacement */ - @SuppressWarnings("unused") - @Deprecated - @ScheduledForRemoval - public static final @NotNull Icon ToolWindowUIDesigner = load("toolwindows/toolWindowUIDesigner.svg", 0, 0); } public static final class TransferSettings { diff --git a/plugins/ui-designer-core/BUILD.bazel b/plugins/ui-designer-core/BUILD.bazel index f9319249bbc8..97dfb7a706f5 100644 --- a/plugins/ui-designer-core/BUILD.bazel +++ b/plugins/ui-designer-core/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( name = "uiDesigner", module_name = "intellij.uiDesigner", visibility = ["//visibility:public"], - srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True), deps = [ "//platform/analysis-api:analysis", "//platform/core-api:core", diff --git a/plugins/ui-designer-core/gen/com/intellij/designer/UiDesignerIcons.java b/plugins/ui-designer-core/gen/com/intellij/designer/UiDesignerIcons.java new file mode 100644 index 000000000000..f8fc9158ba4f --- /dev/null +++ b/plugins/ui-designer-core/gen/com/intellij/designer/UiDesignerIcons.java @@ -0,0 +1,18 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.designer; + +import com.intellij.ui.IconManager; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +/** + * NOTE THIS FILE IS AUTO-GENERATED + * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead + */ +public final class UiDesignerIcons { + private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { + return IconManager.getInstance().loadRasterizedIcon(path, UiDesignerIcons.class.getClassLoader(), cacheKey, flags); + } + /** 13x13 */ public static final @NotNull Icon ToolWindowUIDesigner = load("com/intellij/designer/toolWindowUIDesigner.svg", 769014876, 2); +} diff --git a/plugins/ui-designer-core/intellij.uiDesigner.iml b/plugins/ui-designer-core/intellij.uiDesigner.iml index 4ced2dda67ce..e11af13b7ebc 100644 --- a/plugins/ui-designer-core/intellij.uiDesigner.iml +++ b/plugins/ui-designer-core/intellij.uiDesigner.iml @@ -5,6 +5,7 @@ + diff --git a/platform/icons/compatibilityResources/toolwindows/toolWindowUIDesigner.svg b/plugins/ui-designer-core/resources/com/intellij/designer/toolWindowUIDesigner.svg similarity index 100% rename from platform/icons/compatibilityResources/toolwindows/toolWindowUIDesigner.svg rename to plugins/ui-designer-core/resources/com/intellij/designer/toolWindowUIDesigner.svg diff --git a/platform/icons/compatibilityResources/toolwindows/toolWindowUIDesigner_dark.svg b/plugins/ui-designer-core/resources/com/intellij/designer/toolWindowUIDesigner_dark.svg similarity index 100% rename from platform/icons/compatibilityResources/toolwindows/toolWindowUIDesigner_dark.svg rename to plugins/ui-designer-core/resources/com/intellij/designer/toolWindowUIDesigner_dark.svg diff --git a/plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java index 5c578b2ddef5..336b74d1a5a2 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java @@ -58,7 +58,7 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager { myToolWindow = ToolWindowManager.getInstance(myProject).registerToolWindow(DesignerBundle.message("designer.toolwindow.name"), false, getAnchor(), myProject, true); - myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowUIDesigner); + myToolWindow.setIcon(UiDesignerIcons.ToolWindowUIDesigner); if (!ApplicationManager.getApplication().isHeadlessEnvironment()) { myToolWindow.getComponent().putClientProperty(ToolWindowContentUi.HIDE_ID_LABEL, "true"); @@ -116,7 +116,7 @@ public final class DesignerToolWindowManager extends AbstractToolWindowManager { return createContent(designer, toolWindowContent, DesignerBundle.message("designer.toolwindow.title"), - AllIcons.Toolwindows.ToolWindowUIDesigner, + UiDesignerIcons.ToolWindowUIDesigner, toolWindowContent.getToolWindowPanel(), toolWindowContent.getComponentTree(), 320, diff --git a/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner.svg b/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner.svg new file mode 100644 index 000000000000..5b9d45256b0e --- /dev/null +++ b/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner_dark.svg b/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner_dark.svg new file mode 100644 index 000000000000..de4f82f8052b --- /dev/null +++ b/plugins/ui-designer/resources/com/intellij/uiDesigner/icons/toolWindowUIDesigner_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindowManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindowManager.java index 37c22aee4ee9..90e62fc7b3cc 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindowManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindowManager.java @@ -16,6 +16,7 @@ import com.intellij.ui.content.ContentManager; import com.intellij.uiDesigner.AbstractToolWindowManager; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.designSurface.GuiEditor; +import icons.UIDesignerIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,7 +56,7 @@ public class DesignerToolWindowManager extends AbstractToolWindowManager impleme myToolWindow = ToolWindowManager.getInstance(myProject).registerToolWindow(UIDesignerBundle.message("toolwindow.ui.designer.name"), false, getAnchor(), this, true); - myToolWindow.setIcon(AllIcons.Toolwindows.ToolWindowUIDesigner); + myToolWindow.setIcon(UIDesignerIcons.ToolWindowUIDesigner); if (!ApplicationManager.getApplication().isHeadlessEnvironment()) { myToolWindow.getComponent().putClientProperty(ToolWindowContentUi.HIDE_ID_LABEL, "true"); @@ -99,7 +100,7 @@ public class DesignerToolWindowManager extends AbstractToolWindowManager impleme return createContent(designer, toolWindowContent, UIDesignerBundle.message("toolwindow.ui.designer.title"), - AllIcons.Toolwindows.ToolWindowUIDesigner, + UIDesignerIcons.ToolWindowUIDesigner, toolWindowContent.getToolWindowPanel(), toolWindowContent.getComponentTree(), 320, diff --git a/plugins/ui-designer/src/icons/UIDesignerIcons.java b/plugins/ui-designer/src/icons/UIDesignerIcons.java index b7d882a08ecd..837707557e24 100644 --- a/plugins/ui-designer/src/icons/UIDesignerIcons.java +++ b/plugins/ui-designer/src/icons/UIDesignerIcons.java @@ -76,6 +76,7 @@ public final class UIDesignerIcons { /** 16x16 */ public static final @NotNull Icon Toolbar = load("com/intellij/uiDesigner/icons/toolbar.svg", -410578243, 0); @SuppressWarnings("unused") /** 16x16 */ public static final @NotNull Icon ToolbarSeparator = load("com/intellij/uiDesigner/icons/toolbarSeparator.svg", 357181327, 0); + /** 13x13 */ public static final @NotNull Icon ToolWindowUIDesigner = load("com/intellij/uiDesigner/icons/toolWindowUIDesigner.svg", 769014876, 2); @SuppressWarnings("unused") /** 16x16 */ public static final @NotNull Icon Tree = load("com/intellij/uiDesigner/icons/tree.svg", 631289274, 0); /** 16x16 */ public static final @NotNull Icon Unknown = load("com/intellij/uiDesigner/icons/unknown.svg", 2093308831, 0);