Some new icons - beta version
This commit is contained in:
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
@@ -172,7 +172,7 @@
|
||||
<toolWindow id="Kotlin"
|
||||
factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
|
||||
anchor="right"
|
||||
icon="/org/jetbrains/jet/plugin/icons/kotlin13x13.png"
|
||||
icon="/org/jetbrains/jet/plugin/icons/kotlin_13.png"
|
||||
/>
|
||||
|
||||
<intentionAction>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user