From b62f49c9656b2db75e5a6f5d0a6ba21a75315bfe Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 24 Apr 2012 19:14:28 +0400 Subject: [PATCH] Some new icons - beta version --- .../jetbrains/jet/plugin/icons/class_kotlin.png | Bin 0 -> 1631 bytes .../org/jetbrains/jet/plugin/icons/kotlin.png | Bin 0 -> 1641 bytes .../org/jetbrains/jet/plugin/icons/kotlin_13.png | Bin 0 -> 1530 bytes .../plugin/icons/kotlin_launch_configuration.png | Bin 0 -> 1556 bytes idea/src/META-INF/plugin.xml | 2 +- .../jet/plugin/JetDescriptorIconProvider.java | 2 +- .../jetbrains/jet/plugin/JetIconProvider.java | 2 +- idea/src/org/jetbrains/jet/plugin/JetIcons.java | 3 +++ .../jet/plugin/actions/NewKotlinFileAction.java | 5 +++-- .../plugin/k2jsrun/K2JSRunConfigurationType.java | 4 ++-- .../jet/plugin/run/JetRunConfigurationType.java | 4 ++-- 11 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/kotlin_13.png create mode 100644 idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/class_kotlin.png new file mode 100644 index 0000000000000000000000000000000000000000..84cfb2aadd53a98c531da986840dfeabeb5c943e GIT binary patch literal 1631 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHmlH$x)>Q$t4!S3^@nLsvs5H!~Aw7b8;_ zGgnJPBR3bAUYGpj(%jU%5}4i;gkC3{dO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPrb z(>$o&6x?pH#Hm*w=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6dWw~v6$1m)WltB! zkcwMNf@3`<2TIg^|9|%F?`<=Ceg@CXu$a5dCpfS@%yAK{ zVVwV(m*K|Te_b1QnjV&3T$xdm_R;Ry*WBO(V&>Q7cN8xw%3tN8^5Ca4gB?phvx2t( zw@Kt~5hJg-d-*bcKXas5r?s3uWf!$9Z{?w+Ae{%ThZuMcO}ruHG&|!?u!`#xk!Q=7 zFIAo2FJBt$=z4bHA0|%42dtS5H;;x^T>8yar*qpuL&;&eHBV%gZbcIV=aQH;H>U^h z*s|r&kCa5tu1ix?1drq~`c!@Sp&7IL4$J4)402x|%}L8n zvp+cY;~&o#=Er(>ypMVud0e#O*QB}8zH{P=Sr7Sa?C%p^z@o49sV#X`)^6W|rJq#` zY|AD{TR+&cSS@*RsL635p1x?=JpHn-KNv+iy$X`H+q*mI_|&y7Ss^>CL+?hii9_38 zG4+(99l7_LXUp;I`IjIU6tJnt%d1Q4tNO!td)YVSZD*9ve^~WeGUM?)rr3KdK4-cT zQr>oCTTHqf^LEe0!$J{mYR`9za7B8p44bSMx`JcxLPn;NGZqth7WBxq{_9`)Va|OH zzsPqtZfpAY$Cl>Z_I^|S{UpydQFrIKb-Ns9u2JF)QcC&r;qt?b-&wNfCsmwz>~*Rv z`_ty`GVA;0`##C-|M5Nk#b!O7e&ucT%d&KNp2b;7#6?UxQ)B%4=%ELj&pdi_Y(=Kg ziJ#Zsui2m3rNp@Tsn6d{p`K4q^_^hL{i}O`;i-nk1bum(tDqv^)78&qol`;+0K$oK ANB{r; literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin.png new file mode 100644 index 0000000000000000000000000000000000000000..403a4e89325e11e639da0e780f112536e41d2933 GIT binary patch literal 1641 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 literal 0 HcmV?d00001 diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png new file mode 100644 index 0000000000000000000000000000000000000000..ab1407bb717784b8fc88108b38befeed752cac0d GIT binary patch literal 1556 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh*)icxGNo zet9uiy|1s8XI^nhVqS8pr;Du;&;-5A%oHnAR~KV93l~QVS3^@nLsvs5b7wOr3l{@Z zBNGb?V<$tHUYGpj(%jU%5}4i;gkC3{dO=Acw*Y9fOKMSOS!#+~QGTuh*vnR#xZPrb z(>$o&6x?pH#Hm*w=oo!a#3DsBObD2IKumbD1#;jCKQ#}S+KYh6+F#|T3IhXEho_5U zNX4xslVd%C6J?Ig-~8Fozj%@HS^p*aDs$GIuv1vBV%n>xw1l7I)1qBHD+FG7aqe1u zdJmWKnv|*HKON(xvRHO{1ba*6re;}8FP?3E`=(|3^Eu}vO^iM()#%0DoBjWN?Y!qt z{a38&+IphFwChs8vUrqz?g{ObwLjTdSQP}=o%ZkqPEp|I)#(JDgy|(eu0UygjRjB43e4+fsSP4yl&MN(xMe?}u5e&@y?{GuKf} zHDSH$K{;;5r6K_#!jF`?4W=_rQaZ>f(so~}JDefK^{P&mI9q_@gIkX|eQG`&+IF(Z zd-)rK**yU*5-sJq7E-U59P)E~8k_gzE|1VjAyM818oxID)B5nNTIOl5`p3EyF{SM+ zMSlce+)KVO=VI#|9l%S|FQt#fbAy&>^&&l&J-n&+&GO6e)y_|H&n(Zh)^6(E zQDivx`I0Hk`%AYSX*PCBa!pqvN|0ENSoISka zCzqR$N56}qsY&y~mqB}!vKwPdZzOJg_{&*5t6O5z^iBHzTPyd+&wBgv%icF(ft%0I zGM3j+_ diff --git a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 1317a34b943..862eea63b29 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -92,7 +92,7 @@ public final class JetDescriptorIconProvider { case OBJECT: return JetIcons.OBJECT; case CLASS: - return PlatformIcons.CLASS_ICON; + return JetIcons.CLASS; default: LOG.warn("No icon for descriptor: " + descriptor); return null; diff --git a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java index a237db389ea..1449d48d69e 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -73,7 +73,7 @@ public class JetIconProvider extends IconProvider { return JetIcons.TRAIT; } - Icon icon = jetClass.hasModifier(JetTokens.ENUM_KEYWORD) ? PlatformIcons.ENUM_ICON : PlatformIcons.CLASS_ICON; + Icon icon = jetClass.hasModifier(JetTokens.ENUM_KEYWORD) ? PlatformIcons.ENUM_ICON : JetIcons.CLASS; if (jetClass instanceof JetEnumEntry) { JetEnumEntry enumEntry = (JetEnumEntry) jetClass; if (enumEntry.getPrimaryConstructorParameterList() == null) { diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java index 8e9969cec3f..9b61eb3e9d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java @@ -26,6 +26,7 @@ import javax.swing.*; public interface JetIcons { Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin16x16.png"); + Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/class_kotlin.png"); Icon FILE = SMALL_LOGO; // TODO: Add file icon Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png"); Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png"); @@ -36,4 +37,6 @@ public interface JetIcons { Icon PARAMETER = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/parameter.png"); Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_value.png"); Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/field_variable.png"); + + Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_launch_configuration.png"); } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java index 1e1321f2836..31e7868df1e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java @@ -23,6 +23,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.util.PlatformIcons; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.jet.plugin.JetIcons; /** * @author Nikolay Krasko @@ -37,8 +38,8 @@ public class NewKotlinFileAction extends CreateFileFromTemplateAction { builder .setTitle(JetBundle.message("new.kotlin.file.action")) .addKind("Kotlin file", JetFileType.INSTANCE.getIcon(), "Kotlin File") - .addKind("Class", PlatformIcons.CLASS_ICON, "Kotlin Class") - .addKind("Trait", PlatformIcons.INTERFACE_ICON, "Kotlin Trait") + .addKind("Class", JetIcons.CLASS, "Kotlin Class") + .addKind("Trait", JetIcons.TRAIT, "Kotlin Trait") .addKind("Enum class", PlatformIcons.ENUM_ICON, "Kotlin Enum"); } diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java index f055c3a86ec..21bd928fa72 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java @@ -21,7 +21,7 @@ import com.intellij.execution.configurations.ConfigurationTypeBase; import com.intellij.execution.configurations.ConfigurationTypeUtil; import com.intellij.execution.configurations.RunConfiguration; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.jet.plugin.JetIcons; /** * @author Pavel Talanov @@ -32,7 +32,7 @@ public final class K2JSRunConfigurationType extends ConfigurationTypeBase { } public K2JSRunConfigurationType() { - super("K2JSConfigurationType", "K2JS", "Kotlin to Javascript configuration", JetFileType.INSTANCE.getIcon()); + super("K2JSConfigurationType", "K2JS", "Kotlin to Javascript configuration", JetIcons.LAUNCH); addFactory(new K2JSConfigurationFactory()); } diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java index e698deed70c..8d08fb898b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.run; import com.intellij.execution.configurations.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.jet.plugin.JetIcons; /** * @author yole @@ -30,7 +30,7 @@ public class JetRunConfigurationType extends ConfigurationTypeBase { } public JetRunConfigurationType() { - super("JetRunConfigurationType", "Kotlin", "Kotlin", JetFileType.INSTANCE.getIcon()); + super("JetRunConfigurationType", "Kotlin", "Kotlin", JetIcons.LAUNCH); addFactory(new JetRunConfigurationFactory(this)); }