Gmoccapy: better handling of unsaved changes in tooltable

- show message on leaving tool table with unsaved changes
- reload tooltable from file when showing the table

Author: Sigma1912

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -2008,6 +2008,8 @@ def _init_tooleditor(self):
         btn_add.set_image(self.widgets.img_tool_add)
         btn_add.set_tooltip_text(_("Add new tool"))
         btn_add.set_always_show_image(True)
+        btn_add.disconnect_by_func(self.widgets.tooledit1.add)
+        btn_add.connect("clicked",self.on_btn_add_tool_clicked)
         # Reload button
         btn_reload = self.widgets.tooledit1.wTree.get_object("reload")
         btn_reload.set_size_request(56, 56)
@@ -2024,6 +2026,8 @@ def _init_tooleditor(self):
         btn_save.set_image(self.widgets.img_tool_save)
         btn_save.set_tooltip_text(_("Save tool table to file"))
         btn_save.set_always_show_image(True)
+        btn_save.disconnect_by_func(self.widgets.tooledit1.save)
+        btn_save.connect("clicked",self.on_btn_save_tool_changes_clicked)
         # Create a label for current tool in spindle
         lbl_tool = Gtk.Label()
         self.widgets.tooledit1.lbl_tool = lbl_tool
@@ -2038,12 +2042,16 @@ def _init_tooleditor(self):
         btn_calculator.set_active(self.toolpage_use_calc)
         btn_calculator.connect("toggled", self.on_toolpage_use_calc_toggled)
         buttonbox.pack_start(btn_calculator,False,False,50)
-        column_cell_ids = ["toggle", "tool#1", "pos1", "x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
-                       "d1", "front1", "back1", "orient1", "cell_comments1"]
+        column_cell_ids = ["toggle", "tool#1", "pos1",
+                           "x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
+                           "d1", "front1", "back1", "orient1", "comments1"]
         for col, name in enumerate(column_cell_ids):
-            if col > 0 and col < 16:
+            if col > 0 and col < 17:
                 temp = self.widgets.tooledit1.wTree.get_object("cell_%s" % name)
-                temp.connect('editing-started', self.on_tool_col_edit_started, col)
+                if col < 16: # calulator is only useful for nummeric columns (ie not for 'Comments')
+                    temp.connect('editing-started', self.on_tool_col_edit_started, col)
+                temp.connect('edited', self.on_tool_col_edited)
+        self.widgets.tooledit1.edited = False
         # override 'tooledit_widget' method 'set_selected_tool'
         self.widgets.tooledit1.set_selected_tool = self.set_selected_tool
 
@@ -2124,13 +2132,17 @@ def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
                 store[row][col] = value
             else:
                 store[row][col] = f"{value:11.4f}"
+            self.widgets.tooledit1.edited = True
         # this is needed to get offsetview out of editing mode
         GLib.timeout_add(50,
                      toolview.set_cursor,
                      toolpage.model.get_path(row),
                      toolview.get_columns()[0],
                      True)
 
+    def on_tool_col_edited (self, *args):
+        self.widgets.tooledit1.edited = True
+
     def _init_themes(self):
         # If there are themes then add them to combo box
         model = self.widgets.theme_choice.get_model()
@@ -2606,6 +2618,8 @@ def _show_tooledit_tab(self, state):
             self.widgets.ntb_preview.set_property("show-tabs", not state)
             self.widgets.vbx_jog.hide()
             self.widgets.ntb_preview.set_current_page(2)
+            self.widgets.tooledit1.reload(None)
+            self.widgets.tooledit1.edited = False
             self.widgets.tooledit1.set_selected_tool(self.stat.tool_in_spindle)
             if self.widgets.chk_use_kb_on_tooledit.get_active():
                 self.widgets.ntb_info.set_current_page(1)
@@ -4710,6 +4724,11 @@ def on_btn_back_clicked(self, widget, data=None):
             self.widgets.tbtn_fullsize_preview0.set_active(False)
             self.on_tbtn_fullsize_preview_toggled(self.widgets.tbtn_fullsize_preview0)
         else:  # else we go to main button on manual
+            if self.widgets.tooledit1.edited:
+                message = _("Discard unsaved changes and exit?")
+                result = self.dialogs.yesno_dialog(self, message, _("Attention!"))
+                if not result: # user says no, he want to save
+                    return
             self.widgets.ntb_button.set_current_page(_BB_MANUAL)
             self.widgets.ntb_main.set_current_page(0)
             self.widgets.ntb_preview.set_current_page(0)
@@ -5453,11 +5472,26 @@ def on_btn_delete_tool_clicked(self, widget, data=None):
             self.dialogs.warning_dialog(self, _("Warning Tool can not be deleted!"), message)
             return
         self.widgets.tooledit1.delete(widget)
+        self.widgets.tooledit1.edited = True
+
+    def on_btn_add_tool_clicked(self, widget, data=None):
+        self.widgets.tooledit1.add(None)
+        self.widgets.tooledit1.edited = True
 
     def on_btn_reload_tooltable_clicked(self, widget, data=None):
+        if self.widgets.tooledit1.edited:
+            message = _("Discard unsaved changes and reload the table?")
+            result = self.dialogs.yesno_dialog(self, message, _("Attention!"))
+            if not result: # user says no, he want to save
+                return
         self.widgets.tooledit1.reload(None)
+        self.widgets.tooledit1.edited = False
         self.widgets.tooledit1.set_selected_tool(self.stat.tool_in_spindle)
 
+    def on_btn_save_tool_changes_clicked(self, widget, data=None):
+        self.widgets.tooledit1.save(None)
+        self.widgets.tooledit1.edited = False
+
     def on_btn_tool_touchoff_clicked(self, widget, data=None):
         if not self.widgets.tooledit1.get_selected_tool():
             message = _("No or multiple tools selected in the tool table. ")
@@ -5513,6 +5547,11 @@ def on_btn_tool_touchoff_clicked(self, widget, data=None):
 
     # select a tool entering a number
     def on_btn_select_tool_by_no_clicked(self, widget, data=None):
+        if self.widgets.tooledit1.edited:
+            message = _("Discard unsaved changes and change tool?")
+            result = self.dialogs.yesno_dialog(self, message, _("Attention!"))
+            if not result: # user says no, he want to save
+                return
         value = self.dialogs.entry_dialog(self, data=None, header=_("Enter the tool number as integer "),
                                      label=_("Select the tool to change"), integer=True)
         if value == "ERROR":
@@ -5535,9 +5574,14 @@ def on_btn_select_tool_by_no_clicked(self, widget, data=None):
             # Next two lines fix issue #3129 caused by GStat missing changes in interpreter mode
             command = "G4 P{0}".format(self.get_ini_info.get_cycle_time()/1000)
             self.command.mdi(command)
-            
+
     # set tool with M61 Q? or with T? M6
     def on_btn_selected_tool_clicked(self, widget, data=None):
+        if self.widgets.tooledit1.edited:
+            message = _("Discard unsaved changes and change tool?")
+            result = self.dialogs.yesno_dialog(self, message, _("Attention!"))
+            if not result: # user says no, he want to save
+                return
         tool = self.widgets.tooledit1.get_selected_row()
         if tool == None:
             message = _("you selected no or more than one tool, the tool selection must be unique")