Very basic syntax highlight for comments in the GCode editor for start/end code.

diff --git a/Cura/gui/alterationPanel.py b/Cura/gui/alterationPanel.py
index c102f19b1f502ca2797f362935c9f82410f36acf..2fa320c49e146de479d899f1e4776fc0093e9775 100644 (file)
--- a/Cura/gui/alterationPanel.py
+++ b/Cura/gui/alterationPanel.py
@@ -1,4 +1,4 @@
-import wx\r
+import wx, wx.stc\r
 import sys,math,threading,os\r
 \r
 from util import profile\r
@@ -10,12 +10,21 @@ class alterationPanel(wx.Panel):
                self.alterationFileList = ['start.gcode', 'end.gcode', 'support_start.gcode', 'support_end.gcode', 'nextobject.gcode', 'replace.csv']\r
                self.currentFile = None\r
 \r
-               self.textArea = wx.TextCtrl(self, style=wx.TE_MULTILINE|wx.TE_DONTWRAP|wx.TE_PROCESS_TAB)\r
-               self.textArea.SetFont(wx.Font(wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize(), wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))\r
+               #self.textArea = wx.TextCtrl(self, style=wx.TE_MULTILINE|wx.TE_DONTWRAP|wx.TE_PROCESS_TAB)\r
+               #self.textArea.SetFont(wx.Font(wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize(), wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))\r
+               self.textArea = wx.stc.StyledTextCtrl(self)\r
+               self.textArea.SetLexer(wx.stc.STC_LEX_CONTAINER)\r
                self.list = wx.ListBox(self, choices=self.alterationFileList, style=wx.LB_SINGLE)\r
                self.list.SetSelection(0)\r
                self.Bind(wx.EVT_LISTBOX, self.OnSelect, self.list)\r
                self.textArea.Bind(wx.EVT_KILL_FOCUS, self.OnFocusLost, self.textArea)\r
+               self.textArea.Bind(wx.stc.EVT_STC_STYLENEEDED, self.OnStyle)\r
+               \r
+               fontSize = wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize()\r
+               fontName = wx.Font(wx.SystemSettings.GetFont(wx.SYS_ANSI_VAR_FONT).GetPointSize(), wx.FONTFAMILY_MODERN, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL).GetFaceName()\r
+               self.textArea.SetStyleBits(5)\r
+               self.textArea.StyleSetSpec(wx.stc.STC_STYLE_DEFAULT,    "face:%s,size:%d" % (fontName, fontSize))\r
+               self.textArea.StyleSetSpec(1,                           "fore:#008000,face:%s,size:%d" % (fontName, fontSize))\r
                \r
                sizer = wx.GridBagSizer()\r
                sizer.Add(self.list, (0,0), span=(1,1), flag=wx.EXPAND)\r
@@ -32,9 +41,24 @@ class alterationPanel(wx.Panel):
                self.currentFile = self.list.GetSelection()\r
 \r
        def loadFile(self, filename):\r
-               self.textArea.SetValue(profile.getAlterationFile(filename))\r
+               #self.textArea.SetValue(profile.getAlterationFile(filename))\r
+               self.textArea.SetText(profile.getAlterationFile(filename))\r
 \r
        def OnFocusLost(self, e):\r
                if self.currentFile == self.list.GetSelection():\r
-                       profile.setAlterationFile(self.alterationFileList[self.list.GetSelection()], self.textArea.GetValue())\r
+                       #profile.setAlterationFile(self.alterationFileList[self.list.GetSelection()], self.textArea.GetValue())\r
+                       profile.setAlterationFile(self.alterationFileList[self.list.GetSelection()], self.textArea.GetText())\r
+\r
+       def OnStyle(self, e):\r
+               #for lineNr in xrange(0, \r
+               lineNr = self.textArea.LineFromPosition(self.textArea.GetEndStyled())\r
+               while self.textArea.PositionFromLine(lineNr) > -1:\r
+                       line = self.textArea.GetLine(lineNr)\r
+                       self.textArea.StartStyling(self.textArea.PositionFromLine(lineNr), 31)\r
+                       self.textArea.SetStyling(self.textArea.LineLength(lineNr), wx.stc.STC_STYLE_DEFAULT)\r
+                       if ';' in line:\r
+                               pos = line.index(';')\r
+                               self.textArea.StartStyling(self.textArea.PositionFromLine(lineNr) + pos, 31)\r
+                               self.textArea.SetStyling(self.textArea.LineLength(lineNr) - pos, 1)\r
+                       lineNr += 1\r
 \r