Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Thu Jul 24 22:34:05 2014 +0200
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sat Jul 26 12:05:01 2014 +0200
@@ -192,12 +192,19 @@
             self.propertiesInitialSpacesCheckBox.setEnabled(False)
         
         # Python
+        self.pythonBadIndentationComboBox.addItems([
+            self.tr("No Warning"),
+            self.tr("Inconsistent"),
+            self.tr("Tabs after Spaces"),
+            self.tr("Spaces"),
+            self.tr("Tabs"),
+        ])
+        self.pythonBadIndentationComboBox.setCurrentIndex(
+            Preferences.getEditor("PythonBadIndentation"))
         self.foldPythonCommentCheckBox.setChecked(
             Preferences.getEditor("PythonFoldComment"))
         self.foldPythonStringCheckBox.setChecked(
             Preferences.getEditor("PythonFoldString"))
-        self.pythonBadIndentationCheckBox.setChecked(
-            Preferences.getEditor("PythonBadIndentation"))
         self.pythonAutoindentCheckBox.setChecked(
             Preferences.getEditor("PythonAutoIndent"))
         self.pythonV2UnicodeAllowedCheckBox.setChecked(
@@ -481,7 +488,7 @@
             self.foldPythonStringCheckBox.isChecked())
         Preferences.setEditor(
             "PythonBadIndentation",
-            self.pythonBadIndentationCheckBox.isChecked())
+            self.pythonBadIndentationComboBox.currentIndex())
         Preferences.setEditor(
             "PythonAutoIndent",
             self.pythonAutoindentCheckBox.isChecked())