Gmoccapy: delete tool by row selection, hide checkbox column

Author: hansu

lib/python/gladevcp/tooledit_widget.py

@@ -181,7 +181,7 @@ def match_type(self, model, iter, data):
             return not data
         return data
 
-        # delete the selected tools
+        # delete tools selected by checkbox
     def delete(self,widget):
         liststore  = self.model
         def match_value_cb(model, path, iter, pathlist):
@@ -196,6 +196,11 @@ def match_value_cb(model, path, iter, pathlist):
         for path in pathlist:
             liststore.remove(liststore.get_iter(path))
 
+        # delete tool of selected row
+    def delete_selected_row(self,widget):
+        model, iter = self.view1.get_selection().get_selected()
+        model.remove(iter)
+
         # return tool numbers of all rows with checked checkboxes
     def get_selected_tool(self):
         liststore  = self.model

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -1979,6 +1979,8 @@ def _init_tooleditor(self):
         self.widgets.tooledit1.set_visible("abcxyzuvwijq", False)
         for axis in self.axis_list:
             self.widgets.tooledit1.set_visible("{0}".format(axis), True)
+        # hide select column
+        self.widgets.tooledit1.wTree.get_object("s1").set_visible(False)
         # disconnect the key_press handler in the widget
         tv = self.widgets.tooledit1.wTree.get_object("treeview1")
         tv.disconnect_by_func(self.widgets.tooledit1.on_tree_navigate_key_press)
@@ -2053,6 +2055,7 @@ def _init_tooleditor(self):
                 temp.connect('edited', self.on_tool_col_edited)
         self.widgets.tooledit1.edited = False
         # override 'tooledit_widget' method 'set_selected_tool' so we can set the label text
+        self.tooledit1_set_selected_tool = self.widgets.tooledit1.set_selected_tool
         self.widgets.tooledit1.set_selected_tool = self.set_selected_tool
         # override 'tooledit_widget' method 'toolfile_stale' so we can also update toolinfo
         self.widgets.tooledit1.toolfile_stale = self.toolfile_stale
@@ -2063,8 +2066,9 @@ def toolfile_stale(self):
         self.widgets.tooledit1.set_selected_tool(self.widgets.tooledit1.toolinfo_num)
 
     def set_selected_tool(self, toolnumber):
-        lbl_tool_text = "Tool loaded: " + str(toolnumber)
+        lbl_tool_text = _("Tool loaded: ") + str(toolnumber)
         self.widgets.tooledit1.lbl_tool.set_text(lbl_tool_text)
+        self.tooledit1_set_selected_tool(toolnumber)
 
     def on_tree_navigate_key_press(self, treeview, event, filter):
         keyname = Gdk.keyval_name(event.keyval)
@@ -5488,15 +5492,13 @@ def on_tool_change(self, widget):
             self.halcomp['toolchange-changed'] = False
 
     def on_btn_delete_tool_clicked(self, widget, data=None):
-        selected_tools = self.widgets.tooledit1.get_selected_tool()
-        if not isinstance(selected_tools, list):
-            selected_tools = [selected_tools]
-        if self.stat.tool_in_spindle in selected_tools:
+        selected_tool = self.widgets.tooledit1.get_selected_row()
+        if self.stat.tool_in_spindle == selected_tool:
             message = _("You are trying to delete the tool mounted in the spindle\n")
             message += _("This is not allowed, please change tool prior to delete it")
             self.dialogs.warning_dialog(self, _("Warning Tool can not be deleted!"), message)
             return
-        self.widgets.tooledit1.delete(widget)
+        self.widgets.tooledit1.delete_selected_row(widget)
         self.widgets.tooledit1.edited = True
 
     def on_btn_add_tool_clicked(self, widget, data=None):