Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/ConfigurationPage/DjangoPage.ui	Mon Mar 25 18:30:42 2013 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.ui	Tue Mar 26 16:37:01 2013 +0100
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>536</width>
-    <height>526</height>
+    <height>927</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -185,25 +185,132 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="djangoPythonGroup">
+    <widget class="QGroupBox" name="python3Group">
      <property name="title">
-      <string>Django Python Console</string>
+      <string>Python 3</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="margin">
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <widget class="QGroupBox" name="djangoVirtualEnvPy3Group">
+        <property name="title">
+         <string>Django Virtual Environment</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_4">
+         <item row="0" column="0" colspan="2">
+          <widget class="QLabel" name="label_6">
+           <property name="text">
+            <string>Enter the path of the Django virtual environment. Leave empty to not use a virtual environment setup.</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLineEdit" name="virtualEnvPy3Edit"/>
+         </item>
+         <item row="1" column="1">
+          <widget class="QPushButton" name="virtualEnvPy3Button">
+           <property name="toolTip">
+            <string>Select the virtual environment directory via a selection dialog</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
       <item>
-       <widget class="QCheckBox" name="plainPythonCheckBox">
-        <property name="toolTip">
-         <string>Select to use plain Python instead of IPython</string>
+       <widget class="QGroupBox" name="djangoPython3Group">
+        <property name="title">
+         <string>Django Python Console</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="plainPython3CheckBox">
+           <property name="toolTip">
+            <string>Select to use plain Python instead of IPython</string>
+           </property>
+           <property name="text">
+            <string>Use plain Python instead of IPython</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="python2Group">
+     <property name="title">
+      <string>Python 2</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QGroupBox" name="djangoVirtualEnvPy2Group">
+        <property name="title">
+         <string>Django Virtual Environment</string>
         </property>
-        <property name="text">
-         <string>Use plain Python instead of IPython</string>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0" colspan="2">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Enter the path of the Django virtual environment. Leave empty to not use a virtual environment setup.</string>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLineEdit" name="virtualEnvPy2Edit"/>
+         </item>
+         <item row="1" column="1">
+          <widget class="QPushButton" name="virtualEnvPy2Button">
+           <property name="toolTip">
+            <string>Select the virtual environment directory via a selection dialog</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="djangoPython2Group">
+        <property name="title">
+         <string>Django Python Console</string>
         </property>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="plainPython2CheckBox">
+           <property name="toolTip">
+            <string>Select to use plain Python instead of IPython</string>
+           </property>
+           <property name="text">
+            <string>Use plain Python instead of IPython</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
@@ -230,7 +337,12 @@
   <tabstop>serverAddressEdit</tabstop>
   <tabstop>ipv6CheckBox</tabstop>
   <tabstop>appsRecentSpinBox</tabstop>
-  <tabstop>plainPythonCheckBox</tabstop>
+  <tabstop>virtualEnvPy3Edit</tabstop>
+  <tabstop>virtualEnvPy3Button</tabstop>
+  <tabstop>plainPython3CheckBox</tabstop>
+  <tabstop>virtualEnvPy2Edit</tabstop>
+  <tabstop>virtualEnvPy2Button</tabstop>
+  <tabstop>plainPython2CheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>