From 633f665b7f76d03ba8ca1f631bc8acc1365d9f89 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 31 Oct 2018 17:17:45 +0700 Subject: [PATCH] Add icon for Kotlin/Native Issue #KT-27150 Fixed --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 1 + ...linGradleNativeMultiplatformModuleBuilder.kt | 4 ++++ .../kotlin/ide/konan/NativeLibraryType.kt | 3 ++- .../kotlin/idea/icons/kotlin_native.svg | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_native.svg 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 d6950b496d0..b450d08f956 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -58,4 +58,5 @@ public interface KotlinIcons { Icon JS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_js.png"); Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.png"); + Icon NATIVE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_native.svg"); } diff --git a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt index 888a72c80da..1d215c0baa7 100644 --- a/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle-native/src/org/jetbrains/kotlin/ide/konan/gradle/KotlinGradleNativeMultiplatformModuleBuilder.kt @@ -6,8 +6,10 @@ package org.jetbrains.kotlin.ide.konan.gradle import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder import org.jetbrains.kotlin.konan.target.presetName +import javax.swing.Icon class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultiplatformModuleBuilder() { @@ -17,6 +19,8 @@ class KotlinGradleNativeMultiplatformModuleBuilder : KotlinGradleAbstractMultipl private val nativeSourceName get() = "$nativeTargetName$productionSuffix" val nativeTestName get() = "$nativeTargetName$testSuffix" + override fun getNodeIcon(): Icon = KotlinIcons.NATIVE + override fun getBuilderId() = "kotlin.gradle.multiplatform.native" override fun getPresentableName() = "Kotlin/Native" diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeLibraryType.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeLibraryType.kt index 4b299ecfa07..e0562e627df 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeLibraryType.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/NativeLibraryType.kt @@ -12,6 +12,7 @@ import com.intellij.openapi.roots.libraries.NewLibraryConfiguration import com.intellij.openapi.roots.libraries.ui.LibraryEditorComponent import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.KotlinIcons +import javax.swing.Icon import javax.swing.JComponent object NativeLibraryType : LibraryType(NativeLibraryKind) { @@ -25,5 +26,5 @@ object NativeLibraryType : LibraryType(NativeLibraryKind project: Project ): NewLibraryConfiguration? = null - override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.MPP + override fun getIcon(properties: DummyLibraryProperties?): Icon = KotlinIcons.NATIVE } diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_native.svg b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_native.svg new file mode 100644 index 00000000000..e6c2c788bf9 --- /dev/null +++ b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_native.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + +