diff --git a/platform/icons/src/modules/annotation.png b/platform/icons/compatibilityResources/modules/annotation.png similarity index 100% rename from platform/icons/src/modules/annotation.png rename to platform/icons/compatibilityResources/modules/annotation.png diff --git a/platform/icons/src/modules/annotation@2x.png b/platform/icons/compatibilityResources/modules/annotation@2x.png similarity index 100% rename from platform/icons/src/modules/annotation@2x.png rename to platform/icons/compatibilityResources/modules/annotation@2x.png diff --git a/platform/icons/src/modules/annotation@2x_dark.png b/platform/icons/compatibilityResources/modules/annotation@2x_dark.png similarity index 100% rename from platform/icons/src/modules/annotation@2x_dark.png rename to platform/icons/compatibilityResources/modules/annotation@2x_dark.png diff --git a/platform/icons/src/modules/annotation_dark.png b/platform/icons/compatibilityResources/modules/annotation_dark.png similarity index 100% rename from platform/icons/src/modules/annotation_dark.png rename to platform/icons/compatibilityResources/modules/annotation_dark.png diff --git a/platform/icons/src/modules/split.png b/platform/icons/compatibilityResources/modules/split.png similarity index 100% rename from platform/icons/src/modules/split.png rename to platform/icons/compatibilityResources/modules/split.png diff --git a/platform/icons/src/modules/split@2x.png b/platform/icons/compatibilityResources/modules/split@2x.png similarity index 100% rename from platform/icons/src/modules/split@2x.png rename to platform/icons/compatibilityResources/modules/split@2x.png diff --git a/platform/icons/src/modules/split@2x_dark.png b/platform/icons/compatibilityResources/modules/split@2x_dark.png similarity index 100% rename from platform/icons/src/modules/split@2x_dark.png rename to platform/icons/compatibilityResources/modules/split@2x_dark.png diff --git a/platform/icons/src/modules/split_dark.png b/platform/icons/compatibilityResources/modules/split_dark.png similarity index 100% rename from platform/icons/src/modules/split_dark.png rename to platform/icons/compatibilityResources/modules/split_dark.png diff --git a/platform/icons/src/modules/types/userDefined.png b/platform/icons/compatibilityResources/modules/types/userDefined.png similarity index 100% rename from platform/icons/src/modules/types/userDefined.png rename to platform/icons/compatibilityResources/modules/types/userDefined.png diff --git a/platform/icons/src/modules/types/userDefined@2x.png b/platform/icons/compatibilityResources/modules/types/userDefined@2x.png similarity index 100% rename from platform/icons/src/modules/types/userDefined@2x.png rename to platform/icons/compatibilityResources/modules/types/userDefined@2x.png diff --git a/platform/icons/src/modules/unloadedModule.png b/platform/icons/compatibilityResources/modules/unloadedModule.png similarity index 100% rename from platform/icons/src/modules/unloadedModule.png rename to platform/icons/compatibilityResources/modules/unloadedModule.png diff --git a/platform/icons/src/modules/unloadedModule@2x.png b/platform/icons/compatibilityResources/modules/unloadedModule@2x.png similarity index 100% rename from platform/icons/src/modules/unloadedModule@2x.png rename to platform/icons/compatibilityResources/modules/unloadedModule@2x.png diff --git a/platform/icons/src/toolbar/unknown.png b/platform/icons/compatibilityResources/toolbar/unknown.png similarity index 100% rename from platform/icons/src/toolbar/unknown.png rename to platform/icons/compatibilityResources/toolbar/unknown.png diff --git a/platform/icons/src/toolbar/unknown@2x.png b/platform/icons/compatibilityResources/toolbar/unknown@2x.png similarity index 100% rename from platform/icons/src/toolbar/unknown@2x.png rename to platform/icons/compatibilityResources/toolbar/unknown@2x.png diff --git a/platform/icons/src/modules/annotation.svg b/platform/icons/src/modules/annotation.svg new file mode 100644 index 000000000000..a5e39affacb4 --- /dev/null +++ b/platform/icons/src/modules/annotation.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/modules/editFolder.svg b/platform/icons/src/modules/editFolder.svg index 5fd1786d65a4..1754ac1fbae7 100644 --- a/platform/icons/src/modules/editFolder.svg +++ b/platform/icons/src/modules/editFolder.svg @@ -1,18 +1,9 @@ - - editFolder - - - + + + + + - - - - - - - - - - + diff --git a/platform/icons/src/modules/excludeRoot.svg b/platform/icons/src/modules/excludeRoot.svg index d766f2e16501..fd99aa021d77 100644 --- a/platform/icons/src/modules/excludeRoot.svg +++ b/platform/icons/src/modules/excludeRoot.svg @@ -1,6 +1,3 @@ - - excludeRoot - - - + + diff --git a/platform/icons/src/modules/excludedGeneratedRoot.svg b/platform/icons/src/modules/excludedGeneratedRoot.svg index 1b6e6d7d31ca..cc67f7c1a78f 100644 --- a/platform/icons/src/modules/excludedGeneratedRoot.svg +++ b/platform/icons/src/modules/excludedGeneratedRoot.svg @@ -1,11 +1,8 @@ - - excludedGeneratedRoot - - - - - - - + + + + + + diff --git a/platform/icons/src/modules/generatedSourceRoot.svg b/platform/icons/src/modules/generatedSourceRoot.svg index a501b599d76b..3557936d9e7f 100644 --- a/platform/icons/src/modules/generatedSourceRoot.svg +++ b/platform/icons/src/modules/generatedSourceRoot.svg @@ -1,11 +1,8 @@ - - generatedSourceRoot - - - - - - - + + + + + + diff --git a/platform/icons/src/modules/output.svg b/platform/icons/src/modules/output.svg index 1b87600e39f6..67859b423c77 100644 --- a/platform/icons/src/modules/output.svg +++ b/platform/icons/src/modules/output.svg @@ -1,13 +1,8 @@ - - output - - - - - - - - - + + + + + + diff --git a/platform/icons/src/modules/resourcesRoot.svg b/platform/icons/src/modules/resourcesRoot.svg index db9370c58ee7..5584de84de88 100644 --- a/platform/icons/src/modules/resourcesRoot.svg +++ b/platform/icons/src/modules/resourcesRoot.svg @@ -1,12 +1,9 @@ - - ResourcesRoot - - - - - - - - + + + + + + + diff --git a/platform/icons/src/modules/sourceRoot.svg b/platform/icons/src/modules/sourceRoot.svg index 80270a375493..b94cc04e8813 100644 --- a/platform/icons/src/modules/sourceRoot.svg +++ b/platform/icons/src/modules/sourceRoot.svg @@ -1,6 +1,3 @@ - - sourceRoot - - - + + diff --git a/platform/icons/src/modules/split.svg b/platform/icons/src/modules/split.svg new file mode 100644 index 000000000000..7afe2d53caa7 --- /dev/null +++ b/platform/icons/src/modules/split.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/platform/icons/src/modules/testResourcesRoot.svg b/platform/icons/src/modules/testResourcesRoot.svg index e63c8574dfff..d7889ab833fc 100644 --- a/platform/icons/src/modules/testResourcesRoot.svg +++ b/platform/icons/src/modules/testResourcesRoot.svg @@ -1,14 +1,11 @@ - - testResourcesRoot - - - - - - - - - - + + + + + + + + + diff --git a/platform/icons/src/modules/testRoot.svg b/platform/icons/src/modules/testRoot.svg index 4f2e08218f13..a0e9117a1783 100644 --- a/platform/icons/src/modules/testRoot.svg +++ b/platform/icons/src/modules/testRoot.svg @@ -1,7 +1,3 @@ - - testRoot - - - + + - diff --git a/platform/icons/src/modules/types/userDefined.svg b/platform/icons/src/modules/types/userDefined.svg new file mode 100644 index 000000000000..ad2a42f016e4 --- /dev/null +++ b/platform/icons/src/modules/types/userDefined.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/modules/unloadedModule.svg b/platform/icons/src/modules/unloadedModule.svg new file mode 100644 index 000000000000..7f5e80b85da8 --- /dev/null +++ b/platform/icons/src/modules/unloadedModule.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/platform/icons/src/toolbar/unknown.svg b/platform/icons/src/toolbar/unknown.svg new file mode 100644 index 000000000000..273e209cb471 --- /dev/null +++ b/platform/icons/src/toolbar/unknown.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/icons/src/toolbar/unknown_dark.svg b/platform/icons/src/toolbar/unknown_dark.svg new file mode 100644 index 000000000000..c3247e001f13 --- /dev/null +++ b/platform/icons/src/toolbar/unknown_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 9006dd63bf6d..e0ba8f7f3e65 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -1667,7 +1667,7 @@ public class AllIcons { public static class Modules { public static final Icon AddExcludedRoot = IconLoader.getIcon("/modules/addExcludedRoot.svg"); // 16x16 - public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.png"); // 16x16 + public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.svg"); // 16x16 public static final Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); // 9x9 public static final Icon DeleteContentFolderRollover = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); // 9x9 public static final Icon DeleteContentRoot = IconLoader.getIcon("/modules/deleteContentRoot.png"); // 9x9 @@ -1689,16 +1689,16 @@ public class AllIcons { public static final Icon SourceRoot = IconLoader.getIcon("/modules/sourceRoot.svg"); // 16x16 public static final Icon SourceRootFileLayer = IconLoader.getIcon("/modules/sourceRootFileLayer.png"); // 16x16 public static final Icon Sources = IconLoader.getIcon("/modules/sources.svg"); // 16x16 - public static final Icon Split = IconLoader.getIcon("/modules/split.png"); // 16x16 + public static final Icon Split = IconLoader.getIcon("/modules/split.svg"); // 16x16 public static final Icon TestResourcesRoot = IconLoader.getIcon("/modules/testResourcesRoot.svg"); // 16x16 public static final Icon TestRoot = IconLoader.getIcon("/modules/testRoot.svg"); // 16x16 public static final Icon TestSourceFolder = IconLoader.getIcon("/modules/testSourceFolder.svg"); // 16x16 public static class Types { - public static final Icon UserDefined = IconLoader.getIcon("/modules/types/userDefined.png"); // 16x16 + public static final Icon UserDefined = IconLoader.getIcon("/modules/types/userDefined.svg"); // 16x16 } - public static final Icon UnloadedModule = IconLoader.getIcon("/modules/unloadedModule.png"); // 16x16 + public static final Icon UnloadedModule = IconLoader.getIcon("/modules/unloadedModule.svg"); // 16x16 public static final Icon UnmarkWebroot = IconLoader.getIcon("/modules/unmarkWebroot.svg"); // 16x16 public static final Icon WebRoot = IconLoader.getIcon("/modules/webRoot.svg"); // 16x16 @@ -2289,7 +2289,7 @@ public class AllIcons { public static class Toolbar { public static final Icon Filterdups = IconLoader.getIcon("/toolbar/filterdups.svg"); // 16x16 - public static final Icon Unknown = IconLoader.getIcon("/toolbar/unknown.png"); // 16x16 + public static final Icon Unknown = IconLoader.getIcon("/toolbar/unknown.svg"); // 16x16 /** @deprecated to be removed in IDEA 2020 - use AllIcons.Actions.GroupByPackage */ @SuppressWarnings("unused") diff --git a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg index 95a2d511f5e6..9764eaff07ee 100644 --- a/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg +++ b/python/psi-api/resources/icons/com/jetbrains/python/pythonFile.svg @@ -1,13 +1,8 @@ - - pythonFile - - - - - - - - - + + + + + +