Skip to content

Commit 30d5903

Browse files
committed
Revert "Gmoccapy: hide/show 'Select' column with 'Delete' button"
This reverts commit 75da637.
1 parent 75da637 commit 30d5903

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 1 addition & 9 deletions
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(_("Select tools to delete"))
2000+
btn_delete.set_tooltip_text(_("Delete selected tools"))
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,7 +2042,6 @@ 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)
20462045
column_cell_ids = ["toggle", "tool#1", "pos1",
20472046
"x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
20482047
"d1", "front1", "back1", "orient1", "comments1"]
@@ -5489,11 +5488,6 @@ def on_tool_change(self, widget):
54895488
self.halcomp['toolchange-changed'] = False
54905489

54915490
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
54975491
selected_tools = self.widgets.tooledit1.get_selected_tool()
54985492
if not isinstance(selected_tools, list):
54995493
selected_tools = [selected_tools]
@@ -5502,8 +5496,6 @@ def on_btn_delete_tool_clicked(self, widget, data=None):
55025496
message += _("This is not allowed, please change tool prior to delete it")
55035497
self.dialogs.warning_dialog(self, _("Warning Tool can not be deleted!"), message)
55045498
return
5505-
self.widgets.tooledit1.wTree.get_object("s1").set_visible(False)
5506-
btn_delete.set_tooltip_text(_("Select tools to delete"))
55075499
self.widgets.tooledit1.delete(widget)
55085500
self.widgets.tooledit1.edited = True
55095501

0 commit comments

Comments
 (0)