diff --git a/resources/icons/Haxe_logo.svg b/resources/icons/Haxe_logo.svg new file mode 100644 index 000000000..3c0ea2356 --- /dev/null +++ b/resources/icons/Haxe_logo.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/class.svg b/resources/icons/class.svg index 515c70b4e..69d8293e8 100644 --- a/resources/icons/class.svg +++ b/resources/icons/class.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/enum.svg b/resources/icons/enum.svg index aaa726753..b7b26b6fd 100644 --- a/resources/icons/enum.svg +++ b/resources/icons/enum.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/field.svg b/resources/icons/field.svg index 324a260e9..296aa461f 100644 --- a/resources/icons/field.svg +++ b/resources/icons/field.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/file.svg b/resources/icons/file.svg index 8a3d07c86..5d0b45f2c 100644 --- a/resources/icons/file.svg +++ b/resources/icons/file.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/interface.svg b/resources/icons/interface.svg index 37604096b..d2bbb294c 100644 --- a/resources/icons/interface.svg +++ b/resources/icons/interface.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/C_Logo.png b/resources/icons/legacy/C_Logo.png similarity index 100% rename from resources/icons/C_Logo.png rename to resources/icons/legacy/C_Logo.png diff --git a/resources/icons/C_haXe.png b/resources/icons/legacy/C_haXe.png similarity index 100% rename from resources/icons/C_haXe.png rename to resources/icons/legacy/C_haXe.png diff --git a/resources/icons/E_Logo.png b/resources/icons/legacy/E_Logo.png similarity index 100% rename from resources/icons/E_Logo.png rename to resources/icons/legacy/E_Logo.png diff --git a/resources/icons/E_haXe.png b/resources/icons/legacy/E_haXe.png similarity index 100% rename from resources/icons/E_haXe.png rename to resources/icons/legacy/E_haXe.png diff --git a/resources/icons/HaxeLogo.svg b/resources/icons/legacy/HaxeLogo.svg similarity index 100% rename from resources/icons/HaxeLogo.svg rename to resources/icons/legacy/HaxeLogo.svg diff --git a/resources/icons/HaxeLogo_15.png b/resources/icons/legacy/HaxeLogo_15.png similarity index 100% rename from resources/icons/HaxeLogo_15.png rename to resources/icons/legacy/HaxeLogo_15.png diff --git a/resources/icons/HaxeLogo_16.png b/resources/icons/legacy/HaxeLogo_16.png similarity index 100% rename from resources/icons/HaxeLogo_16.png rename to resources/icons/legacy/HaxeLogo_16.png diff --git a/resources/icons/HaxeLogo_24.png b/resources/icons/legacy/HaxeLogo_24.png similarity index 100% rename from resources/icons/HaxeLogo_24.png rename to resources/icons/legacy/HaxeLogo_24.png diff --git a/resources/icons/HaxeLogo_8.png b/resources/icons/legacy/HaxeLogo_8.png similarity index 100% rename from resources/icons/HaxeLogo_8.png rename to resources/icons/legacy/HaxeLogo_8.png diff --git a/resources/icons/I_Logo.png b/resources/icons/legacy/I_Logo.png similarity index 100% rename from resources/icons/I_Logo.png rename to resources/icons/legacy/I_Logo.png diff --git a/resources/icons/I_haXe.png b/resources/icons/legacy/I_haXe.png similarity index 100% rename from resources/icons/I_haXe.png rename to resources/icons/legacy/I_haXe.png diff --git a/resources/icons/field-logo.png b/resources/icons/legacy/field-logo.png similarity index 100% rename from resources/icons/field-logo.png rename to resources/icons/legacy/field-logo.png diff --git a/resources/icons/field-logo.svg b/resources/icons/legacy/field-logo.svg similarity index 100% rename from resources/icons/field-logo.svg rename to resources/icons/legacy/field-logo.svg diff --git a/resources/icons/haXe_16.png b/resources/icons/legacy/haXe_16.png similarity index 100% rename from resources/icons/haXe_16.png rename to resources/icons/legacy/haXe_16.png diff --git a/resources/icons/haXe_24.png b/resources/icons/legacy/haXe_24.png similarity index 100% rename from resources/icons/haXe_24.png rename to resources/icons/legacy/haXe_24.png diff --git a/resources/icons/method-logo.png b/resources/icons/legacy/method-logo.png similarity index 100% rename from resources/icons/method-logo.png rename to resources/icons/legacy/method-logo.png diff --git a/resources/icons/method-logo.svg b/resources/icons/legacy/method-logo.svg similarity index 100% rename from resources/icons/method-logo.svg rename to resources/icons/legacy/method-logo.svg diff --git a/resources/icons/nmml_16.png b/resources/icons/legacy/nmml_16.png similarity index 100% rename from resources/icons/nmml_16.png rename to resources/icons/legacy/nmml_16.png diff --git a/resources/icons/method.svg b/resources/icons/method.svg index 95d7ec147..bc8743963 100644 --- a/resources/icons/method.svg +++ b/resources/icons/method.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/icons/nme.svg b/resources/icons/nme.svg new file mode 100644 index 000000000..e9be7a502 --- /dev/null +++ b/resources/icons/nme.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/common/com/intellij/plugins/haxe/HaxeComponentType.java b/src/common/com/intellij/plugins/haxe/HaxeComponentType.java index 957ec5918..1ac0c39a0 100644 --- a/src/common/com/intellij/plugins/haxe/HaxeComponentType.java +++ b/src/common/com/intellij/plugins/haxe/HaxeComponentType.java @@ -22,6 +22,7 @@ import com.intellij.icons.AllIcons; import com.intellij.plugins.haxe.lang.psi.*; import com.intellij.psi.PsiElement; +import icons.HaxeIcons; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -33,7 +34,7 @@ public enum HaxeComponentType { CLASS(0) { @Override public Icon getIcon() { - return icons.HaxeIcons.C_Haxe; + return icons.HaxeIcons.Class; } @Override public Icon getCompletionIcon() { @@ -42,7 +43,7 @@ public Icon getCompletionIcon() { }, ENUM(1) { @Override public Icon getIcon() { - return icons.HaxeIcons.E_Haxe; + return icons.HaxeIcons.Enum; } @Override public Icon getCompletionIcon() { @@ -51,7 +52,7 @@ public Icon getCompletionIcon() { }, INTERFACE(2) { @Override public Icon getIcon() { - return icons.HaxeIcons.I_Haxe; + return icons.HaxeIcons.Interface; } @Override public Icon getCompletionIcon() { @@ -65,7 +66,7 @@ public Icon getIcon() { }, METHOD(4) { @Override public Icon getIcon() { - return AllIcons.Nodes.Method; + return HaxeIcons.Method; } }, VARIABLE(5) { @Override @@ -75,7 +76,7 @@ public Icon getIcon() { }, FIELD(6) { @Override public Icon getIcon() { - return AllIcons.Nodes.Field; + return HaxeIcons.Field; } }, PARAMETER(7) { @Override @@ -90,7 +91,7 @@ public Icon getIcon() { }, CLASSVARIABLE(9) { @Override public Icon getIcon() { - return AllIcons.Nodes.Field; + return HaxeIcons.Field; } }; diff --git a/src/common/com/intellij/plugins/haxe/HaxeFileType.java b/src/common/com/intellij/plugins/haxe/HaxeFileType.java index 00aa15727..3ad1e6ceb 100644 --- a/src/common/com/intellij/plugins/haxe/HaxeFileType.java +++ b/src/common/com/intellij/plugins/haxe/HaxeFileType.java @@ -54,7 +54,7 @@ public String getDefaultExtension() { } public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @Override diff --git a/src/common/com/intellij/plugins/haxe/config/sdk/HaxeSdkType.java b/src/common/com/intellij/plugins/haxe/config/sdk/HaxeSdkType.java index 8f38a442c..bfe71024d 100644 --- a/src/common/com/intellij/plugins/haxe/config/sdk/HaxeSdkType.java +++ b/src/common/com/intellij/plugins/haxe/config/sdk/HaxeSdkType.java @@ -38,12 +38,12 @@ public HaxeSdkType() { @Override public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @Override public Icon getIconForAddAction() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } public static HaxeSdkType getInstance() { diff --git a/src/common/com/intellij/plugins/haxe/hxml/HXMLFileType.java b/src/common/com/intellij/plugins/haxe/hxml/HXMLFileType.java index f3d3ed4fb..2cfb4aad8 100644 --- a/src/common/com/intellij/plugins/haxe/hxml/HXMLFileType.java +++ b/src/common/com/intellij/plugins/haxe/hxml/HXMLFileType.java @@ -56,7 +56,7 @@ public String getDefaultExtension() { } public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @Override diff --git a/src/common/com/intellij/plugins/haxe/ide/HaxeFileTemplateUtil.java b/src/common/com/intellij/plugins/haxe/ide/HaxeFileTemplateUtil.java index 4b58f2a86..564e94942 100644 --- a/src/common/com/intellij/plugins/haxe/ide/HaxeFileTemplateUtil.java +++ b/src/common/com/intellij/plugins/haxe/ide/HaxeFileTemplateUtil.java @@ -75,15 +75,15 @@ public static String getTemplateShortName(String templateName) { public static Icon getTemplateIcon(String name) { name = getTemplateShortName(name); if ("Class".equals(name)) { - return icons.HaxeIcons.C_Haxe; + return icons.HaxeIcons.Class; } else if ("Interface".equals(name)) { - return icons.HaxeIcons.I_Haxe; + return icons.HaxeIcons.Interface; } else if ("Enum".equals(name)) { - return icons.HaxeIcons.E_Haxe; + return icons.HaxeIcons.Enum; } - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } public static PsiElement createClass(String className, String packageName, PsiDirectory directory, String templateName, @org.jetbrains.annotations.Nullable java.lang.ClassLoader classLoader) diff --git a/src/common/com/intellij/plugins/haxe/ide/actions/CreateClassAction.java b/src/common/com/intellij/plugins/haxe/ide/actions/CreateClassAction.java index 71aaaba03..e75ffb528 100644 --- a/src/common/com/intellij/plugins/haxe/ide/actions/CreateClassAction.java +++ b/src/common/com/intellij/plugins/haxe/ide/actions/CreateClassAction.java @@ -52,7 +52,7 @@ public class CreateClassAction extends CreateTemplateInPackageAction { } public CreateClassAction() { - super(HaxeBundle.message("action.create.new.class"), HaxeBundle.message("action.create.new.class"), icons.HaxeIcons.Haxe_16, SOURCES); + super(HaxeBundle.message("action.create.new.class"), HaxeBundle.message("action.create.new.class"), icons.HaxeIcons.HAXE_LOGO, SOURCES); } @Override diff --git a/src/common/com/intellij/plugins/haxe/ide/actions/CreateNMMLFileAction.java b/src/common/com/intellij/plugins/haxe/ide/actions/CreateNMMLFileAction.java index 4acb9bd8b..2d21709a6 100644 --- a/src/common/com/intellij/plugins/haxe/ide/actions/CreateNMMLFileAction.java +++ b/src/common/com/intellij/plugins/haxe/ide/actions/CreateNMMLFileAction.java @@ -37,7 +37,7 @@ public class CreateNMMLFileAction extends CreateFileFromTemplateAction implements DumbAware { public CreateNMMLFileAction() { super(HaxeBundle.message("create.nmml.file.action"), HaxeBundle.message("create.nmml.file.action.description"), - icons.HaxeIcons.Nmml_16); + icons.HaxeIcons.NMML_LOGO); } @Override @@ -52,7 +52,7 @@ protected void buildDialog(Project project, PsiDirectory directory, CreateFileFr for (FileTemplate fileTemplate : HaxeFileTemplateUtil.getNMMLTemplates()) { final String templateName = fileTemplate.getName(); final String shortName = HaxeFileTemplateUtil.getTemplateShortName(templateName); - builder.addKind(shortName, icons.HaxeIcons.Nmml_16, templateName); + builder.addKind(shortName, icons.HaxeIcons.NMML_LOGO, templateName); } } diff --git a/src/common/com/intellij/plugins/haxe/ide/completion/HaxeCompilerCompletionItem.java b/src/common/com/intellij/plugins/haxe/ide/completion/HaxeCompilerCompletionItem.java index 2e2546321..3f7e6fcbd 100644 --- a/src/common/com/intellij/plugins/haxe/ide/completion/HaxeCompilerCompletionItem.java +++ b/src/common/com/intellij/plugins/haxe/ide/completion/HaxeCompilerCompletionItem.java @@ -74,7 +74,7 @@ public LookupElement toLookupElement() { .append("):") .append(this.retType); - Icon icon = "var".equals(this.memberType) ? HaxeIcons.Field_Haxe : HaxeIcons.Method_Haxe; + Icon icon = "var".equals(this.memberType) ? HaxeIcons.Field : HaxeIcons.Method; LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(this, this.name) .withIcon(icon) diff --git a/src/common/com/intellij/plugins/haxe/ide/highlight/HXMLColorSettingsPage.java b/src/common/com/intellij/plugins/haxe/ide/highlight/HXMLColorSettingsPage.java index 517850db3..f2e0d77a8 100644 --- a/src/common/com/intellij/plugins/haxe/ide/highlight/HXMLColorSettingsPage.java +++ b/src/common/com/intellij/plugins/haxe/ide/highlight/HXMLColorSettingsPage.java @@ -41,7 +41,7 @@ public class HXMLColorSettingsPage implements ColorSettingsPage { @Nullable @Override public Icon getIcon() { - return HaxeIcons.Haxe_16; + return HaxeIcons.HAXE_LOGO; } @NotNull diff --git a/src/common/com/intellij/plugins/haxe/ide/highlight/HaxeColorSettingsPage.java b/src/common/com/intellij/plugins/haxe/ide/highlight/HaxeColorSettingsPage.java index fc97efad4..8382a16e4 100644 --- a/src/common/com/intellij/plugins/haxe/ide/highlight/HaxeColorSettingsPage.java +++ b/src/common/com/intellij/plugins/haxe/ide/highlight/HaxeColorSettingsPage.java @@ -98,7 +98,7 @@ public String getDisplayName() { @Override public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @NotNull diff --git a/src/common/com/intellij/plugins/haxe/ide/library/HaxeLibraryType.java b/src/common/com/intellij/plugins/haxe/ide/library/HaxeLibraryType.java index bda7083d0..8213f1a4c 100644 --- a/src/common/com/intellij/plugins/haxe/ide/library/HaxeLibraryType.java +++ b/src/common/com/intellij/plugins/haxe/ide/library/HaxeLibraryType.java @@ -82,7 +82,7 @@ public LibraryPropertiesEditor createPropertiesEditor(@NotNull LibraryEditorComp @Override public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } public static HaxeLibraryType getInstance() { diff --git a/src/common/com/intellij/plugins/haxe/ide/module/HaxeModuleType.java b/src/common/com/intellij/plugins/haxe/ide/module/HaxeModuleType.java index 827e01e53..f5cca03da 100644 --- a/src/common/com/intellij/plugins/haxe/ide/module/HaxeModuleType.java +++ b/src/common/com/intellij/plugins/haxe/ide/module/HaxeModuleType.java @@ -48,14 +48,10 @@ public String getDescription() { return HaxeBundle.message("haxe.module.type.description"); } - // @Override - Missing from 2017.2 - public Icon getBigIcon() { - return icons.HaxeIcons.Haxe_24; - } @Override public Icon getNodeIcon(boolean isOpened) { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @Override diff --git a/src/common/com/intellij/plugins/haxe/nmml/NMMLFileType.java b/src/common/com/intellij/plugins/haxe/nmml/NMMLFileType.java index e34e78911..c6dfeb375 100644 --- a/src/common/com/intellij/plugins/haxe/nmml/NMMLFileType.java +++ b/src/common/com/intellij/plugins/haxe/nmml/NMMLFileType.java @@ -55,6 +55,6 @@ public String getDefaultExtension() { @Override public Icon getIcon() { - return icons.HaxeIcons.Nmml_16; + return icons.HaxeIcons.NMML_LOGO; } } diff --git a/src/common/com/intellij/plugins/haxe/runner/HaxeRunConfigurationType.java b/src/common/com/intellij/plugins/haxe/runner/HaxeRunConfigurationType.java index d33dbd5d8..e829cd8ab 100644 --- a/src/common/com/intellij/plugins/haxe/runner/HaxeRunConfigurationType.java +++ b/src/common/com/intellij/plugins/haxe/runner/HaxeRunConfigurationType.java @@ -50,7 +50,7 @@ public String getConfigurationTypeDescription() { } public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @NotNull diff --git a/src/common/com/intellij/plugins/haxe/tests/runner/HaxeTestsRunConfigurationType.java b/src/common/com/intellij/plugins/haxe/tests/runner/HaxeTestsRunConfigurationType.java index cf8705802..c298d6d8a 100644 --- a/src/common/com/intellij/plugins/haxe/tests/runner/HaxeTestsRunConfigurationType.java +++ b/src/common/com/intellij/plugins/haxe/tests/runner/HaxeTestsRunConfigurationType.java @@ -46,7 +46,7 @@ public String getConfigurationTypeDescription() { @Override public Icon getIcon() { - return icons.HaxeIcons.Haxe_16; + return icons.HaxeIcons.HAXE_LOGO; } @NotNull diff --git a/src/icons/HaxeIcons.java b/src/icons/HaxeIcons.java index 081d6b933..089cbe128 100644 --- a/src/icons/HaxeIcons.java +++ b/src/icons/HaxeIcons.java @@ -21,22 +21,20 @@ import javax.swing.*; -/** - * NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant - * Don't repeat mistakes of others ;-) - */ + public class HaxeIcons { private static Icon load(String path) { return IconLoader.getIcon(path, HaxeIcons.class); } - public static final Icon C_Haxe = load("/icons/C_Logo.png"); // 16x16 - public static final Icon E_Haxe = load("/icons/E_Logo.png"); // 16x16 - public static final Icon Haxe_16 = load("/icons/HaxeLogo_16.png"); // 16x16 - public static final Icon Haxe_24 = load("/icons/HaxeLogo_24.png"); // 24x24 - public static final Icon I_Haxe = load("/icons/I_Logo.png"); // 16x16 - public static final Icon Nmml_16 = load("/icons/nmml_16.png"); // 16x16 + public static final Icon Class = load("/icons/class.svg"); + public static final Icon Enum = load("/icons/enum.svg"); + public static final Icon Interface = load("/icons/interface.svg"); + public static final Icon Method = load("/icons/method.svg"); + public static final Icon Field = load("/icons/field.svg"); + + public static final Icon HAXE_LOGO = load("/icons/Haxe_logo.svg"); + public static final Icon NMML_LOGO = load("/icons/nme.svg"); + - public static final Icon Method_Haxe = load("/icons/method-logo.png"); //16x16 - public static final Icon Field_Haxe = load("/icons/field-logo.png"); //16x16 }