Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/ConfigurationPage/DjangoPage.py	Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/ConfigurationPage/DjangoPage.py	Sat Mar 24 19:11:39 2018 +0100
@@ -79,6 +79,14 @@
         self.consoleCommandCombo.addItems(consoleList)
         self.consoleCommandNoCloseCombo.addItems(consoleNoCloseList)
         
+        self.py2ShellCombo.addItem(self.tr("Plain Python"), "python")
+        self.py2ShellCombo.addItem(self.tr("IPython"), "ipython")
+        self.py2ShellCombo.addItem(self.tr("bpython"), "bpython")
+        
+        self.py3ShellCombo.addItem(self.tr("Plain Python"), "python")
+        self.py3ShellCombo.addItem(self.tr("IPython"), "ipython")
+        self.py3ShellCombo.addItem(self.tr("bpython"), "bpython")
+        
         # set initial values
         self.consoleCommandCombo.setEditText(
             self.__plugin.getPreferences("ConsoleCommand"))
@@ -89,6 +97,8 @@
             self.__plugin.getPreferences("ServerAddress"))
         self.ipv6CheckBox.setChecked(
             self.__plugin.getPreferences("UseIPv6"))
+        self.threadingCheckBox.setChecked(
+            self.__plugin.getPreferences("UseThreading"))
         
         self.externalBrowserCheckBox.setChecked(
             self.__plugin.getPreferences("UseExternalBrowser"))
@@ -98,16 +108,18 @@
         
         self.virtualEnvPy2Edit.setText(
             self.__plugin.getPreferences("VirtualEnvironmentPy2"))
-        self.plainPython2CheckBox.setChecked(
-            self.__plugin.getPreferences("UsePlainPythonPy2"))
+        self.py2ShellCombo.setCurrentIndex(self.py2ShellCombo.findData(
+            self.__plugin.getPreferences("Python2ConsoleType")))
         
         self.virtualEnvPy3Edit.setText(
             self.__plugin.getPreferences("VirtualEnvironmentPy3"))
-        self.plainPython3CheckBox.setChecked(
-            self.__plugin.getPreferences("UsePlainPythonPy3"))
+        self.py3ShellCombo.setCurrentIndex(self.py3ShellCombo.findData(
+            self.__plugin.getPreferences("Python3ConsoleType")))
         
         self.translationsEdit.setText(
             self.__plugin.getPreferences("TranslationsEditor"))
+        self.fuzzyTranslationsCheckBox.setChecked(
+            self.__plugin.getPreferences("FuzzyTranslations"))
     
     def save(self):
         """
@@ -124,6 +136,8 @@
             "ServerAddress", self.serverAddressEdit.text())
         self.__plugin.setPreferences(
             "UseIPv6", self.ipv6CheckBox.isChecked())
+        self.__plugin.setPreferences(
+            "UseThreading", self.threadingCheckBox.isChecked())
         
         self.__plugin.setPreferences(
             "UseExternalBrowser", self.externalBrowserCheckBox.isChecked())
@@ -134,15 +148,19 @@
         self.__plugin.setPreferences(
             "VirtualEnvironmentPy2", self.virtualEnvPy2Edit.text())
         self.__plugin.setPreferences(
-            "UsePlainPythonPy2", self.plainPython2CheckBox.isChecked())
+            "Python2ConsoleType",
+            self.py2ShellCombo.itemData(self.py2ShellCombo.currentIndex()))
         
         self.__plugin.setPreferences(
             "VirtualEnvironmentPy3", self.virtualEnvPy3Edit.text())
         self.__plugin.setPreferences(
-            "UsePlainPythonPy3", self.plainPython3CheckBox.isChecked())
+            "Python3ConsoleType",
+            self.py3ShellCombo.itemData(self.py3ShellCombo.currentIndex()))
         
         self.__plugin.setPreferences(
             "TranslationsEditor", self.translationsEdit.text())
+        self.__plugin.setPreferences(
+            "FuzzyTranslations", self.fuzzyTranslationsCheckBox.isChecked())
     
     @pyqtSlot()
     def on_virtualEnvPy3Button_clicked(self):