diff -r 0af028b93cb3 -r 7991ea245c20 eric6/Preferences/ConfigurationPages/QtPage.ui
--- a/eric6/Preferences/ConfigurationPages/QtPage.ui Mon Dec 21 13:36:24 2020 +0100
+++ b/eric6/Preferences/ConfigurationPages/QtPage.ui Tue Dec 22 19:59:29 2020 +0100
@@ -7,10 +7,10 @@
<x>0</x>
<y>0</y>
<width>556</width>
- <height>690</height>
+ <height>1027</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_6">
+ <layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
@@ -36,7 +36,7 @@
<property name="title">
<string>Qt</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
@@ -179,94 +179,265 @@
<property name="title">
<string>PyQt</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Tools Directory:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="E5PathPicker" name="pyqtToolsDirPicker" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="toolTip">
- <string>Enter the path of the PyQt tools directory, if they are not found.</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox">
+ <widget class="QGroupBox" name="groupBox_5">
<property name="title">
- <string>pyuic Options</string>
+ <string>PyQt 5</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Indent Width:</string>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Virtual Environment:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="pyqt5VenvComboBox">
+ <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="pyqt5VenvDlgButton">
+ <property name="toolTip">
+ <string>Press to open the virtual environment manager dialog</string>
+ </property>
+ <property name="text">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Tools Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="E5PathPicker" name="pyqtToolsDirPicker" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enter the path of the PyQt 5 tools directory, if they are not found.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>pyuic5 Options</string>
</property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Indent Width:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="pyuicIndentSpinBox">
+ <property name="toolTip">
+ <string>Select the indent width (default: 4)</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="minimum">
+ <number>2</number>
+ </property>
+ <property name="maximum">
+ <number>16</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>448</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" colspan="3">
+ <widget class="QCheckBox" name="pyuicImportsCheckBox">
+ <property name="text">
+ <string>Generate imports relative to '.'</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QCheckBox" name="pyuicExecuteCheckBox">
+ <property name="toolTip">
+ <string>Select to generate extra code to test and display the form</string>
+ </property>
+ <property name="text">
+ <string>Generate Extra Test Code</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="pyuicIndentSpinBox">
- <property name="toolTip">
- <string>Select the indent width (default: 4)</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>16</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_8">
+ <property name="title">
+ <string>PyQt 6</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Virtual Environment:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="pyqt6VenvComboBox">
+ <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="pyqt6VenvDlgButton">
+ <property name="toolTip">
+ <string>Press to open the virtual environment manager dialog</string>
+ </property>
+ <property name="text">
+ <string notr="true"/>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Tools Directory:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="E5PathPicker" name="pyqt6ToolsDirPicker" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="toolTip">
+ <string>Enter the path of the PyQt 6 tools directory, if they are not found.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_9">
+ <property name="title">
+ <string>pyuic6 Options</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>448</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" colspan="3">
- <widget class="QCheckBox" name="pyuicImportsCheckBox">
- <property name="text">
- <string>Generate imports relative to '.'</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <widget class="QCheckBox" name="pyuicExecuteCheckBox">
- <property name="toolTip">
- <string>Select to generate extra code to test and display the form</string>
- </property>
- <property name="text">
- <string>Generate Extra Test Code</string>
- </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>448</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" colspan="3">
+ <widget class="QCheckBox" name="pyuic6ExecuteCheckBox">
+ <property name="toolTip">
+ <string>Select to generate extra code to test and display the form</string>
+ </property>
+ <property name="text">
+ <string>Generate Extra Test Code</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="pyuic6IndentSpinBox">
+ <property name="toolTip">
+ <string>Select the indent width (default: 4)</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="minimum">
+ <number>2</number>
+ </property>
+ <property name="maximum">
+ <number>16</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Indent Width:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
@@ -280,7 +451,41 @@
<property name="title">
<string>PySide2</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <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>
+ </layout>
+ </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
@@ -355,10 +560,19 @@
<tabstop>qtToolsDirPicker</tabstop>
<tabstop>qtPrefixEdit</tabstop>
<tabstop>qtPostfixEdit</tabstop>
+ <tabstop>pyqt5VenvComboBox</tabstop>
+ <tabstop>pyqt5VenvDlgButton</tabstop>
<tabstop>pyqtToolsDirPicker</tabstop>
<tabstop>pyuicIndentSpinBox</tabstop>
<tabstop>pyuicImportsCheckBox</tabstop>
<tabstop>pyuicExecuteCheckBox</tabstop>
+ <tabstop>pyqt6VenvComboBox</tabstop>
+ <tabstop>pyqt6VenvDlgButton</tabstop>
+ <tabstop>pyqt6ToolsDirPicker</tabstop>
+ <tabstop>pyuic6IndentSpinBox</tabstop>
+ <tabstop>pyuic6ExecuteCheckBox</tabstop>
+ <tabstop>pyside2VenvComboBox</tabstop>
+ <tabstop>pyside2VenvDlgButton</tabstop>
<tabstop>pyside2ToolsDirPicker</tabstop>
<tabstop>pyside2uicImportsCheckBox</tabstop>
</tabstops>
