From b2035aca342b49919277e8b105095db16a6cddb0 Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Tue, 22 Dec 2020 05:00:00 +0200
Subject: [PATCH] - minor changes to the syntax highlighting in GCode Editor

---
 CHANGELOG.md          |  1 +
 appGUI/GUIElements.py | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 214c19b9..684448e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
 
 - made sure that the GCode Editor does not have a misleading Cancel option when closing the tab
 - made sure that some other part of the program outputs the log messages to the Tcl Shell if the Verbose Log options is set in Preferences
+- minor changes to the syntax highlighting in GCode Editor
 
 20.12.2020
 
diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py
index 53c4952d..048b5cee 100644
--- a/appGUI/GUIElements.py
+++ b/appGUI/GUIElements.py
@@ -4360,13 +4360,51 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
                     brush = QtGui.QBrush(Qt.blue, Qt.SolidPattern)
                     keyword.setForeground(brush)
                     keyword.setFontWeight(QtGui.QFont.Bold)
-                    keywords = ["F", "G", "M", "T"]
+                    keywords = ["G", "T"]
                     for word in keywords:
                         # pattern = QtCore.QRegExp("\\b" + word + "\\b")
                         pattern = QtCore.QRegExp("\\b" + word + "\d+(\.\d*)?\s?" + "\\b")
                         rule = (pattern, keyword)
                         self.highlightingRules.append(rule)
 
+                    keyword1 = QtGui.QTextCharFormat()
+                    # keyword 1
+                    brush = QtGui.QBrush(QtGui.QColor("teal"), Qt.SolidPattern)
+                    keyword1.setForeground(brush)
+                    keyword1.setFontWeight(QtGui.QFont.Bold)
+                    keywords = ["F"]
+                    for word in keywords:
+                        # pattern = QtCore.QRegExp("\\b" + word + "\\b")
+                        pattern = QtCore.QRegExp("\\b" + word + "\d+(\.\d*)?\s?" + "\\b")
+                        rule = (pattern, keyword1)
+                        self.highlightingRules.append(rule)
+
+                    # keyword 2
+                    keyword2 = QtGui.QTextCharFormat()
+                    # SVG colors: https://doc.qt.io/qt-5/qml-color.html#svg-color-reference
+                    brush = QtGui.QBrush(QtGui.QColor("coral"), Qt.SolidPattern)
+                    keyword2.setForeground(brush)
+                    keyword2.setFontWeight(QtGui.QFont.Bold)
+                    keywords = ["M"]
+                    for word in keywords:
+                        # pattern = QtCore.QRegExp("\\b" + word + "\\b")
+                        pattern = QtCore.QRegExp("\\b" + word + "\d+(\.\d*)?\s?" + "\\b")
+                        rule = (pattern, keyword2)
+                        self.highlightingRules.append(rule)
+
+                    # keyword 3
+                    keyword3 = QtGui.QTextCharFormat()
+                    # SVG colors: https://doc.qt.io/qt-5/qml-color.html#svg-color-reference
+                    brush = QtGui.QBrush(QtGui.QColor("purple"), Qt.SolidPattern)
+                    keyword3.setForeground(brush)
+                    keyword3.setFontWeight(QtGui.QFont.Bold)
+                    keywords = ["Z"]
+                    for word in keywords:
+                        # pattern = QtCore.QRegExp("\\b" + word + "\\b")
+                        pattern = QtCore.QRegExp("\\b" + word + "[\-|\+]?\d+(\.\d*)?\s?" + "\\b")
+                        rule = (pattern, keyword3)
+                        self.highlightingRules.append(rule)
+
                     # reservedClasses
                     reservedClasses.setForeground(brush)
                     reservedClasses.setFontWeight(QtGui.QFont.Bold)