--- a/eric6/VirtualEnv/VirtualenvAddEditDialog.ui Sat Jun 20 17:36:20 2020 +0200 +++ b/eric6/VirtualEnv/VirtualenvAddEditDialog.ui Sun Jun 21 18:26:12 2020 +0200 @@ -7,98 +7,24 @@ <x>0</x> <y>0</y> <width>700</width> - <height>220</height> + <height>188</height> </rect> </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Logical Name:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="E5ClearableLineEdit" name="nameEdit"> - <property name="toolTip"> - <string>Enter a unique name for the virtual environment</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> <property name="text"> - <string>Directory:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="E5PathPicker" name="targetDirectoryPicker" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::WheelFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the directory of the virtual environment</string> + <string>PATH Prefix:</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Python Interpreter:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="E5PathPicker" name="pythonExecPicker" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::WheelFocus</enum> - </property> - <property name="toolTip"> - <string>Enter the Python interpreter of the virtual environment</string> - </property> - </widget> + <item row="4" column="1"> + <widget class="E5ClearableLineEdit" name="execPathEdit"/> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Python Variant:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QComboBox" name="variantComboBox"> - <property name="toolTip"> - <string>Select the Python variant</string> - </property> - <item> - <property name="text"> - <string notr="true">Python 3</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">Python 2</string> - </property> - </item> - </widget> - </item> - <item row="4" column="0" colspan="2"> + <item row="3" column="0" colspan="2"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> <widget class="QCheckBox" name="globalCheckBox"> @@ -149,17 +75,7 @@ </item> </layout> </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>PATH Prefix:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="E5ClearableLineEdit" name="execPathEdit"/> - </item> - <item row="6" column="0" colspan="2"> + <item row="5" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -169,6 +85,66 @@ </property> </widget> </item> + <item row="2" column="1"> + <widget class="E5PathPicker" name="pythonExecPicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::WheelFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the Python interpreter of the virtual environment</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5PathPicker" name="targetDirectoryPicker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::WheelFocus</enum> + </property> + <property name="toolTip"> + <string>Enter the directory of the virtual environment</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5ClearableLineEdit" name="nameEdit"> + <property name="toolTip"> + <string>Enter a unique name for the virtual environment</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Python Interpreter:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Logical Name:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Directory:</string> + </property> + </widget> + </item> </layout> </widget> <customwidgets> @@ -188,7 +164,6 @@ <tabstop>nameEdit</tabstop> <tabstop>targetDirectoryPicker</tabstop> <tabstop>pythonExecPicker</tabstop> - <tabstop>variantComboBox</tabstop> <tabstop>globalCheckBox</tabstop> <tabstop>anacondaCheckBox</tabstop> <tabstop>remoteCheckBox</tabstop>