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

PY-22324 Split Local Interpreter into Virtual Environment and System Interpreter options

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2017-10-10 05:49:49 +03:00
parent fc47264d5a
commit d0ec2d2678
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/add/PyAddSdkDialog.kt
+8 -9
View File
@@ -54,7 +54,8 @@ class PyAddSdkDialog(private val project: Project?,
val sdks = existingSdks
.filter { it.sdkType is PythonSdkType && !PythonSdkType.isInvalid(it) }
.sortedWith(PreferredSdkComparator())
return createCardSplitter(listOf(createLocalInterpreterPanel(project, sdks, newProjectPath),
return createCardSplitter(listOf(createVirtualEnvPanel(project, sdks, newProjectPath),
PyAddSystemWideInterpreterPanel(existingSdks),
createAnacondaPanel()))
}
@@ -97,25 +98,23 @@ class PyAddSdkDialog(private val project: Project?,
}
}
private fun createLocalInterpreterPanel(project: Project?,
existingSdks: List<Sdk>,
newProjectPath: String?): PyAddSdkPanel {
private fun createVirtualEnvPanel(project: Project?,
existingSdks: List<Sdk>,
newProjectPath: String?): PyAddSdkPanel {
val newVirtualEnvPanel = if (project != null || PlatformUtils.isPyCharmEducational())
PyAddNewVirtualEnvPanel(project, existingSdks, newProjectPath)
else
null
val existingVirtualEnvPanel = PyAddExistingVirtualEnvPanel(project, existingSdks, newProjectPath)
val systemInterpreterPanel = PyAddSystemWideInterpreterPanel(existingSdks)
val panels = listOf(newVirtualEnvPanel,
existingVirtualEnvPanel,
systemInterpreterPanel)
existingVirtualEnvPanel)
.filterNotNull()
val defaultPanel = when {
detectVirtualEnvs(project, existingSdks).any { it.isAssociatedWithProject(project) } -> existingVirtualEnvPanel
newVirtualEnvPanel != null -> newVirtualEnvPanel
else -> systemInterpreterPanel
else -> existingVirtualEnvPanel
}
return PyAddSdkGroupPanel("Local interpreter", PythonIcons.Python.Python, panels, defaultPanel)
return PyAddSdkGroupPanel("Virtual environment", PythonIcons.Python.Virtualenv, panels, defaultPanel)
}
private fun createAnacondaPanel(): PyAddSdkPanel {
python/src/com/jetbrains/python/sdk/add/PyAddSdkGroupPanel.kt
+5 -1
View File
@@ -37,7 +37,11 @@ class PyAddSdkGroupPanel(name: String,
init {
layout = BorderLayout()
add(createRadioButtonPanel(panels, defaultPanel), BorderLayout.NORTH)
val contentPanel = when (panels.size) {
1 -> panels[0]
else -> createRadioButtonPanel(panels, defaultPanel)
}
add(contentPanel, BorderLayout.NORTH)
}
override fun validateAll() = panels.filter { it.isEnabled }.flatMap { it.validateAll() }
python/src/com/jetbrains/python/sdk/add/PyAddSystemWideInterpreterPanel.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import java.awt.BorderLayout
* @author vlan
*/
class PyAddSystemWideInterpreterPanel(private val existingSdks: List<Sdk>) : PyAddSdkPanel() {
override val panelName = "System-wide interpreter"
override val panelName = "System interpreter"
private val sdkComboBox = PySdkPathChoosingComboBox(detectSystemWideSdks(existingSdks), null)
init {