diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java index a87a177843f..0acd69cf4c0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java @@ -32,7 +32,7 @@ public class JetFileType extends LanguageFileType { @NotNull @Override protected Icon compute() { - return IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin16x16.png"); + return IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png"); } }; @@ -40,21 +40,25 @@ public class JetFileType extends LanguageFileType { super(JetLanguage.INSTANCE); } + @Override @NotNull public String getName() { return "Kotlin"; } + @Override @NotNull public String getDescription() { return "Kotlin"; } + @Override @NotNull public String getDefaultExtension() { return "kt"; } + @Override public Icon getIcon() { return myIcon.getValue(); } diff --git a/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png new file mode 100644 index 00000000000..00ca1072485 Binary files /dev/null and b/idea/resources/org/jetbrains/jet/plugin/icons/kotlin_file.png differ diff --git a/idea/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/src/org/jetbrains/jet/plugin/JetIcons.java index 9b61eb3e9d6..4b7947bdd12 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetIcons.java +++ b/idea/src/org/jetbrains/jet/plugin/JetIcons.java @@ -24,10 +24,10 @@ import javax.swing.*; * @author Nikolay Krasko */ public interface JetIcons { - Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin16x16.png"); + Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin.png"); Icon CLASS = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/class_kotlin.png"); - Icon FILE = SMALL_LOGO; // TODO: Add file icon + Icon FILE = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/kotlin_file.png"); Icon OBJECT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/object.png"); Icon TRAIT = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/trait.png"); Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/jet/plugin/icons/function.png");