MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Слияние ветки 'feature/ASPR-3010' в '253'

Browse Source
This commit is contained in:
Nikita Iarychenko
2026-02-24 10:07:09 +03:00
committed by GitFlic
parent a5eed52e8e aa504b91aa
commit e3c1fceffa
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/ide-startup/importSettings/intellij.ide.startup.importSettings.iml
View File

@@ -67,6 +67,5 @@
<orderEntry type="module" module-name="intellij.platform.ide.ui" />
<orderEntry type="module" module-name="intellij.platform.ide.initialConfigImport" />
<orderEntry type="module" module-name="intellij.platform.plugins.parser.impl" />
<orderEntry type="module" module-name="intellij.java.ui" />
</component>
</module>

4
plugins/ide-startup/importSettings/resources/icons/spring.svg Normal file
View File

@@ -0,0 +1,4 @@
<!-- 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">
<path fill="#62B543" fill-opacity=".7" fill-rule="evenodd" d="M13.8189229,12.2851118 C11.7381304,15.0552815 7.29624189,14.1257561 4.44717245,14.2546012 C4.44717245,14.2546012 3.94283089,14.2832335 3.43439732,14.3670851 C3.43439732,14.3670851 3.62672229,14.2852786 3.87224354,14.2004045 C5.87221867,13.5091403 6.81849847,13.3700694 8.03485163,12.7452728 C10.3181992,11.5754411 12.5923397,9.02819378 13.0537151,6.3817562 C12.1841607,8.92798092 9.53969226,11.1183477 7.13256106,12.0059474 C5.4834767,12.61336 2.50243959,13.2064565 2.50243959,13.2074791 L2.38172498,13.1430565 C0.354128707,12.1572892 0.297863422,7.76939754 3.97863607,6.35516911 C5.59293826,5.73446293 7.13665308,6.07600472 8.88087692,5.65981457 C10.7417233,5.21805992 12.8961723,3.81917019 13.7718647,2 C14.7549727,4.91230844 15.9344977,9.46790327 13.8189229,12.2851118 Z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/OpenIdePluginIcons.java
View File

@@ -25,5 +25,6 @@ public final class OpenIdePluginIcons {
public static final class Icons {
/** 60x48 */ public static final @NotNull Icon Docker = load("icons/docker.svg", -271658419, 0);
/** 16x16 */ public static final @NotNull Icon Spring = load("icons/spring.svg", 1614158219, 0);
}
}

3
plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/chooser/ui/OpenIdeStartupWizardService.kt
View File

@@ -20,7 +20,6 @@ import com.intellij.ide.startup.importSettings.data.*
import com.intellij.ide.startup.importSettings.openide.utils.PluginInstallationUtil
import com.intellij.ide.startup.importSettings.transfer.ProgressIndicatorAdapter
import com.intellij.ide.startup.importSettings.transfer.TransferSettingsProgressIndicator
import com.intellij.java.ui.icons.JavaUIIcons
import com.intellij.openapi.application.EDT
import com.intellij.openapi.application.ModalityState
import com.intellij.openapi.application.asContextElement
@@ -107,7 +106,7 @@ class OpenIdeStartupWizardService(private val coroutineScope: CoroutineScope) :
),
WizardPluginImpl(
id = "bundled.spring",
icon = JavaUIIcons.SpringPromo,
icon = OpenIdePluginIcons.Icons.Spring,
name = "Spring support",
description = ImportSettingsBundle.message("plugin.description.spring.support"),
bundled = true,