Merge pull request vlachoudis#810 from buschhardt/commenteditor

comment uncomment rows added

CNCList.py

@@ -22,6 +22,7 @@
 
 from CNC import Tab, Block, CNC
 import tkExtra
+import re
 #import tkDialogs
 
 BLOCK_COLOR   = "LightYellow"
@@ -661,6 +662,28 @@ def toggleEnable(self, event=None):
 		self._toggleEnable()
 		self.winfo_toplevel().event_generate("<<Status>>",data="Toggled Visibility of selected objects")
 
+	# ----------------------------------------------------------------------
+	# comment uncomment row
+	# ----------------------------------------------------------------------
+	def commentRow(self, event=None):
+		if not self._items: return
+		all_items = self._items
+		sel_items = list(map(int,self.curselection()))
+		mreg = re.compile("^\((.*)\)$")
+		change = False
+		for i in sel_items:
+			my_item = all_items[i]
+			if my_item[1] is not None:
+				change = True
+				#check for ()
+				line = self.gcode[my_item[0]][my_item[1]]
+				m = mreg.search(line)
+				if m is None:
+					self.gcode[my_item[0]][my_item[1]] = "("+line+")"
+				else:
+					self.gcode[my_item[0]][my_item[1]] = m.group(1)
+		if change: self.fill()
+
 	# ----------------------------------------------------------------------
 	# change color of a block
 	# ----------------------------------------------------------------------

EditorPage.py

@@ -247,12 +247,11 @@ def __init__(self, master, app):
 
 		# ---
 		row += 1
-		b = Ribbon.LabelButton(self.frame,
+		b = Ribbon.LabelButton(self.frame, self.app,  "<<Comment>>",
 				image=Utils.icons["comment"],
 				text=_("Comment"),
 				compound=LEFT,
 				anchor=W,
-				state=DISABLED,
 				background=Ribbon._BACKGROUND)
 		b.grid(row=row, column=col, columnspan=2, padx=0, pady=0, sticky=NSEW)
 		tkExtra.Balloon.set(b, _("(Un)Comment selected lines"))

bCNC.py

@@ -309,6 +309,7 @@ def __init__(self, master, **kw):
 		self.bind('<<Enable>>',		self.editor.enable)
 		self.bind('<<Disable>>',	self.editor.disable)
 		self.bind('<<ChangeColor>>',    self.editor.changeColor)
+		self.bind('<<Comment>>',		self.editor.commentRow)
 
 		# Canvas X-bindings
 		self.bind("<<ViewChange>>",	self.viewChange)