diff -r c33c1dbd0ee5 -r f04328aef87a eric6/Preferences/ConfigurationPages/QtPage.ui --- a/eric6/Preferences/ConfigurationPages/QtPage.ui Mon Mar 09 20:21:38 2020 +0100 +++ b/eric6/Preferences/ConfigurationPages/QtPage.ui Tue Mar 10 19:32:25 2020 +0100 @@ -10,7 +10,7 @@ <height>772</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QVBoxLayout" name="verticalLayout_6"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -32,69 +32,172 @@ </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_3"> + <widget class="QGroupBox" name="groupBox_6"> <property name="title"> - <string>Qt Translations Directory</string> + <string>Qt</string> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="TextLabel1_2_2_5"> - <property name="text"> - <string><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></string> - </property> - </widget> - </item> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> - <widget class="E5PathPicker" name="qtTransPicker" 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> + <widget class="QGroupBox" name="groupBox_3"> + <property name="title"> + <string>Qt Translations Directory</string> </property> - <property name="toolTip"> - <string>Enter the path of the Qt translations directory.</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="textLabel1_2_4"> - <property name="text"> - <string><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="TextLabel1_2_2_5"> + <property name="text"> + <string><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></string> + </property> + </widget> + </item> + <item> + <widget class="E5PathPicker" name="qtTransPicker" 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 Qt translations directory.</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="textLabel1_2_4"> + <property name="text"> + <string><b>Note:</b> Leave this entry empty to use an environment variable or the path compiled into the Qt library. Environment variables supported are <ul> <li>QT4TRANSLATIONSDIR for Qt4</li> <li>QT5TRANSLATIONSDIR for Qt5</li> <li>QTTRANSLATIONSDIR for any Qt variant</li> </ul></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4"> + <property name="title"> + <string>Qt Tools</string> </property> - <property name="wordWrap"> - <bool>true</bool> - </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Tools Directory:</string> + </property> + </widget> + </item> + <item> + <widget class="E5PathPicker" name="qtToolsDirPicker" 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 Qt tools directory, if they are not found.</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Qt-Prefix:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="qtPrefixEdit"> + <property name="toolTip"> + <string>Enter the prefix for the Qt tools name</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Qt-Postfix:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="qtPostfixEdit"> + <property name="toolTip"> + <string>Enter the postfix for the Qt tools name</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="qtSampleLabel"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>This gives an example of the complete tool name</string> + </property> + <property name="text"> + <string>designer</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> </widget> </item> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_4"> + <widget class="QGroupBox" name="groupBox_7"> <property name="title"> - <string>Qt Tools</string> + <string>PyQt</string> </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout_4"> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QLabel" name="label_4"> + <widget class="QLabel" name="label_6"> <property name="text"> <string>Tools Directory:</string> </property> </widget> </item> <item> - <widget class="E5PathPicker" name="qtToolsDirPicker" native="true"> + <widget class="E5PathPicker" name="pyqtToolsDirPicker" native="true"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <horstretch>0</horstretch> @@ -105,187 +208,127 @@ <enum>Qt::StrongFocus</enum> </property> <property name="toolTip"> - <string>Enter the path of the Qt tools directory, if they are not found.</string> + <string>Enter the path of the PyQt tools directory, if they are not found.</string> </property> </widget> </item> </layout> </item> <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</string> - </property> - <property name="wordWrap"> - <bool>true</bool> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>pyuic Options</string> </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Qt-Prefix:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="qtPrefixEdit"> - <property name="toolTip"> - <string>Enter the prefix for the Qt tools name</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Qt-Postfix:</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="qtPostfixEdit"> - <property name="toolTip"> - <string>Enter the postfix for the Qt tools name</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="qtSampleLabel"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>This gives an example of the complete tool name</string> - </property> - <property name="text"> - <string>designer</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox_2"> - <property name="title"> - <string>PyQt Tools</string> - </property> - <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> + <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> </layout> </widget> </item> <item> - <widget class="QGroupBox" name="groupBox_5"> + <widget class="QGroupBox" name="pyside2Group"> <property name="title"> - <string>PySide2 Tools</string> + <string>PySide2</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_4"> + <layout class="QVBoxLayout" name="verticalLayout_5"> <item> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Tools Directory:</string> - </property> - </widget> + <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="E5PathPicker" 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::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="E5PathPicker" 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::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> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>pyuic / pyside-uic 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> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>pyside2-uic Options</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> + <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> @@ -320,9 +363,11 @@ <tabstop>qtPrefixEdit</tabstop> <tabstop>qtPostfixEdit</tabstop> <tabstop>pyqtToolsDirPicker</tabstop> - <tabstop>pyside2ToolsDirPicker</tabstop> <tabstop>pyuicIndentSpinBox</tabstop> <tabstop>pyuicImportsCheckBox</tabstop> + <tabstop>pyuicExecuteCheckBox</tabstop> + <tabstop>pyside2ToolsDirPicker</tabstop> + <tabstop>pyside2uicImportsCheckBox</tabstop> </tabstops> <resources/> <connections/>