diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java index 16003348848c..9666fb16767b 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java @@ -100,7 +100,7 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable, Act append(" "); } else { - setBorder(IdeBorderFactory.createEmptyBorder(3, 10, 3, 5)); + setBorder(IdeBorderFactory.createEmptyBorder(2, 10, 2, 5)); setIcon(value.getIcon()); } append(value.getName()); diff --git a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java index c51dbd6fbb8d..23f4e7e2db73 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java +++ b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java @@ -15,6 +15,7 @@ */ package com.intellij.platform.templates; +import com.intellij.icons.AllIcons; import com.intellij.ide.fileTemplates.impl.UrlUtil; import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.application.PathManager; @@ -27,6 +28,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -146,5 +148,10 @@ public class ArchivedTemplatesFactory extends ProjectTemplatesFactory { return CUSTOM_GROUP.equals(group) ? -2 : 0; } + @Override + public Icon getGroupIcon(String group) { + return CUSTOM_GROUP.equals(group) ? AllIcons.Modules.Types.UserDefined : super.getGroupIcon(group); + } + private final static Logger LOG = Logger.getInstance(ArchivedTemplatesFactory.class); } diff --git a/platform/icons/src/modules/types/emptyProjectType.png b/platform/icons/src/modules/types/emptyProjectType.png index 25791ecd207f..36ed04db4f01 100644 Binary files a/platform/icons/src/modules/types/emptyProjectType.png and b/platform/icons/src/modules/types/emptyProjectType.png differ diff --git a/platform/icons/src/modules/types/emptyProjectType@2x.png b/platform/icons/src/modules/types/emptyProjectType@2x.png new file mode 100644 index 000000000000..601c9d08a75f Binary files /dev/null and b/platform/icons/src/modules/types/emptyProjectType@2x.png differ diff --git a/platform/icons/src/modules/types/javaModule.png b/platform/icons/src/modules/types/javaModule.png index def27cfa7e91..ffd12819cdfe 100644 Binary files a/platform/icons/src/modules/types/javaModule.png and b/platform/icons/src/modules/types/javaModule.png differ diff --git a/platform/icons/src/modules/types/javaModule@2x.png b/platform/icons/src/modules/types/javaModule@2x.png new file mode 100644 index 000000000000..25962f60e0be Binary files /dev/null and b/platform/icons/src/modules/types/javaModule@2x.png differ diff --git a/platform/icons/src/modules/types/userDefined.png b/platform/icons/src/modules/types/userDefined.png new file mode 100644 index 000000000000..aaf940aba9bb Binary files /dev/null and b/platform/icons/src/modules/types/userDefined.png differ diff --git a/platform/icons/src/modules/types/userDefined@2x.png b/platform/icons/src/modules/types/userDefined@2x.png new file mode 100644 index 000000000000..fdc09e8e8c29 Binary files /dev/null and b/platform/icons/src/modules/types/userDefined@2x.png differ diff --git a/platform/icons/src/modules/types/webModule.png b/platform/icons/src/modules/types/webModule.png index 4a561d909f30..affdb0f48688 100644 Binary files a/platform/icons/src/modules/types/webModule.png and b/platform/icons/src/modules/types/webModule.png differ diff --git a/platform/icons/src/modules/types/webModule@2x.png b/platform/icons/src/modules/types/webModule@2x.png new file mode 100644 index 000000000000..9b20aa6c522d Binary files /dev/null and b/platform/icons/src/modules/types/webModule@2x.png differ diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 8701647a4c28..584c4c81795c 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -713,6 +713,7 @@ public class AllIcons { public static final Icon JavaeeAppModule = IconLoader.getIcon("/modules/types/JavaeeAppModule.png"); // 24x24 public static final Icon JavaModule = IconLoader.getIcon("/modules/types/javaModule.png"); // 24x24 public static final Icon PluginModule = IconLoader.getIcon("/modules/types/pluginModule.png"); // 24x24 + public static final Icon UserDefined = IconLoader.getIcon("/modules/types/userDefined.png"); // 24x24 public static final Icon WebModule = IconLoader.getIcon("/modules/types/webModule.png"); // 24x24 } diff --git a/plugins/groovy/resources/icons/JetgroovyIcons.java b/plugins/groovy/resources/icons/JetgroovyIcons.java index 2781405b89e0..d7beb420f06f 100644 --- a/plugins/groovy/resources/icons/JetgroovyIcons.java +++ b/plugins/groovy/resources/icons/JetgroovyIcons.java @@ -53,6 +53,7 @@ public class JetgroovyIcons { public static final Icon Groovy_16x16 = load("/icons/groovy/groovy_16x16.png"); // 16x16 public static final Icon Groovy_32x32 = load("/icons/groovy/groovy_32x32.png"); // 32x32 public static final Icon GroovyDoc = load("/icons/groovy/GroovyDoc.png"); // 16x16 + public static final Icon GroovyModule = load("/icons/groovy/groovyModule.png"); // 24x24 public static final Icon Interface = load("/icons/groovy/interface.png"); // 16x16 public static final Icon Method = load("/icons/groovy/method.png"); // 16x16 public static final Icon Property = load("/icons/groovy/property.png"); // 16x16 diff --git a/plugins/groovy/resources/icons/groovy/groovyModule.png b/plugins/groovy/resources/icons/groovy/groovyModule.png new file mode 100644 index 000000000000..278c0d841109 Binary files /dev/null and b/plugins/groovy/resources/icons/groovy/groovyModule.png differ diff --git a/plugins/groovy/resources/icons/groovy/groovyModule@2x.png b/plugins/groovy/resources/icons/groovy/groovyModule@2x.png new file mode 100644 index 000000000000..b421a44efe8d Binary files /dev/null and b/plugins/groovy/resources/icons/groovy/groovyModule@2x.png differ diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java index d163b28da897..58f4a1998a91 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java @@ -39,7 +39,7 @@ public class GroovyAwareModuleBuilder extends JavaModuleBuilder { @SuppressWarnings("UnusedDeclaration") public GroovyAwareModuleBuilder() { - this("groovy", "Groovy", "Simple module with attached Groovy library", null); + this("groovy", "Groovy", "Simple module with attached Groovy library", JetgroovyIcons.Groovy.GroovyModule); } protected GroovyAwareModuleBuilder(String builderId, String presentableName, String description, Icon bigIcon) {