diff --git a/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form b/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form index 78c5657ecc11..5d2cd592e325 100644 --- a/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form +++ b/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.form @@ -1,6 +1,6 @@
- + @@ -8,23 +8,14 @@ - - - - - - - - - - + - + diff --git a/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java b/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java index b4e5b8eac767..d894191369af 100644 --- a/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java +++ b/python/ide/src/com/jetbrains/python/configuration/AddVEnvOptionsDialog.java @@ -25,7 +25,6 @@ import java.awt.*; * @author yole */ public class AddVEnvOptionsDialog extends DialogWrapper { - private JBCheckBox myUseForThisProjectJBCheckBox; private JBCheckBox myMakeAvailableToAllJBCheckBox; private JPanel myMainPanel; @@ -40,10 +39,6 @@ public class AddVEnvOptionsDialog extends DialogWrapper { return myMainPanel; } - public boolean useForThisProject() { - return myUseForThisProjectJBCheckBox.isSelected(); - } - public boolean makeAvailableToAll() { return myMakeAvailableToAllJBCheckBox.isSelected(); } diff --git a/python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java b/python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java index baf335dc10fa..e0f173143c55 100644 --- a/python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java +++ b/python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java @@ -17,7 +17,6 @@ package com.jetbrains.python.configuration; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.intellij.CommonBundle; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; @@ -35,7 +34,6 @@ import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; @@ -71,7 +69,6 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol private JPanel myNotificationsPlaceholder; private PythonPathEditor myPathEditor; private boolean mySdkListChanged = false; - private boolean myMakeActiveAdded = false; private Sdk myAddedSdk; private final PyConfigurableInterpreterList myInterpreterList; private final ProjectSdksModel myProjectSdksModel; @@ -228,7 +225,7 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol private void createVirtualEnv(Sdk sdk) { CreateVirtualEnvDialog.VirtualEnvCallback callback = new CreateVirtualEnvDialog.VirtualEnvCallback() { @Override - public void virtualEnvCreated(Sdk sdk, boolean associateWithProject, boolean setAsProjectInterpreter) { + public void virtualEnvCreated(Sdk sdk, boolean associateWithProject) { PythonSdkType.setupSdkPaths(sdk, myProject, null); if (associateWithProject) { SdkAdditionalData additionalData = sdk.getSdkAdditionalData(); @@ -243,12 +240,11 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol ((PythonSdkAdditionalData)additionalData).associateWithProject(myProject); } } - myMakeActiveAdded = setAsProjectInterpreter; addCreatedSdk(sdk, true); } }; final List allSdks = PyConfigurableInterpreterList.getInstance(myProject).getAllPythonSdks(myProject); - final CreateVirtualEnvDialog dialog = new CreateVirtualEnvDialog(myProject, myNewProject, allSdks, sdk); + final CreateVirtualEnvDialog dialog = new CreateVirtualEnvDialog(myProject, allSdks, sdk); dialog.show(); if (dialog.isOK()) { dialog.createVirtualEnv(allSdks, callback); @@ -291,11 +287,9 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol myModifiedModificators.clear(); myProjectSdksModel.apply(); mySdkListChanged = false; - if (myMakeActiveAdded) { - SdkConfigurationUtil.setDirectoryProjectSdk(myProject, myAddedSdk); - myProjectSdksModel.setProjectSdk(myAddedSdk); - myInterpreterList.setSelectedSdk(myAddedSdk); - } + SdkConfigurationUtil.setDirectoryProjectSdk(myProject, myAddedSdk); + myProjectSdksModel.setProjectSdk(myAddedSdk); + myInterpreterList.setSelectedSdk(myAddedSdk); } /** @@ -369,7 +363,6 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol .show(myProject, myProjectSdksModel.getSdks(), new PythonSdkConfigurable(myProject).createComponent(), button.getPreferredPopupPoint(), false, new NullableConsumer() { @Override public void consume(Sdk sdk) { - myMakeActiveAdded = false; addCreatedSdk(sdk, false); } }); @@ -379,8 +372,7 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol if (sdk != null) { myAddedSdk = sdk; boolean isVirtualEnv = PythonSdkType.isVirtualEnv(sdk); - boolean askSetAsProjectInterpreter = !myProject.isDefault() && !myNewProject; - if (askSetAsProjectInterpreter && isVirtualEnv && !newVirtualEnv) { + if (isVirtualEnv && !newVirtualEnv) { AddVEnvOptionsDialog dialog = new AddVEnvOptionsDialog(myPanel); dialog.show(); if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) { @@ -389,20 +381,11 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol SdkModificator modificator = myModificators.get(sdk); setSdkAssociated(modificator, !dialog.makeAvailableToAll()); myModifiedModificators.add(modificator); - myMakeActiveAdded = dialog.useForThisProject(); } myProjectSdksModel.addSdk(sdk); refreshSdkList(); mySdkList.setSelectedValue(sdk, true); mySdkListChanged = true; - if (askSetAsProjectInterpreter && !isVirtualEnv && !PythonSdkType.isInvalid(sdk) && !PythonSdkType.isIncompleteRemote(sdk)) { - //TODO: make native mac dialog work - myMakeActiveAdded = Messages.showIdeaMessageDialog(myProject, "Do you want to set this interpreter as Project Interpreter?", - "Project Interpreter", - new String[]{CommonBundle.getYesButtonText(), CommonBundle.getNoButtonText()}, 0, null, - null - ) == Messages.YES; - } } } diff --git a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.form b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.form index bd84b37f8011..ea6172e1faac 100644 --- a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.form +++ b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.form @@ -1,6 +1,6 @@ - + @@ -16,7 +16,7 @@ - + @@ -60,30 +60,22 @@ - + - + - + + - - - - - - - - - diff --git a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java index e86fca40be89..7eea8e0aba89 100644 --- a/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java +++ b/python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java @@ -67,18 +67,16 @@ public class CreateVirtualEnvDialog extends IdeaDialog { private JTextField myName; private JBCheckBox mySitePackagesCheckBox; private JBCheckBox myMakeAvailableToAllProjectsCheckbox; - private JBCheckBox mySetAsProjectInterpreterCheckbox; @Nullable private Project myProject; private String myInitialPath; public interface VirtualEnvCallback { - void virtualEnvCreated(Sdk sdk, boolean associateWithProject, boolean setAsProjectInterpreter); + void virtualEnvCreated(Sdk sdk, boolean associateWithProject); } private static void setupVirtualEnvSdk(List allSdks, final String path, boolean associateWithProject, - final boolean makeActive, VirtualEnvCallback callback) { final VirtualFile sdkHome = ApplicationManager.getApplication().runWriteAction(new Computable() { @@ -92,27 +90,25 @@ public class CreateVirtualEnvDialog extends IdeaDialog { SdkConfigurationUtil.createUniqueSdkName(PythonSdkType.getInstance(), sdkHome.getPath(), allSdks); final ProjectJdkImpl sdk = new ProjectJdkImpl(name, PythonSdkType.getInstance()); sdk.setHomePath(sdkHome.getPath()); - callback.virtualEnvCreated(sdk, associateWithProject, makeActive); + callback.virtualEnvCreated(sdk, associateWithProject); } } public CreateVirtualEnvDialog(Project project, - boolean isNewProject, final List allSdks, @Nullable Sdk suggestedBaseSdk) { super(project); - setupDialog(project, isNewProject, allSdks, suggestedBaseSdk); + setupDialog(project, allSdks, suggestedBaseSdk); } public CreateVirtualEnvDialog(Component owner, - boolean isNewProject, final List allSdks, @Nullable Sdk suggestedBaseSdk) { super(owner); - setupDialog(null, isNewProject, allSdks, suggestedBaseSdk); + setupDialog(null, allSdks, suggestedBaseSdk); } - private void setupDialog(Project project, boolean isNewProject, List allSdks, @Nullable Sdk suggestedBaseSdk) { + private void setupDialog(Project project, List allSdks, @Nullable Sdk suggestedBaseSdk) { myProject = project; init(); setTitle("Create Virtual Environment"); @@ -123,15 +119,9 @@ public class CreateVirtualEnvDialog extends IdeaDialog { } updateSdkList(allSdks, suggestedBaseSdk); - myMakeAvailableToAllProjectsCheckbox.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0)); if (project == null || project.isDefault() || !PlatformUtils.isPyCharm()) { myMakeAvailableToAllProjectsCheckbox.setSelected(true); myMakeAvailableToAllProjectsCheckbox.setVisible(false); - mySetAsProjectInterpreterCheckbox.setSelected(false); - mySetAsProjectInterpreterCheckbox.setVisible(false); - } - else if (isNewProject) { - mySetAsProjectInterpreterCheckbox.setText("Set as project interpreter for the project being created"); } setOKActionEnabled(false); @@ -288,10 +278,6 @@ public class CreateVirtualEnvDialog extends IdeaDialog { return !myMakeAvailableToAllProjectsCheckbox.isSelected(); } - public boolean setAsProjectInterpreter() { - return mySetAsProjectInterpreterCheckbox.isSelected(); - } - @Override public JComponent getPreferredFocusedComponent() { return myName; @@ -326,7 +312,7 @@ public class CreateVirtualEnvDialog extends IdeaDialog { application.invokeLater(new Runnable() { @Override public void run() { - setupVirtualEnvSdk(allSdks, myPath, associateWithProject(), setAsProjectInterpreter(), callback); + setupVirtualEnvSdk(allSdks, myPath, associateWithProject(), callback); } }, ModalityState.any()); } diff --git a/python/src/com/jetbrains/python/sdk/DetailsChooser.java b/python/src/com/jetbrains/python/sdk/DetailsChooser.java index 10dd82f7360f..436c80abfdc4 100644 --- a/python/src/com/jetbrains/python/sdk/DetailsChooser.java +++ b/python/src/com/jetbrains/python/sdk/DetailsChooser.java @@ -138,16 +138,16 @@ public class DetailsChooser extends BaseListPopupStep { final CreateVirtualEnvDialog dialog; final List allSdks = Arrays.asList(myExistingSdks); if (myProject != null) { - dialog = new CreateVirtualEnvDialog(myProject, false, allSdks, null); + dialog = new CreateVirtualEnvDialog(myProject, allSdks, null); } else { - dialog = new CreateVirtualEnvDialog(myOwnerComponent, false, allSdks, null); + dialog = new CreateVirtualEnvDialog(myOwnerComponent, allSdks, null); } dialog.show(); if (dialog.isOK()) { dialog.createVirtualEnv(allSdks, new CreateVirtualEnvDialog.VirtualEnvCallback() { @Override - public void virtualEnvCreated(Sdk sdk, boolean associateWithProject, boolean setAsProjectInterpreter) { + public void virtualEnvCreated(Sdk sdk, boolean associateWithProject) { myCallback.consume(sdk); } });