--- a/src/eric7/Preferences/ConfigurationPages/QtPage.ui Thu Apr 10 18:39:29 2025 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/QtPage.ui Sun Apr 13 14:46:18 2025 +0200 @@ -10,7 +10,7 @@ <height>1316</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_10"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -517,198 +517,93 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_10"> + <widget class="QGroupBox" name="pyside2Group_2"> <property name="title"> - <string>PySide</string> + <string>PySide6</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_9"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="QGroupBox" name="pyside2Group"> - <property name="title"> - <string>PySide2</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_7"> - <item> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Virtual Environment:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="pyside2VenvComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select the virtual environment to be used</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="pyside2VenvDlgButton"> - <property name="toolTip"> - <string>Press to open the virtual environment manager dialog</string> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="pyside2VenvRefreshButton"> - <property name="toolTip"> - <string>Press to refresh the list of vitual environments</string> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_5"> - <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Tools Directory:</string> - </property> - </widget> - </item> - <item> - <widget class="EricPathPicker" name="pyside2ToolsDirPicker" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::FocusPolicy::StrongFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the path of the PySide2 tools directory, if they are not found.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>pyside2-uic Options</string> - </property> - <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="pyside2uicImportsCheckBox"> - <property name="text"> - <string>Generate imports relative to '.'</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Virtual Environment:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="pyside6VenvComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the virtual environment to be used</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="pyside6VenvDlgButton"> + <property name="toolTip"> + <string>Press to open the virtual environment manager dialog</string> + </property> + <property name="text"> + <string notr="true"/> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="pyside6VenvRefreshButton"> + <property name="toolTip"> + <string>Press to refresh the list of vitual environments</string> + </property> + <property name="text"> + <string notr="true"/> + </property> + </widget> + </item> + </layout> </item> <item> - <widget class="QGroupBox" name="pyside2Group_2"> + <layout class="QHBoxLayout" name="horizontalLayout_10"> + <item> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Tools Directory:</string> + </property> + </widget> + </item> + <item> + <widget class="EricPathPicker" name="pyside6ToolsDirPicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::FocusPolicy::StrongFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the path of the PySide6 tools directory, if they are not found.</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QGroupBox" name="groupBox_11"> <property name="title"> - <string>PySide6</string> + <string>pyside6-uic Options</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>Virtual Environment:</string> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="pyside6VenvComboBox"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select the virtual environment to be used</string> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="pyside6VenvDlgButton"> - <property name="toolTip"> - <string>Press to open the virtual environment manager dialog</string> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - </item> - <item> - <widget class="QToolButton" name="pyside6VenvRefreshButton"> - <property name="toolTip"> - <string>Press to refresh the list of vitual environments</string> - </property> - <property name="text"> - <string notr="true"/> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_10"> - <item> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Tools Directory:</string> - </property> - </widget> - </item> - <item> - <widget class="EricPathPicker" name="pyside6ToolsDirPicker" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::FocusPolicy::StrongFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the path of the PySide6 tools directory, if they are not found.</string> - </property> - </widget> - </item> - </layout> - </item> - <item> - <widget class="QGroupBox" name="groupBox_11"> - <property name="title"> - <string>pyside6-uic Options</string> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0" colspan="2"> + <widget class="QCheckBox" name="pyside6uicImportsCheckBox"> + <property name="text"> + <string>Generate imports relative to '.'</string> </property> - <layout class="QGridLayout" name="gridLayout_4"> - <item row="0" column="0" colspan="2"> - <widget class="QCheckBox" name="pyside6uicImportsCheckBox"> - <property name="text"> - <string>Generate imports relative to '.'</string> - </property> - </widget> - </item> - </layout> </widget> </item> </layout> @@ -760,11 +655,6 @@ <tabstop>pyqt6ToolsDirPicker</tabstop> <tabstop>pyuic6IndentSpinBox</tabstop> <tabstop>pyuic6ExecuteCheckBox</tabstop> - <tabstop>pyside2VenvComboBox</tabstop> - <tabstop>pyside2VenvDlgButton</tabstop> - <tabstop>pyside2VenvRefreshButton</tabstop> - <tabstop>pyside2ToolsDirPicker</tabstop> - <tabstop>pyside2uicImportsCheckBox</tabstop> <tabstop>pyside6VenvComboBox</tabstop> <tabstop>pyside6VenvDlgButton</tabstop> <tabstop>pyside6VenvRefreshButton</tabstop>