Merge branch 'master' into dev_0.6

2020-05-21 15:41:17 +02:00
parent cc35704899 9f003abcc3
commit cb36e90149
10 changed files with 62 additions and 32 deletions
@@ -159,22 +159,24 @@ class GuiDocHighlighter(QSyntaxHighlighter):
        ))

        # Quoted Strings
-        self.hRules.append((
-            "{:s}(.+?){:s}".format('"','"'), {
-                0 : self.hStyles["dialogue1"],
-            }
-        ))
-        self.hRules.append((
-            "{:s}(.+?){:s}".format(*self.mainConf.fmtDoubleQuotes), {
-                0 : self.hStyles["dialogue2"],
-            }
-        ))
-        self.hRules.append((
-            "{:s}(.+?){:s}".format(*self.mainConf.fmtSingleQuotes), {
-                0 : self.hStyles["dialogue3"],
-            }
-        ))
+        if self.mainConf.highlightQuotes:
+            self.hRules.append((
+                "{:s}(.+?){:s}".format('"','"'), {
+                    0 : self.hStyles["dialogue1"],
+                }
+            ))
+            self.hRules.append((
+                "{:s}(.+?){:s}".format(*self.mainConf.fmtDoubleQuotes), {
+                    0 : self.hStyles["dialogue2"],
+                }
+            ))
+            self.hRules.append((
+                "{:s}(.+?){:s}".format(*self.mainConf.fmtSingleQuotes), {
+                    0 : self.hStyles["dialogue3"],
+                }
+            ))

+        # Auto-Replace Tags
        self.hRules.append((
            r"<(\S+?)>", {
                0 : self.hStyles["replace"],