MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed new project size and name for Community Edition

Browse Source 
PY-13268 New Project: Do not show select project type step in Community Edition
This commit is contained in:
Ekaterina Tuzova
2014-07-31 14:05:51 +04:00
parent cbc4871ac2
commit d8cd8c6f27
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/newProject/PyCharmNewProjectDialog.java
+5 -1
View File
@@ -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);
}
};
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
+4 -1
View File
@@ -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());
python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
+3 -3
View File
@@ -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<AbstractProjectSettingsStep> callback = new NullableConsumer<AbstractProjectSettingsStep>() {
@Override
@@ -192,7 +192,7 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa
}
public PyCharmNewProjectStep() {
this(null);
this("Select Project Type", null);
}