From 6dbaec0cc611880bc0a877c9a1ca6947c30a37fc Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 19 Jul 2017 15:29:40 +0200 Subject: [PATCH] Use distinct icon for Kotlin/JS module and libraries --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 2 ++ .../org/jetbrains/kotlin/idea/icons/kotlin_js.png | Bin 0 -> 313 bytes .../jetbrains/kotlin/idea/icons/kotlin_js@2x.png | Bin 0 -> 601 bytes .../GradleKotlinFrameworkSupportProvider.kt | 9 +++++---- .../kotlin/idea/framework/JSFrameworkType.kt | 4 ++-- .../kotlin/idea/framework/JSLibraryType.kt | 2 +- .../kotlin/idea/framework/KotlinModuleBuilder.kt | 6 ++++-- .../idea/framework/KotlinTemplatesFactory.kt | 10 ++++++++-- 8 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js@2x.png diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java index 5bd33406fc7..6f28c6cf028 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -52,4 +52,6 @@ public interface KotlinIcons { Icon FROM_IMPL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/fromImpl.png"); Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png"); + + Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.png"); } diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js.png new file mode 100644 index 0000000000000000000000000000000000000000..f8b7f80aebbda4a3eaf94da73ae7e476d41dd2bc GIT binary patch literal 313 zcmV-90mlA`P)<2009O7Am>#0GAGTt00000 LNkvXXu0mjfsb+x$ literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d84e887de41376dc987a654a66c34652073e4c4c GIT binary patch literal 601 zcmV-f0;c_mP)$;8jY`k$Yd^*;jxBLnllUq5BJzP)8&;AEh=13;F8=(G^UAMETb4D1X) zzsoSZd_wm$aN_bimT#ZF{zA8$<{_Y`#{cKit&c26&b(qie)1=)AP?W_WsL1>@*31S8snXg6RJY zjEtZ-_tpIQgh7)ZEC;f5{=QFQ&)@xJ-*w@eK)O5MONv7Pn9bO3-2coBVuP~Xk6-`5 z4#1Y+6vbJ7s!Fnc2eH5Z`p-mh2wb@Ffdv%DAS@@z^$+HIB{Al&Aj{j=evrl}KVJL> z=RYeAj!zUjz(7Ob56IW2ue@V{6*eHti#*xyBU^?HKxx6#i0hr1D*IOupOM^>@CYMn zNeGK`Y*~%wbpg4SQxpQ|rS7L7#=?QB4av5gS`N?#h92L5Isk~*kn0F)6~$ybf|_*! zS&pD~Wkj+gXi*!I(JSLibraryKind) { project) } - override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.SMALL_LOGO + override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.JS companion object { fun getInstance() = Extensions.findExtension(EP_NAME, JSLibraryType::class.java) diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt index 9a6403c42d6..962b4d96695 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt @@ -23,15 +23,17 @@ import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.openapi.roots.ui.configuration.ModulesProvider import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.resolve.TargetPlatform +import javax.swing.Icon class KotlinModuleBuilder( - val targetPlatform: TargetPlatform, val builderName: String, val builderDescription: String) : JavaModuleBuilder() { + val targetPlatform: TargetPlatform, val builderName: String, val builderDescription: String, val icon: Icon +) : JavaModuleBuilder() { override fun getBuilderId() = "kotlin.module.builder" override fun getName() = builderName override fun getPresentableName() = builderName override fun getDescription() = builderDescription override fun getBigIcon() = KotlinIcons.KOTLIN_LOGO_24 - override fun getNodeIcon() = KotlinIcons.SMALL_LOGO + override fun getNodeIcon() = icon override fun getGroupName() = KotlinTemplatesFactory.KOTLIN_GROUP_NAME override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider) = ModuleWizardStep.EMPTY_ARRAY diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 075746c136b..5ebd098642e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -33,7 +33,13 @@ class KotlinTemplatesFactory : ProjectTemplatesFactory() { override fun createTemplates(group: String?, context: WizardContext?) = arrayOf( - BuilderBasedTemplate(KotlinModuleBuilder(JvmPlatform, "Kotlin (JVM)", "Kotlin module for JVM target")), - BuilderBasedTemplate(KotlinModuleBuilder(JsPlatform, "Kotlin (JavaScript)", "Kotlin module for JavaScript target")) + BuilderBasedTemplate(KotlinModuleBuilder(JvmPlatform, + "Kotlin/JVM", + "Kotlin module for JVM target", + KotlinIcons.SMALL_LOGO)), + + BuilderBasedTemplate(KotlinModuleBuilder(JsPlatform, "Kotlin/JS", + "Kotlin module for JavaScript target", + KotlinIcons.JS)) ) }