Merge pull request #1649 from hansu/gmoccapy-gcode-view-2.8

Gmoccapy: fix gcode view issue (2.8)

Author: c-morley

lib/python/gladevcp/hal_sourceview.py

@@ -46,6 +46,7 @@ def __init__(self, *a, **kw):
         self.buf = gtksourceview.Buffer()
         self.buf.set_max_undo_levels(20)
         self.buf.connect('changed', self.update_iter)
+        self.buf.connect('modified-changed', self.modified_changed)
         self.set_buffer(self.buf)
         self.lm = gtksourceview.LanguageManager()
         self.sm = gtksourceview.StyleSchemeManager()
@@ -206,6 +207,9 @@ def update_iter(self,widget=None):
         self.match_start = self.match_end = None
         start, end = self.buf.get_bounds()
         self.buf.remove_tag(self.found_text_tag, start, end)
+
+    def modified_changed(self,widget):
+        self.update_iter()
         self.emit("changed")
 
     # This will search the buffer for a specified text string.
@@ -331,6 +335,9 @@ def do_get_property(self, property):
 
 class EMC_Action_SaveAs(EMC_Action_Save):
     __gtype_name__ = 'EMC_Action_SaveAs'
+    __gsignals__ = {
+        'saved-as': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()),
+    }
 
     def __init__(self, *a, **kw):
         _EMC_Action.__init__(self, *a, **kw)
@@ -353,3 +360,4 @@ def on_activate(self, w):
         if r == gtk.RESPONSE_OK:
             self.save(fn)
             self.currentfolder = os.path.dirname(fn)
+            self.emit('saved-as')

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -210,6 +210,7 @@ def __init__(self, argv):
         self.gcodeerror = ""   # we need this to avoid multiple messages of the same error
 
         self.file_changed = False
+        self.widgets.hal_action_saveas.connect("saved-as", self.saved_as)
 
         self.lathe_mode = None # we need this to check if we have a lathe config
         self.backtool_lathe = False
@@ -4679,9 +4680,10 @@ def on_btn_edit_clicked(self, widget, data=None):
         self.gcodeerror = ""
         self.file_changed = False
 
-    def on_gcode_view_changed(self, state):
-        print("gcode view changed")
-        self.file_changed = True
+    def on_gcode_view_changed(self, widget):
+        buf_modified = self.widgets.gcode_view.buf.get_modified()
+        print("gcode view changed (modified: {})".format(buf_modified))
+        self.file_changed = buf_modified
 
     # Search and replace handling in edit mode
     # undo changes while in edit mode
@@ -4760,6 +4762,9 @@ def on_btn_new_clicked(self, widget, data=None):
         self.widgets.gcode_view.grab_focus()
         self.widgets.btn_save.set_sensitive(False)
 
+    def saved_as(self, widget):
+        self.widgets.btn_save.set_sensitive(True)
+
     def on_tbtn_optional_blocks_toggled(self, widget, data=None):
         opt_blocks = widget.get_active()
         self.command.set_block_delete(opt_blocks)