From d57f3c8122fffa183eda0b513afdb31c7a8c47d7 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Fri, 3 Jan 2025 15:55:41 +0100 Subject: [PATCH] [icons] Reuse platform icons where possible GitOrigin-RevId: 0e074c99da276742e7b2e11107e7095d7d6f771c --- platform/icons/src/PlatformIconMappings.json | 5 ++++- platform/icons/src/expui/nodes/constructor.svg | 7 +++++++ platform/icons/src/expui/nodes/constructor_dark.svg | 7 +++++++ platform/icons/src/expui/toolwindows/dataflow.svg | 4 ++++ platform/icons/src/expui/toolwindows/dataflow@20x20.svg | 4 ++++ .../icons/src/expui/toolwindows/dataflow@20x20_dark.svg | 4 ++++ platform/icons/src/expui/toolwindows/dataflow_dark.svg | 4 ++++ platform/icons/src/expui/toolwindows/webServer.svg | 6 ++++++ platform/icons/src/expui/toolwindows/webServer@20x20.svg | 6 ++++++ .../icons/src/expui/toolwindows/webServer@20x20_dark.svg | 6 ++++++ platform/icons/src/expui/toolwindows/webServer_dark.svg | 6 ++++++ platform/icons/src/nodes/constructor.svg | 7 +++++++ platform/icons/src/toolwindows/toolWindowServer.svg | 5 +++++ platform/icons/src/toolwindows/toolWindowServer_dark.svg | 5 +++++ platform/remote-servers/impl/api-dump.txt | 1 - .../impl/resources/icons/serversToolWindow.svg | 8 -------- .../impl/resources/icons/serversToolWindow_dark.svg | 8 -------- .../remote-servers/impl/src/icons/RemoteServersIcons.java | 1 - platform/util/ui/api-dump.txt | 2 ++ platform/util/ui/src/com/intellij/icons/AllIcons.java | 4 +++- 20 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 platform/icons/src/expui/nodes/constructor.svg create mode 100644 platform/icons/src/expui/nodes/constructor_dark.svg create mode 100644 platform/icons/src/expui/toolwindows/dataflow.svg create mode 100644 platform/icons/src/expui/toolwindows/dataflow@20x20.svg create mode 100644 platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg create mode 100644 platform/icons/src/expui/toolwindows/dataflow_dark.svg create mode 100644 platform/icons/src/expui/toolwindows/webServer.svg create mode 100644 platform/icons/src/expui/toolwindows/webServer@20x20.svg create mode 100644 platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg create mode 100644 platform/icons/src/expui/toolwindows/webServer_dark.svg create mode 100644 platform/icons/src/nodes/constructor.svg create mode 100644 platform/icons/src/toolwindows/toolWindowServer.svg create mode 100644 platform/icons/src/toolwindows/toolWindowServer_dark.svg delete mode 100644 platform/remote-servers/impl/resources/icons/serversToolWindow.svg delete mode 100644 platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg diff --git a/platform/icons/src/PlatformIconMappings.json b/platform/icons/src/PlatformIconMappings.json index 23b59bf521ca..a45fb3d5281f 100644 --- a/platform/icons/src/PlatformIconMappings.json +++ b/platform/icons/src/PlatformIconMappings.json @@ -650,6 +650,7 @@ "classAnonymous.svg": "nodes/anonymousClass.svg", "classInitializer.svg": "nodes/classInitializer.svg", "constant.svg": "nodes/constant.svg", + "constructor.svg": "nodes/constructor.svg", "controller.svg": "nodes/controller.svg", "copyOfFolder.svg": ["nodes/copyOfFolder.svg", "vcs/folders.svg"], "dataColumn.svg": "nodes/dataColumn.svg", @@ -923,6 +924,7 @@ "build.svg": "toolwindows/toolWindowBuild.svg", "commit.svg": "toolwindows/toolWindowCommit.svg", "coverage.svg": "toolwindows/toolWindowCoverage.svg", + "dataflow.svg": "toolwindows/toolWindowAnalyzeDataflow.svg", "debug.svg": "toolwindows/toolWindowDebugger.svg", "documentation.svg": "toolwindows/documentation.svg", "find.svg": "toolwindows/toolWindowFind.svg", @@ -951,7 +953,8 @@ "web.svg": [ "toolwindows/webToolWindow.svg", "general/web.svg" - ] + ], + "webServer.svg": "toolwindows/toolWindowServer.svg" }, "vcs": { "arrowLeft.svg": "vcs/arrow_left.svg", diff --git a/platform/icons/src/expui/nodes/constructor.svg b/platform/icons/src/expui/nodes/constructor.svg new file mode 100644 index 000000000000..96b6cc25149d --- /dev/null +++ b/platform/icons/src/expui/nodes/constructor.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/expui/nodes/constructor_dark.svg b/platform/icons/src/expui/nodes/constructor_dark.svg new file mode 100644 index 000000000000..25a47e1dd91d --- /dev/null +++ b/platform/icons/src/expui/nodes/constructor_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/expui/toolwindows/dataflow.svg b/platform/icons/src/expui/toolwindows/dataflow.svg new file mode 100644 index 000000000000..9f48d8b1e439 --- /dev/null +++ b/platform/icons/src/expui/toolwindows/dataflow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/platform/icons/src/expui/toolwindows/dataflow@20x20.svg b/platform/icons/src/expui/toolwindows/dataflow@20x20.svg new file mode 100644 index 000000000000..78e10dc00dd9 --- /dev/null +++ b/platform/icons/src/expui/toolwindows/dataflow@20x20.svg @@ -0,0 +1,4 @@ + + + + diff --git a/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg b/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg new file mode 100644 index 000000000000..627b3e02f045 --- /dev/null +++ b/platform/icons/src/expui/toolwindows/dataflow@20x20_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/platform/icons/src/expui/toolwindows/dataflow_dark.svg b/platform/icons/src/expui/toolwindows/dataflow_dark.svg new file mode 100644 index 000000000000..aecd83789d5f --- /dev/null +++ b/platform/icons/src/expui/toolwindows/dataflow_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/platform/icons/src/expui/toolwindows/webServer.svg b/platform/icons/src/expui/toolwindows/webServer.svg new file mode 100644 index 000000000000..f4d860871ff7 --- /dev/null +++ b/platform/icons/src/expui/toolwindows/webServer.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/expui/toolwindows/webServer@20x20.svg b/platform/icons/src/expui/toolwindows/webServer@20x20.svg new file mode 100644 index 000000000000..67a09d2e825a --- /dev/null +++ b/platform/icons/src/expui/toolwindows/webServer@20x20.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg b/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg new file mode 100644 index 000000000000..d5dff96be166 --- /dev/null +++ b/platform/icons/src/expui/toolwindows/webServer@20x20_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/expui/toolwindows/webServer_dark.svg b/platform/icons/src/expui/toolwindows/webServer_dark.svg new file mode 100644 index 000000000000..300b6d48313a --- /dev/null +++ b/platform/icons/src/expui/toolwindows/webServer_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/nodes/constructor.svg b/platform/icons/src/nodes/constructor.svg new file mode 100644 index 000000000000..acb5b4c59468 --- /dev/null +++ b/platform/icons/src/nodes/constructor.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/toolwindows/toolWindowServer.svg b/platform/icons/src/toolwindows/toolWindowServer.svg new file mode 100644 index 000000000000..a11e73130359 --- /dev/null +++ b/platform/icons/src/toolwindows/toolWindowServer.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/platform/icons/src/toolwindows/toolWindowServer_dark.svg b/platform/icons/src/toolwindows/toolWindowServer_dark.svg new file mode 100644 index 000000000000..90654c4c7262 --- /dev/null +++ b/platform/icons/src/toolwindows/toolWindowServer_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/platform/remote-servers/impl/api-dump.txt b/platform/remote-servers/impl/api-dump.txt index 01c0750dd4ad..1a14048ecaa5 100644 --- a/platform/remote-servers/impl/api-dump.txt +++ b/platform/remote-servers/impl/api-dump.txt @@ -1,5 +1,4 @@ f:icons.RemoteServersIcons - sf:ResumeScaled:javax.swing.Icon -- sf:ServersToolWindow:javax.swing.Icon - sf:SuspendScaled:javax.swing.Icon - ():V diff --git a/platform/remote-servers/impl/resources/icons/serversToolWindow.svg b/platform/remote-servers/impl/resources/icons/serversToolWindow.svg deleted file mode 100644 index 9ab8ade39cf0..000000000000 --- a/platform/remote-servers/impl/resources/icons/serversToolWindow.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg b/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg deleted file mode 100644 index 468b87df9f16..000000000000 --- a/platform/remote-servers/impl/resources/icons/serversToolWindow_dark.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java index 6e859de0017c..9e3fd0c15385 100644 --- a/platform/remote-servers/impl/src/icons/RemoteServersIcons.java +++ b/platform/remote-servers/impl/src/icons/RemoteServersIcons.java @@ -15,6 +15,5 @@ public final class RemoteServersIcons { return IconManager.getInstance().loadRasterizedIcon(path, RemoteServersIcons.class.getClassLoader(), cacheKey, flags); } /** 16x16 */ public static final @NotNull Icon ResumeScaled = load("icons/resumeScaled.svg", -397781337, 0); - /** 13x13 */ public static final @NotNull Icon ServersToolWindow = load("icons/serversToolWindow.svg", -310128575, 2); /** 16x16 */ public static final @NotNull Icon SuspendScaled = load("icons/suspendScaled.svg", 1727665128, 0); } diff --git a/platform/util/ui/api-dump.txt b/platform/util/ui/api-dump.txt index 64b30d2fcda6..9f3714355746 100644 --- a/platform/util/ui/api-dump.txt +++ b/platform/util/ui/api-dump.txt @@ -855,6 +855,7 @@ f:com.intellij.icons.AllIcons$Nodes - sf:ConfigFolder:javax.swing.Icon - sf:Console:javax.swing.Icon - sf:Constant:javax.swing.Icon +- sf:Constructor:javax.swing.Icon - sf:Controller:javax.swing.Icon - sf:CopyOfFolder:javax.swing.Icon - sf:CustomRegion:javax.swing.Icon @@ -1276,6 +1277,7 @@ f:com.intellij.icons.AllIcons$Toolwindows - sf:ToolWindowProject:javax.swing.Icon - sf:ToolWindowRun:javax.swing.Icon - sf:ToolWindowRunWithCoverage:javax.swing.Icon +- sf:ToolWindowServer:javax.swing.Icon - sf:ToolWindowServices:javax.swing.Icon - sf:ToolWindowStructure:javax.swing.Icon - sf:ToolWindowTodo: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 d30a401f2d49..ed4aeab9a4e2 100644 --- a/platform/util/ui/src/com/intellij/icons/AllIcons.java +++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java @@ -920,6 +920,7 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon ConfigFolder = load("expui/build/taskGroup.svg", "nodes/configFolder.svg", -1322890185, 0); /** 16x16 */ public static final @NotNull Icon Console = load("expui/fileTypes/shell.svg", "nodes/console.svg", 1497553448, 0); /** 16x16 */ public static final @NotNull Icon Constant = load("expui/nodes/constant.svg", "nodes/constant.svg", -1342227936, 0); + /** 16x16 */ public static final @NotNull Icon Constructor = load("expui/nodes/constructor.svg", "nodes/constructor.svg", 1815954927, 0); /** 16x16 */ public static final @NotNull Icon Controller = load("expui/nodes/controller.svg", "nodes/controller.svg", 1122138685, 0); /** 16x16 */ public static final @NotNull Icon CopyOfFolder = load("expui/nodes/copyOfFolder.svg", "nodes/copyOfFolder.svg", 992788029, 0); /** 16x16 */ public static final @NotNull Icon CustomRegion = load("nodes/customRegion.svg", 254535518, 0); @@ -1361,7 +1362,7 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon Repositories = load("expui/toolwindows/repositories.svg", 974555029, 2); /** 13x13 */ public static final @NotNull Icon SettingSync = load("expui/toolwindows/settingSync.svg", "toolwindows/settingSync.svg", -1037362170, 2); /** 16x16 */ public static final @NotNull Icon Task = load("expui/toolwindows/task.svg", -1024942290, 2); - /** 13x13 */ public static final @NotNull Icon ToolWindowAnalyzeDataflow = load("toolwindows/toolWindowAnalyzeDataflow.svg", -1971803045, 2); + /** 13x13 */ public static final @NotNull Icon ToolWindowAnalyzeDataflow = load("expui/toolwindows/dataflow.svg", "toolwindows/toolWindowAnalyzeDataflow.svg", -1971803045, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowAnt = load("expui/toolwindows/ant.svg", "toolwindows/toolWindowAnt.svg", -835486132, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowBookmarks = load("expui/toolwindows/bookmarks.svg", "toolwindows/toolWindowBookmarks.svg", 1090576904, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowBuild = load("expui/toolwindows/build.svg", "toolwindows/toolWindowBuild.svg", -477872521, 2); @@ -1388,6 +1389,7 @@ public class AllIcons { /** 13x13 */ public static final @NotNull Icon ToolWindowProject = load("expui/toolwindows/project.svg", "toolwindows/toolWindowProject.svg", 373456992, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowRun = load("expui/toolwindows/run.svg", "toolwindows/toolWindowRun.svg", 562367487, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowRunWithCoverage = load("expui/toolwindows/toolWindowRunWithCoverage.svg", "toolwindows/toolWindowRunWithCoverage.svg", -2005199929, 2); + /** 13x13 */ public static final @NotNull Icon ToolWindowServer = load("expui/toolwindows/webServer.svg", "toolwindows/toolWindowServer.svg", 79377911, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowServices = load("expui/toolwindows/services.svg", "toolwindows/toolWindowServices.svg", 116892796, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowStructure = load("expui/toolwindows/structure.svg", "toolwindows/toolWindowStructure.svg", -1465620418, 2); /** 13x13 */ public static final @NotNull Icon ToolWindowTodo = load("expui/toolwindows/todo.svg", "toolwindows/toolWindowTodo.svg", -2027082181, 2);