Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/ConfigurationPage/DjangoPage.ui	Fri Mar 30 14:47:18 2018 +0200
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.ui	Sat Jun 23 16:35:46 2018 +0200
@@ -10,7 +10,7 @@
     <height>1201</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_7">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -227,8 +227,8 @@
      <property name="title">
       <string>Python 3</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <item row="0" column="0" colspan="2">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
        <widget class="QGroupBox" name="djangoVirtualEnvPy3Group">
         <property name="title">
          <string>Django Virtual Environment</string>
@@ -263,25 +263,51 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Django Python Console:</string>
+      <item>
+       <widget class="QGroupBox" name="djangoVirtualEnvironmentPy3Group">
+        <property name="title">
+         <string>Django Virtual Environment</string>
         </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Select the Virtual Environment to be used with Django</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">
+        <item>
+         <widget class="QLabel" name="label_10">
+          <property name="text">
+           <string>Django 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>
@@ -291,8 +317,8 @@
      <property name="title">
       <string>Python 2</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_7">
-      <item row="0" column="0" colspan="2">
+     <layout class="QVBoxLayout" name="verticalLayout_6">
+      <item>
        <widget class="QGroupBox" name="djangoVirtualEnvPy2Group">
         <property name="title">
          <string>Django Virtual Environment</string>
@@ -327,25 +353,51 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="text">
-         <string>Django Python Console:</string>
+      <item>
+       <widget class="QGroupBox" name="djangoVirtualEnvironmentPy2Group">
+        <property name="title">
+         <string>Django 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 Django</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_2">
+        <item>
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>Django 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>
@@ -429,9 +481,11 @@
   <tabstop>appsRecentSpinBox</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>translationsEdit</tabstop>
   <tabstop>translationsButton</tabstop>