MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] Refactor icons layout in community

Browse Source 
Icons removed from SDK package (no need to have a separate class for it), ultimate icons moved out of community module.

There are only 3 icon packages in community:
* `PythonParserIcons`
* `PythonPsiApiIcons`
* `PythonIcons` (aka `intellij.python.community.impl`)

Latter two have `.json` mapper to replace old icons with new one for New UI which is included into corresponding `.xml` file.

GitOrigin-RevId: 0438ad4485b5a82a89c81ec63ae6e575d5bb52de
This commit is contained in:
Ilya.Kazakevich
2024-01-12 14:23:10 +01:00
committed by intellij-monorepo-bot
parent bf5cbaecdc
commit b599287e32
59 changed files with 50 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
View File

@@ -42,12 +42,6 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
iconDirectory = "icons/com/jetbrains/python/parser",
)
"intellij.python.sdk" -> IntellijIconClassGeneratorModuleConfig(
className = "PythonSdkIcons",
packageName = "com.jetbrains.python.sdk.icons",
iconDirectory = "icons/com/jetbrains/python/sdk",
)
"intellij.python.psi" -> IntellijIconClassGeneratorModuleConfig(
className = "PythonPsiApiIcons",
packageName = "com.jetbrains.python.psi.icons",

0
platform/build-scripts/test-system/testlog/idea.log Normal file
View File

21
python/gen/com/jetbrains/python/icons/PythonIcons.java
View File

@@ -15,30 +15,10 @@ public final class PythonIcons {
return IconManager.getInstance().loadRasterizedIcon(path, PythonIcons.class.getClassLoader(), cacheKey, flags);
}
public static final class Chameleon {
/** 16x16 */ public static final @NotNull Icon Chameleon = load("icons/com/jetbrains/pythonCore/chameleon/chameleon.svg", 1927144371, 0);
}
public static final class Cython {
/** 16x16 */ public static final @NotNull Icon CythonFile = load("icons/com/jetbrains/pythonCore/cython/cythonFile.svg", -1709759022, 0);
}
public static final class Django {
/** 13x13 */ public static final @NotNull Icon DjangoLogo = load("icons/com/jetbrains/pythonCore/django/django-logo.svg", -403444033, 2);
}
public static final class Fastapi {
/** 16x16 */ public static final @NotNull Icon FastapiLogo = load("icons/com/jetbrains/pythonCore/fastapi/fastapi-logo.svg", -1790650098, 0);
}
public static final class Flask {
/** 16x16 */ public static final @NotNull Icon FlaskLogo = load("icons/com/jetbrains/pythonCore/flask/flask-logo.svg", -1772027362, 2);
}
public static final class Pyramid {
/** 16x16 */ public static final @NotNull Icon PyramidLogo = load("icons/com/jetbrains/pythonCore/pyramid/pyramid-logo.svg", 323505170, 0);
}
public static final class Python {
/** 16x16 */ public static final @NotNull Icon Anaconda = load("icons/com/jetbrains/pythonCore/python/anaconda.svg", -520915032, 0);
/** 16x16 */ public static final @NotNull Icon AttachDebugger = load("icons/com/jetbrains/pythonCore/python/attachDebugger.svg", 1845469384, 2);
@@ -51,7 +31,6 @@ public final class PythonIcons {
/** 16x16 */ public static final @NotNull Icon StepIntoMyCode = load("icons/com/jetbrains/pythonCore/python/debug/StepIntoMyCode.svg", -1301661836, 2);
}
/** 16x16 */ public static final @NotNull Icon Dotnet = load("icons/com/jetbrains/pythonCore/python/dotnet.svg", -927339199, 0);
/** 16x16 */ public static final @NotNull Icon ExecuteCurrentStatement = load("icons/com/jetbrains/pythonCore/python/executeCurrentStatement.svg", -43244894, 2);
/** 16x16 */ public static final @NotNull Icon Function = load("icons/com/jetbrains/pythonCore/python/function.svg", 1027695397, 0);
/** 16x16 */ public static final @NotNull Icon Jython = load("icons/com/jetbrains/pythonCore/python/jython.svg", -359107473, 0);

61
python/gen/icons/PythonIcons.java
View File

@@ -1,61 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package icons;
import com.intellij.ui.IconManager;
import com.jetbrains.python.parser.icons.PythonParserIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public final class PythonIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonIcons.class.getClassLoader(), cacheKey, flags);
}
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public static final class Python {
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public static final class Debug {
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true) public static final @NotNull Icon SpecialVar =
com.jetbrains.python.icons.PythonIcons.Python.Debug.SpecialVar;
}
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true) public static final @NotNull Icon Python = PythonSdkIcons.Python;
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true) public static final @NotNull Icon PythonTests =
com.jetbrains.python.icons.PythonIcons.Python.PythonTests;
/**
* @deprecated moved to {@link com.jetbrains.python.icons.PythonIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true) public static final @NotNull Icon Virtualenv = com.jetbrains.python.icons.PythonIcons.Python.Virtualenv;
}
}

8
python/ide/impl/src/com/jetbrains/python/newProject/steps/PythonBaseProjectGenerator.java
View File

@@ -10,10 +10,9 @@ import com.jetbrains.python.PyBundle;
import com.jetbrains.python.newProject.PyNewProjectSettings;
import com.jetbrains.python.newProject.PythonProjectGenerator;
import com.jetbrains.python.newProject.welcome.PyWelcomeGenerator;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.remote.PyProjectSynchronizer;
import com.jetbrains.python.sdk.PySdkExtKt;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -39,10 +38,9 @@ public final class PythonBaseProjectGenerator extends PythonProjectGenerator<PyN
return panel;
}
@Nullable
@Override
public Icon getLogo() {
return PythonSdkIcons.Python;
public @NotNull Icon getLogo() {
return PythonPsiApiIcons.Python;
}
@Override

5
python/pluginJava/com/jetbrains/python/facet/PythonFacetType.java
View File

@@ -9,9 +9,8 @@ import com.intellij.openapi.projectRoots.ProjectJdkTable;
import com.intellij.openapi.projectRoots.Sdk;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.module.PythonModuleType;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -55,6 +54,6 @@ public final class PythonFacetType extends FacetType<PythonFacet, PythonFacetCon
@Override
public Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
}

5
python/pluginJava/com/jetbrains/python/facet/PythonFrameworkSupportProvider.java
View File

@@ -8,8 +8,7 @@ import com.intellij.ide.util.frameworkSupport.FrameworkSupportProvider;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
import com.jetbrains.python.module.PythonModuleType;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -22,7 +21,7 @@ public final class PythonFrameworkSupportProvider extends FrameworkSupportProvid
@Override
public Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
@NotNull

5
python/pluginMinor/com/jetbrains/python/minor/facet/PythonFacetType.java
View File

@@ -17,9 +17,8 @@ import com.intellij.openapi.util.text.StringUtil;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.facet.PythonFacetSettings;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -65,7 +64,7 @@ public final class PythonFacetType extends FacetType<PythonFacet, PythonFacetTyp
@Override
public Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
public static class PythonFacetConfiguration extends PythonFacetSettings implements FacetConfiguration {

7
python/pluginResources/PythonIconMappings.json
View File

@@ -2,13 +2,6 @@
"icons": {
"com": {
"jetbrains": {
"python": {
"sdk": {
"expui": {
"python.svg": "icons/com/jetbrains/python/sdk/python.svg"
}
}
},
"pythonCore": {
"python": {
"expui": {

9
python/pluginResources/icons/com/jetbrains/pythonCore/chameleon/chameleon.svg
View File

@@ -1,9 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd">
<polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
<polygon fill="#9AA7B0" fill-opacity=".8" points="8 1 8 6 3 6 3 8 13 8 13 1"/>
<polygon fill="#62B543" fill-opacity=".7" points="1 16 16 16 16 9 1 9"/>
<path fill="#231F20" fill-opacity=".7" d="M0,2.501 C0,1 0.931,2.02832126e-16 2.256,0 C3.20239258,0 3.55,0.311 3.969,0.753 L3.42669678,1.42712402 C3.07669678,1.06812402 2.75,1 2.25,1 C1.418,1 1,1.73791504 1,2.487 C1,3.23608496 1.412,4 2.25,4 C2.787,4 3.05169678,3.89340869 3.42669678,3.50640869 L4,4.144 C3.544,4.669 3.19732666,5 2.225,5 C0.949,5 7.35277938e-17,4.002 0,2.501 Z" transform="translate(3 10)"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 904 B

5
python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo.svg
View File

@@ -1,5 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.35103 2.4375H7.0805V10.3642C6.19463 10.5318 5.54249 10.5977 4.83688 10.5977C2.72456 10.5955 1.625 9.65185 1.625 7.83944C1.625 6.09319 2.79133 4.95987 4.59871 4.95987C4.87917 4.95987 5.09283 4.98194 5.35103 5.04807V2.4375ZM5.41164 6.47656C5.20908 6.4104 5.04216 6.38836 4.82847 6.38836C3.95374 6.38836 3.44848 6.92192 3.44848 7.857C3.44848 8.76741 3.9315 9.27011 4.81737 9.27011C5.00876 9.27011 5.16457 9.25933 5.41164 9.22625V6.47656Z" fill="#6E6E6E"/>
<path d="M9.84797 5.17268V9.14149C9.84797 10.5083 9.74559 11.1656 9.44509 11.7322C9.16463 12.277 8.79516 12.6206 8.0317 13L6.42688 12.2438C7.19034 11.8889 7.55981 11.5754 7.79577 11.097C8.0428 10.6077 8.12071 10.0411 8.12071 8.55057V5.17272L9.84797 5.17268ZM8.12071 2.4375H9.85018V4.19479H8.12071V2.4375Z" fill="#6E6E6E"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1018 B

5
python/pluginResources/icons/com/jetbrains/pythonCore/django/django-logo_dark.svg
View File

@@ -1,5 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.35103 2.4375H7.0805V10.3642C6.19463 10.5318 5.54249 10.5977 4.83688 10.5977C2.72456 10.5955 1.625 9.65185 1.625 7.83944C1.625 6.09319 2.79133 4.95987 4.59871 4.95987C4.87917 4.95987 5.09283 4.98194 5.35103 5.04807V2.4375ZM5.41164 6.47656C5.20908 6.4104 5.04216 6.38836 4.82847 6.38836C3.95374 6.38836 3.44848 6.92192 3.44848 7.857C3.44848 8.76741 3.9315 9.27011 4.81737 9.27011C5.00876 9.27011 5.16457 9.25933 5.41164 9.22625V6.47656Z" fill="#AFB1B3"/>
<path d="M9.84797 5.17268V9.14149C9.84797 10.5083 9.74559 11.1656 9.44509 11.7322C9.16463 12.277 8.79516 12.6206 8.0317 13L6.42688 12.2438C7.19034 11.8889 7.55981 11.5754 7.79577 11.097C8.0428 10.6077 8.12071 10.0411 8.12071 8.55057V5.17272L9.84797 5.17268ZM8.12071 2.4375H9.85018V4.19479H8.12071V2.4375Z" fill="#AFB1B3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1018 B

9
python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow.svg
View File

@@ -1,9 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.9045 4.618C8.61597 4.54103 8.31278 4.5 8 4.5C7.68722 4.5 7.38403 4.54103 7.0955 4.618L7.40532 3.37873C7.46096 3.15615 7.66095 3 7.89039 3H8.10961C8.33905 3 8.53904 3.15615 8.59468 3.37873L8.9045 4.618Z" fill="#6C707E"/>
<path d="M11.5 8H13V7.39039C13 7.16095 12.8439 6.96096 12.6213 6.90532L11.1847 6.54618C11.3872 6.98896 11.5 7.4813 11.5 8Z" fill="#6C707E"/>
<path d="M4.5 8C4.5 7.4813 4.61283 6.98896 4.81529 6.54618L3.37873 6.90532C3.15615 6.96096 3 7.16095 3 7.39039V8H4.5Z" fill="#6C707E"/>
<path d="M9 8C9 8.55228 8.55228 9 8 9C7.44772 9 7 8.55228 7 8C7 7.44772 7.44772 7 8 7C8.55228 7 9 7.44772 9 8Z" fill="#6C707E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="#6C707E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2856 1.50386C12.1076 1.19229 11.7762 1 11.4174 1H4.57798C4.21913 1 3.88778 1.19229 3.70974 1.50386L0.281171 7.50386C0.105495 7.81129 0.105495 8.18871 0.281171 8.49614L3.70974 14.4961C3.88778 14.8077 4.21913 15 4.57798 15H11.4174C11.7762 15 12.1076 14.8077 12.2856 14.4961L15.7142 8.49614C15.8899 8.18871 15.8899 7.81129 15.7142 7.50386L12.2856 1.50386ZM1.14941 8L4.57798 14L11.4173 14L14.8459 8L11.4173 2L4.57799 2L1.14941 8Z" fill="#6C707E"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

16
python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20.svg
View File

@@ -1,16 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_8689_12733)">
<path d="M10.5804 3.90194C10.5336 3.66823 10.3284 3.5 10.0901 3.5H9.9099C9.67156 3.5 9.46635 3.66823 9.41961 3.90194L9.08123 5.59387C9.37784 5.53234 9.68514 5.5 10 5.5C10.3149 5.5 10.6222 5.53234 10.9188 5.59387L10.5804 3.90194Z" fill="#6C707E"/>
<path d="M14.0402 8.01608L16.1857 8.87428C16.3755 8.95021 16.5 9.13406 16.5 9.33852V10H14.5C14.5 9.28796 14.3346 8.61455 14.0402 8.01608Z" fill="#6C707E"/>
<path d="M5.95981 8.01608C5.66537 8.61455 5.5 9.28796 5.5 10H3.5V9.33852C3.5 9.13406 3.62448 8.95021 3.8143 8.87428L5.95981 8.01608Z" fill="#6C707E"/>
<path d="M10 11.5C10.8284 11.5 11.5 10.8284 11.5 10C11.5 9.17157 10.8284 8.5 10 8.5C9.17157 8.5 8.5 9.17157 8.5 10C8.5 10.8284 9.17157 11.5 10 11.5Z" fill="#6C707E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10C14 12.2091 12.2091 14 10 14C7.79086 14 6 12.2091 6 10C6 7.79086 7.79086 6 10 6C12.2091 6 14 7.79086 14 10ZM12.5 10C12.5 11.3807 11.3807 12.5 10 12.5C8.61929 12.5 7.5 11.3807 7.5 10C7.5 8.61929 8.61929 7.5 10 7.5C11.3807 7.5 12.5 8.61929 12.5 10Z" fill="#6C707E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3618 1.62982C15.1391 1.24036 14.7246 1 14.2757 1H5.72035C5.27147 1 4.85698 1.24036 4.63427 1.62982L0.162861 9.37982C-0.0568912 9.76411 -0.0568912 10.2359 0.162861 10.6202L4.63427 18.3701C4.85698 18.7596 5.27147 19 5.72035 19H14.2757C14.7246 19 15.1391 18.7596 15.3618 18.3701L19.8332 10.6202C20.053 10.2359 20.053 9.76411 19.8332 9.37982L15.3618 1.62982ZM18.4593 10L14.1321 2.5H5.86398L1.5368 10L5.86401 17.5H14.132L18.4593 10Z" fill="#6C707E"/>
</g>
<defs>
<clipPath id="clip0_8689_12733">
<rect width="20" height="20" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

21
python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow@20x20_dark.svg
View File

@@ -1,21 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_8689_12735)">
<g clip-path="url(#clip1_8689_12735)">
<path d="M10.5804 3.90194C10.5336 3.66823 10.3284 3.5 10.0901 3.5H9.9099C9.67156 3.5 9.46635 3.66823 9.41961 3.90194L9.08123 5.59387C9.37784 5.53234 9.68514 5.5 10 5.5C10.3149 5.5 10.6222 5.53234 10.9188 5.59387L10.5804 3.90194Z" fill="#CED0D6"/>
<path d="M14.0402 8.01608L16.1857 8.87428C16.3755 8.95021 16.5 9.13406 16.5 9.33852V10H14.5C14.5 9.28796 14.3346 8.61455 14.0402 8.01608Z" fill="#CED0D6"/>
<path d="M5.95981 8.01608C5.66537 8.61455 5.5 9.28796 5.5 10H3.5V9.33852C3.5 9.13406 3.62448 8.95021 3.8143 8.87428L5.95981 8.01608Z" fill="#CED0D6"/>
<path d="M10 11.5C10.8284 11.5 11.5 10.8284 11.5 10C11.5 9.17157 10.8284 8.5 10 8.5C9.17157 8.5 8.5 9.17157 8.5 10C8.5 10.8284 9.17157 11.5 10 11.5Z" fill="#CED0D6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10C14 12.2091 12.2091 14 10 14C7.79086 14 6 12.2091 6 10C6 7.79086 7.79086 6 10 6C12.2091 6 14 7.79086 14 10ZM12.5 10C12.5 11.3807 11.3807 12.5 10 12.5C8.61929 12.5 7.5 11.3807 7.5 10C7.5 8.61929 8.61929 7.5 10 7.5C11.3807 7.5 12.5 8.61929 12.5 10Z" fill="#CED0D6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3618 1.62982C15.1391 1.24036 14.7246 1 14.2757 1H5.72035C5.27147 1 4.85698 1.24036 4.63427 1.62982L0.162861 9.37982C-0.0568912 9.76411 -0.0568912 10.2359 0.162861 10.6202L4.63427 18.3701C4.85698 18.7596 5.27147 19 5.72035 19H14.2757C14.7246 19 15.1391 18.7596 15.3618 18.3701L19.8332 10.6202C20.053 10.2359 20.053 9.76411 19.8332 9.37982L15.3618 1.62982ZM18.4593 10L14.1321 2.5H5.86398L1.5368 10L5.86401 17.5H14.132L18.4593 10Z" fill="#CED0D6"/>
</g>
</g>
<defs>
<clipPath id="clip0_8689_12735">
<rect width="20" height="20" fill="white"/>
</clipPath>
<clipPath id="clip1_8689_12735">
<rect width="20" height="20" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

16
python/pluginResources/icons/com/jetbrains/pythonCore/expui/appEngineToolWindow_dark.svg
View File

@@ -1,16 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_8689_12740)">
<path d="M8.9045 4.618C8.61597 4.54103 8.31278 4.5 8 4.5C7.68722 4.5 7.38403 4.54103 7.0955 4.618L7.40532 3.37873C7.46096 3.15615 7.66095 3 7.89039 3H8.10961C8.33905 3 8.53904 3.15615 8.59468 3.37873L8.9045 4.618Z" fill="#CED0D6"/>
<path d="M11.5 8H13V7.39039C13 7.16095 12.8439 6.96096 12.6213 6.90532L11.1847 6.54618C11.3872 6.98896 11.5 7.4813 11.5 8Z" fill="#CED0D6"/>
<path d="M4.5 8C4.5 7.4813 4.61283 6.98896 4.81529 6.54618L3.37873 6.90532C3.15615 6.96096 3 7.16095 3 7.39039V8H4.5Z" fill="#CED0D6"/>
<path d="M9 8C9 8.55228 8.55228 9 8 9C7.44772 9 7 8.55228 7 8C7 7.44772 7.44772 7 8 7C8.55228 7 9 7.44772 9 8Z" fill="#CED0D6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="#CED0D6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2856 1.50386C12.1076 1.19229 11.7762 1 11.4174 1H4.57798C4.21913 1 3.88778 1.19229 3.70974 1.50386L0.281171 7.50386C0.105495 7.81129 0.105495 8.18871 0.281171 8.49614L3.70974 14.4961C3.88778 14.8077 4.21913 15 4.57798 15H11.4174C11.7762 15 12.1076 14.8077 12.2856 14.4961L15.7142 8.49614C15.8899 8.18871 15.8899 7.81129 15.7142 7.50386L12.2856 1.50386ZM1.14941 8L4.57798 14L11.4173 14L14.8459 8L11.4173 2L4.57799 2L1.14941 8Z" fill="#CED0D6"/>
</g>
<defs>
<clipPath id="clip0_8689_12740">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

4
python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI.svg
View File

@@ -1,4 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 1C4.13542 1 1 4.13542 1 8C1 11.8657 4.13542 15 8 15C11.8652 15 15 11.8657 15 8C15 4.13542 11.8657 1 8 1ZM7.636 13.6117V9.22033H5.19417L8.70175 2.38833V6.77967H11.052L7.636 13.6117Z" fill="#1D978B"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 441 B

4
python/pluginResources/icons/com/jetbrains/pythonCore/expui/fastAPI_dark.svg
View File

@@ -1,4 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 1C4.13542 1 1 4.13542 1 8C1 11.8657 4.13542 15 8 15C11.8652 15 15 11.8657 15 8C15 4.13542 11.8657 1 8 1ZM7.636 13.6117V9.22033H5.19417L8.70175 2.38833V6.77967H11.052L7.636 13.6117Z" fill="#1D978B"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 441 B

4
python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

4
python/pluginResources/icons/com/jetbrains/pythonCore/expui/flask_dark.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

1
python/pluginResources/icons/com/jetbrains/pythonCore/expui/icon-robots.txt
View File

@@ -1 +0,0 @@
skip: *

5
python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango.svg
View File

@@ -1,5 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.58589 3H8.71446V12.756C7.62417 12.9622 6.82152 13.0434 5.95308 13.0434C3.3533 13.0407 2 11.8792 2 9.64854C2 7.49931 3.43549 6.10445 5.65995 6.10445C6.00514 6.10445 6.2681 6.13162 6.58589 6.213V3ZM6.66048 7.97115C6.41117 7.88972 6.20574 7.8626 5.94273 7.8626C4.86614 7.8626 4.24428 8.51929 4.24428 9.67016C4.24428 10.7907 4.83877 11.4094 5.92907 11.4094C6.16463 11.4094 6.3564 11.3961 6.66048 11.3554V7.97115Z" fill="#6C707E"/>
<path d="M12.1207 6.36638V11.2511C12.1207 12.9333 11.9947 13.7422 11.6249 14.4397C11.2797 15.1102 10.825 15.533 9.88532 16L7.91016 15.0692C8.84979 14.6326 9.30453 14.2467 9.59494 13.6578C9.89898 13.0557 9.99487 12.3582 9.99487 10.5238V6.36642L12.1207 6.36638ZM9.99487 3H12.1234V5.16282H9.99487V3Z" fill="#6C707E"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 984 B

5
python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20.svg
View File

@@ -1,5 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.34271 3.61011H11.0034V15.8051C9.64056 16.0629 8.63726 16.1643 7.5517 16.1643C4.30198 16.1609 2.61035 14.7091 2.61035 11.9208C2.61035 9.23424 4.40471 7.49067 7.18529 7.49067C7.61677 7.49067 7.94548 7.52463 8.34271 7.62636V3.61011ZM8.43595 9.82404C8.12432 9.72226 7.86753 9.68835 7.53877 9.68835C6.19302 9.68835 5.4157 10.5092 5.4157 11.9478C5.4157 13.3484 6.15881 14.1218 7.52169 14.1218C7.81614 14.1218 8.05585 14.1052 8.43595 14.0543V9.82404Z" fill="#6C707E"/>
<path d="M15.6636 7.81808V13.9239C15.6636 16.0267 15.5061 17.0379 15.0438 17.9097C14.6123 18.7478 14.0439 19.2764 12.8693 19.8601L10.4004 18.6966C11.5749 18.1508 12.1434 17.6685 12.5064 16.9324C12.8864 16.1797 13.0063 15.3079 13.0063 13.0148V7.81813L15.6636 7.81808ZM13.0063 3.61011H15.667V6.31363H13.0063V3.61011Z" fill="#6C707E"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

12
python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango@20x20_dark.svg
View File

@@ -1,12 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_8530_12705)">
<path d="M8.34271 3.61011H11.0034V15.8051C9.64056 16.0629 8.63726 16.1643 7.5517 16.1643C4.30198 16.1609 2.61035 14.7091 2.61035 11.9208C2.61035 9.23424 4.40471 7.49067 7.18529 7.49067C7.61677 7.49067 7.94548 7.52463 8.34271 7.62636V3.61011ZM8.43595 9.82404C8.12432 9.72226 7.86753 9.68835 7.53877 9.68835C6.19302 9.68835 5.4157 10.5092 5.4157 11.9478C5.4157 13.3484 6.15881 14.1218 7.52169 14.1218C7.81614 14.1218 8.05585 14.1052 8.43595 14.0543V9.82404Z" fill="#CED0D6"/>
<path d="M15.6636 7.81808V13.9239C15.6636 16.0267 15.5061 17.0379 15.0438 17.9097C14.6123 18.7478 14.0439 19.2764 12.8693 19.8601L10.4004 18.6966C11.5749 18.1508 12.1434 17.6685 12.5064 16.9324C12.8864 16.1797 13.0063 15.3079 13.0063 13.0148V7.81813L15.6636 7.81808ZM13.0063 3.61011H15.667V6.31363H13.0063V3.61011Z" fill="#CED0D6"/>
</g>
<defs>
<clipPath id="clip0_8530_12705">
<rect width="20" height="20" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

5
python/pluginResources/icons/com/jetbrains/pythonCore/expui/toolWindowDjango_dark.svg
View File

@@ -1,5 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.58589 3H8.71446V12.756C7.62417 12.9622 6.82152 13.0434 5.95308 13.0434C3.3533 13.0407 2 11.8792 2 9.64854C2 7.49931 3.43549 6.10445 5.65995 6.10445C6.00514 6.10445 6.2681 6.13162 6.58589 6.213V3ZM6.66048 7.97115C6.41117 7.88972 6.20574 7.8626 5.94273 7.8626C4.86614 7.8626 4.24428 8.51929 4.24428 9.67016C4.24428 10.7907 4.83877 11.4094 5.92907 11.4094C6.16463 11.4094 6.3564 11.3961 6.66048 11.3554V7.97115Z" fill="#CED0D6"/>
<path d="M12.1207 6.36638V11.2511C12.1207 12.9333 11.9947 13.7422 11.6249 14.4397C11.2797 15.1102 10.825 15.533 9.88532 16L7.91016 15.0692C8.84979 14.6326 9.30453 14.2467 9.59494 13.6578C9.89898 13.0557 9.99487 12.3582 9.99487 10.5238V6.36642L12.1207 6.36638ZM9.99487 3H12.1234V5.16282H9.99487V3Z" fill="#CED0D6"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 984 B

6
python/pluginResources/icons/com/jetbrains/pythonCore/fastapi/fastapi-logo.svg
View File

@@ -1,6 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg xmlns="http://www.w3.org/2000/svg" role="img" width="16" height="16" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24">
<path
d="M12 0C5.375 0 0 5.375 0 12c0 6.627 5.375 12 12 12c6.626 0 12-5.373 12-12c0-6.625-5.373-12-12-12zm-.624 21.62v-7.528H7.19L13.203 2.38v7.528h4.029L11.376 21.62z"
fill="#1d978b"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 460 B

4
python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

4
python/pluginResources/icons/com/jetbrains/pythonCore/flask/flask-logo_dark.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

4
python/pluginResources/icons/com/jetbrains/pythonCore/pyramid/pyramid-logo.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

141
python/pluginResources/icons/com/jetbrains/pythonCore/python/dotnet.svg
View File

@@ -1,141 +0,0 @@
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<linearGradient id="dotnet-a" x1="49.997%" x2="49.997%" y1="-19.516%" y2="129.625%">
<stop offset="0%" stop-color="#0994DC"/>
<stop offset="35.001%" stop-color="#66CEF5"/>
<stop offset="35.001%" stop-color="#66CEF5"/>
<stop offset="84.616%" stop-color="#127BCA"/>
<stop offset="84.616%" stop-color="#127BCA"/>
<stop offset="100%" stop-color="#127BCA"/>
</linearGradient>
<linearGradient id="dotnet-b" x1="50.001%" x2="50.001%" y1="-19.516%" y2="129.624%">
<stop offset="0%" stop-color="#0E76BC"/>
<stop offset="36%" stop-color="#36AEE8"/>
<stop offset="36%" stop-color="#36AEE8"/>
<stop offset="84.616%" stop-color="#00ADEF"/>
<stop offset="84.616%" stop-color="#00ADEF"/>
<stop offset="100%" stop-color="#00ADEF"/>
</linearGradient>
<linearGradient id="dotnet-c" x1="49.999%" x2="49.999%" y1="110.922%" y2="-6.214%">
<stop offset="0%" stop-color="#1C63B7"/>
<stop offset="50%" stop-color="#33BDF2"/>
<stop offset="100%" stop-color="#33BDF2" stop-opacity=".42"/>
</linearGradient>
<linearGradient id="dotnet-d" x1="50.001%" x2="50.001%" y1="-19.515%" y2="129.627%">
<stop offset="0%" stop-color="#166AB8"/>
<stop offset="39.999%" stop-color="#36AEE8"/>
<stop offset="39.999%" stop-color="#36AEE8"/>
<stop offset="84.616%" stop-color="#0798DD"/>
<stop offset="84.616%" stop-color="#0798DD"/>
<stop offset="100%" stop-color="#0798DD"/>
</linearGradient>
<linearGradient id="dotnet-e" x1="49.999%" x2="49.999%" y1="-19.521%" y2="129.627%">
<stop offset="0%" stop-color="#124379"/>
<stop offset="39%" stop-color="#1487CB"/>
<stop offset="39%" stop-color="#1487CB"/>
<stop offset="78.023%" stop-color="#165197"/>
<stop offset="78.023%" stop-color="#165197"/>
<stop offset="100%" stop-color="#165197"/>
</linearGradient>
<linearGradient id="dotnet-f" x1="0%" y1="50.001%" y2="50.001%">
<stop offset="0%" stop-color="#33BDF2" stop-opacity=".698"/>
<stop offset="100%" stop-color="#1DACD8"/>
</linearGradient>
<linearGradient id="dotnet-g" x1="50.01%" x2="50.01%" y1="94.686%" y2="-3.025%">
<stop offset="0%" stop-color="#136AB4"/>
<stop offset="60%" stop-color="#59CAF5" stop-opacity=".549"/>
<stop offset="100%" stop-color="#59CAF5" stop-opacity=".235"/>
</linearGradient>
<linearGradient id="dotnet-h" x1="-.001%" x2="99.999%" y1="50%" y2="50%">
<stop offset="0%" stop-color="#05A1E6" stop-opacity=".247"/>
<stop offset="100%" stop-color="#05A1E6"/>
</linearGradient>
<linearGradient id="dotnet-i" x1="49.998%" x2="49.998%" y1="124.314%" y2="-9.421%">
<stop offset="0%" stop-color="#318ED5"/>
<stop offset="100%" stop-color="#38A7E4"/>
</linearGradient>
<linearGradient id="dotnet-j" x1="49.999%" x2="49.999%" y1="91.2%" y2="-76.785%">
<stop offset="0%" stop-color="#05A1E6"/>
<stop offset="100%" stop-color="#05A1E6" stop-opacity=".549"/>
</linearGradient>
<linearGradient id="dotnet-k" x1="50%" x2="50%" y1="100.01%" y2=".01%">
<stop offset="0%" stop-color="#1959A6"/>
<stop offset="50%" stop-color="#05A1E6"/>
<stop offset="50%" stop-color="#05A1E6"/>
<stop offset="91.759%" stop-color="#7EC5EA"/>
<stop offset="100%" stop-color="#7EC5EA"/>
</linearGradient>
<linearGradient id="dotnet-l" x1="59.804%" x2="38.471%" y1="94.568%" y2="5.755%">
<stop offset="0%" stop-color="#165096"/>
<stop offset="100%" stop-color="#0D82CA"/>
</linearGradient>
<linearGradient id="dotnet-m" x1="49.995%" x2="49.995%" y1="76.998%" y2="-3.299%">
<stop offset="0%" stop-color="#05A1E6"/>
<stop offset="87.363%" stop-color="#0495D6"/>
<stop offset="100%" stop-color="#0495D6"/>
</linearGradient>
<linearGradient id="dotnet-n" x1="65.263%" x2="34.263%" y1="-4.161%" y2="105.844%">
<stop offset="0%" stop-color="#38A7E4" stop-opacity=".329"/>
<stop offset="96.153%" stop-color="#0E88D3"/>
<stop offset="96.153%" stop-color="#0E88D3"/>
<stop offset="100%" stop-color="#0E88D3"/>
</linearGradient>
<linearGradient id="dotnet-o" x1="50.017%" x2="50.017%" y1="-.296%" y2="101.882%">
<stop offset="0%" stop-color="#168CD4"/>
<stop offset="50%" stop-color="#1C87CC"/>
<stop offset="100%" stop-color="#154B8D"/>
</linearGradient>
<linearGradient id="dotnet-p" x1="16.674%" x2="87.813%" y1="205.565%" y2="-19.836%">
<stop offset="0%" stop-color="#97D6EE"/>
<stop offset="70.329%" stop-color="#55C1EA"/>
<stop offset="100%" stop-color="#55C1EA"/>
</linearGradient>
<linearGradient id="dotnet-q" x1="6.89%" x2="75.783%" y1="6.3%" y2="116.771%">
<stop offset="0%" stop-color="#7ACCEC"/>
<stop offset="100%" stop-color="#3FB7ED"/>
</linearGradient>
<linearGradient id="dotnet-r" x1="49.997%" x2="49.997%" y1="6.363%" y2="127.961%">
<stop offset="0%" stop-color="#1DA7E7"/>
<stop offset="100%" stop-color="#37ABE7" stop-opacity="0"/>
</linearGradient>
</defs>
<g fill="none" fill-rule="evenodd" transform="translate(0 5)">
<path fill="url(#dotnet-a)" d="M5.581875,1.2930625 C6.154625,3.0446875 6.371625,6.1694375 8.046625,6.1694375 C8.174125,6.1694375 8.303,6.1569375 8.4323125,6.1323125 C6.9096875,5.7773125 6.7291875,2.6865625 5.800125,1.086 C5.72601395,1.15359392 5.65322925,1.2226279 5.5818125,1.2930625"/>
<path fill="url(#dotnet-b)" d="M5.800125,1.086 C6.72925,2.6865625 6.9096875,5.7773125 8.4323125,6.1323125 C8.5519375,6.110375 8.6718125,6.077125 8.7919375,6.0351875 C7.42525,5.365625 7.0475,2.36425 5.9923125,0.919375 C5.92718099,0.973692841 5.8631065,1.02926574 5.800125,1.0860625"/>
<path fill="#14559A" d="M7.1388125,0.1340625 C7.0115625,0.1340625 6.8824375,0.1465625 6.752875,0.1711875 C6.4139375,0.2350625 6.069625,0.381 5.7225625,0.6018125 C5.817375,0.695375 5.9075625,0.8024375 5.9924375,0.9193125 C6.3454375,0.626375 6.696125,0.4099375 7.0455625,0.2798125 C7.17308647,0.232096055 7.30451932,0.195562533 7.438375,0.170625 C7.34043741,0.145986755 7.23980104,0.133703785 7.1388125,0.1340625"/>
<path fill="url(#dotnet-c)" d="M9.8588125,5.4179375 C10.0044159,5.30161179 10.1446446,5.17871356 10.2790625,5.049625 C9.6970625,3.306125 9.48875,0.1366875 7.802,0.1366875 C7.681375,0.1366875 7.5596875,0.1479375 7.43825,0.1704375 C8.9746875,0.5525625 9.1715,3.8953125 9.858875,5.4179375"/>
<path fill="#3092C4" d="M7.4383125,0.200202405 C7.34037009,0.160833491 7.23973522,0.141214626 7.13875,0.141802405 L7.8020625,0.145702405 C7.6814375,0.145702405 7.55975,0.163702405 7.4383125,0.200102405"/>
<path fill="#1969BC" d="M9.829375,5.7883125 C9.7634375,5.7254375 9.7008125,5.6564375 9.6391875,5.5828125 C9.3554375,5.7836875 9.0728125,5.9360625 8.791875,6.0351875 C8.89214707,6.08443682 8.99832769,6.12060755 9.1078125,6.1428125 C9.19639215,6.1607489 9.28656043,6.1696694 9.3769375,6.1694375 C9.692125,6.1694375 9.9413125,6.132125 10.1535,6.030375 C10.036625,5.96725 9.9295625,5.885375 9.829375,5.7883125"/>
<path fill="url(#dotnet-d)" d="M7.0454375,0.2800625 C8.4215625,0.9998125 8.5411875,4.2593125 9.63925,5.5828125 C9.7139772,5.53001897 9.78713389,5.47503682 9.858625,5.4179375 C9.17125,3.8953125 8.9746875,0.5523125 7.4385625,0.1704375 C7.30462229,0.19564948 7.17309666,0.232326101 7.0454375,0.2800625"/>
<path fill="url(#dotnet-e)" d="M5.9923125,0.919375 C7.0474375,2.36425 7.42525,5.3655625 8.7919375,6.0351875 C9.072875,5.9360625 9.3555625,5.7836875 9.63925,5.5828125 C8.5411875,4.2593125 8.4215625,0.9998125 7.0454375,0.2800625 C6.6960625,0.4099375 6.3453125,0.626375 5.9923125,0.9193125"/>
<path fill="url(#dotnet-f)" d="M4.90675,1.250875 C4.741375,1.6248125 4.5724375,2.1163125 4.3681875,2.757875 C4.774375,2.185625 5.17925,1.6925 5.581875,1.293125 C5.5264375,1.122625 5.466875,0.9654375 5.4026875,0.8253125 C5.2298458,0.9581469 5.06431254,1.10022927 4.9068125,1.2509375"/>
<path fill="#2B74B1" d="M5.5493125,0.7174375 C5.49990143,0.752604557 5.45106172,0.788567583 5.4028125,0.8253125 C5.467,0.965375 5.52625,1.1225625 5.58175,1.2930625 C5.65327167,1.2227584 5.72603309,1.15372674 5.8,1.086 C5.7220625,0.9520625 5.63925,0.828375 5.5493125,0.7174375"/>
<path fill="#125A9E" d="M5.7225,0.601875 C5.6639156,0.639108459 5.60615181,0.677617651 5.54925,0.717375 C5.63925,0.8283125 5.722,0.952 5.80025,1.0861875 C5.86309495,1.02917558 5.92717261,0.973537416 5.9924375,0.9193125 C5.907625,0.8025 5.8174375,0.695375 5.7225625,0.6018125"/>
<path fill="url(#dotnet-g)" d="M15.1091875,0.0006875 C14.330875,3.00225 12.70525,5.4130625 11.3423125,6.020875 L11.3398125,6.020875 C11.315,6.032125 11.2904375,6.042375 11.2661875,6.0523125 C11.2628125,6.054375 11.25975,6.054625 11.2571875,6.0558125 C11.2500625,6.0586875 11.2434375,6.0609375 11.23625,6.0638125 C11.232875,6.0658125 11.229875,6.0665 11.2268125,6.0676875 C11.2153125,6.0718125 11.2040625,6.07525 11.1928125,6.07975 C11.1879375,6.0818125 11.183375,6.0830625 11.17875,6.0846875 C11.1732241,6.08681193 11.1675915,6.08864773 11.161875,6.0901875 C11.15675,6.0921875 11.151375,6.0936875 11.1455,6.0959375 C11.140625,6.0979375 11.1355,6.0988125 11.1309375,6.1008125 C11.1209375,6.1036875 11.1118125,6.106125 11.1018125,6.1095625 C11.0976875,6.1095625 11.093875,6.1118125 11.0895625,6.1129375 C11.083375,6.1149375 11.0764375,6.116375 11.0698125,6.11825 C11.06525,6.12025 11.0614375,6.1209375 11.0565625,6.1219375 C11.0496875,6.1239375 11.042,6.1258125 11.0350625,6.1274375 L11.009,6.1331875 C11.0714215,6.15620063 11.1374725,6.16780189 11.204,6.1674375 C12.496375,6.1674375 13.799375,3.8514375 15.9554375,-4.26325641e-14 L15.108875,-4.26325641e-14 L15.1091875,0.0006875 Z"/>
<path fill="url(#dotnet-h)" d="M4.0875625,0.255875 C4.088375,0.255875 4.0894375,0.253875 4.089875,0.253875 C4.0909375,0.253875 4.0925,0.253875 4.093,0.251875 L4.094625,0.251875 C4.10175,0.249375 4.108375,0.2465625 4.1155625,0.243875 C4.1174375,0.243875 4.118375,0.243875 4.1196875,0.241875 C4.1215,0.241875 4.12325,0.2398125 4.1250625,0.2395625 C4.1326875,0.237125 4.140375,0.23425 4.1475625,0.231625 L4.14875,0.231625 C4.165875,0.2265 4.18175,0.220125 4.1983125,0.2141875 C4.2006875,0.2141875 4.2029375,0.2121875 4.20575,0.2121875 C4.212625,0.2099375 4.2198125,0.2075 4.227,0.205875 C4.2303125,0.2038125 4.233625,0.2038125 4.2366875,0.20275 C4.2440625,0.2005625 4.25125,0.1980625 4.258125,0.1964375 C4.26125,0.1964375 4.264,0.194375 4.2663125,0.1941875 C4.2900625,0.187625 4.313625,0.1815 4.337375,0.1758125 C4.3406875,0.1758125 4.3435,0.17375 4.3470625,0.1735625 C4.3539375,0.1715625 4.360375,0.1704375 4.3678125,0.1694375 C4.370875,0.1674375 4.3744375,0.1674375 4.378,0.166375 C4.384875,0.164375 4.3915625,0.164125 4.399,0.1625 L4.4038125,0.1625 C4.4181875,0.1595625 4.43275,0.1571875 4.4470625,0.1545 L4.45575,0.1545 C4.462625,0.1525 4.46875,0.15225 4.4756875,0.151 C4.4794375,0.151 4.4833125,0.149 4.4869375,0.149 C4.4933125,0.149 4.4996875,0.1469375 4.5060625,0.146125 C4.5094375,0.146125 4.5126875,0.146125 4.5165625,0.1440625 C4.531625,0.1420625 4.5471875,0.14125 4.5630625,0.14 C4.51737049,0.135406583 4.4714844,0.133007993 4.4255625,0.1328125 C2.9701875,0.1328125 0.9649375,2.83325 0.0616875,6.330375 L0.23575,6.330375 C0.5248125,5.814875 0.7845,5.3271875 1.022,4.869375 C1.6545625,2.3923125 2.9430625,0.7030625 4.087625,0.2555"/>
<path fill="#0D82CA" d="M4.9068125,1.250875 C5.06428877,1.10016465 5.22980135,0.958082121 5.402625,0.82525 C5.36747867,0.747062868 5.32806516,0.670864812 5.2845625,0.597 C5.1514375,0.7585625 5.02975,0.97175 4.9068125,1.250875"/>
<path fill="#0D82CA" d="M5.026375,0.276375 C5.121375,0.356125 5.2065625,0.46575 5.2845,0.5971875 C5.3090625,0.567 5.333875,0.539125 5.359625,0.5130625 C5.2515,0.412125 5.13475,0.3293125 5.0079375,0.2669375 C5.0130625,0.26975 5.0181875,0.2720625 5.0235,0.2743125 C5.0235,0.2743125 5.0255,0.2763125 5.026375,0.2763125"/>
<path fill="url(#dotnet-i)" d="M1.021875,4.8696875 C2.349,2.312375 2.97775,0.693875 4.0875625,0.25575 C2.94325,0.703625 1.6545,2.392875 1.0219375,4.8696875"/>
<path fill="#127BCA" d="M5.3595625,0.513 C5.33375,0.5393125 5.30925,0.5669375 5.2844375,0.597125 C5.32796592,0.670995625 5.36746127,0.747169699 5.40275,0.8253125 C5.45099968,0.788588575 5.49983938,0.752646387 5.54925,0.7175 C5.49087533,0.64498615 5.42749091,0.57665211 5.3595625,0.513"/>
<path fill="url(#dotnet-j)" d="M1.624375,6.3191875 C1.6161875,6.32125 1.608,6.32125 1.6003125,6.3220625 L1.59575,6.3220625 C1.5888125,6.3220625 1.581625,6.324125 1.57525,6.324125 L1.5719375,6.324125 C1.5553125,6.326125 1.5389375,6.326125 1.523125,6.327375 L1.518,6.327375 C2.8611875,6.2898125 3.475125,5.6173125 3.779875,4.6419375 C4.0114375,3.9025 4.2015625,3.2795625 4.36825,2.756875 C3.805625,3.54875 3.2405,4.4926875 2.6723125,5.550125 C2.3983125,6.05975 1.9816875,6.272625 1.6243125,6.31825"/>
<path fill="url(#dotnet-k)" d="M1.624375,6.3186875 C1.9816875,6.2731875 2.3983125,6.0605625 2.6723125,5.5505625 C3.2405,4.4934375 3.8059375,3.54925 4.3679375,2.757375 C4.5724375,2.1155 4.7411875,1.62425 4.9068125,1.2503125 C3.7865,2.3166875 2.6618125,4.0898125 1.6243125,6.3181875"/>
<path fill="#05A1E6" d="M1.021875,4.86975 C0.784375,5.3275 0.5246875,5.8151875 0.235625,6.33075 L0.7419375,6.33075 C0.805878861,5.83866121 0.899360149,5.35086379 1.021875,4.87"/>
<path fill="url(#dotnet-l)" d="M4.5165,0.145375 C4.512375,0.145375 4.5093125,0.147375 4.50575,0.147375 C4.499625,0.1494375 4.49325,0.1494375 4.4868125,0.1500625 C4.4830625,0.1500625 4.4794375,0.1500625 4.4755625,0.152125 C4.4686875,0.154125 4.4623125,0.1543125 4.455625,0.155625 C4.4525625,0.155625 4.4495,0.155625 4.4469375,0.157625 C4.432375,0.1600625 4.4180625,0.16275 4.4038125,0.1651875 L4.3989375,0.1651875 C4.3915,0.16725 4.3848125,0.1683125 4.3779375,0.1693125 C4.374375,0.1713125 4.3708125,0.1713125 4.3674375,0.172125 C4.3605625,0.1741875 4.3536875,0.175 4.347,0.17625 C4.3434375,0.17825 4.340625,0.17825 4.3373125,0.1784375 C4.3135625,0.1841875 4.29,0.1903125 4.26625,0.196875 C4.26375,0.196875 4.261125,0.198875 4.2580625,0.1993125 C4.2509375,0.2013125 4.244,0.203375 4.2365625,0.205625 C4.2335,0.2076875 4.2299375,0.2076875 4.226875,0.2085 C4.21975286,0.210471267 4.21266829,0.212575803 4.205625,0.2148125 C4.202875,0.2148125 4.2005625,0.2168125 4.198,0.2168125 C4.181625,0.2229375 4.1655,0.229125 4.148625,0.2341875 C4.1415,0.2364375 4.1338125,0.2393125 4.126125,0.242 C4.1230625,0.244 4.1203125,0.2445 4.11675,0.245875 C4.1095625,0.248125 4.102375,0.251 4.09575,0.253625 C4.09325,0.2556875 4.090625,0.255875 4.088875,0.2569375 C2.9790625,0.6950625 2.35025,2.3135 1.0231875,4.8708125 C0.900564274,5.35166982 0.80710237,5.83949588 0.7433125,6.331625 L0.814375,6.331625 C1.0145,6.331625 1.071,6.3295625 1.30125,6.3295625 L1.5244375,6.3295625 C1.54025,6.3275625 1.556625,6.3275625 1.5731875,6.32625 L1.5763125,6.32625 C1.5831875,6.32625 1.5900625,6.32425 1.59675,6.32425 L1.601625,6.32425 C1.609,6.32425 1.6174375,6.32225 1.625625,6.321375 C2.663125,4.093 3.78775,2.319875 4.908125,1.2535 C5.03125,0.9744375 5.1526875,0.76125 5.285625,0.5999375 C5.207875,0.4685625 5.12275,0.3586875 5.0276875,0.2789375 C5.0276875,0.2789375 5.025125,0.2789375 5.0249375,0.276875 C5.0195,0.2746875 5.0144375,0.272 5.0090625,0.269375 C5.0036875,0.2664375 4.9990625,0.2641875 4.9934375,0.261375 C4.988213,0.259174754 4.98310239,0.256713316 4.978125,0.254 C4.9715,0.2519375 4.966125,0.2490625 4.96025,0.2464375 C4.955375,0.244375 4.9510625,0.2423125 4.9461875,0.2403125 C4.93628828,0.23646979 4.92649315,0.232364168 4.9168125,0.228 C4.9124375,0.226 4.908375,0.224875 4.9043125,0.2233125 C4.8968769,0.220605502 4.88951976,0.217687657 4.88225,0.2145625 C4.8786875,0.2125 4.874625,0.2120625 4.8705,0.210625 C4.8600625,0.207125 4.8498125,0.2034375 4.840125,0.2001875 L4.8375625,0.2001875 C4.8258125,0.1963125 4.8143125,0.1934375 4.8023125,0.1901875 C4.7995,0.188125 4.7971875,0.188125 4.794375,0.1876875 C4.783875,0.184875 4.7746875,0.1820625 4.76475,0.179375 C4.76225,0.179375 4.759875,0.1773125 4.757875,0.1773125 C4.733431,0.171050506 4.70876915,0.165672011 4.6839375,0.1611875 C4.6814375,0.1611875 4.678875,0.159125 4.6763125,0.159125 C4.66573366,0.157022559 4.65508051,0.155313052 4.644375,0.154 C4.64175,0.152 4.64025,0.152 4.638,0.152 C4.62541352,0.150071097 4.61278534,0.148424849 4.600125,0.1470625 L4.5935,0.1470625 C4.58325,0.1450625 4.5738125,0.144875 4.564375,0.1438125 C4.54825,0.1458125 4.5329375,0.1466875 4.5178125,0.148125"/>
<path fill="url(#dotnet-m)" d="M12.069,1.662375 C11.8136875,2.4803125 11.606875,3.1550625 11.4269375,3.71025 C12.1275625,2.746125 12.8176875,1.53325 13.474875,0.133625 C12.7083125,0.374375 12.2993125,0.9255 12.069,1.662375"/>
<path fill="url(#dotnet-n)" d="M11.4491875,5.96975 C11.4134375,5.988 11.377625,6.0053125 11.3423125,6.020875 C12.70525,5.4130625 14.330875,3.00225 15.1091875,0.0006875 L14.9514375,0.0006875 C13.1633125,3.1949375 12.5881875,5.3333125 11.4491875,5.96975"/>
<path fill="#079AE1" d="M10.55925,5.7014375 C10.85575,5.3395 11.0973125,4.72425 11.4270625,3.71025 C11.0466875,4.23275 10.6638125,4.6818125 10.280625,5.048125 C10.280625,5.050125 10.280625,5.050125 10.278625,5.051375 C10.3621875,5.301875 10.4539375,5.5229375 10.5585,5.701375"/>
<path fill="#1969BC" d="M10.55925,5.7014375 C10.4583125,5.8245625 10.3514375,5.9184375 10.2325625,5.9879375 C10.2065,6.0030625 10.1801875,6.0173125 10.153375,6.0304375 C10.2823391,6.10027457 10.4234862,6.14476359 10.5691875,6.1615 C10.5916875,6.16375 10.6139375,6.1658125 10.6371875,6.1674375 L10.6413125,6.1674375 C10.65175,6.1674375 10.66275,6.1674375 10.674,6.1694375 L10.7849375,6.1694375 C10.789,6.1694375 10.79325,6.1694375 10.797375,6.1674375 C10.8053125,6.1674375 10.8136875,6.1674375 10.821875,6.165375 L10.834,6.165375 C10.842375,6.165375 10.8515625,6.163375 10.8605625,6.1625 L10.8625625,6.1625 C10.86525,6.1625 10.868125,6.1605 10.87075,6.1605 C10.880125,6.1584375 10.89,6.157625 10.899125,6.1561875 L10.9075625,6.1561875 C10.9179375,6.1541875 10.92875,6.152875 10.9394375,6.150875 L10.944625,6.150875 C10.9660625,6.14675 10.987,6.14275 11.00825,6.137375 C10.832375,6.073 10.685125,5.921125 10.558375,5.704875"/>
<path fill="#1E5CB3" d="M8.046625,6.1694375 C8.1741875,6.1694375 8.303,6.1569375 8.432375,6.132125 C8.552,6.1104375 8.671875,6.077125 8.792,6.03525 C8.8921835,6.08444932 8.9982543,6.12061842 9.107625,6.142875 C9.19631167,6.16079445 9.28658396,6.16969394 9.3770625,6.1694375 L8.046625,6.1694375 Z"/>
<path fill="#1E5CB3" d="M9.3770625,6.1694375 C9.692,6.1694375 9.9414375,6.132125 10.1533125,6.030375 C10.2822898,6.10025606 10.4234579,6.14478743 10.5691875,6.1615625 C10.5916875,6.16375 10.6139375,6.1658125 10.6371875,6.1674375 L10.6413125,6.1674375 C10.65175,6.1674375 10.66275,6.1674375 10.674,6.1695 L10.71225,6.1695 L9.3761875,6.1695 L9.3770625,6.1695 L9.3770625,6.1694375 Z"/>
<path fill="#1D60B5" d="M10.713,6.1976 L10.785875,6.1976 C10.7901875,6.1976 10.79425,6.1976 10.798375,6.1944 C10.8063125,6.1944 10.8146875,6.1944 10.8231875,6.1911 L10.83525,6.1911 C10.843625,6.1911 10.8528125,6.1879 10.8615625,6.1866 L10.8638125,6.1866 C10.8665,6.1866 10.869125,6.1834 10.8718125,6.1834 C10.8811875,6.1801 10.891,6.1788 10.900125,6.1764 C10.90325,6.1764 10.9056875,6.1764 10.9089375,6.1732 C10.919375,6.17 10.9301875,6.1683 10.9409375,6.1651 L10.9460625,6.1651 C10.9675,6.1585 10.9884375,6.152 11.009625,6.1435 C11.0720479,6.18031259 11.1380979,6.19887433 11.204625,6.1983 L10.713375,6.2015 L10.713,6.1976 Z"/>
<path fill="#175FAB" d="M10.2794375,5.0514375 L10.2794375,5.049375 C10.1450445,5.178467 10.0048364,5.3013654 9.85925,5.4176875 C9.78764089,5.47471692 9.71442377,5.52969749 9.6396875,5.5825625 C9.70125,5.6561875 9.763875,5.7251875 9.829875,5.788125 C9.9300625,5.8851875 10.037125,5.967 10.1539375,6.030125 C10.1805625,6.017 10.2070625,6.00275 10.2329375,5.9876875 C10.352,5.9181875 10.458875,5.824375 10.5598125,5.7011875 C10.4553125,5.52275 10.3635625,5.3016875 10.2799375,5.0511875"/>
<path fill="url(#dotnet-o)" d="M14.452,0.0006875 L13.6581875,0.0006875 C13.6153125,0.00275 13.573625,0.0041875 13.5325,0.0068125 C13.5130625,0.0485 13.493125,0.0901875 13.4739375,0.132125 C12.8168125,1.53175 12.1266875,2.744625 11.4260625,3.70875 C11.0965625,4.7226875 10.8548125,5.3379375 10.5583125,5.699875 C10.6850625,5.916125 10.8325625,6.0681875 11.007875,6.132625 C11.013,6.1305625 11.017125,6.1305625 11.0216875,6.1295 L11.0245625,6.1295 C11.027625,6.1295 11.0309375,6.1275 11.03425,6.1275 C11.041375,6.1254375 11.0490625,6.1241875 11.05625,6.122 C11.0608125,6.1199375 11.064625,6.11975 11.06925,6.11825 C11.0759375,6.11625 11.0828125,6.1148125 11.0889375,6.1131875 C11.0930625,6.111125 11.097125,6.1105 11.1011875,6.1096875 C11.1114375,6.106375 11.120625,6.1039375 11.130375,6.100875 C11.1349375,6.098875 11.1398125,6.097125 11.1449375,6.0959375 C11.1505625,6.0939375 11.1561875,6.0925 11.1613125,6.0900625 C11.1671875,6.088 11.1730625,6.0869375 11.1781875,6.08475 C11.18275,6.0826875 11.1875625,6.0814375 11.1919375,6.079625 C11.2034375,6.0755 11.2146875,6.0720625 11.2261875,6.0675625 C11.2293125,6.0675625 11.232375,6.0646875 11.2356875,6.0640625 C11.2425625,6.0611875 11.24975,6.0589375 11.256625,6.055875 C11.259125,6.0538125 11.26225,6.053625 11.2655625,6.0525625 C11.289625,6.0425625 11.314375,6.0323125 11.3391875,6.021125 L11.34175,6.021125 C11.377767,6.00509302 11.4133229,5.98804453 11.448375,5.97 C12.5875625,5.3335625 13.16275,3.1951875 14.950875,0.0009375 L14.4514375,0.0009375 L14.4520625,0.0006875 L14.452,0.0006875 Z"/>
<path fill="#7DCBEC" d="M4.5630625,0.1410625 C4.565875,0.1410625 4.5684375,0.1410625 4.5711875,0.1430625 C4.578125,0.1430625 4.5850625,0.1430625 4.5919375,0.1453125 L4.5988125,0.1453125 C4.611375,0.1473125 4.623875,0.1484375 4.6366875,0.15025 C4.639,0.15025 4.6410625,0.15025 4.6430625,0.15225 C4.6535625,0.15425 4.6643125,0.156 4.675,0.1575625 C4.6773125,0.1575625 4.680375,0.159625 4.6829375,0.159625 C4.7075,0.1645 4.7325625,0.169625 4.7565625,0.1759375 C4.7588125,0.1759375 4.7611875,0.178 4.7631875,0.178 C4.7734375,0.1804375 4.782625,0.1835 4.792875,0.186375 C4.796,0.186375 4.7981875,0.188375 4.801,0.188875 C4.8130625,0.1919375 4.8243125,0.195 4.836,0.198875 C4.8365625,0.198875 4.83725,0.198875 4.838625,0.200875 C4.848625,0.2039375 4.8588125,0.2078125 4.86925,0.2113125 C4.8734375,0.2133125 4.87725,0.2141875 4.8810625,0.2151875 C4.88825,0.2183125 4.8961875,0.2213125 4.9030625,0.2241875 C4.907125,0.2241875 4.9111875,0.2270625 4.9155625,0.2285625 C4.925,0.2328125 4.9349375,0.2366875 4.9446875,0.24075 C4.9498125,0.2428125 4.954125,0.245125 4.9590625,0.2469375 C4.9646875,0.2498125 4.9705,0.2524375 4.976625,0.2544375 C4.98175,0.2569375 4.987375,0.2595625 4.99225,0.2618125 C4.997625,0.26475 5.0026875,0.2669375 5.007875,0.2698125 C5.134625,0.3321875 5.2514375,0.41525 5.3595625,0.516 C5.39828053,0.475232119 5.43995637,0.437379181 5.48425,0.40275 C5.2478125,0.235 4.98,0.139375 4.6709375,0.139375 C4.635125,0.139375 4.599375,0.1414375 4.5630625,0.144125"/>
<path fill="#5EC5ED" d="M5.3595625,0.513 C5.42749062,0.5766524 5.49087502,0.644986418 5.54925,0.7175 C5.60608604,0.677606149 5.66385199,0.639053834 5.7225,0.601875 C5.64893894,0.5277955 5.56916826,0.46015247 5.4840625,0.3996875 C5.43977139,0.434250305 5.3981531,0.472107907 5.3595625,0.5129375"/>
<path fill="url(#dotnet-p)" d="M4.563,0.392875 C4.59925,0.3959375 4.6350625,0.39725 4.670875,0.39725 C4.979875,0.39725 5.24775,0.301625 5.4841875,0.134125 C5.7336875,0.331 6.03525,0.39975 6.4541875,0.39975 L4.4254375,0.39975 C4.4723125,0.39975 4.518,0.3969375 4.563,0.392875" transform="matrix(1 0 0 -1 0 .534)"/>
<path fill="url(#dotnet-q)" d="M6.4541875,0.601875 C6.03525,0.601875 5.7336875,0.533125 5.4841875,0.33625 C5.56918279,0.275740937 5.64888584,0.208122974 5.7224375,0.134125 C6.06975,0.3549375 6.4138125,0.5011875 6.7530625,0.5650625 C6.88018835,0.589237921 7.00928373,0.601561612 7.1386875,0.601875 L6.4541875,0.601875 Z" transform="matrix(1 0 0 -1 0 .736)"/>
<path fill="url(#dotnet-r)" d="M11.4269375,3.71075 C11.607125,3.155125 11.8134375,2.4805625 12.06925,1.662375 C12.299875,0.9251875 12.708,0.374125 13.4745625,0.133625 C13.4948125,0.0924375 13.5139375,0.05 13.533625,0.008375 C12.284,0.08325 11.6999375,0.7189375 11.406,1.6603125 C10.892,3.3038125 10.580625,4.3691875 10.2808125,5.0480625 C10.66375,4.6820625 11.046625,4.2326875 11.4269375,3.71075"/>
<path fill="#000" fill-rule="nonzero" d="M13.5857557,5.78563256 L13.3091894,5.78563256 L13.3091894,6.6791875 L13.1964148,6.6791875 L13.1964148,5.78563256 L12.91875,5.78563256 L12.91875,5.67931437 L13.5856336,5.67931437 L13.5856336,5.78563256 L13.5857557,5.78563256 Z M14.7180177,6.67893376 L14.6057313,6.67893376 L14.6057313,6.00753056 C14.6057313,5.95462521 14.6096369,5.88979395 14.6148851,5.81341739 C14.6032903,5.85909108 14.5937703,5.89080892 14.5849827,5.91110833 L14.2575214,6.67893376 L14.2025987,6.67893376 L13.874283,5.91681754 C13.8645189,5.89563003 13.854999,5.86124789 13.8446247,5.81354426 L13.8407191,5.81354426 C13.8446247,5.85376248 13.8459672,5.91884748 13.8459672,6.00917989 L13.8459672,6.67906063 L13.7380747,6.67906063 L13.7380747,5.6791875 L13.8868541,5.6791875 L14.1818501,6.37697994 C14.2041853,6.42937781 14.2182211,6.46984977 14.2253,6.49687337 L14.2295718,6.49687337 C14.2490999,6.4418112 14.2652105,6.40083175 14.275951,6.37380815 L14.5770494,5.6791875 L14.71875,5.6791875 L14.71875,6.67893376 L14.7180177,6.67893376 Z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

1
python/python-parser/resources/META-INF/PythonParser.xml
View File

@@ -6,6 +6,5 @@
hashBangs="python"
implementationClass="com.jetbrains.python.PythonFileType"
fieldName="INSTANCE"/>
<iconMapper mappingFile="PythonPsiApiIconMappings.json"/>
</extensions>
</idea-plugin>

2
python/python-psi-api/gen/com/jetbrains/python/psi/icons/PythonPsiApiIcons.java
View File

@@ -25,5 +25,5 @@ public final class PythonPsiApiIcons {
/** 16x16 */ public static final @NotNull Icon PropertyDeleter = load("icons/com/jetbrains/python/psi/propertyDeleter.svg", 474832287, 2);
/** 16x16 */ public static final @NotNull Icon PropertyGetter = load("icons/com/jetbrains/python/psi/propertyGetter.svg", 1495604199, 2);
/** 16x16 */ public static final @NotNull Icon PropertySetter = load("icons/com/jetbrains/python/psi/propertySetter.svg", -1451064081, 2);
/** 16x16 */ public static final @NotNull Icon PythonFile = load("icons/com/jetbrains/python/psi/pythonFile.svg", -1892316725, 0);
/** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/python/psi/python.svg", 2008591516, 8);
}

28
python/python-psi-api/gen/icons/PythonPsiApiIcons.java
View File

@@ -1,28 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package icons;
import com.intellij.ui.IconManager;
import com.jetbrains.python.parser.icons.PythonParserIcons;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* @deprecated moved to {@link PythonParserIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public final class PythonPsiApiIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonPsiApiIcons.class.getClassLoader(), cacheKey, flags);
}
/**
* @deprecated moved to {@link PythonParserIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
/** 16x16 */ public static final @NotNull Icon PythonFile = PythonParserIcons.PythonFile;
}

2
python/python-psi-api/resources/META-INF/PythonPsi.xml
View File

@@ -48,5 +48,7 @@
<extensions defaultExtensionNs="com.intellij">
<projectService serviceInterface="com.jetbrains.python.psi.types.TypeEvalContextCache"
serviceImplementation="com.jetbrains.python.psi.types.TypeEvalContextCacheImpl"/>
<iconMapper mappingFile="PythonPsiApiIconMappings.json"/>
</extensions>
</idea-plugin>

2
python/python-psi-api/resources/PythonPsiApiIconMappings.json
View File

@@ -5,7 +5,7 @@
"python": {
"psi": {
"expui": {
"python.svg": "icons/com/jetbrains/python/psi/pythonFile.svg"
"python.svg": "icons/com/jetbrains/python/parser/pythonFile.svg"
}
}
}

0
python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python_stroke.svg → python/python-psi-api/resources/icons/com/jetbrains/python/psi/expui/python_stroke.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

0
python/python-sdk/resources/icons/com/jetbrains/python/sdk/python.svg → python/python-psi-api/resources/icons/com/jetbrains/python/psi/python.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

8
python/python-psi-api/resources/icons/com/jetbrains/python/psi/pythonFile.svg
View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd">
<polygon fill="#9AA7B0" fill-opacity=".8" points="7 1 3 5 7 5"/>
<path fill="#9AA7B0" fill-opacity=".8" d="M8,15 L8,14.2969971 C7.36669922,14.199707 6.88330078,13.8920898 6.54980469,13.3741455 C6.04956055,12.597229 5.93456815,11.4361142 6.19824,10.48829 C6.43894131,9.35763335 7.42625169,8.54140082 8.582,8.51758 L8.582,8.30371 C8.54238583,7.73543641 8.73742659,7.17576161 9.12164336,6.75518863 C9.50586012,6.33461565 10.0091436,6.01178592 10.5786743,6 C11.0159164,5.92635891 11.4950401,5.96724118 11.93844,5.96679 C12.256801,5.96513612 12.6106543,6.00191945 13,6.07714 L13,1 L8,1 L8,6 L3,6 L3,15 L8,15 Z"/>
<path fill="#40A0CF" fill-opacity=".9" fill-rule="nonzero" d="M11.4913273,6.87848182 C11.140205,6.87885379 10.7897227,6.90844683 10.4435091,6.96695455 C9.5156,7.12909091 9.34714545,7.46846364 9.34714545,8.09432727 L9.34714545,8.92090909 L11.5398727,8.92090909 L11.5398727,9.19642727 L8.5242,9.19642727 C7.86120772,9.18181909 7.28351073,9.64553477 7.15436364,10.2959909 C6.94853771,11.0163063 6.94853771,11.7798664 7.15436364,12.5001818 C7.21449071,13.1059266 7.71153147,13.5748995 8.31974545,13.5997545 L9.07363636,13.5997545 L9.07363636,12.6088455 C9.09437381,11.8647707 9.69915617,11.2699502 10.4434727,11.2615727 L12.6336727,11.2615727 C12.9252637,11.2609951 13.2046621,11.1445126 13.4103098,10.9377889 C13.6159575,10.7310652 13.7309804,10.4510628 13.7300364,10.1594727 L13.7300364,8.09432727 C13.6891878,7.50110733 13.225523,7.02432847 12.6336727,6.96695455 C12.255995,6.90590528 11.8739012,6.87631276 11.4913273,6.87848182 Z M10.3054545,7.54328182 C10.4726651,7.5425433 10.6238453,7.642633 10.6884634,7.79685492 C10.7530816,7.95107684 10.7184039,8.12903997 10.600609,8.24771713 C10.4828141,8.36639429 10.3051147,8.40239892 10.1504149,8.33893338 C9.99571511,8.27546783 9.89450011,8.12503865 9.89399091,7.95782727 C9.89352675,7.72988991 10.0775201,7.5445185 10.3054545,7.54328182 Z"/>
<path fill="#FFC900" fill-opacity=".9" fill-rule="nonzero" d="M14.0035364,9.19642727 L14.0035364,10.1594909 C13.9910624,10.9116696 13.3858254,11.5192282 12.6337,11.5345818 L10.4435,11.5345818 C9.83937796,11.5432182 9.35262001,12.0325229 9.34713636,12.6366818 L9.34713636,14.7018182 C9.41880712,15.2760701 9.86962988,15.7292517 10.4435,15.8039182 C11.1569057,16.0244958 11.9202943,16.0244958 12.6337,15.8039182 C13.2106869,15.7356093 13.6647667,15.2791537 13.7300636,14.7018182 L13.7300636,13.8752818 L11.5398818,13.8752818 L11.5398818,13.5997636 L14.8264636,13.5997636 C15.4637364,13.5997636 15.7012182,13.1601091 15.9228273,12.5001909 C16.1478282,11.7826865 16.1478282,11.0135045 15.9228273,10.296 C15.8879234,9.70500551 15.4173536,9.23305833 14.8264636,9.19642727 L14.0035364,9.19642727 Z M12.7717182,14.4263364 C12.9391579,14.4255968 13.0904985,14.5259586 13.1549699,14.6804903 C13.2194413,14.835022 13.1843021,15.013184 13.0659843,15.131664 C12.9476664,15.2501439 12.7695527,15.2855269 12.6149329,15.2212671 C12.4603131,15.1570073 12.3597442,15.0058042 12.3602545,14.8383636 C12.3601315,14.7291513 12.4034241,14.6243686 12.4805978,14.5470927 C12.5577715,14.4698167 12.6624967,14.4263853 12.7717091,14.4263636 L12.7717182,14.4263364 Z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.2 KiB

0
python/python-sdk/resources/icons/com/jetbrains/python/sdk/python_stroke.svg → python/python-psi-api/resources/icons/com/jetbrains/python/psi/python_stroke.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

18
python/python-sdk/gen/com/jetbrains/python/sdk/icons/PythonSdkIcons.java
View File

@@ -1,18 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.jetbrains.python.sdk.icons;
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 PythonSdkIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonSdkIcons.class.getClassLoader(), cacheKey, flags);
}
/** 16x16 */ public static final @NotNull Icon Python = load("icons/com/jetbrains/python/sdk/python.svg", 2008591516, 8);
}

1
python/python-sdk/intellij.python.sdk.iml
View File

@@ -6,7 +6,6 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

2
python/python-sdk/resources/META-INF/PythonSdk.xml
View File

@@ -8,6 +8,4 @@
interface="com.jetbrains.python.sdk.configuration.PyProjectSdkConfigurationExtension"
dynamic="true"/>
</extensionPoints>
<extensions defaultExtensionNs="com.intellij">
</extensions>
</idea-plugin>

1
python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/icon-robots.txt
View File

@@ -1 +0,0 @@
skip: *

15
python/python-sdk/resources/icons/com/jetbrains/python/sdk/expui/python.svg
View File

@@ -1,15 +0,0 @@
<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.9167 1.00011C7.33942 1.00277 6.78812 1.05146 6.30304 1.13636C4.87405 1.38606 4.6146 1.90869 4.6146 2.87252V4.14544H7.99148V4.56975H4.6146H3.34729C2.36587 4.56975 1.50652 5.15319 1.23772 6.26309C0.927672 7.53529 0.91392 8.32916 1.23772 9.65755C1.47776 10.6463 2.05101 11.3509 3.03243 11.3509H4.19348V9.82493C4.19348 8.72252 5.15785 7.75011 6.30304 7.75011H9.67598C10.6149 7.75011 11.3644 6.98549 11.3644 6.05288V2.87252C11.3644 1.96737 10.5924 1.28743 9.67598 1.13636C9.09589 1.04085 8.49398 0.997461 7.9167 1.00011ZM6.09051 2.0239C6.43932 2.0239 6.72417 2.31024 6.72417 2.66231C6.72417 3.01313 6.43932 3.29682 6.09051 3.29682C5.74045 3.29682 5.45685 3.01313 5.45685 2.66231C5.45685 2.31024 5.74045 2.0239 6.09051 2.0239Z" fill="url(#paint0_linear_1150_23815)"/>
<path d="M11.7854 4.5697V6.05283C11.7854 7.20268 10.7998 8.17048 9.67588 8.17048H6.30294C5.37904 8.17048 4.6145 8.95257 4.6145 9.86771V13.0481C4.6145 13.9532 5.41029 14.4856 6.30294 14.7453C7.37187 15.0562 8.39692 15.1124 9.67588 14.7453C10.526 14.5018 11.3643 14.0119 11.3643 13.0481V11.7751H7.99138V11.3508H11.3643H13.0528C14.0342 11.3508 14.3999 10.6738 14.7412 9.6575C15.0938 8.61127 15.0788 7.60516 14.7412 6.26304C14.4987 5.29672 14.0354 4.5697 13.0528 4.5697H11.7854ZM9.88841 12.6238C10.2385 12.6238 10.5221 12.9075 10.5221 13.2583C10.5221 13.6103 10.2385 13.8967 9.88841 13.8967C9.5396 13.8967 9.25476 13.6103 9.25476 13.2583C9.25476 12.9075 9.5396 12.6238 9.88841 12.6238Z" fill="url(#paint1_linear_1150_23815)"/>
<defs>
<linearGradient id="paint0_linear_1150_23815" x1="1" y1="1" x2="8.71457" y2="7.64655" gradientUnits="userSpaceOnUse">
<stop stop-color="#5A9FD4"/>
<stop offset="1" stop-color="#306998"/>
</linearGradient>
<linearGradient id="paint1_linear_1150_23815" x1="9.80726" y1="13.1513" x2="7.05423" y2="9.2508" gradientUnits="userSpaceOnUse">
<stop stop-color="#F4C20E"/>
<stop offset="1" stop-color="#FBDC3E"/>
</linearGradient>
</defs>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

4
python/python-sdk/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
View File

@@ -23,12 +23,12 @@ import com.intellij.util.PatternUtil;
import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PySdkBundle;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.run.CommandLinePatcher;
import com.jetbrains.python.sdk.PyRemoteSdkAdditionalDataMarker;
import com.jetbrains.python.sdk.PySdkUtil;
import com.jetbrains.python.sdk.PythonEnvUtil;
import com.jetbrains.python.sdk.PythonSdkAdditionalData;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -402,7 +402,7 @@ public abstract class PythonSdkFlavor<D extends PyFlavorData> {
}
public @NotNull Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
public void initPythonPath(@NotNull Collection<String> path, boolean passParentEnvs, @NotNull Map<String, String> env) {

26
python/python-sdk/src/icons/PythonSdkIcons.java
View File

@@ -1,26 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package icons;
import com.intellij.ui.IconManager;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
/**
* @deprecated moved to {@link com.jetbrains.python.sdk.icons.PythonSdkIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public final class PythonSdkIcons {
private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) {
return IconManager.getInstance().loadRasterizedIcon(path, PythonSdkIcons.class.getClassLoader(), cacheKey, flags);
}
/**
* @deprecated moved to {@link com.jetbrains.python.sdk.icons.PythonSdkIcons}
*/
@ApiStatus.ScheduledForRemoval
@Deprecated(forRemoval = true)
public static final @NotNull Icon Python = com.jetbrains.python.sdk.icons.PythonSdkIcons.Python;
}

5
python/src/com/jetbrains/python/actions/PyRunFileInConsoleAction.java
View File

@@ -15,10 +15,9 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiFile;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.run.PythonRunConfiguration;
import com.jetbrains.python.run.PythonRunConfigurationProducer;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
@@ -28,7 +27,7 @@ public class PyRunFileInConsoleAction extends AnAction implements DumbAware {
public PyRunFileInConsoleAction() {
super(PyBundle.messagePointer("acton.run.file.in.python.console.title"),
PyBundle.messagePointer("action.run.file.in.python.console.description"), PythonSdkIcons.Python);
PyBundle.messagePointer("action.run.file.in.python.console.description"), PythonPsiApiIcons.Python);
}
@Override

6
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
View File

@@ -78,6 +78,8 @@ import com.jetbrains.python.debugger.PyDebugValue;
import com.jetbrains.python.debugger.PyVariableViewSettings;
import com.jetbrains.python.debugger.ValuesPolicy;
import com.jetbrains.python.debugger.settings.PyDebuggerSettings;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.remote.PyRemotePathMapper;
import com.jetbrains.python.remote.PyRemoteSdkAdditionalDataBase;
import com.jetbrains.python.remote.PyRemoteSocketToLocalHostProvider;
@@ -86,8 +88,6 @@ import com.jetbrains.python.run.*;
import com.jetbrains.python.run.target.HelpersAwareTargetEnvironmentRequest;
import com.jetbrains.python.sdk.PythonEnvUtil;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import org.jetbrains.annotations.*;
import javax.swing.*;
@@ -1275,7 +1275,7 @@ public class PydevConsoleRunnerImpl implements PydevConsoleRunner {
final ServerSocket serverSocket = PythonCommandLineState.createServerSocket();
return XDebuggerManager.getInstance(myProject).
startSessionAndShowTab(PyBundle.message("pydev.console.runner.python.console.debugger"), PythonSdkIcons.Python, null, true,
startSessionAndShowTab(PyBundle.message("pydev.console.runner.python.console.debugger"), PythonPsiApiIcons.Python, null, true,
new XDebugProcessStarter() {
@Override
@NotNull

4
python/src/com/jetbrains/python/newProject/PythonNewProjectWizard.kt
View File

@@ -24,12 +24,12 @@ import com.jetbrains.python.PyBundle
import com.jetbrains.python.PythonModuleTypeBase
import com.jetbrains.python.newProject.steps.ProjectSpecificSettingsStep
import com.jetbrains.python.newProject.steps.PyAddExistingSdkPanel
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import com.jetbrains.python.sdk.PySdkProvider
import com.jetbrains.python.sdk.PySdkSettings
import com.jetbrains.python.sdk.add.PyAddNewCondaEnvPanel
import com.jetbrains.python.sdk.add.PyAddNewVirtualEnvPanel
import com.jetbrains.python.sdk.add.PyAddSdkPanel
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.sdk.pythonSdk
import java.nio.file.Path
@@ -42,7 +42,7 @@ class PythonNewProjectWizard : LanguageGeneratorNewProjectWizard {
override val name = PYTHON
override val icon = PythonSdkIcons.Python
override val icon = PythonPsiApiIcons.Python
override val ordinal = 600

4
python/src/com/jetbrains/python/packaging/pyproject/PyprojectMetadataCompletionContributor.kt
View File

@@ -7,7 +7,7 @@ import com.intellij.codeInsight.completion.CompletionResultSet
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.psi.util.elementType
import com.intellij.psi.util.parentOfType
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import org.toml.lang.psi.TOML_STRING_LITERALS
import org.toml.lang.psi.TomlKeyValue
import org.toml.lang.psi.ext.name
@@ -29,7 +29,7 @@ class PyprojectMetadataCompletionContributor : CompletionContributor() {
if (TOML_STRING_LITERALS.contains(parent.elementType) && parent.parentOfType<TomlKeyValue>()?.key?.name == "build-backend") {
knownBackends.map {
LookupElementBuilder.create(it).withIcon(PythonSdkIcons.Python)
LookupElementBuilder.create(it).withIcon(PythonPsiApiIcons.Python)
}
.forEach { result.addElement(it) }
}

8
python/src/com/jetbrains/python/packaging/pyproject/PyprojectPackageCompletionContributor.kt
View File

@@ -11,7 +11,7 @@ import com.intellij.psi.util.elementType
import com.intellij.psi.util.parentOfType
import com.jetbrains.python.PyBundle
import com.jetbrains.python.packaging.pip.PypiPackageCache
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import org.toml.lang.psi.TOML_STRING_LITERALS
import org.toml.lang.psi.TomlArray
import org.toml.lang.psi.TomlKeyValue
@@ -32,8 +32,10 @@ class PyprojectPackageCompletionContributor : CompletionContributor() {
val cache = service<PypiPackageCache>()
val maxPriority = cache.packages.size
cache.packages.asSequence()
.map { LookupElementBuilder.create(it.lowercase()).withTypeText(PyBundle.message("python.pyproject.package.completion.tail")).withIcon(
PythonSdkIcons.Python) }
.map {
LookupElementBuilder.create(it.lowercase()).withTypeText(PyBundle.message("python.pyproject.package.completion.tail")).withIcon(
PythonPsiApiIcons.Python)
}
.mapIndexed { index, lookupElementBuilder ->
PrioritizedLookupElement.withPriority(lookupElementBuilder, (maxPriority - index).toDouble())
}

4
python/src/com/jetbrains/python/requirements/RequirementsCompletionUtil.kt
View File

@@ -11,7 +11,7 @@ import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.project.Project
import com.jetbrains.python.packaging.management.PythonPackageManager
import com.jetbrains.python.packaging.management.createSpecification
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import com.jetbrains.python.sdk.pythonSdk
fun completePackageNames(project: Project, result: CompletionResultSet) {
@@ -19,7 +19,7 @@ fun completePackageNames(project: Project, result: CompletionResultSet) {
val packages = repositoryManager.allPackages()
val maxPriority = packages.size
packages.asSequence().map {
LookupElementBuilder.create(it.lowercase()).withIcon(PythonSdkIcons.Python)
LookupElementBuilder.create(it.lowercase()).withIcon(PythonPsiApiIcons.Python)
}.mapIndexed { index, lookupElementBuilder ->
PrioritizedLookupElement.withPriority(lookupElementBuilder, (maxPriority - index).toDouble())
}.forEach { result.addElement(it) }

5
python/src/com/jetbrains/python/run/PythonConfigurationType.java
View File

@@ -7,8 +7,7 @@ import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.openapi.project.Project;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.icons.PythonIcons;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -53,7 +52,7 @@ public final class PythonConfigurationType implements ConfigurationType {
@Override
public Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
@Override

6
python/src/com/jetbrains/python/run/runAnything/PyRunAnythingPipProvider.kt
View File

@@ -7,7 +7,7 @@ import com.jetbrains.python.packaging.management.PythonPackageManager
import com.jetbrains.python.packaging.pip.PipBasedPackageManager
import com.jetbrains.python.packaging.repository.PyPIPackageRepository
import com.jetbrains.python.packaging.repository.PyPackageRepository
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import javax.swing.Icon
class PyRunAnythingPipProvider : PyRunAnythingPackageProvider() {
@@ -20,11 +20,11 @@ class PyRunAnythingPipProvider : PyRunAnythingPackageProvider() {
override fun getCompletionGroupTitle() = PyBundle.message("python.run.anything.pip.provider")
override fun getIcon(value: String): Icon {
return PythonSdkIcons.Python
return PythonPsiApiIcons.Python
}
override fun getHelpIcon(): Icon {
return PythonSdkIcons.Python
return PythonPsiApiIcons.Python
}
override fun getDefaultCommands(): Sequence<String> {

5
python/src/com/jetbrains/python/sdk/PythonSdkType.java
View File

@@ -36,6 +36,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.PyNames;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.psi.icons.PythonPsiApiIcons;
import com.jetbrains.python.remote.PyCredentialsContribution;
import com.jetbrains.python.remote.PyRemoteInterpreterUtil;
import com.jetbrains.python.remote.PyRemoteSdkAdditionalDataBase;
@@ -43,10 +44,8 @@ import com.jetbrains.python.remote.PythonRemoteInterpreterManager;
import com.jetbrains.python.sdk.add.PyAddSdkDialog;
import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import com.jetbrains.python.sdk.icons.PythonSdkIcons;
import com.jetbrains.python.target.PyInterpreterVersionUtil;
import com.jetbrains.python.target.PyTargetAwareAdditionalData;
import com.jetbrains.python.icons.PythonIcons;
import one.util.streamex.StreamEx;
import org.jdom.Element;
import org.jetbrains.annotations.*;
@@ -108,7 +107,7 @@ public final class PythonSdkType extends SdkType {
@Override
public Icon getIcon() {
return PythonSdkIcons.Python;
return PythonPsiApiIcons.Python;
}
@NotNull

4
python/src/com/jetbrains/python/sdk/add/PyAddSdkPanel.kt
View File

@@ -35,11 +35,11 @@ import com.jetbrains.python.newProject.steps.PyAddNewEnvironmentPanel
import com.jetbrains.python.pathValidation.PlatformAndRoot
import com.jetbrains.python.pathValidation.ValidationRequest
import com.jetbrains.python.pathValidation.validateEmptyDir
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import com.jetbrains.python.sdk.*
import com.jetbrains.python.sdk.add.PyAddSdkDialogFlowAction.OK
import com.jetbrains.python.sdk.configuration.findPreferredVirtualEnvBaseSdk
import com.jetbrains.python.sdk.flavors.MacPythonSdkFlavor
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.ui.pyModalBlocking
import java.awt.Component
import javax.swing.Icon
@@ -66,7 +66,7 @@ abstract class PyAddSdkPanel : JPanel(), PyAddSdkView {
override fun complete(): Unit = Unit
abstract override val panelName: String
override val icon: Icon = PythonSdkIcons.Python
override val icon: Icon = PythonPsiApiIcons.Python
open val sdk: Sdk? = null
open val nameExtensionComponent: JComponent? = null
open var newProjectPath: String? = null

11
python/src/com/jetbrains/python/sdk/add/v2/common.kt
View File

@@ -14,6 +14,7 @@ import com.intellij.openapi.ui.validation.DialogValidationRequestor
import com.intellij.openapi.wm.IdeFocusManager
import com.intellij.ui.dsl.builder.Panel
import com.jetbrains.python.PyBundle.message
import com.jetbrains.python.icons.PythonIcons
import com.jetbrains.python.newProject.collector.InterpreterStatisticsInfo
import com.jetbrains.python.sdk.PyDetectedSdk
import com.jetbrains.python.sdk.installSdkIfNeeded
@@ -21,8 +22,6 @@ import com.jetbrains.python.sdk.pipenv.PIPENV_ICON
import com.jetbrains.python.sdk.poetry.POETRY_ICON
import com.jetbrains.python.sdk.setup
import com.jetbrains.python.statistics.InterpreterTarget
import com.jetbrains.python.icons.PythonIcons
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import kotlinx.coroutines.CoroutineScope
import javax.swing.Icon
@@ -55,7 +54,7 @@ enum class PythonSupportedEnvironmentManagers(val nameKey: String, val icon: Ico
CONDA("sdk.create.custom.conda", PythonIcons.Python.Anaconda),
POETRY("sdk.create.custom.poetry", POETRY_ICON),
PIPENV("sdk.create.custom.pipenv", PIPENV_ICON),
PYTHON("sdk.create.custom.python", PythonSdkIcons.Python)
PYTHON("sdk.create.custom.python", com.jetbrains.python.psi.icons.PythonPsiApiIcons.Python)
}
enum class PythonInterpreterSelectionMode(val nameKey: String) {
@@ -91,9 +90,9 @@ internal fun setupBaseSdk(sdk: Sdk, existingSdks: List<Sdk>): Sdk? {
notification.collapseDirection
notification.addAction(NotificationAction.createSimple(message("python.sdk.installation.balloon.error.action")) {
notification.expire()
HelpManager.getInstance().invokeHelp("create.python.interpreter")
})
notification.expire()
HelpManager.getInstance().invokeHelp("create.python.interpreter")
})
NotificationsManager
.getNotificationsManager()

6
python/src/com/jetbrains/python/sdk/add/v2/uiUtils.kt
View File

@@ -33,6 +33,7 @@ import com.intellij.ui.dsl.builder.components.ValidationType
import com.intellij.ui.dsl.builder.components.validationTooltip
import com.intellij.ui.util.preferredHeight
import com.jetbrains.python.PyBundle.message
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import com.jetbrains.python.sdk.PyDetectedSdk
import com.jetbrains.python.sdk.PySdkToInstall
import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMethod.CREATE_NEW
@@ -41,7 +42,6 @@ import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMode.CUSTOM
import com.jetbrains.python.sdk.add.v2.PythonSupportedEnvironmentManagers.VIRTUALENV
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnv
import com.jetbrains.python.sdk.flavors.conda.PyCondaEnvIdentity
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.CoroutineStart
import kotlinx.coroutines.flow.SharedFlow
@@ -130,7 +130,7 @@ class PythonNewEnvironmentDialogNavigator {
internal fun SimpleColoredComponent.customizeForPythonSdk(sdk: Sdk) {
when (sdk) {
is PyDetectedSdk -> {
icon = IconLoader.getTransparentIcon(PythonSdkIcons.Python)
icon = IconLoader.getTransparentIcon(PythonPsiApiIcons.Python)
append(sdk.homePath!!)
append(" " + message("sdk.rendering.detected.grey.text"), SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES)
}
@@ -140,7 +140,7 @@ internal fun SimpleColoredComponent.customizeForPythonSdk(sdk: Sdk) {
append(" " + message("sdk.rendering.installable.grey.text"), SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES)
}
else -> {
icon = PythonSdkIcons.Python
icon = PythonPsiApiIcons.Python
append(sdk.versionString!!)
append(" " + sdk.homePath!!, SimpleTextAttributes.GRAYED_SMALL_ATTRIBUTES)
}

4
python/src/com/jetbrains/python/target/PythonLanguageRuntimeType.kt
View File

@@ -11,7 +11,7 @@ import com.intellij.openapi.options.Configurable
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.NlsSafe
import com.jetbrains.python.PyBundle
import com.jetbrains.python.sdk.icons.PythonSdkIcons
import com.jetbrains.python.psi.icons.PythonPsiApiIcons
import org.jetbrains.annotations.Nls
import java.util.function.Supplier
import javax.swing.Icon
@@ -20,7 +20,7 @@ class PythonLanguageRuntimeType : LanguageRuntimeType<PythonLanguageRuntimeConfi
override val displayName: @NlsSafe String = "Python"
override val icon: Icon
get() = PythonSdkIcons.Python
get() = PythonPsiApiIcons.Python
override val configurableDescription: @Nls String
get() = PyBundle.message("python.language.configure.label")