Gmoccapy: change tool selection behavior in tooltable

- Checkboxes in the first column are only used to select the row(s) to be deleted
- Tool to change to is selected by highlighting the row (same as in the offset page)
- Current tool in spindle is indicated by a label in the buttonbox at the bottom

Author: Sigma1912

lib/python/gladevcp/tooledit_widget.py

@@ -196,7 +196,7 @@ def match_value_cb(model, path, iter, pathlist):
         for path in pathlist:
             liststore.remove(liststore.get_iter(path))
 
-        # return the selected tool number
+        # return tool numbers of all rows with checked checkboxes
     def get_selected_tool(self):
         liststore  = self.model
         def match_value_cb(model, path, iter, pathlist):
@@ -211,6 +211,15 @@ def match_value_cb(model, path, iter, pathlist):
         else:
             return(liststore.get_value(liststore.get_iter(pathlist[0]),1))
 
+        # return tool number of the highlighted (ie selected) row
+    def get_selected_row(self):
+        model, iter = self.view1.get_selection().get_selected()
+        if iter:
+            tool = model.get_value(iter, 1)
+            return tool
+        else:
+            return None
+
     def set_selected_tool(self,toolnumber):
         try:
             treeselection = self.view2.get_selection()

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -1985,10 +1985,11 @@ def _init_tooleditor(self):
         btn_save.set_label("")
         btn_save.set_image(self.widgets.img_tool_save)
         btn_save.set_always_show_image(True)
-        # Empty space in between
-        spacer = Gtk.Label()
-        spacer.show_all()
-        buttonbox.pack_start(spacer,True,True,0)
+        # Create a label for current tool in spindle
+        lbl_tool = Gtk.Label()
+        self.widgets.tooledit1.lbl_tool = lbl_tool
+        lbl_tool.show_all()
+        buttonbox.pack_start(lbl_tool,True,True,0)
         # Calculator button
         btn_calculator = Gtk.ToggleButton()
         btn_calculator.set_size_request(56, 56)
@@ -2004,6 +2005,12 @@ def _init_tooleditor(self):
             if col > 0 and col < 16:
                 temp = self.widgets.tooledit1.wTree.get_object("cell_%s" % name)
                 temp.connect('editing-started', self.on_tool_col_edit_started, col)
+        # override 'tooledit_widget' method 'set_selected_tool'
+        self.widgets.tooledit1.set_selected_tool = self.set_selected_tool
+
+    def set_selected_tool(self, toolnumber):
+        lbl_tool_text = "Tool loaded: " + str(toolnumber)
+        self.widgets.tooledit1.lbl_tool.set_text(lbl_tool_text)
 
     def on_tree_navigate_key_press(self, treeview, event, filter):
         keyname = Gdk.keyval_name(event.keyval)
@@ -5409,7 +5416,7 @@ def on_btn_select_tool_by_no_clicked(self, widget, data=None):
 
     # set tool with M61 Q? or with T? M6
     def on_btn_selected_tool_clicked(self, widget, data=None):
-        tool = self.widgets.tooledit1.get_selected_tool()
+        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")
             self.dialogs.warning_dialog(self, _("Important Warning!"), message)