Skip to content

Commit 75da637

Browse files
committed
Gmoccapy: hide/show 'Select' column with 'Delete' button
Avoids confusion about using the 'Select' column to select tool to change to
1 parent 4788f77 commit 75da637

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,7 @@ def _init_tooleditor(self):
19971997
btn_delete.set_size_request(56, 56)
19981998
btn_delete.set_label("")
19991999
btn_delete.set_image(self.widgets.img_tool_delete)
2000-
btn_delete.set_tooltip_text(_("Delete selected tools"))
2000+
btn_delete.set_tooltip_text(_("Select tools to delete"))
20012001
btn_delete.set_always_show_image(True)
20022002
btn_delete.disconnect_by_func(self.widgets.tooledit1.delete)
20032003
btn_delete.connect("clicked",self.on_btn_delete_tool_clicked)
@@ -2042,6 +2042,7 @@ def _init_tooleditor(self):
20422042
btn_calculator.set_active(self.toolpage_use_calc)
20432043
btn_calculator.connect("toggled", self.on_toolpage_use_calc_toggled)
20442044
buttonbox.pack_start(btn_calculator,False,False,50)
2045+
self.widgets.tooledit1.wTree.get_object("s1").set_visible(False)
20452046
column_cell_ids = ["toggle", "tool#1", "pos1",
20462047
"x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
20472048
"d1", "front1", "back1", "orient1", "comments1"]
@@ -5488,6 +5489,11 @@ def on_tool_change(self, widget):
54885489
self.halcomp['toolchange-changed'] = False
54895490

54905491
def on_btn_delete_tool_clicked(self, widget, data=None):
5492+
btn_delete = self.widgets.tooledit1.wTree.get_object("delete")
5493+
if not self.widgets.tooledit1.wTree.get_object("s1").get_visible():
5494+
self.widgets.tooledit1.wTree.get_object("s1").set_visible(True)
5495+
btn_delete.set_tooltip_text(_("Delete selected tools"))
5496+
return
54915497
selected_tools = self.widgets.tooledit1.get_selected_tool()
54925498
if not isinstance(selected_tools, list):
54935499
selected_tools = [selected_tools]
@@ -5496,6 +5502,8 @@ def on_btn_delete_tool_clicked(self, widget, data=None):
54965502
message += _("This is not allowed, please change tool prior to delete it")
54975503
self.dialogs.warning_dialog(self, _("Warning Tool can not be deleted!"), message)
54985504
return
5505+
self.widgets.tooledit1.wTree.get_object("s1").set_visible(False)
5506+
btn_delete.set_tooltip_text(_("Select tools to delete"))
54995507
self.widgets.tooledit1.delete(widget)
55005508
self.widgets.tooledit1.edited = True
55015509

0 commit comments

Comments
 (0)