diff -r 5c925935cbb9 -r d280acf98fb5 ProjectDjango/ConfigurationPage/DjangoPage.ui
--- a/ProjectDjango/ConfigurationPage/DjangoPage.ui Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.ui Sat Mar 24 19:11:39 2018 +0100
@@ -10,7 +10,7 @@
<height>1201</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_6">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
@@ -126,6 +126,16 @@
</property>
</widget>
</item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="threadingCheckBox">
+ <property name="toolTip">
+ <string>Select to enable threading in the server</string>
+ </property>
+ <property name="text">
+ <string>Enable Threading</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -217,8 +227,8 @@
<property name="title">
<string>Python 3</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="djangoVirtualEnvPy3Group">
<property name="title">
<string>Django Virtual Environment</string>
@@ -253,38 +263,24 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="djangoPython3Group">
- <property name="title">
- <string>Django Python Console</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Django Python Console:</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>6</number>
- </property>
- <property name="topMargin">
- <number>6</number>
- </property>
- <property name="rightMargin">
- <number>6</number>
- </property>
- <property name="bottomMargin">
- <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>
+ <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>
@@ -295,8 +291,8 @@
<property name="title">
<string>Python 2</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
+ <layout class="QGridLayout" name="gridLayout_7">
+ <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="djangoVirtualEnvPy2Group">
<property name="title">
<string>Django Virtual Environment</string>
@@ -331,72 +327,77 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="djangoPython2Group">
- <property name="title">
- <string>Django Python Console</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Django Python Console:</string>
+ </property>
+ </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>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>6</number>
- </property>
- <property name="topMargin">
- <number>6</number>
- </property>
- <property name="rightMargin">
- <number>6</number>
- </property>
- <property name="bottomMargin">
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="plainPython2CheckBox">
- <property name="toolTip">
- <string>Select to use plain Python instead of IPython</string>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Translations</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="TranslationsGroup">
+ <property name="title">
+ <string>Translations Editor</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="label_8">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>40</height>
+ </size>
</property>
<property name="text">
- <string>Use plain Python instead of IPython</string>
+ <string>Enter the path of an editor to use to do the translations. Leave empty to disable this feature.</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLineEdit" name="translationsEdit"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="QToolButton" name="translationsButton">
+ <property name="toolTip">
+ <string>Select the translations editor via a file selection dialog</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="TranslationsGroup">
- <property name="title">
- <string>Translations Editor</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0" colspan="2">
- <widget class="QLabel" name="label_8">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>40</height>
- </size>
+ <item>
+ <widget class="QCheckBox" name="fuzzyTranslationsCheckBox">
+ <property name="toolTip">
+ <string>Select to include fuzzy translations (1.8.0+ only)</string>
</property>
<property name="text">
- <string>Enter the path of an editor to use to do the translations. Leave empty to disable this feature.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLineEdit" name="translationsEdit"/>
- </item>
- <item row="1" column="1">
- <widget class="QToolButton" name="translationsButton">
- <property name="toolTip">
- <string>Select the translations editor via a file selection dialog</string>
+ <string>Include Fuzzy Translations</string>
</property>
</widget>
</item>
@@ -423,16 +424,18 @@
<tabstop>consoleCommandNoCloseCombo</tabstop>
<tabstop>serverAddressEdit</tabstop>
<tabstop>ipv6CheckBox</tabstop>
+ <tabstop>threadingCheckBox</tabstop>
<tabstop>externalBrowserCheckBox</tabstop>
<tabstop>appsRecentSpinBox</tabstop>
<tabstop>virtualEnvPy3Edit</tabstop>
<tabstop>virtualEnvPy3Button</tabstop>
- <tabstop>plainPython3CheckBox</tabstop>
+ <tabstop>py3ShellCombo</tabstop>
<tabstop>virtualEnvPy2Edit</tabstop>
<tabstop>virtualEnvPy2Button</tabstop>
- <tabstop>plainPython2CheckBox</tabstop>
+ <tabstop>py2ShellCombo</tabstop>
<tabstop>translationsEdit</tabstop>
<tabstop>translationsButton</tabstop>
+ <tabstop>fuzzyTranslationsCheckBox</tabstop>
</tabstops>
<resources/>
<connections/>
