fixed PY-13328 Create New Project: warning about installing template packages is not shown

This commit is contained in:
Ekaterina Tuzova
2014-06-23 13:25:03 +04:00
parent ddb661efad
commit b6f24f015d
5 changed files with 87 additions and 5 deletions
@@ -107,6 +107,9 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
final JPanel scrollPanel = new JPanel(new BorderLayout());
mainPanel.setPreferredSize(new Dimension(mainPanel.getPreferredSize().width, 400));
myErrorLabel = new JLabel("");
myErrorLabel.setForeground(JBColor.RED);
myCreateButton = new Button(myCreateAction, myCreateAction.getTemplatePresentation());
final JPanel panel = createBasePanel();
scrollPanel.add(panel, BorderLayout.NORTH);
@@ -120,11 +123,9 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
mainPanel.add(scrollPane, BorderLayout.CENTER);
final JPanel bottomPanel = new JPanel(new BorderLayout());
myCreateButton = new Button(myCreateAction, myCreateAction.getTemplatePresentation());
myCreateButton.setPreferredSize(new Dimension(mainPanel.getPreferredSize().width, 40));
myErrorLabel = new JLabel("");
myErrorLabel.setForeground(JBColor.RED);
bottomPanel.add(myErrorLabel, BorderLayout.NORTH);
bottomPanel.add(myCreateButton, BorderLayout.CENTER);
mainPanel.add(bottomPanel, BorderLayout.SOUTH);
@@ -242,7 +243,7 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
return false;
}
if (myProjectGenerator instanceof PythonProjectGenerator) {
final ValidationResult warningResult = ((PythonProjectGenerator)myProjectGenerator).warningValidation();
final ValidationResult warningResult = ((PythonProjectGenerator)myProjectGenerator).warningValidation(getSdk());
if (!warningResult.isOk()) {
setWarningText(warningResult.getErrorMessage());
}