Mercurial Repositories > eric / file diff

diff -r 9b9396fc54aa -r 552d2d74f5cf Preferences/ConfigurationPages/EditorPropertiesPage.py
--- a/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sun Nov 13 19:14:57 2011 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.py	Sun Nov 13 19:56:47 2011 +0100
@@ -64,6 +64,12 @@
                 Preferences.getEditor("CppStylePreprocessor"))
         else:
             self.cppStylePreprocessorCheckBox.setEnabled(False)
+        if QSCINTILLA_VERSION() >= 0x020600:
+            self.cppHighlightTripleQuotedCheckBox.setChecked(
+                Preferences.getEditor("CppHighlightTripleQuotedStrings"))
+        else:
+            self.cppHighlightTripleQuotedCheckBox.setEnabled(False)
+        
         
         # CSS
         self.foldCssCommentCheckBox.setChecked(
@@ -119,6 +125,11 @@
             Preferences.getEditor("PerlFoldPackages"))
         self.foldPerlPODBlocksCheckBox.setChecked(
             Preferences.getEditor("PerlFoldPODBlocks"))
+        if QSCINTILLA_VERSION() >= 0x020600:
+            self.foldPerlAtElseCheckBox.setChecked(
+                Preferences.getEditor("PerlFoldAtElse"))
+        else:
+            self.foldPerlAtElseCheckBox.setEnabled(False)
         
         # PostScript
         if "PostScript" in self.languages:
@@ -168,6 +179,11 @@
         else:
             self.foldPythonQuotesCheckBox.setEnabled(False)
             self.pythonStringsOverNewlineCheckBox.setEnabled(False)
+        if QSCINTILLA_VERSION() >= 0x020600:
+            self.pythonHighlightSubidentifierCheckBox.setChecked(
+                Preferences.getEditor("PythonHighlightSubidentifier"))
+        else:
+            self.pythonHighlightSubidentifierCheckBox.setEnabled(False)
         
         # Ruby
         if QSCINTILLA_VERSION() >= 0x020500:
@@ -275,6 +291,9 @@
         if QSCINTILLA_VERSION() >= 0x020500:
             Preferences.setEditor("CppStylePreprocessor",
                 self.cppStylePreprocessorCheckBox.isChecked())
+        if QSCINTILLA_VERSION() >= 0x020600:
+            Preferences.setEditor("CppHighlightTripleQuotedStrings",
+                self.cppHighlightTripleQuotedCheckBox.isChecked())
         
         # CSS
         Preferences.setEditor("CssFoldComment",
@@ -321,6 +340,9 @@
             self.foldPerlPackagesCheckBox.isChecked())
         Preferences.setEditor("PerlFoldPODBlocks",
             self.foldPerlPODBlocksCheckBox.isChecked())
+        if QSCINTILLA_VERSION() >= 0x020600:
+            Preferences.setEditor("PerlFoldAtElse",
+                self.foldPerlAtElseCheckBox.isChecked())
         
         # PostScript
         if "PostScript" in self.languages:
@@ -362,6 +384,9 @@
                 self.foldPythonQuotesCheckBox.isChecked())
             Preferences.setEditor("PythonStringsOverNewLineAllowed",
                 self.pythonStringsOverNewlineCheckBox.isChecked())
+        if QSCINTILLA_VERSION() >= 0x020600:
+            Preferences.setEditor("PythonHighlightSubidentifier",
+                self.pythonHighlightSubidentifierCheckBox.isChecked())
         
         # Ruby
         if QSCINTILLA_VERSION() >= 0x020500: