From d8cd8c6f27adcb18c7123a5b37828234fee47b6c Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Thu, 31 Jul 2014 14:05:51 +0400 Subject: [PATCH] fixed new project size and name for Community Edition PY-13268 New Project: Do not show select project type step in Community Edition --- .../python/newProject/PyCharmNewProjectDialog.java | 6 +++++- .../newProject/actions/AbstractProjectSettingsStep.java | 5 ++++- .../python/newProject/actions/PyCharmNewProjectStep.java | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java b/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java index d186f33620e5..7570e3f05b31 100644 --- a/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java +++ b/python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java @@ -16,9 +16,11 @@ package com.jetbrains.python.newProject; import com.intellij.openapi.actionSystem.DefaultActionGroup; +import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.wm.impl.welcomeScreen.CardActionsPanel; +import com.intellij.platform.DirectoryProjectGenerator; import com.jetbrains.python.newProject.actions.PyCharmNewProjectStep; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,7 +44,8 @@ public class PyCharmNewProjectDialog extends DialogWrapper { PyCharmNewProjectDialog.this.close(OK_EXIT_CODE); } }; - final DefaultActionGroup root = new PyCharmNewProjectStep(runnable); + final DirectoryProjectGenerator[] generators = Extensions.getExtensions(DirectoryProjectGenerator.EP_NAME); + final DefaultActionGroup root = new PyCharmNewProjectStep(generators.length == 0 ? "Create Project" : "Select Project Type", runnable); return new CardActionsPanel(root) { @@ -53,6 +56,7 @@ public class PyCharmNewProjectDialog extends DialogWrapper { @Override public Dimension getMinimumSize() { + if (generators.length == 0) return new Dimension(550, 200); return new Dimension(650, 450); } }; diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java index fa8614e993eb..071697f9944d 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java @@ -8,6 +8,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.impl.ActionButtonWithText; +import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.project.DumbAware; @@ -108,7 +109,9 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane final JPanel mainPanel = new JPanel(new BorderLayout()); final JPanel scrollPanel = new JPanel(new BorderLayout()); - mainPanel.setPreferredSize(new Dimension(mainPanel.getPreferredSize().width, 400)); + final DirectoryProjectGenerator[] generators = Extensions.getExtensions(DirectoryProjectGenerator.EP_NAME); + final int height = generators.length == 0 ? 150 : 400; + mainPanel.setPreferredSize(new Dimension(mainPanel.getPreferredSize().width, height)); myErrorLabel = new JLabel(""); myErrorLabel.setForeground(JBColor.RED); myCreateButton = new Button(myCreateAction, myCreateAction.getTemplatePresentation()); diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java index e3d094848815..4f9f1074df68 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java @@ -62,8 +62,8 @@ import java.util.List; public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAware { private static final Logger LOG = Logger.getInstance(PyCharmNewProjectStep.class); - public PyCharmNewProjectStep(@Nullable final Runnable runnable) { - super("Select Project Type", true); + public PyCharmNewProjectStep(@NotNull final String name, @Nullable final Runnable runnable) { + super(name, true); final NullableConsumer callback = new NullableConsumer() { @Override @@ -192,7 +192,7 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa } public PyCharmNewProjectStep() { - this(null); + this("Select Project Type", null); }