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

select in combobox interpreter selected in details

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-02-12 20:19:43 +04:00
parent 77ff70dce4
commit fb03522bb8
3 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+15 -2
View File
@@ -73,6 +73,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
private PyInstalledPackagesPanel myPackagesPanel;
private JButton myDetailsButton;
private static final String SHOW_ALL = "Show All";
private NullableConsumer<Sdk> myDetailsCallback;
public PyActiveSdkConfigurable(@NotNull Project project) {
myModule = null;
@@ -104,12 +105,23 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
myPackagesPanel.updatePackages(new PyPackageManagementService(myProject, selectedSdk));
}
});
myDetailsCallback = new NullableConsumer<Sdk>() {
@Override
public void consume(@Nullable Sdk sdk) {
if (getSdk() != sdk) {
mySdkCombo.setSelectedItem(sdk);
}
}
};
myDetailsButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
PythonSdkDetailsStep
.show(myProject, myProjectSdksModel.getSdks(), new PythonSdkDetailsDialog(myProject),
.show(myProject, myProjectSdksModel.getSdks(),
myModule == null ? new PythonSdkDetailsDialog(myProject, myDetailsCallback) :
new PythonSdkDetailsDialog(myModule, myDetailsCallback),
RelativePoint.fromScreen(myDetailsButton.getLocationOnScreen()), true,
new NullableConsumer<Sdk>() {
@Override
@@ -141,7 +153,8 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
public void setSelectedItem(Object item)
{
if (SHOW_ALL.equals(item)) {
PythonSdkDetailsDialog options = new PythonSdkDetailsDialog(myProject);
PythonSdkDetailsDialog options = myModule == null ? new PythonSdkDetailsDialog(myProject, myDetailsCallback) :
new PythonSdkDetailsDialog(myModule, myDetailsCallback);
options.show();
return;
}
python/ide/src/com/jetbrains/python/configuration/PythonSdkConfigurable.java
+1 -1
View File
@@ -360,7 +360,7 @@ public class PythonSdkConfigurable implements Configurable, Configurable.NoScrol
private void addSdk(AnActionButton button) {
PythonSdkDetailsStep
.show(myProject, myProjectSdksModel.getSdks(), new PythonSdkDetailsDialog(myProject), button.getPreferredPopupPoint(), false,
.show(myProject, myProjectSdksModel.getSdks(), new PythonSdkDetailsDialog(myProject, null), button.getPreferredPopupPoint(), false,
new NullableConsumer<Sdk>() {
@Override
public void consume(Sdk sdk) {
python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
+33 -15
View File
@@ -20,7 +20,6 @@ import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
@@ -74,15 +73,19 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
private boolean myNewProject = false;
private boolean myShowOtherProjectVirtualenvs = true;
private final Module myModule;
private NullableConsumer<Sdk> myShowMoreCallback;
public void setNewProject(final boolean newProject) {
myNewProject = newProject;
}
public PythonSdkDetailsDialog(Project project) {
public PythonSdkDetailsDialog(Project project, NullableConsumer<Sdk> showMoreCallback) {
super(project);
myModule = null;
setTitle("Project Interpreters");
myShowMoreCallback = showMoreCallback;
myProject = project;
myInterpreterList = PyConfigurableInterpreterList.getInstance(myProject);
myProjectSdksModel = myInterpreterList.getModel();
@@ -90,6 +93,19 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
updateOkButton();
}
public PythonSdkDetailsDialog(Module module, NullableConsumer<Sdk> showMoreCallback) {
super(module.getProject());
myModule = module;
setTitle("Project Interpreters");
myShowMoreCallback = showMoreCallback;
myProject = module.getProject();
myInterpreterList = PyConfigurableInterpreterList.getInstance(myProject);
myProjectSdksModel = myInterpreterList.getModel();
init();
updateOkButton();
}
@Nullable
@Override
protected JComponent createCenterPanel() {
@@ -151,6 +167,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
});
mySdkList.addListSelectionListener(new ListSelectionListener() {
public void valueChanged(ListSelectionEvent event) {
updateOkButton();
updateUI(getSelectedSdk());
}
});
@@ -167,7 +184,11 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
}
public boolean isModified() {
return mySdkListChanged ||
Sdk projectSdk = getSdk();
if (projectSdk != null) {
projectSdk = myProjectSdksModel.findSdk(projectSdk.getName());
}
return getSelectedSdk() != projectSdk || mySdkListChanged ||
myProjectSdksModel.isModified() ||
!myModifiedModificators.isEmpty();
}
@@ -200,9 +221,10 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
myModifiedModificators.clear();
myProjectSdksModel.apply();
mySdkListChanged = false;
SdkConfigurationUtil.setDirectoryProjectSdk(myProject, myAddedSdk);
myProjectSdksModel.setProjectSdk(myAddedSdk);
myInterpreterList.setSelectedSdk(myAddedSdk);
if (myAddedSdk != null) {
myInterpreterList.setSelectedSdk(myAddedSdk);
}
myShowMoreCallback.consume(getSelectedSdk());
}
/**
@@ -222,7 +244,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
private void refreshSdkList() {
final List<Sdk> pythonSdks = myInterpreterList.getAllPythonSdks(myProject);
Sdk projectSdk = myProjectSdksModel.getProjectSdk();
Sdk projectSdk = getSdk();
if (!myShowOtherProjectVirtualenvs) {
VirtualEnvProjectFilter.removeNotMatching(myProject, pythonSdks);
}
@@ -230,7 +252,6 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
mySdkList.setModel(new CollectionListModel<Sdk>(pythonSdks));
mySdkListChanged = false;
if (projectSdk == null) projectSdk = getSdk();
if (projectSdk != null) {
projectSdk = myProjectSdksModel.findSdk(projectSdk.getName());
mySdkList.clearSelection();
@@ -238,16 +259,13 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
mySdkList.updateUI();
}
}
@Nullable
private Sdk getSdk() {
final Module[] modules = ModuleManager.getInstance(myProject).getModules();
if (modules.length > 0) {
final Module module = modules[0];
final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
return rootManager.getSdk();
if (myModule == null) {
return ProjectRootManager.getInstance(myProject).getProjectSdk();
}
return ProjectRootManager.getInstance(myProject).getProjectSdk();
final ModuleRootManager rootManager = ModuleRootManager.getInstance(myModule);
return rootManager.getSdk();
}
private void addSdk(AnActionButton button) {