diff -r be24be92ed0f -r 72ebb74aa42d ProjectPyramid/ConfigurationPage/PyramidPage.py
--- a/ProjectPyramid/ConfigurationPage/PyramidPage.py Thu Apr 09 18:34:09 2020 +0200
+++ b/ProjectPyramid/ConfigurationPage/PyramidPage.py Tue Jun 23 18:14:14 2020 +0200
@@ -7,16 +7,15 @@
Module implementing the Pyramid configuration page.
"""
-from __future__ import unicode_literals
-
from PyQt5.QtCore import pyqtSlot
from E5Gui.E5Completers import E5DirCompleter
from E5Gui import E5FileDialog
from E5Gui.E5Application import e5App
-from Preferences.ConfigurationPages.ConfigurationPageBase import \
+from Preferences.ConfigurationPages.ConfigurationPageBase import (
ConfigurationPageBase
+)
from .Ui_PyramidPage import Ui_PyramidPage
import Utilities
@@ -57,40 +56,20 @@
self.consoleCommandCombo.addItems(consoleList)
self.virtualEnvPy3Button.setIcon(UI.PixmapCache.getIcon("open"))
- self.virtualEnvPy2Button.setIcon(UI.PixmapCache.getIcon("open"))
self.translationsButton.setIcon(UI.PixmapCache.getIcon("open"))
self.urlResetButton.setIcon(UI.PixmapCache.getIcon("editUndo"))
- self.virtualEnvPy2Completer = E5DirCompleter(self.virtualEnvPy2Edit)
self.virtualEnvPy3Completer = E5DirCompleter(self.virtualEnvPy3Edit)
- self.py2ShellCombo.addItem(self.tr("Plain Python"), "python")
- self.py2ShellCombo.addItem(self.tr("IPython"), "ipython")
- self.py2ShellCombo.addItem(self.tr("bpython"), "bpython")
-
self.py3ShellCombo.addItem(self.tr("Plain Python"), "python")
self.py3ShellCombo.addItem(self.tr("IPython"), "ipython")
self.py3ShellCombo.addItem(self.tr("bpython"), "bpython")
- try:
- venvManager = e5App().getObject("VirtualEnvManager")
-
- self.py2VenvNameComboBox.addItems(
- [""] + sorted(venvManager.getVirtualenvNamesForVariant(2)))
- self.py3VenvNameComboBox.addItems(
- [""] + sorted(venvManager.getVirtualenvNamesForVariant(3)))
-
- self.pyramidVirtualEnvPy2Group.hide()
- self.pyramidVirtualEnvPy3Group.hide()
-
- self.__hasVirtualEnvironmentManager = True
- except KeyError:
- venvManager = None
-
- self.pyramidVirtualEnvironmentPy2Group.hide()
- self.pyramidVirtualEnvironmentPy3Group.hide()
-
- self.__hasVirtualEnvironmentManager = False
+ venvManager = e5App().getObject("VirtualEnvManager")
+
+ self.py3VenvNameComboBox.addItems(
+ [""] + sorted(venvManager.getVirtualenvNames()))
+ self.pyramidVirtualEnvPy3Group.hide()
# set initial values
self.consoleCommandCombo.setEditText(
@@ -99,31 +78,13 @@
self.externalBrowserCheckBox.setChecked(
self.__plugin.getPreferences("UseExternalBrowser"))
- if venvManager:
- venvName = self.__plugin.getPreferences(
- "VirtualEnvironmentNamePy2")
- if venvName:
- index = self.py2VenvNameComboBox.findText(venvName)
- if index < 0:
- index = 0
- self.py2VenvNameComboBox.setCurrentIndex(index)
- else:
- self.virtualEnvPy2Edit.setText(
- self.__plugin.getPreferences("VirtualEnvironmentPy2"))
- self.py2ShellCombo.setCurrentIndex(self.py2ShellCombo.findData(
- self.__plugin.getPreferences("Python2ConsoleType")))
-
- if venvManager:
- venvName = self.__plugin.getPreferences(
- "VirtualEnvironmentNamePy3")
- if venvName:
- index = self.py3VenvNameComboBox.findText(venvName)
- if index < 0:
- index = 0
- self.py3VenvNameComboBox.setCurrentIndex(index)
- else:
- self.virtualEnvPy3Edit.setText(
- self.__plugin.getPreferences("VirtualEnvironmentPy3"))
+ venvName = self.__plugin.getPreferences(
+ "VirtualEnvironmentNamePy3")
+ if venvName:
+ index = self.py3VenvNameComboBox.findText(venvName)
+ if index < 0:
+ index = 0
+ self.py3VenvNameComboBox.setCurrentIndex(index)
self.py3ShellCombo.setCurrentIndex(self.py3ShellCombo.findData(
self.__plugin.getPreferences("Python3ConsoleType")))
@@ -143,24 +104,9 @@
self.__plugin.setPreferences(
"UseExternalBrowser", self.externalBrowserCheckBox.isChecked())
- if self.__hasVirtualEnvironmentManager:
- self.__plugin.setPreferences(
- "VirtualEnvironmentNamePy2",
- self.py2VenvNameComboBox.currentText())
- else:
- self.__plugin.setPreferences(
- "VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text())
self.__plugin.setPreferences(
- "Python2ConsoleType",
- self.py2ShellCombo.itemData(self.py2ShellCombo.currentIndex()))
-
- if self.__hasVirtualEnvironmentManager:
- self.__plugin.setPreferences(
- "VirtualEnvironmentNamePy3",
- self.py3VenvNameComboBox.currentText())
- else:
- self.__plugin.setPreferences(
- "VirtualEnvironmentPy3", self.virtualEnvPy3Edit.text())
+ "VirtualEnvironmentNamePy3",
+ self.py3VenvNameComboBox.currentText())
self.__plugin.setPreferences(
"Python3ConsoleType",
self.py3ShellCombo.itemData(self.py3ShellCombo.currentIndex()))
@@ -191,25 +137,6 @@
virtualEnv))
@pyqtSlot()
- def on_virtualEnvPy2Button_clicked(self):
- """
- Private slot to select the virtual environment for Python 2 via a
- directory selection dialog.
- """
- vDir = self.virtualEnvPy2Edit.text()
- if not vDir:
- vDir = Utilities.getHomeDir()
- virtualEnv = E5FileDialog.getExistingDirectory(
- self,
- self.tr("Select Virtual Environment for Python 2"),
- vDir,
- E5FileDialog.Options(E5FileDialog.Option(0)))
-
- if virtualEnv:
- self.virtualEnvPy2Edit.setText(Utilities.toNativeSeparators(
- virtualEnv))
-
- @pyqtSlot()
def on_translationsButton_clicked(self):
"""
Private slot to select the translations editor via a file selection
