Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Thu Jan 12 19:26:13 2017 +0100
+++ b/Preferences/ConfigurationPages/EditorPropertiesPage.ui	Sat Jan 14 14:12:42 2017 +0100
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>2611</height>
+    <height>2930</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -472,6 +472,35 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="jsonGroup">
+     <property name="title">
+      <string>JSON</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_12">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="jsonHighlightCommentsCheckBox">
+        <property name="toolTip">
+         <string>Select to enable highlighting of line/block comments</string>
+        </property>
+        <property name="text">
+         <string>Highlight comments</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QCheckBox" name="jsonHighlightEscapeCheckBox">
+        <property name="toolTip">
+         <string>Select to enable highlighting of escape sequences in strings</string>
+        </property>
+        <property name="text">
+         <string>Highlight escape sequences</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="pascalGroup">
      <property name="title">
       <string>Pascal Lexer Properties</string>
@@ -1077,6 +1106,8 @@
   <tabstop>htmlDjangoCheckBox</tabstop>
   <tabstop>htmlMakoCheckBox</tabstop>
   <tabstop>xmlSyleScriptsCheckBox</tabstop>
+  <tabstop>jsonHighlightCommentsCheckBox</tabstop>
+  <tabstop>jsonHighlightEscapeCheckBox</tabstop>
   <tabstop>foldPascalCommentCheckBox</tabstop>
   <tabstop>foldPascalPreprocessorCheckBox</tabstop>
   <tabstop>pascalSmartHighlightingCheckBox</tabstop>