--- a/src/eric7/Preferences/ConfigurationPages/QtPage.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Preferences/ConfigurationPages/QtPage.py Wed Jul 13 14:55:47 2022 +0200
@@ -23,6 +23,7 @@
"""
Class implementing the Qt configuration page.
"""
+
def __init__(self):
"""
Constructor
@@ -30,31 +31,36 @@
super().__init__()
self.setupUi(self)
self.setObjectName("QtPage")
-
+
try:
self.__virtualenvManager = ericApp().getObject("VirtualEnvManager")
self.__standalone = False
except KeyError:
from VirtualEnv.VirtualenvManager import VirtualenvManager
+
self.__virtualenvManager = VirtualenvManager()
self.__standalone = True
-
+
for button in (
- self.pyqt5VenvDlgButton, self.pyqt6VenvDlgButton,
- self.pyside2VenvDlgButton, self.pyside6VenvDlgButton,
+ self.pyqt5VenvDlgButton,
+ self.pyqt6VenvDlgButton,
+ self.pyside2VenvDlgButton,
+ self.pyside6VenvDlgButton,
):
button.setIcon(UI.PixmapCache.getIcon("virtualenv"))
button.clicked.connect(self.__showVirtualEnvManager)
button.setVisible(self.__standalone)
-
+
for button in (
- self.pyqt5VenvRefreshButton, self.pyqt6VenvRefreshButton,
- self.pyside2VenvRefreshButton, self.pyside6VenvRefreshButton,
+ self.pyqt5VenvRefreshButton,
+ self.pyqt6VenvRefreshButton,
+ self.pyside2VenvRefreshButton,
+ self.pyside6VenvRefreshButton,
):
button.setIcon(UI.PixmapCache.getIcon("reload"))
button.clicked.connect(self.__populateAndSetVenvComboBoxes)
button.setVisible(not self.__standalone)
-
+
self.qtTransPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
for picker in (
self.qtToolsDirPicker,
@@ -64,45 +70,41 @@
self.pyside6ToolsDirPicker,
):
picker.setMode(EricPathPickerModes.DIRECTORY_SHOW_FILES_MODE)
-
+
self.__populateAndSetVenvComboBoxes(True)
-
+
# set initial values
- self.qtTransPicker.setText(
- Preferences.getQt("Qt6TranslationsDir"))
-
+ self.qtTransPicker.setText(Preferences.getQt("Qt6TranslationsDir"))
+
# 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(
- Preferences.getQt("PyuicFromImports"))
- self.pyuicExecuteCheckBox.setChecked(
- Preferences.getQt("PyuicExecute"))
-
+ self.pyuicImportsCheckBox.setChecked(Preferences.getQt("PyuicFromImports"))
+ 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"))
-
+ self.pyuic6ExecuteCheckBox.setChecked(Preferences.getQt("Pyuic6Execute"))
+
# PySide 2
- self.pyside2ToolsDirPicker.setText(
- Preferences.getQt("PySide2ToolsDir"))
+ self.pyside2ToolsDirPicker.setText(Preferences.getQt("PySide2ToolsDir"))
self.pyside2uicImportsCheckBox.setChecked(
- Preferences.getQt("PySide2FromImports"))
-
+ Preferences.getQt("PySide2FromImports")
+ )
+
# PySide 6
- self.pyside6ToolsDirPicker.setText(
- Preferences.getQt("PySide6ToolsDir"))
+ self.pyside6ToolsDirPicker.setText(Preferences.getQt("PySide6ToolsDir"))
self.pyside6uicImportsCheckBox.setChecked(
- Preferences.getQt("PySide6FromImports"))
-
+ Preferences.getQt("PySide6FromImports")
+ )
+
def save(self):
"""
Public slot to save the Qt configuration.
@@ -111,64 +113,62 @@
Preferences.setQt("QtToolsDir", self.qtToolsDirPicker.text())
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",
- self.pyuicImportsCheckBox.isChecked())
- Preferences.setQt("PyuicExecute",
- self.pyuicExecuteCheckBox.isChecked())
-
- Preferences.setQt("PyQt6VenvName",
- self.pyqt6VenvComboBox.currentText())
+ Preferences.setQt("PyuicFromImports", self.pyuicImportsCheckBox.isChecked())
+ 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("Pyuic6Execute", self.pyuic6ExecuteCheckBox.isChecked())
+
+ Preferences.setQt("PySide2VenvName", self.pyside2VenvComboBox.currentText())
Preferences.setQt("PySide2ToolsDir", self.pyside2ToolsDirPicker.text())
- Preferences.setQt("PySide2FromImports",
- self.pyside2uicImportsCheckBox.isChecked())
-
- Preferences.setQt("PySide6VenvName",
- self.pyside6VenvComboBox.currentText())
+ Preferences.setQt(
+ "PySide2FromImports", self.pyside2uicImportsCheckBox.isChecked()
+ )
+
+ Preferences.setQt("PySide6VenvName", self.pyside6VenvComboBox.currentText())
Preferences.setQt("PySide6ToolsDir", self.pyside6ToolsDirPicker.text())
- Preferences.setQt("PySide6FromImports",
- self.pyside6uicImportsCheckBox.isChecked())
-
+ Preferences.setQt(
+ "PySide6FromImports", self.pyside6uicImportsCheckBox.isChecked()
+ )
+
def __updateQtSample(self):
"""
Private slot to update the Qt tools sample label.
"""
self.qtSampleLabel.setText(
self.tr("Sample: {0}designer{1}").format(
- self.qtPrefixEdit.text(), self.qtPostfixEdit.text()))
-
+ self.qtPrefixEdit.text(), self.qtPostfixEdit.text()
+ )
+ )
+
@pyqtSlot(str)
def on_qtPrefixEdit_textChanged(self, txt):
"""
Private slot to handle a change in the entered Qt directory.
-
+
@param txt the entered string (string)
"""
self.__updateQtSample()
-
+
@pyqtSlot(str)
def on_qtPostfixEdit_textChanged(self, txt):
"""
Private slot to handle a change in the entered Qt directory.
-
+
@param txt the entered string (string)
"""
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
@@ -176,37 +176,37 @@
@param initial flag indicating an initial population
@type bool
"""
- venvName = (Preferences.getQt(envKey) if initial
- else comboBox.currentText())
-
+ venvName = Preferences.getQt(envKey) if initial else comboBox.currentText()
+
comboBox.clear()
- comboBox.addItems(
- [""] +
- sorted(self.__virtualenvManager.getVirtualenvNames())
- )
-
+ 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.pyqt5VenvComboBox, "PyQtVenvName", initial
+ )
self.__populateAndSetVenvComboBox(
- self.pyqt6VenvComboBox, "PyQt6VenvName", initial)
+ self.pyqt6VenvComboBox, "PyQt6VenvName", initial
+ )
self.__populateAndSetVenvComboBox(
- self.pyside2VenvComboBox, "PySide2VenvName", initial)
+ self.pyside2VenvComboBox, "PySide2VenvName", initial
+ )
self.__populateAndSetVenvComboBox(
- self.pyside6VenvComboBox, "PySide6VenvName", initial)
-
+ self.pyside6VenvComboBox, "PySide6VenvName", initial
+ )
+
def __showVirtualEnvManager(self):
"""
Private method to show the virtual environment manager dialog.
@@ -220,7 +220,7 @@
def create(dlg):
"""
Module function to create the configuration page.
-
+
@param dlg reference to the configuration dialog
@return reference to the instantiated page (ConfigurationPageBase)
"""
