--- a/src/eric7/Preferences/ConfigurationPages/Ui_QtPage.py Sun Apr 13 14:46:18 2025 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/Ui_QtPage.py Sun Apr 13 15:53:14 2025 +0200 @@ -12,7 +12,7 @@ class Ui_QtPage(object): def setupUi(self, QtPage): QtPage.setObjectName("QtPage") - QtPage.resize(556, 1316) + QtPage.resize(556, 786) self.verticalLayout_4 = QtWidgets.QVBoxLayout(QtPage) self.verticalLayout_4.setObjectName("verticalLayout_4") self.headerLabel = QtWidgets.QLabel(parent=QtPage) @@ -120,76 +120,7 @@ self.verticalLayout_2.addLayout(self.gridLayout_5) self.verticalLayout_8.addWidget(self.groupBox_4) self.verticalLayout_4.addWidget(self.groupBox_6) - self.groupBox_7 = QtWidgets.QGroupBox(parent=QtPage) - self.groupBox_7.setObjectName("groupBox_7") - self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.groupBox_7) - self.verticalLayout_6.setObjectName("verticalLayout_6") - self.groupBox_5 = QtWidgets.QGroupBox(parent=self.groupBox_7) - self.groupBox_5.setObjectName("groupBox_5") - self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.groupBox_5) - self.verticalLayout_7.setObjectName("verticalLayout_7") - self.horizontalLayout_9 = QtWidgets.QHBoxLayout() - self.horizontalLayout_9.setObjectName("horizontalLayout_9") - self.label = QtWidgets.QLabel(parent=self.groupBox_5) - self.label.setObjectName("label") - self.horizontalLayout_9.addWidget(self.label) - self.pyqt5VenvComboBox = QtWidgets.QComboBox(parent=self.groupBox_5) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pyqt5VenvComboBox.sizePolicy().hasHeightForWidth()) - self.pyqt5VenvComboBox.setSizePolicy(sizePolicy) - self.pyqt5VenvComboBox.setObjectName("pyqt5VenvComboBox") - self.horizontalLayout_9.addWidget(self.pyqt5VenvComboBox) - self.pyqt5VenvDlgButton = QtWidgets.QToolButton(parent=self.groupBox_5) - self.pyqt5VenvDlgButton.setText("") - self.pyqt5VenvDlgButton.setObjectName("pyqt5VenvDlgButton") - self.horizontalLayout_9.addWidget(self.pyqt5VenvDlgButton) - self.pyqt5VenvRefreshButton = QtWidgets.QToolButton(parent=self.groupBox_5) - self.pyqt5VenvRefreshButton.setText("") - self.pyqt5VenvRefreshButton.setObjectName("pyqt5VenvRefreshButton") - self.horizontalLayout_9.addWidget(self.pyqt5VenvRefreshButton) - self.verticalLayout_7.addLayout(self.horizontalLayout_9) - self.horizontalLayout_3 = QtWidgets.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.label_6 = QtWidgets.QLabel(parent=self.groupBox_5) - self.label_6.setObjectName("label_6") - self.horizontalLayout_3.addWidget(self.label_6) - self.pyqtToolsDirPicker = EricPathPicker(parent=self.groupBox_5) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.pyqtToolsDirPicker.sizePolicy().hasHeightForWidth()) - self.pyqtToolsDirPicker.setSizePolicy(sizePolicy) - self.pyqtToolsDirPicker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) - self.pyqtToolsDirPicker.setObjectName("pyqtToolsDirPicker") - self.horizontalLayout_3.addWidget(self.pyqtToolsDirPicker) - self.verticalLayout_7.addLayout(self.horizontalLayout_3) - self.groupBox = QtWidgets.QGroupBox(parent=self.groupBox_5) - self.groupBox.setObjectName("groupBox") - self.gridLayout = QtWidgets.QGridLayout(self.groupBox) - self.gridLayout.setObjectName("gridLayout") - self.label_2 = QtWidgets.QLabel(parent=self.groupBox) - self.label_2.setObjectName("label_2") - self.gridLayout.addWidget(self.label_2, 0, 0, 1, 1) - self.pyuicIndentSpinBox = QtWidgets.QSpinBox(parent=self.groupBox) - self.pyuicIndentSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) - self.pyuicIndentSpinBox.setMinimum(2) - self.pyuicIndentSpinBox.setMaximum(16) - self.pyuicIndentSpinBox.setProperty("value", 4) - self.pyuicIndentSpinBox.setObjectName("pyuicIndentSpinBox") - self.gridLayout.addWidget(self.pyuicIndentSpinBox, 0, 1, 1, 1) - spacerItem = QtWidgets.QSpacerItem(448, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout.addItem(spacerItem, 0, 2, 1, 1) - self.pyuicImportsCheckBox = QtWidgets.QCheckBox(parent=self.groupBox) - self.pyuicImportsCheckBox.setObjectName("pyuicImportsCheckBox") - self.gridLayout.addWidget(self.pyuicImportsCheckBox, 1, 0, 1, 3) - self.pyuicExecuteCheckBox = QtWidgets.QCheckBox(parent=self.groupBox) - self.pyuicExecuteCheckBox.setObjectName("pyuicExecuteCheckBox") - self.gridLayout.addWidget(self.pyuicExecuteCheckBox, 2, 0, 1, 3) - self.verticalLayout_7.addWidget(self.groupBox) - self.verticalLayout_6.addWidget(self.groupBox_5) - self.groupBox_8 = QtWidgets.QGroupBox(parent=self.groupBox_7) + self.groupBox_8 = QtWidgets.QGroupBox(parent=QtPage) self.groupBox_8.setObjectName("groupBox_8") self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_8) self.verticalLayout_5.setObjectName("verticalLayout_5") @@ -234,8 +165,8 @@ self.groupBox_9.setObjectName("groupBox_9") self.gridLayout_3 = QtWidgets.QGridLayout(self.groupBox_9) self.gridLayout_3.setObjectName("gridLayout_3") - spacerItem1 = QtWidgets.QSpacerItem(448, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout_3.addItem(spacerItem1, 0, 2, 1, 1) + spacerItem = QtWidgets.QSpacerItem(448, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) + self.gridLayout_3.addItem(spacerItem, 0, 2, 1, 1) self.pyuic6ExecuteCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_9) self.pyuic6ExecuteCheckBox.setObjectName("pyuic6ExecuteCheckBox") self.gridLayout_3.addWidget(self.pyuic6ExecuteCheckBox, 1, 0, 1, 3) @@ -250,8 +181,7 @@ self.label_9.setObjectName("label_9") self.gridLayout_3.addWidget(self.label_9, 0, 0, 1, 1) self.verticalLayout_5.addWidget(self.groupBox_9) - self.verticalLayout_6.addWidget(self.groupBox_8) - self.verticalLayout_4.addWidget(self.groupBox_7) + self.verticalLayout_4.addWidget(self.groupBox_8) self.pyside2Group_2 = QtWidgets.QGroupBox(parent=QtPage) self.pyside2Group_2.setObjectName("pyside2Group_2") self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.pyside2Group_2) @@ -302,8 +232,8 @@ self.gridLayout_4.addWidget(self.pyside6uicImportsCheckBox, 0, 0, 1, 2) self.verticalLayout_3.addWidget(self.groupBox_11) self.verticalLayout_4.addWidget(self.pyside2Group_2) - spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) - self.verticalLayout_4.addItem(spacerItem2) + spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) + self.verticalLayout_4.addItem(spacerItem1) self.retranslateUi(QtPage) QtCore.QMetaObject.connectSlotsByName(QtPage) @@ -312,14 +242,7 @@ QtPage.setTabOrder(self.qtPrefixEdit, self.qtPostfixEdit) QtPage.setTabOrder(self.qtPostfixEdit, self.qhelpgeneratorPicker) QtPage.setTabOrder(self.qhelpgeneratorPicker, self.lreleasePicker) - QtPage.setTabOrder(self.lreleasePicker, self.pyqt5VenvComboBox) - QtPage.setTabOrder(self.pyqt5VenvComboBox, self.pyqt5VenvDlgButton) - QtPage.setTabOrder(self.pyqt5VenvDlgButton, self.pyqt5VenvRefreshButton) - QtPage.setTabOrder(self.pyqt5VenvRefreshButton, self.pyqtToolsDirPicker) - QtPage.setTabOrder(self.pyqtToolsDirPicker, self.pyuicIndentSpinBox) - QtPage.setTabOrder(self.pyuicIndentSpinBox, self.pyuicImportsCheckBox) - QtPage.setTabOrder(self.pyuicImportsCheckBox, self.pyuicExecuteCheckBox) - QtPage.setTabOrder(self.pyuicExecuteCheckBox, self.pyqt6VenvComboBox) + QtPage.setTabOrder(self.lreleasePicker, self.pyqt6VenvComboBox) QtPage.setTabOrder(self.pyqt6VenvComboBox, self.pyqt6VenvDlgButton) QtPage.setTabOrder(self.pyqt6VenvDlgButton, self.pyqt6VenvRefreshButton) QtPage.setTabOrder(self.pyqt6VenvRefreshButton, self.pyqt6ToolsDirPicker) @@ -356,20 +279,6 @@ self.qhelpgeneratorPicker.setToolTip(_translate("QtPage", "Enter the path of the \'qhelpgenerator\' program, if it cannot be found automatically.")) self.label_15.setText(_translate("QtPage", "\'lrelease\':")) self.lreleasePicker.setToolTip(_translate("QtPage", "Enter the path of the \'lrelease\' program, if it cannot be found automatically.")) - self.groupBox_7.setTitle(_translate("QtPage", "PyQt")) - self.groupBox_5.setTitle(_translate("QtPage", "PyQt 5")) - self.label.setText(_translate("QtPage", "Virtual Environment:")) - self.pyqt5VenvComboBox.setToolTip(_translate("QtPage", "Select the virtual environment to be used")) - self.pyqt5VenvDlgButton.setToolTip(_translate("QtPage", "Press to open the virtual environment manager dialog")) - self.pyqt5VenvRefreshButton.setToolTip(_translate("QtPage", "Press to refresh the list of vitual environments")) - self.label_6.setText(_translate("QtPage", "Tools Directory:")) - self.pyqtToolsDirPicker.setToolTip(_translate("QtPage", "Enter the path of the PyQt 5 tools directory, if they are not found.")) - self.groupBox.setTitle(_translate("QtPage", "pyuic5 Options")) - self.label_2.setText(_translate("QtPage", "Indent Width:")) - self.pyuicIndentSpinBox.setToolTip(_translate("QtPage", "Select the indent width (default: 4)")) - self.pyuicImportsCheckBox.setText(_translate("QtPage", "Generate imports relative to \'.\'")) - self.pyuicExecuteCheckBox.setToolTip(_translate("QtPage", "Select to generate extra code to test and display the form")) - self.pyuicExecuteCheckBox.setText(_translate("QtPage", "Generate Extra Test Code")) self.groupBox_8.setTitle(_translate("QtPage", "PyQt 6")) self.label_10.setText(_translate("QtPage", "Virtual Environment:")) self.pyqt6VenvComboBox.setToolTip(_translate("QtPage", "Select the virtual environment to be used"))