From 26f1d6ae7c120d17d12b34cdf90734e051d75002 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Fri, 30 Mar 2018 12:30:56 +0300 Subject: [PATCH] Update Icon for .kts and .gradle.kts files ^KT-23431 Fixed --- .../jetbrains/kotlin/idea/KotlinIconProvider.kt | 6 ++++++ .../org/jetbrains/kotlin/idea/KotlinIcons.java | 2 ++ .../jetbrains/kotlin/idea/icons/kotlin_file.png | Bin 186 -> 270 bytes .../kotlin/idea/icons/kotlin_file@2x.png | Bin 427 -> 357 bytes .../kotlin/idea/icons/kotlin_gradle_script.png | Bin 0 -> 460 bytes .../idea/icons/kotlin_gradle_script@2x.png | Bin 0 -> 714 bytes .../kotlin/idea/icons/kotlin_script.png | Bin 0 -> 303 bytes .../kotlin/idea/icons/kotlin_script@2x.png | Bin 0 -> 427 bytes .../idea/actions/NewKotlinScriptAction.kt | 6 +++--- 9 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script@2x.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png create mode 100644 idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script@2x.png diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt index 72ea2565020..ddc45d7d996 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt @@ -39,6 +39,12 @@ import javax.swing.Icon class KotlinIconProvider : IconProvider(), DumbAware { override fun getIcon(psiElement: PsiElement, flags: Int): Icon? { if (psiElement is KtFile) { + if (psiElement.isScript()) { + return when { + psiElement.name.endsWith(".gradle.kts") -> KotlinIcons.GRADLE_SCRIPT + else -> KotlinIcons.SCRIPT + } + } val mainClass = getSingleClass(psiElement) return if (mainClass != null) getIcon(mainClass, flags) else KotlinIcons.FILE } 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 08f121adcf1..d6950b496d0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIcons.java @@ -31,6 +31,8 @@ public interface KotlinIcons { Icon ABSTRACT_CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/abstractClassKotlin.png"); Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.png"); Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png"); + Icon SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_script.png"); + Icon GRADLE_SCRIPT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png"); Icon ACTIVITY = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_activity.png"); Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png"); Icon INTERFACE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/interfaceKotlin.png"); diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file.png index d6f2e6c7fbc7ab5e5a07e7db89096baf117d0d00..10626a0007848d570f55ff339cbbb0d88825b44a 100755 GIT binary patch delta 242 zcmVQh*#~WElVgeCz)I2hln|uQ9B96l>1F|MwG2Y6H<;z@m8p zXVs%XCJHns5*>)hnm6%!e-PJrSV&SVz%;Mq4`E1^o+bcf?gxg807=mZ(wryR3*#EV s3}Gas@q3$`08sOLB+ba+0ziNP007fSlQTRmVE_OC07*qoM6N<$f&e*RdjJ3c delta 158 zcmV;P0Ac@*0=fZ^B!7WPL_t(|+GAiq1GAQI;0EG}Q1&Klm;o1nX@)5x$pB={BpZOP znJgFJa1}{j*hDNIVg^tp!1&hv{|~}e%dh@_(W&$Qdz%~#pC{S?Y?^^sfG7h9Y9?d= zvgXr$9{-zX^(&AR2FRLa*L(zp$9W(YAjtqE%`l8<2rhs{GZ)+t03wX2t4KgJ?*IS* M07*qoM6N<$f*A`zhX4Qo diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_file@2x.png index 132848ea7665e86b65c535e13c82a450268278fc..bdf9921c08d70ddcd0f3fb1b601468cadccdb16c 100755 GIT binary patch delta 331 zcmV-R0krNCuksM94mT$;Uiwu|uWp5%z4^X`yHgP6$EC*7~)CvKnfwY_?2hhTD zq8&gh%ZYLTEiEVL09sp)*8%jf90XYKa%BYy#MNkl$l|RwT2EvXY z*8x+~KK+L|qPyt)e~Fd9{^KYe@jHTC2TVx+_aEelhT<3h#aI5pWjSflK?>+k|NpRsRTCP8&y*m;47>{-0RO;f??RvR-6$zW?WJ01E&B07*qoM6N<$f<(8_6#xJL diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_gradle_script.png new file mode 100644 index 0000000000000000000000000000000000000000..4ee5ed4c31dc39033df36f348cc7793701e4e211 GIT binary patch literal 460 zcmV;-0WxJ6$%6zvVjH4$wyMV5URld$;Ja9 zzXQbzfozx;>OtWGbHRUP+o78GBiRN5j!;AP!@LIMGqM0RBP&Wo3NQgQU&KRQ;)pEB zLMWa=w&0Uz0Xq2u&=oK~$bX8^I0uD`0N=X*@Br5Nd5vM+qi_cPzn@_07ce0u5)e=T z8rA@`^#aJxpeTi@#HN|E>QN%LXapr7MUcxt9FPlun)hSVj4L6*QsO}nb2w*@3rFq0AaDSelJNBgoLU-@tfOLO z@>F6-^ae<;{D{Er)#3`AJN+JbgW%f^gfUEYQcfNM1ji3!ub0O5LL(GNEbpjZ0~`oa z2>^HzE~iFvjR1+rAy<$*Cq3pw)fxf-N68L286CZ?S#qTUcjG zI!l1OFIm8At_=oAgwz*I^K}(+M%l1(n(>DpU>xVQM2xE=B=7aIZ8HCykICsF7-wF* zWhwx3q+(QoNB5fW+|yKOVOM1STjUh*Ese+YJgE~FD8_;D56|{N&hSFFGw{B}NGIul zfu;hs;)%pg2nm=^^PVg(>;t|uS#!OPQ}8g;%lDrOfYj}@dL?VCU$&f4?|L2-AvC^` z2ZxmHUDki{?pw-D?L4fix#wf+e9+6Vm8Jsq@rKm9H1NKS`#>jf$(0pNMx8`Jow403 zc-J(fR{UgX#fj6<41pB9s}mAH!?ILVq_VGfLNPcu4Q(qIZbyYQa0FiK)WzW62#^Ya zWQ=m)D7_1K(n?m9$_}J67vZcw`g+Zl;nBd1S{~ZM$v5#bory$CDg3nRvI79PN&t_C zR1=cb6K};tV#;+JV!-uD`He(2MP8icBe-a|5MjWrB(j1SM{vqSB%lQ&`T;mgqNhm~ w+uP>wXCo4TcWqmkm|68p<_P|!#D@R_0F+Ap$=F%Xt^fc407*qoM6N<$g4G#Es{jB1 literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png b/idea/resources/org/jetbrains/kotlin/idea/icons/kotlin_script.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb6cd01b8041cb62b9a15dcff582115ff50a817 GIT binary patch literal 303 zcmV+~0nq-5P)RCwBAV4x5%B6DUf->@7=aTB3$ zVp?RtUJ!!`P2vQR7MsHu=mwl5(f|uw27Dzo44B9bJYaZnV>3X9Nd2#Xf%p~00H}$6 zL>jOh#$Z7b^h1wApe+OqL^l8f@U8p*AMCfE*BI743TNQ|`w1qs0f-Zk4ZxXzuxMVu zS@kH9s93NCu5tqcQ+5uOn9Sx*9 zfZ9>OO{xQE4hFpgxChz+=2W)t1knzF78=e}cEDy*LLidLmR|uDZkLI20F8XV9Gf5u zxxNSb#*Ze6kVd}830R1&HgN&Ib^rfk6QA_Fm?8Y*8eG~g0I?%y)uRvC9H2|7uLxMa z0BCU{zC@@_okj2d}8%eetR|tG1)pAhK zlVdq92izw$-m!s|{2>hD8V?PC*;Ig32T?) { @@ -34,7 +34,7 @@ class NewKotlinScriptAction : CreateFileFromTemplateAction( override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) { builder.setTitle("New Kotlin Script") - .addKind("Kotlin Script", KotlinFileType.INSTANCE.icon, "Kotlin Script") + .addKind("Kotlin Script", KotlinIcons.SCRIPT, "Kotlin Script") } override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) =