Updating code to use SVGs instead of pngs (#1086)

Using new SVG icons when available (old icons moved to legacy folder)

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;
     }
   };
 

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

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() {

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

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)

src/common/com/intellij/plugins/haxe/ide/actions/CreateClassAction.java

@@ -52,7 +52,7 @@ public class CreateClassAction extends CreateTemplateInPackageAction<PsiFile> {
   }
 
   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

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);
     }
   }
 

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)

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

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

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() {

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

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;
   }
 }

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

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

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
 }