Start plugins wizard #20 icons for categories

2026-09-27 10:03:11 +07:00 · 2014-04-25 14:22:47 +04:00
parent 7f65a87340
commit 19f96849ab
27 changed files with 48 additions and 46 deletions
@@ -17,6 +17,8 @@ package com.intellij.ide.customize;

 import com.intellij.openapi.application.ApplicationNamesInfo;
 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;
 import com.intellij.ui.JBColor;
@@ -60,8 +62,8 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
    add(scrollPane, MAIN);
    add(myCustomizePanel, CUSTOMIZE);

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

@@ -74,18 +76,19 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
      };
      gridPanel.setOpaque(true);
      GridBagConstraints gbc = new GridBagConstraints();
-      gbc.insets = new Insets(0, 0, 10, 0);
      gbc.fill = GridBagConstraints.BOTH;
      gbc.gridwidth = GridBagConstraints.REMAINDER;
      gbc.weightx = 1;
-      JLabel titleLabel = new JLabel("<html><body><h2 style=\"text-align:left;\">" + group + "</h2></body></html>") {
+      JLabel titleLabel = new JLabel("<html><body><h2 style=\"text-align:left;\">" + group + "</h2></body></html>", SwingConstants.CENTER) {
        @Override
        public boolean isEnabled() {
          return isGroupEnabled(group);
        }
      };
+      groupPanel.add(new JLabel(IconLoader.getIcon(entry.getValue().getFirst())), gbc);
+      //gbc.insets.bottom = 5;
      groupPanel.add(titleLabel, gbc);
-      JLabel descriptionLabel = new JLabel(PluginGroups.getInstance().getDescription(group)) {
+      JLabel descriptionLabel = new JLabel(PluginGroups.getInstance().getDescription(group), SwingConstants.CENTER) {
        @Override
        public Dimension getPreferredSize() {
          Dimension size = super.getPreferredSize();
@@ -107,18 +110,16 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
      gbc.weighty = 1;
      groupPanel.add(Box.createVerticalGlue(), gbc);
      gbc.weighty = 0;
+      JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 5));
+      buttonsPanel.setOpaque(false);
      if (PluginGroups.getInstance().getSets(group).size() == 1) {
-        groupPanel.add(createLink(SWITCH_COMMAND + ":" + group, getGroupSwitchTextProvider(group)), gbc);
+        buttonsPanel.add(createLink(SWITCH_COMMAND + ":" + group, getGroupSwitchTextProvider(group)));
      }
      else {
-        JPanel buttonsPanel = new JPanel(new GridLayout(1, 2, 10, 5));
-        buttonsPanel.setOpaque(false);
-        LinkLabel customizeButton = createLink(CUSTOMIZE_COMMAND + ":" + group, CUSTOMIZE_TEXT_PROVIDER);
-        buttonsPanel.add(customizeButton);
-        LinkLabel disableAllButton = createLink(SWITCH_COMMAND + ":" + group, getGroupSwitchTextProvider(group));
-        buttonsPanel.add(disableAllButton);
-        groupPanel.add(buttonsPanel, gbc);
+        buttonsPanel.add(createLink(CUSTOMIZE_COMMAND + ":" + group, CUSTOMIZE_TEXT_PROVIDER));
+        buttonsPanel.add(createLink(SWITCH_COMMAND + ":" + group, getGroupSwitchTextProvider(group)));
      }
+      groupPanel.add(buttonsPanel, gbc);
      gridPanel.add(groupPanel);
    }

@@ -133,7 +134,7 @@ public class CustomizePluginsStepPanel extends AbstractCustomizeWizardStep imple
          protected Color getColor() {
            return ColorUtil.withAlpha(JBColor.foreground(), .2);
          }
-        }, BorderFactory.createEmptyBorder(GAP, GAP, GAP, GAP)));
+        }, BorderFactory.createEmptyBorder(GAP / 2, GAP, GAP / 2, GAP)));
      cursor++;
    }
  }
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;

 class IdSet {
-  private static final List<String> BLACK_LIST = Arrays.asList("Support", "Integration", "integration");
+  private static final List<String> BLACK_LIST = Arrays.asList("Support", "support", "Integration", "integration");

  String myTitle;
  String[] myIds;
@@ -22,6 +22,7 @@ import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
@@ -32,12 +33,12 @@ import java.util.*;

 class PluginGroups {
  static final String CORE = "Core";
-  private static final int MAX_DESCR_LENGTH = 50;
+  private static final int MAX_DESCR_LENGTH = 55;


  private static PluginGroups instance = null;

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

  private final Map<String, List<IdSet>> myGroups = new LinkedHashMap<String, List<IdSet>>();
@@ -67,7 +68,7 @@ class PluginGroups {
    PluginManager.loadDisabledPlugins(new File(PathManager.getConfigPath()).getPath(), myDisabledPluginIds);


-    myTree.put(CORE, Arrays.asList(
+    myTree.put(CORE, Pair.create((String)null, Arrays.asList(
      "com.intellij.copyright",
      "com.intellij.java-i18n",
      "org.intellij.intelliLang",
@@ -76,8 +77,8 @@ class PluginGroups {
      "Structural Search",
      "Type Migration",
      "ZKM"
-    ));
-    myTree.put("Java Frameworks", Arrays.asList(
+    )));
+    myTree.put("Java Frameworks", Pair.create("/plugins/JavaFrameworks.png", Arrays.asList(
      "com.intellij.appengine",
      "org.intellij.grails",
      "com.intellij.gwt",
@@ -112,13 +113,13 @@ class PluginGroups {
      "GuiceyIDEA",
      "com.intellij.aspectj",
      "Osmorc"
-    ));
-    myTree.put("Build Tools", Arrays.asList(
+    )));
+    myTree.put("Build Tools", Pair.create("/plugins/BuildTools.png", Arrays.asList(
      "AntSupport",
      "Maven:org.jetbrains.idea.maven,org.jetbrains.idea.maven.ext",
      "org.jetbrains.plugins.gradle"
-    ));
-    myTree.put("Web Development", Arrays.asList(
+    )));
+    myTree.put("Web Development", Pair.create("/plugins/WebDevelopment.png", Arrays.asList(
      "HTML:HtmlTools,QuirksMode,W3Validators",
      "org.jetbrains.plugins.haml",
      "com.jetbrains.plugins.jade",
@@ -131,8 +132,8 @@ class PluginGroups {
      "com.intellij.flex",
      "com.intellij.plugins.html.instantEditing",
      "com.jetbrains.restClient"
-    ));
-    myTree.put("Version Controls", Arrays.asList(
+    )));
+    myTree.put("Version Controls", Pair.create("/plugins/VersionControls.png", Arrays.asList(
      "ClearcasePlugin",
      "CVS",
      "Git4Idea",
@@ -141,15 +142,15 @@ class PluginGroups {
      "PerforceDirectPlugin",
      "Subversion",
      "TFS"
-    ));
-    myTree.put("Test Tools", Arrays.asList(
+    )));
+    myTree.put("Test Tools", Pair.create("/plugins/TestTools.png", Arrays.asList(
      "JUnit",
      "TestNG-J",
      "cucumber-java",
      "cucumber",
      "Coverage:Coverage,Emma"
-    ));
-    myTree.put("Application Servers", Arrays.asList(
+    )));
+    myTree.put("Application Servers", Pair.create("/plugins/ApplicationServers.png", Arrays.asList(
      "com.intellij.javaee.view",
      "Geronimo",
      "GlassFish",
@@ -161,26 +162,26 @@ class PluginGroups {
      "WebSphere",
      "com.intellij.dmserver",
      "JSR45Plugin"
-    ));
-    myTree.put("Clouds", Arrays.asList(
+    )));
+    myTree.put("Clouds", Pair.create("/plugins/Clouds.png", Arrays.asList(
      "CloudFoundry",
      "CloudBees",
      "Heroku",
      "OpenShift"
-    ));
+    )));
    //myTree.put("Groovy", Arrays.asList("org.intellij.grails"));
    //TODO Scala -> Play 2.x (Play 2.0 Support)
-    myTree.put("Swing", Arrays.asList(
+    myTree.put("Swing", Pair.create("/plugins/Swing.png", Arrays.asList(
      "com.intellij.uiDesigner"//TODO JavaFX?
-    ));
-    myTree.put("Android", Arrays.asList(
+    )));
+    myTree.put("Android", Pair.create("/plugins/Android.png", Arrays.asList(
      "org.jetbrains.android",
-      "com.intellij.android-designer"));
-    myTree.put("Database Tools", Arrays.asList(
+      "com.intellij.android-designer")));
+    myTree.put("Database Tools", Pair.create("/plugins/DatabaseTools.png", Arrays.asList(
      "com.intellij.sql",
      "com.intellij.persistence.database"
-    ));
-    myTree.put("Other Tools", Arrays.asList(
+    )));
+    myTree.put("Other Tools", Pair.create("/plugins/OtherTools.png", Arrays.asList(
      "ByteCodeViewer",
      "com.intellij.dsm",
      "org.jetbrains.idea.eclipse",
@@ -190,8 +191,8 @@ class PluginGroups {
      "com.intellij.diagram",
      "org.jetbrains.plugins.yaml",
      "XSLT and XPath:XPathView,XSLT-Debugger"
-    ));
-    myTree.put("Plugin Development", Arrays.asList("DevKit"));
+    )));
+    myTree.put("Plugin Development", Pair.create("/plugins/PluginDevelopment.png", Arrays.asList("DevKit")));

    myFeaturedPlugins.put("Scala", "Custom Languages:Plugin for Scala language support:org.intellij.scala");
    myFeaturedPlugins.put("Live Edit Tool", "Web Development:Provides live edit HTML/CSS/JavaScript:com.intellij.plugins.html.instantEditing");
@@ -204,13 +205,13 @@ class PluginGroups {
  private void initIfNeed() {
    if (myInitialized) return;
    myInitialized = true;
-    for (Map.Entry<String, List<String>> entry : myTree.entrySet()) {
+    for (Map.Entry<String, Pair<String, List<String>>> entry : myTree.entrySet()) {
      final String group = entry.getKey();
      if (CORE.equals(group)) continue;

      List<IdSet> idSets = new ArrayList<IdSet>();
      StringBuilder description = new StringBuilder();
-      for (String idDescription : entry.getValue()) {
+      for (String idDescription : entry.getValue().getSecond()) {
        IdSet idSet = new IdSet(idDescription);
        String idSetTitle = idSet.getTitle();
        if (idSetTitle == null) continue;
@@ -226,12 +227,12 @@ class PluginGroups {
        int lastWord = description.lastIndexOf(",", MAX_DESCR_LENGTH);
        description.delete(lastWord, description.length()).append("...");
      }
-      description.insert(0, "<html><body><i>");
+      description.insert(0, "<html><body><center><i>");
      myDescriptions.put(group, description.toString());
    }
  }

-  Map<String, List<String>> getTree() {
+  Map<String, Pair<String, List<String>>> getTree() {
    initIfNeed();
    return myTree;
  }