--- a/eric6/Preferences/ConfigurationPages/QtPage.py Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Preferences/ConfigurationPages/QtPage.py Tue Dec 22 19:59:29 2020 +0100
@@ -9,13 +9,13 @@
from PyQt5.QtCore import pyqtSlot
+from E5Gui.E5Application import e5App
from E5Gui.E5PathPicker import E5PathPickerModes
from .ConfigurationPageBase import ConfigurationPageBase
from .Ui_QtPage import Ui_QtPage
import Preferences
-import Utilities
class QtPage(ConfigurationPageBase, Ui_QtPage):
@@ -30,21 +30,34 @@
self.setupUi(self)
self.setObjectName("QtPage")
+ try:
+ self.__virtualenvManager = e5App().getObject("VirtualEnvManager")
+ except KeyError:
+ from VirtualEnv.VirtualenvManager import VirtualenvManager
+ self.__virtualenvManager = VirtualenvManager()
+
self.qtTransPicker.setMode(E5PathPickerModes.DirectoryMode)
self.qtToolsDirPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode)
self.pyqtToolsDirPicker.setMode(
E5PathPickerModes.DirectoryShowFilesMode)
+ self.pyqt6ToolsDirPicker.setMode(
+ E5PathPickerModes.DirectoryShowFilesMode)
self.pyside2ToolsDirPicker.setMode(
E5PathPickerModes.DirectoryShowFilesMode)
+ self.__populateAndSetVenvComboBoxes(True)
+
# set initial values
self.qtTransPicker.setText(
Preferences.getQt("Qt5TranslationsDir"))
+
+ # Qt
self.qtToolsDirPicker.setText(Preferences.getQt("QtToolsDir"))
self.qtPrefixEdit.setText(Preferences.getQt("QtToolsPrefix"))
self.qtPostfixEdit.setText(Preferences.getQt("QtToolsPostfix"))
self.__updateQtSample()
+ # PyQt 5
self.pyqtToolsDirPicker.setText(Preferences.getQt("PyQtToolsDir"))
self.pyuicIndentSpinBox.setValue(Preferences.getQt("PyuicIndent"))
self.pyuicImportsCheckBox.setChecked(
@@ -52,13 +65,18 @@
self.pyuicExecuteCheckBox.setChecked(
Preferences.getQt("PyuicExecute"))
+ # PyQt 6
+ self.pyqt6ToolsDirPicker.setText(Preferences.getQt("PyQt6ToolsDir"))
+ self.pyuic6IndentSpinBox.setValue(Preferences.getQt("Pyuic6Indent"))
+ self.pyuic6ExecuteCheckBox.setChecked(
+ Preferences.getQt("Pyuic6Execute"))
+
+ # PySide 2
self.pyside2ToolsDirPicker.setText(
Preferences.getQt("PySide2ToolsDir"))
self.pyside2uicImportsCheckBox.setChecked(
Preferences.getQt("PySide2FromImports"))
-
- self.pyside2Group.setEnabled(Utilities.checkPyside())
-
+
def save(self):
"""
Public slot to save the Qt configuration.
@@ -68,6 +86,7 @@
Preferences.setQt("QtToolsPrefix", self.qtPrefixEdit.text())
Preferences.setQt("QtToolsPostfix", self.qtPostfixEdit.text())
+ Preferences.setQt("PyQtVenvName", self.pyqt5VenvComboBox.currentText())
Preferences.setQt("PyQtToolsDir", self.pyqtToolsDirPicker.text())
Preferences.setQt("PyuicIndent", self.pyuicIndentSpinBox.value())
Preferences.setQt("PyuicFromImports",
@@ -75,10 +94,19 @@
Preferences.setQt("PyuicExecute",
self.pyuicExecuteCheckBox.isChecked())
+ Preferences.setQt("PyQt6VenvName",
+ self.pyqt6VenvComboBox.currentText())
+ Preferences.setQt("PyQt6ToolsDir", self.pyqt6ToolsDirPicker.text())
+ Preferences.setQt("Pyuic6Indent", self.pyuic6IndentSpinBox.value())
+ Preferences.setQt("Pyuic6Execute",
+ self.pyuic6ExecuteCheckBox.isChecked())
+
+ Preferences.setQt("PySide2VenvName",
+ self.pyside2VenvComboBox.currentText())
Preferences.setQt("PySide2ToolsDir", self.pyside2ToolsDirPicker.text())
Preferences.setQt("PySide2FromImports",
self.pyside2uicImportsCheckBox.isChecked())
-
+
def __updateQtSample(self):
"""
Private slot to update the Qt tools sample label.
@@ -105,6 +133,78 @@
"""
self.__updateQtSample()
+ def __populateAndSetVenvComboBox(self, comboBox, envKey, initial):
+ """
+ Private method to populate and set the virtual environment combo boxes.
+
+ @param comboBox reference to the combo box to be populated
+ @type QComboBox
+ @param envKey preferences key for the environment
+ @type str
+ @param initial flag indicating an initial population
+ @type bool
+ """
+ if initial:
+ venvName = Preferences.getQt(envKey)
+ else:
+ venvName = comboBox.currentText()
+
+ comboBox.clear()
+ comboBox.addItems(
+ [""] +
+ sorted(self.__virtualenvManager.getVirtualenvNames())
+ )
+
+ if venvName:
+ index = comboBox.findText(venvName)
+ if index < 0:
+ index = 0
+ comboBox.setCurrentIndex(index)
+
+ def __populateAndSetVenvComboBoxes(self, initial):
+ """
+ Private method to populate the virtual environment combo boxes.
+
+ @param initial flag indicating an initial population
+ @type bool
+ """
+ self.__populateAndSetVenvComboBox(
+ self.pyqt5VenvComboBox, "PyQtVenvName", initial)
+ self.__populateAndSetVenvComboBox(
+ self.pyqt6VenvComboBox, "PyQt6VenvName", initial)
+ self.__populateAndSetVenvComboBox(
+ self.pyside2VenvComboBox, "PySide2VenvName", initial)
+
+ def __showVirtualEnvManager(self):
+ """
+ Private method to show the virtual environment manager dialog.
+ """
+ self.__virtualenvManager.showVirtualenvManagerDialog(modal=True)
+ self.__populateAndSetVenvComboBoxes(False)
+ self.activateWindow()
+ self.raise_()
+
+ @pyqtSlot()
+ def on_pyqt5VenvDlgButton_clicked(self):
+ """
+ Private slot to show the virtual environment manager dialog.
+ """
+ self.__showVirtualEnvManager()
+
+ @pyqtSlot()
+ def on_pyqt6VenvDlgButton_clicked(self):
+ """
+ Private slot to show the virtual environment manager dialog.
+ """
+ self.__showVirtualEnvManager()
+
+ @pyqtSlot()
+ def on_pyside2VenvDlgButton_clicked(self):
+ """
+ Private slot to show the virtual environment manager dialog.
+ """
+ self.__showVirtualEnvManager()
+
def create(dlg):
"""
