From 64a8008a8abbd2f91e84ee2c8c0d03e73717da68 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 17 Nov 2017 12:31:01 +0100 Subject: [PATCH] Add icon for multiplatform projects, update JS icon #KT-19824 Fixed --- .../org/jetbrains/kotlin/idea/KotlinIcons.java | 1 + .../GradleKotlinFrameworkSupportProvider.kt | 2 +- .../KotlinGradleMultiplatformModuleBuilder.kt | 2 +- .../jetbrains/kotlin/idea/icons/kotlin_js.png | Bin 313 -> 454 bytes .../kotlin/idea/icons/kotlin_js@2x.png | Bin 601 -> 934 bytes .../idea/icons/kotlin_multiplatform_project.png | Bin 0 -> 424 bytes .../icons/kotlin_multiplatform_project@2x.png | Bin 0 -> 739 bytes .../kotlin_multiplatform_project@2x_dark.png | Bin 0 -> 739 bytes .../icons/kotlin_multiplatform_project_dark.png | Bin 0 -> 425 bytes .../kotlin/idea/framework/CommonLibraryType.kt | 2 +- 10 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project@2x.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project@2x_dark.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project_dark.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 ee7855b19e9..16fcf64cae1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -55,4 +55,5 @@ public interface KotlinIcons { 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"); + Icon MPP = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project.png"); } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt index 9e9aa180979..cc99173151e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt @@ -138,7 +138,7 @@ open class GradleKotlinJSFrameworkSupportProvider(frameworkTypeId: String = "KOT } open class GradleKotlinMPPCommonFrameworkSupportProvider : - GradleKotlinFrameworkSupportProvider("KOTLIN_MPP_COMMON", "Kotlin (Multiplatform Common - Experimental)", KotlinIcons.SMALL_LOGO) { + GradleKotlinFrameworkSupportProvider("KOTLIN_MPP_COMMON", "Kotlin (Multiplatform Common - Experimental)", KotlinIcons.MPP) { override fun getPluginId() = "kotlin-platform-common" override fun getDependencies(sdk: Sdk?) = listOf(MAVEN_COMMON_STDLIB_ID) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformModuleBuilder.kt index 22ac059ac7d..576f880084a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMultiplatformModuleBuilder.kt @@ -38,7 +38,7 @@ class KotlinGradleMultiplatformModuleBuilder : GradleModuleBuilder() { override fun getBuilderId() = "kotlin.gradle.multiplatform" - override fun getNodeIcon() = KotlinIcons.SMALL_LOGO + override fun getNodeIcon() = KotlinIcons.MPP override fun getPresentableName() = "Kotlin (Multiplatform - Experimental)" diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_js.png index f8b7f80aebbda4a3eaf94da73ae7e476d41dd2bc..935c9c31c7a0d55dce6ef9730b5e6deb3b29c894 100644 GIT binary patch delta 392 zcmV;30eAkn0>%T7NPhunNklVn-MUs{whJcQZJ?xQR{k2Ov(A zZ`=L>rvVukk2Baly^l>Z2smnVFTH>)fMS5(?fVRtPhT_q{(sNS!0-=4bE3h7DHqTM z;RcvL{m9^P=Pko;23|%A*@MXR28A1jy!5A<@KrT5hBaWdk zb?R#s5M8(YoqsHd4dbK40?3flGCU0HbeM43`25{p_SxB@cQ9N4PGZswcr}B7k_78_ zknQbjKS-k(0Mfi(2UEj=E8qE0@<*`1Q;-Ypz4*-u_W~}>Ah7oMSCOR$zlcc+G5<2009O7Am>#0GAGTt00000NkvXXu0mjf!$xvF 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 index d84e887de41376dc987a654a66c34652073e4c4c..6bcc6aff0a04eea56c81779594737bc03d48ce6f 100644 GIT binary patch delta 875 zcmV-x1C;#P1f~a&NPh!JNklF|9LIk<&i>!FHEdnowA92vBMJ$Tq&kF1 zryz*vG<=CMSMBQTpK;yU+2-xG zHnY34GqbvM=)q&=J>LF4-{1GW`Mm}BADgv5YD>K1g2|}bKz|mNfsTorP!;?Jn1tnr8 z7MKH0qm=^+=g8vLVL~{iT7a1iLEGp99{z)e<4UuRWnOya8Ic?hR|{{Y`e2j)7jL^Z zb%C@9vZ8H(NPibou>f;;2`;&wz(&6pA}I58u=FCxs%sAkskn*+n0Wa4w}VjXo0qpe z>A+RD-y<@`#^vE*IO}=?C3Jv~tI+m82X5P~+k{+vJTshyGp-TXKnMBEbpWVRM3vcI z+tE%aaaU4+F&u$Y)O&E!i+p@td{P5SM38lzt%TCEg?~%IPg0+um=5y?PA3Lt7D4X1 zdyY`^Wu*u(vK$^;ZbO&=E30u>CDrMAoq2*5ZP4K zWdQ~j;20GG2d&{V*JXx^$7EB_(X8Mi0R#n5=)?KU^%~(q)|uj2zvh&ZAWM0xjSe>0QgB8eWHCvSxT)fE5t*UMOp^EGfPn{ z#bg1s@Zk@P6yL~r5g5Tw z?6*z}VZw&aLembDXJ@58u%hC+T6X~k|G51YU;y6KY8o!bbJG9-002ovPDHLkV1n@w Bu^|8e delta 540 zcmV+%0^|Lr2iXLWNPhwQNkl?W_WsL1>@*31S8snXg6RJYjEtZ-_tpIQgh7)Z zEC;f5{=QFQ&wt^x$@LHBdnGaEuOQ3Y*M5-3C_i5O2IoI34USI~JHS9g z;19^xr?0$YffY6&%ZohO?;~4=3_xkY(}?SxnJW8N5PzSM+>-DJBWg(qi*syQjplU$ zxt3ED0_dggry$0{fvOG3wwziH&<2Jc-+(#*h}V$o2x=9@WIKYIbpct9pmt?MvLk3w z8n0gNN6@29h}RMH>X_hk1U-93SRFy{t{H|S2BL2Wb_ByH efC7L30~G*(3*C=Obc!ti0000`_GD1Gl;>0O>@KD=?p&a4m12_ z=7x*0GJk`)1g;sY0hKqGFu1=t!|)49Gm;?-xU26bB8#CI5OeP!gY&a1K%2R+`dOgv zaw57Q+yKWXHyJ{2pFwdpvS#U)eTmp4zy{bndBTu-@hrn{M(mo^x>hFQ3T&_ev6mk( z{9@#1U;sttUxef?31fzu>aaw7=>TlNF9rc@NMq9sG8k;YPnZjUh8&j>XIP-8ilGo)Gt5x10e?V&2h@C8hMQr9 zt`Gw*#n=pFfq0tNCu5ys$K_y0esn){zt zGDLh@#lXb)7sw+?`vT6YM~NT?6S*$$e%!zi{C+FL-+ycj|Nb*0`-N!BL4buE%R3&m zGX%ch!SI)n72<_|Ag}x)CL~ZSC(8j9k7qFWzuCj^kC6?@a-tl8VL8bT@O!hLA?n3e zG@ldY2&|Tq$6Lf&bi_;7hx0V5Y&WdRfen%|euDy{+$b7sGaC?59q2$I|NU-Cw2)iQ|2sB(y zBqnrmIzZ|3D~8mYdl>%yXC)BS7>-yV)_gLN*tCV!0g9jAFtnUr&A|EZFOKYn(-8}# z+x8`rlCv-zpz!G(L&M3<44i-e5y);B^a6$UEs3O-D<}?-|MZce=EOb*j^F=Dwp^`a zWgk1Wa!Zd0&*f5sNw*y&yg+0s|rBxZG>Dpp7Xi0yAG$|It zLX5a50D{A^@(i=|OsL)_ggf95%mG*&aa3B8VV<5AQ9dFB&_fC-4X~rOA)t;pAuYnN zNKb)gtzx(X{xPtj`Wy&O$?!5P(-mhR$7jTb5K2*u?1(ec91N>;d1>A+z^IHsjyNyF z%&<;}nSq>CO=`$sIN$lhgs1^_TI3@`u)FaX9v V8C)U3IavSz002ovPDHLkV1j{3LfrrW literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project@2x_dark.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project@2x_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..77c4cb555bb5a84fc031cfce8889f4a733081362 GIT binary patch literal 739 zcmV<90v!E`P)NCu5ys$K_y0esn){zt zGDLh@#lXb)7sw+?`vT6YM~NT?6S*$$e%!zi{C+FL-+ycj|Nb*0`-N!BL4buE%R3&m zGX%ch!SI)n72<_|Ag}x)CL~ZSC(8j9k7qFWzuCj^kC6?@a-tl8VL8bT@O!hLA?n3e zG@ldY2&|Tq$6Lf&bi_;7hx0V5Y&WdRfen%|euDy{+$b7sGaC?59q2$I|NU-Cw2)iQ|2sB(y zBqnrmIzZ|3D~8mYdl>%yXC)BS7>-yV)_gLN*tCV!0g9jAFtnUr&A|EZFOKYn(-8}# z+x8`rlCv-zpz!G(L&M3<44i-e5y);B^a6$UEs3O-D<}?-|MZce=EOb*j^F=Dwp^`a zWgk1Wa!Zd0&*f5sNw*y&yg+0T@7CCBw_GOjn$N9G?*zLMTNsvLnt&b1jN>cy; literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project_dark.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_multiplatform_project_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..0d8adc83fedd9bc8b9b33116f0da36d4ab2e16bd GIT binary patch literal 425 zcmV;a0apHrP)`_GD1Gl;>0O>@KD=?p&a4m12_ z=7x*0GJk`)1g;sY0hKqGFu1=t!|)49Gm;?-xU26bB8#CI5OeP!gY&a1K%2R+`dOgv zaw57Q+yKWXHyJ{2pFwdpvS#U)eTmp4zy{bndBTu-@hrn{M(mo^x>hFQ3T&_ev6mk( z{9@#1U;sttUxef?31fzu>aaw7=>TlNF9rcbt zp)16IOEESBSs>nK0&3=ASg*s#fXk`43aK Tx<~h800000NkvXXu0mjfzu&MD literal 0 HcmV?d00001 diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CommonLibraryType.kt b/idea/src/org/jetbrains/kotlin/idea/framework/CommonLibraryType.kt index aeb01b80040..3e40a70e6b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/CommonLibraryType.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CommonLibraryType.kt @@ -34,5 +34,5 @@ object CommonLibraryType : LibraryType(CommonLibraryKind contextDirectory: VirtualFile?, project: Project): NewLibraryConfiguration? = null - override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.SMALL_LOGO + override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.MPP }