diff --git a/images/resources/ImagesIconMappings.json b/images/resources/ImagesIconMappings.json index e50e93c1a79e..e45a1a9d34e0 100644 --- a/images/resources/ImagesIconMappings.json +++ b/images/resources/ImagesIconMappings.json @@ -4,7 +4,6 @@ "images": { "icons": { "expui": { - "image.svg": "org/intellij/images/icons/ImagesFileType.svg", "chessboard.svg": "org/intellij/images/icons/ToggleTransparencyChessboard.svg" } } diff --git a/images/src/org/intellij/images/ImagesIcons.java b/images/src/org/intellij/images/ImagesIcons.java index ed081623f6a7..ef9598ccdc32 100644 --- a/images/src/org/intellij/images/ImagesIcons.java +++ b/images/src/org/intellij/images/ImagesIcons.java @@ -14,7 +14,6 @@ public final class ImagesIcons { private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { return IconManager.getInstance().loadRasterizedIcon(path, ImagesIcons.class.getClassLoader(), cacheKey, flags); } - /** 16x16 */ public static final @NotNull Icon ImagesFileType = load("org/intellij/images/icons/ImagesFileType.svg", -522473644, 0); /** 75x86 */ public static final @NotNull Icon ThumbnailBlank = load("org/intellij/images/icons/ThumbnailBlank.png", 0, 2); /** 75x82 */ public static final @NotNull Icon ThumbnailDirectory = load("org/intellij/images/icons/ThumbnailDirectory.png", 0, 0); /** 13x13 */ public static final @NotNull Icon ThumbnailToolWindow = load("org/intellij/images/icons/ThumbnailToolWindow.svg", -1802959248, 2); diff --git a/images/src/org/intellij/images/fileTypes/impl/ImageFileType.java b/images/src/org/intellij/images/fileTypes/impl/ImageFileType.java index d11ffb1ac771..c4422e53a488 100644 --- a/images/src/org/intellij/images/fileTypes/impl/ImageFileType.java +++ b/images/src/org/intellij/images/fileTypes/impl/ImageFileType.java @@ -1,9 +1,9 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.intellij.images.fileTypes.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.fileTypes.UserBinaryFileType; import org.intellij.images.ImagesBundle; -import org.intellij.images.ImagesIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -35,6 +35,6 @@ public final class ImageFileType extends UserBinaryFileType { @Override public Icon getIcon() { - return ImagesIcons.ImagesFileType; + return AllIcons.FileTypes.Image; } } diff --git a/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java b/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java index c19368b4d79f..24b8344cfba8 100644 --- a/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java +++ b/images/src/org/intellij/images/fileTypes/impl/SvgFileType.java @@ -1,10 +1,10 @@ // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.intellij.images.fileTypes.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.highlighter.XmlLikeFileType; import com.intellij.openapi.fileTypes.UIBasedFileType; -import org.intellij.images.ImagesIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -46,6 +46,6 @@ public final class SvgFileType extends XmlLikeFileType implements UIBasedFileTyp @Override public Icon getIcon() { - return ImagesIcons.ImagesFileType; + return AllIcons.FileTypes.Image; } } diff --git a/platform/icons/src/PlatformIconMappings.json b/platform/icons/src/PlatformIconMappings.json index c7cadf45b116..9bfd39479cf6 100644 --- a/platform/icons/src/PlatformIconMappings.json +++ b/platform/icons/src/PlatformIconMappings.json @@ -181,6 +181,7 @@ "fileTypes/custom.svg", "fileTypes/text.svg" ], + "image.svg": "fileTypes/image.svg", "unknown.svg": "fileTypes/unknown.svg", "velocity.svg": "icons/velocity.svg", "vueJs.svg": "icons/vue.svg", diff --git a/images/resources/org/intellij/images/icons/expui/image.svg b/platform/icons/src/expui/fileTypes/image.svg similarity index 86% rename from images/resources/org/intellij/images/icons/expui/image.svg rename to platform/icons/src/expui/fileTypes/image.svg index d26fb11993da..9a09720fae95 100644 --- a/images/resources/org/intellij/images/icons/expui/image.svg +++ b/platform/icons/src/expui/fileTypes/image.svg @@ -1,4 +1,4 @@ - + diff --git a/images/resources/org/intellij/images/icons/expui/image_dark.svg b/platform/icons/src/expui/fileTypes/image_dark.svg similarity index 86% rename from images/resources/org/intellij/images/icons/expui/image_dark.svg rename to platform/icons/src/expui/fileTypes/image_dark.svg index 08c547ce597d..4f189a0e32c8 100644 --- a/images/resources/org/intellij/images/icons/expui/image_dark.svg +++ b/platform/icons/src/expui/fileTypes/image_dark.svg @@ -1,4 +1,4 @@ - + diff --git a/images/resources/org/intellij/images/icons/ImagesFileType.svg b/platform/icons/src/fileTypes/image.svg similarity index 100% rename from images/resources/org/intellij/images/icons/ImagesFileType.svg rename to platform/icons/src/fileTypes/image.svg diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java index b1274d05b1d3..dfe9e3025c4c 100644 --- a/platform/util/ui/src/com/intellij/icons/AllIcons.java +++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java @@ -399,6 +399,7 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon Htaccess = load("fileTypes/htaccess.svg", -2088610418, 0); /** 16x16 */ public static final @NotNull Icon Html = load("fileTypes/html.svg", -1577865559, 0); /** 16x16 */ public static final @NotNull Icon Idl = load("fileTypes/idl.svg", -219435872, 0); + /** 16x16 */ public static final @NotNull Icon Image = load("fileTypes/image.svg", -1773595662, 0); /** 16x16 */ public static final @NotNull Icon Java = load("fileTypes/java.svg", 1910963991, 0); /** 16x16 */ public static final @NotNull Icon JavaClass = load("fileTypes/javaClass.svg", 1466981955, 0); /** 16x16 */ public static final @NotNull Icon JavaOutsideSource = load("fileTypes/javaOutsideSource.svg", -223692720, 0); diff --git a/platform/util/ui/src/com/intellij/icons/ExpUiIcons.java b/platform/util/ui/src/com/intellij/icons/ExpUiIcons.java index 85da91f7dbe8..a107f580843a 100644 --- a/platform/util/ui/src/com/intellij/icons/ExpUiIcons.java +++ b/platform/util/ui/src/com/intellij/icons/ExpUiIcons.java @@ -173,6 +173,7 @@ public final class ExpUiIcons { /** 16x16 */ public static final @NotNull Icon IdeaModule = load("expui/fileTypes/ideaModule.svg", 1417127557, 2); /** 16x16 */ public static final @NotNull Icon Idl = load("expui/fileTypes/idl.svg", -1553952385, 2); /** 16x16 */ public static final @NotNull Icon Ignored = load("expui/fileTypes/ignored.svg", -676991736, 2); + /** 16x16 */ public static final @NotNull Icon Image = load("expui/fileTypes/image.svg", -1705666596, 2); /** 16x16 */ public static final @NotNull Icon Java = load("expui/fileTypes/java.svg", 1155678562, 2); /** 16x16 */ public static final @NotNull Icon JavaScript = load("expui/fileTypes/javaScript.svg", 390154029, 2); /** 16x16 */ public static final @NotNull Icon Jest = load("expui/fileTypes/jest.svg", -2044269766, 0);