diff -r 10364f51ba54 -r 4de6dbce4dd6 ProjectPyramid/ConfigurationPage/PyramidPage.ui --- a/ProjectPyramid/ConfigurationPage/PyramidPage.ui Sat Mar 31 13:41:00 2018 +0200 +++ b/ProjectPyramid/ConfigurationPage/PyramidPage.ui Sat Jun 23 17:45:53 2018 +0200 @@ -7,10 +7,10 @@ <x>0</x> <y>0</y> <width>528</width> - <height>1006</height> + <height>1265</height> </rect> </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <layout class="QVBoxLayout" name="verticalLayout_3"> <item> <widget class="QLabel" name="headerLabel"> <property name="text"> @@ -97,8 +97,8 @@ <property name="title"> <string>Python 3</string> </property> - <layout class="QGridLayout" name="gridLayout_5"> - <item row="0" column="0" colspan="2"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> <widget class="QGroupBox" name="pyramidVirtualEnvPy3Group"> <property name="title"> <string>Pyramid Virtual Environment</string> @@ -133,25 +133,51 @@ </layout> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Pyramid Python Console:</string> + <item> + <widget class="QGroupBox" name="pyramidVirtualEnvironmentPy3Group"> + <property name="title"> + <string>Pyramid Virtual Environment</string> </property> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <item> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Select the Virtual Environment to be used with Pyramid</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="py3VenvNameComboBox"/> + </item> + </layout> </widget> </item> - <item row="1" column="1"> - <widget class="QComboBox" name="py3ShellCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select the Python console type</string> - </property> - </widget> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Pyramid Python Console:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="py3ShellCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the Python console type</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -161,8 +187,8 @@ <property name="title"> <string>Python 2</string> </property> - <layout class="QGridLayout" name="gridLayout_3"> - <item row="0" column="0" colspan="2"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> <widget class="QGroupBox" name="pyramidVirtualEnvPy2Group"> <property name="title"> <string>Pyramid Virtual Environment</string> @@ -197,25 +223,51 @@ </layout> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>Pyramid Python Console:</string> + <item> + <widget class="QGroupBox" name="pyramidVirtualEnvironmentPy2Group"> + <property name="title"> + <string>Pyramid Virtual Environment</string> </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Select the Virtual Environment to be used with Pyramid</string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="py2VenvNameComboBox"/> + </item> + </layout> </widget> </item> - <item row="1" column="1"> - <widget class="QComboBox" name="py2ShellCombo"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip"> - <string>Select the Python console type</string> - </property> - </widget> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>Pyramid Python Console:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="py2ShellCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip"> + <string>Select the Python console type</string> + </property> + </widget> + </item> + </layout> </item> </layout> </widget> @@ -305,9 +357,11 @@ <tabstop>externalBrowserCheckBox</tabstop> <tabstop>virtualEnvPy3Edit</tabstop> <tabstop>virtualEnvPy3Button</tabstop> + <tabstop>py3VenvNameComboBox</tabstop> <tabstop>py3ShellCombo</tabstop> <tabstop>virtualEnvPy2Edit</tabstop> <tabstop>virtualEnvPy2Button</tabstop> + <tabstop>py2VenvNameComboBox</tabstop> <tabstop>py2ShellCombo</tabstop> <tabstop>urlEdit</tabstop> <tabstop>urlResetButton</tabstop>