diff options
Diffstat (limited to 'python/ide/src/com')
3 files changed, 35 insertions, 13 deletions
diff --git a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java b/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java index 3010b74486fa..69a98ded43f5 100644 --- a/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java +++ b/python/ide/src/com/jetbrains/python/PythonSdkChooserCombo.java @@ -64,8 +64,15 @@ public class PythonSdkChooserCombo extends ComboboxWithBrowseButton { comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { notifyChanged(e); + updateTooltip(); } }); + updateTooltip(); + } + + private void updateTooltip() { + final Object item = getComboBox().getSelectedItem(); + getComboBox().setToolTipText(item instanceof Sdk ? ((Sdk)item).getHomePath() : null); } private void showOptions(final Project project) { 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 6ba283caf199..dd68cdb6ed2f 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java @@ -205,7 +205,19 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane final Project project = ProjectManager.getInstance().getDefaultProject(); final List<Sdk> sdks = PyConfigurableInterpreterList.getInstance(project).getAllPythonSdks(); VirtualEnvProjectFilter.removeAllAssociated(sdks); - final Sdk preferred = sdks.isEmpty() ? null : sdks.iterator().next(); + Sdk compatibleSdk = sdks.isEmpty() ? null : sdks.iterator().next(); + DirectoryProjectGenerator generator = getProjectGenerator(); + if (generator instanceof PyFrameworkProjectGenerator && !((PyFrameworkProjectGenerator)generator).supportsPython3()) { + if (compatibleSdk != null && PythonSdkType.getLanguageLevelForSdk(compatibleSdk).isPy3K()) { + Sdk python2Sdk = PythonSdkType.findPython2Sdk(sdks); + if (python2Sdk != null) { + compatibleSdk = python2Sdk; + + } + } + } + + final Sdk preferred = compatibleSdk; mySdkCombo = new PythonSdkChooserCombo(project, sdks, new Condition<Sdk>() { @Override public boolean value(Sdk sdk) { @@ -231,6 +243,8 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane @Nullable protected JPanel extendBasePanel() { + if (myProjectGenerator instanceof PythonProjectGenerator) + return ((PythonProjectGenerator)myProjectGenerator).extendBasePanel(); return null; } @@ -354,17 +368,19 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane } public void selectCompatiblePython() { - DirectoryProjectGenerator generator = getProjectGenerator(); - if (generator instanceof PyFrameworkProjectGenerator && !((PyFrameworkProjectGenerator)generator).supportsPython3()) { - Sdk sdk = getSdk(); - if (sdk != null && PythonSdkType.getLanguageLevelForSdk(sdk).isPy3K()) { - Sdk python2Sdk = PythonSdkType.findPython2Sdk(null); - if (python2Sdk != null) { - mySdkCombo.getComboBox().setSelectedItem(python2Sdk); - mySdkCombo.getComboBox().repaint(); - } - } - } + //DirectoryProjectGenerator generator = getProjectGenerator(); + //if (generator instanceof PyFrameworkProjectGenerator && !((PyFrameworkProjectGenerator)generator).supportsPython3()) { + // Sdk sdk = getSdk(); + // if (sdk != null && PythonSdkType.getLanguageLevelForSdk(sdk).isPy3K()) { + // Sdk python2Sdk = PythonSdkType.findPython2Sdk(null); + // if (python2Sdk != null) { + // mySdkCombo.getComboBox().setSelectedItem(python2Sdk); + // mySdkCombo.getComboBox().revalidate(); + // mySdkCombo.getComboBox().repaint(); + // + // } + // } + //} } private static boolean acceptsRemoteSdk(DirectoryProjectGenerator generator) { diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java index 950e11e0beca..4397a090b253 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/ProjectSpecificAction.java @@ -42,6 +42,5 @@ public class ProjectSpecificAction extends DefaultActionGroup implements DumbAwa @Override public void actionPerformed(AnActionEvent e) { super.actionPerformed(e); - mySettings.selectCompatiblePython(); } } |