CPP-560 New Welcome Screen for CLion: move ultimate and community icons to platform

2026-09-27 10:03:11 +07:00 · 2014-08-12 14:58:12 +04:00
parent 14054a76f3
commit 3a24d25785
28 changed files with 51 additions and 22 deletions
@@ -19,7 +19,6 @@ import com.intellij.ide.plugins.PluginManager;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.VerticalFlowLayout;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.ui.ColorUtil;
 import com.intellij.ui.JBCardLayout;
@@ -68,8 +67,8 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
    add(scrollPane, MAIN);
    add(myCustomizePanel, CUSTOMIZE);

-    Map<String, Pair<String, List<String>>> groups = pluginGroups.getTree();
-    for (final Map.Entry<String, Pair<String, List<String>>> entry : groups.entrySet()) {
+    Map<String, Pair<Icon, List<String>>> groups = pluginGroups.getTree();
+    for (final Map.Entry<String, Pair<Icon, List<String>>> entry : groups.entrySet()) {
      final String group = entry.getKey();
      if (PluginGroups.CORE.equals(group)) continue;

@@ -91,7 +90,7 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
          return isGroupEnabled(group);
        }
      };
-      groupPanel.add(new JLabel(IconLoader.getIcon(entry.getValue().getFirst())), gbc);
+      groupPanel.add(new JLabel(entry.getValue().getFirst()), gbc);
      //gbc.insets.bottom = 5;
      groupPanel.add(titleLabel, gbc);
      JLabel descriptionLabel = new JLabel(pluginGroups.getDescription(group), SwingConstants.CENTER) {
@@ -26,8 +26,10 @@ import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
+import icons.PlatformImplIcons;
 import org.jetbrains.annotations.Nullable;

+import javax.swing.*;
 import java.io.File;
 import java.util.*;

@@ -35,7 +37,7 @@ public class PluginGroups {
  static final String CORE = "Core";
  private static final int MAX_DESCR_LENGTH = 55;

-  final Map<String, Pair<String, List<String>>> myTree = new LinkedHashMap<String, Pair<String, List<String>>>();
+  final Map<String, Pair<Icon, List<String>>> myTree = new LinkedHashMap<String, Pair<Icon, List<String>>>();
  final Map<String, String> myFeaturedPlugins = new LinkedHashMap<String, String>();

  private final Map<String, List<IdSet>> myGroups = new LinkedHashMap<String, List<IdSet>>();
@@ -60,8 +62,8 @@ public class PluginGroups {
  }

  protected void
-  initGroups(Map<String, Pair<String, List<String>>> tree, Map<String, String> featuredPlugins) {
-    tree.put(CORE, Pair.create((String)null, Arrays.asList(
+  initGroups(Map<String, Pair<Icon, List<String>>> tree, Map<String, String> featuredPlugins) {
+    tree.put(CORE, Pair.create((Icon)null, Arrays.asList(
      "com.intellij.copyright",
      "com.intellij.java-i18n",
      "org.intellij.intelliLang",
@@ -70,7 +72,7 @@ public class PluginGroups {
      "Type Migration",
      "ZKM"
    )));
-    tree.put("Java Frameworks", Pair.create("/plugins/JavaFrameworks.png", Arrays.asList(
+    tree.put("Java Frameworks", Pair.create(PlatformImplIcons.JavaFrameworks, Arrays.asList(
      "com.intellij.appengine",
      "org.intellij.grails",
      "com.intellij.gwt",
@@ -105,12 +107,12 @@ public class PluginGroups {
      "com.intellij.aspectj",
      "Osmorc"
    )));
-    tree.put("Build Tools", Pair.create("/plugins/BuildTools.png", Arrays.asList(
+    tree.put("Build Tools", Pair.create(PlatformImplIcons.BuildTools, Arrays.asList(
      "AntSupport",
      "Maven:org.jetbrains.idea.maven,org.jetbrains.idea.maven.ext",
      "org.jetbrains.plugins.gradle"
    )));
-    tree.put("Web Development", Pair.create("/plugins/WebDevelopment.png", Arrays.asList(
+    tree.put("Web Development", Pair.create(PlatformImplIcons.WebDevelopment, Arrays.asList(
      "HTML:HtmlTools,QuirksMode,W3Validators",
      "org.jetbrains.plugins.haml",
      "com.jetbrains.plugins.jade",
@@ -127,14 +129,14 @@ public class PluginGroups {

    addVcsGroup(tree);

-    tree.put("Test Tools", Pair.create("/plugins/TestTools.png", Arrays.asList(
+    tree.put("Test Tools", Pair.create(PlatformImplIcons.TestTools, Arrays.asList(
      "JUnit",
      "TestNG-J",
      "cucumber-java",
      "cucumber",
      "Coverage:Coverage,Emma"
    )));
-    tree.put("Application Servers", Pair.create("/plugins/ApplicationServers.png", Arrays.asList(
+    tree.put("Application Servers", Pair.create(PlatformImplIcons.ApplicationServers, Arrays.asList(
      "com.intellij.javaee.view",
      "Geronimo",
      "GlassFish",
@@ -147,7 +149,7 @@ public class PluginGroups {
      "com.intellij.dmserver",
      "JSR45Plugin"
    )));
-    tree.put("Clouds", Pair.create("/plugins/Clouds.png", Arrays.asList(
+    tree.put("Clouds", Pair.create(PlatformImplIcons.Clouds, Arrays.asList(
      "CloudFoundry",
      "CloudBees",
      "Heroku",
@@ -155,16 +157,16 @@ public class PluginGroups {
    )));
    //myTree.put("Groovy", Arrays.asList("org.intellij.grails"));
    //TODO Scala -> Play 2.x (Play 2.0 Support)
-    tree.put("Swing", Pair.create("/plugins/Swing.png", Arrays.asList(
+    tree.put("Swing", Pair.create(PlatformImplIcons.Swing, Arrays.asList(
      "com.intellij.uiDesigner"//TODO JavaFX?
    )));
-    tree.put("Android", Pair.create("/plugins/Android.png", Arrays.asList(
+    tree.put("Android", Pair.create(PlatformImplIcons.Android, Arrays.asList(
      "org.jetbrains.android",
      "com.intellij.android-designer")));
-    tree.put("Database Tools", Pair.create("/plugins/DatabaseTools.png", Arrays.asList(
+    tree.put("Database Tools", Pair.create(PlatformImplIcons.DatabaseTools, Arrays.asList(
      "com.intellij.database"
    )));
-    tree.put("Other Tools", Pair.create("/plugins/OtherTools.png", Arrays.asList(
+    tree.put("Other Tools", Pair.create(PlatformImplIcons.OtherTools, Arrays.asList(
      "ByteCodeViewer",
      "com.intellij.dsm",
      "org.jetbrains.idea.eclipse",
@@ -175,7 +177,7 @@ public class PluginGroups {
      "org.jetbrains.plugins.yaml",
      "XSLT and XPath:XPathView,XSLT-Debugger"
    )));
-    tree.put("Plugin Development", Pair.create("/plugins/PluginDevelopment.png", Arrays.asList("DevKit")));
+    tree.put("Plugin Development", Pair.create(PlatformImplIcons.PluginDevelopment, Arrays.asList("DevKit")));

    featuredPlugins.put("Scala", "Custom Languages:Plugin for Scala language support:org.intellij.scala");
    featuredPlugins.put("Live Edit Tool",
@@ -186,8 +188,8 @@ public class PluginGroups {
                          "Tools Integration:Integration for Atlassian JIRA, Bamboo, Cricible, FishEye:atlassian-idea-plugin");
  }

-  protected static void addVcsGroup(Map<String, Pair<String, List<String>>> tree) {
-    tree.put("Version Controls", Pair.create("/plugins/VersionControls.png", Arrays.asList(
+  protected static void addVcsGroup(Map<String, Pair<Icon, List<String>>> tree) {
+    tree.put("Version Controls", Pair.create(PlatformImplIcons.VersionControls, Arrays.asList(
      "ClearcasePlugin",
      "CVS",
      "Git4Idea",
@@ -206,7 +208,7 @@ public class PluginGroups {
  private void initIfNeed() {
    if (myInitialized) return;
    myInitialized = true;
-    for (Map.Entry<String, Pair<String, List<String>>> entry : myTree.entrySet()) {
+    for (Map.Entry<String, Pair<Icon, List<String>>> entry : myTree.entrySet()) {
      final String group = entry.getKey();
      if (CORE.equals(group)) continue;

@@ -233,7 +235,7 @@ public class PluginGroups {
    }
  }

-  Map<String, Pair<String, List<String>>> getTree() {
+  Map<String, Pair<Icon, List<String>>> getTree() {
    initIfNeed();
    return myTree;
  }
@@ -0,0 +1,28 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
+ */
+public class PlatformImplIcons {
+  private static Icon load(String path) {
+    return IconLoader.getIcon(path, PlatformImplIcons.class);
+  }
+
+  public static final Icon Android = load("/icons/plugins/Android.png"); // 48x48
+  public static final Icon ApplicationServers = load("/icons/plugins/ApplicationServers.png"); // 48x48
+  public static final Icon BuildTools = load("/icons/plugins/BuildTools.png"); // 48x48
+  public static final Icon Clouds = load("/icons/plugins/Clouds.png"); // 48x48
+  public static final Icon DatabaseTools = load("/icons/plugins/DatabaseTools.png"); // 48x48
+  public static final Icon JavaFrameworks = load("/icons/plugins/JavaFrameworks.png"); // 48x48
+  public static final Icon OtherTools = load("/icons/plugins/OtherTools.png"); // 48x48
+  public static final Icon PluginDevelopment = load("/icons/plugins/PluginDevelopment.png"); // 48x48
+  public static final Icon Swing = load("/icons/plugins/Swing.png"); // 48x48
+  public static final Icon TestTools = load("/icons/plugins/TestTools.png"); // 48x48
+  public static final Icon VersionControls = load("/icons/plugins/VersionControls.png"); // 48x48
+  public static final Icon WebDevelopment = load("/icons/plugins/WebDevelopment.png"); // 48x48
+}