MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-45900 Add new version of new interpreter UI to Python interpreter settings

Browse Source 
GitOrigin-RevId: 8e3f0ec0ada1900796f82cabc53e60b5322c0fe0
This commit is contained in:
Alexander Koshevoy
2021-10-08 15:43:31 +03:00
committed by intellij-monorepo-bot
parent 79e05f7fbe
commit f9b6e4c069
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
python/pluginResources/messages/PyBundle.properties
View File

@@ -443,6 +443,7 @@ active.sdk.dialog.show.all.item=Show All\u2026
active.sdk.dialog.project.interpreter=Python Interpreter:
active.sdk.dialog.project.interpreter.path.mappings=Path mappings:
active.sdk.dialog.project.interpreter.path.mappings.default.project.error=Open or create project to configure mappings
active.sdk.dialog.link.add.interpreter.text=Add Interpreter
sdk.details.step.add=Add\u2026
sdk.details.step.show.all=Show All\u2026

46
python/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
View File

@@ -16,8 +16,13 @@
package com.jetbrains.python.configuration;
import com.intellij.icons.AllIcons;
import com.intellij.ide.DataManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Experiments;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.ConfigurationException;
@@ -29,11 +34,14 @@ import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
import com.intellij.openapi.ui.ComboBox;
import com.intellij.openapi.ui.FixedSizeButton;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pair;
import com.intellij.ui.CollectionComboBoxModel;
import com.intellij.ui.ComboboxSpeedSearch;
import com.intellij.ui.components.DropDownLink;
import com.intellij.util.NullableConsumer;
import com.intellij.util.ui.JBUI;
import com.intellij.webcore.packaging.PackagesNotificationPanel;
@@ -105,14 +113,41 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
final Pair<PyCustomSdkUiProvider, Disposable> customizer =
customUiProvider == null ? null : new Pair<>(customUiProvider, myDisposable);
final JButton detailsButton = buildDetailsButton(mySdkCombo, this::onShowDetailsClicked);
final JButton additionalAction;
if (Experiments.getInstance().isFeatureEnabled("add.python.interpreter.dialog.on.targets")) {
additionalAction = new DropDownLink<>(PyBundle.message("active.sdk.dialog.link.add.interpreter.text"),
link -> createAddInterpreterPopup(project, module, link, this::updateSdkListAndSelect));
}
else {
additionalAction = buildDetailsButton(mySdkCombo, this::onShowDetailsClicked);
}
myMainPanel = buildPanel(project, mySdkCombo, detailsButton, myPackagesPanel, packagesNotificationPanel, customizer);
myMainPanel = buildPanel(project, mySdkCombo, additionalAction, myPackagesPanel, packagesNotificationPanel, customizer);
myInterpreterList = PyConfigurableInterpreterList.getInstance(myProject);
myProjectSdksModel = myInterpreterList.getModel();
}
@NotNull
private static ListPopup createAddInterpreterPopup(@NotNull Project project,
@Nullable Module module,
@NotNull Component dataContextComponent,
@NotNull Consumer<Sdk> onSdkCreated) {
DataContext dataContext = DataManager.getInstance().getDataContext(dataContextComponent);
List<AnAction> actions = AddInterpreterActions.collectAddInterpreterActions(project, module, onSdkCreated);
return JBPopupFactory.getInstance().createActionGroupPopup(
null,
new DefaultActionGroup(actions),
dataContext,
JBPopupFactory.ActionSelectionAid.SPEEDSEARCH,
false,
null,
-1,
action -> false,
null
);
}
@NotNull
private static ComboBox<Object> buildSdkComboBox(@NotNull Runnable onShowAllSelected, @NotNull Runnable onSdkSelected) {
final ComboBox<Object> result = new ComboBox<>() {
@@ -146,10 +181,13 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
return result;
}
/**
* @param additionalAction either the gear button for the old UI or the link "Add Interpreter" for the new UI
*/
@NotNull
private static JPanel buildPanel(@NotNull Project project,
@NotNull ComboBox<?> sdkComboBox,
@NotNull JButton detailsButton,
@NotNull JComponent additionalAction,
@NotNull PyInstalledPackagesPanel installedPackagesPanel,
@NotNull PackagesNotificationPanel packagesNotificationPanel,
@Nullable Pair<PyCustomSdkUiProvider, Disposable> customizer) {
@@ -174,7 +212,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
c.gridx = 2;
c.gridy = 0;
c.weightx = 0.0;
result.add(detailsButton, c);
result.add(additionalAction, c);
if (customizer != null) {
customizer.first.customizeActiveSdkPanel(project, sdkComboBox, result, c, customizer.second);