Skip to content

Commit 726bd91

Browse files
Sigma1912Sigma1912
committed
Gmoccapy: Move tool table buttons to table frame, add toggle button for calculator use
1 parent ac7e5a0 commit 726bd91

6 files changed

Lines changed: 79 additions & 38 deletions

File tree

‎share/gmoccapy/icons/classic/32x32/actions/add.png‎

6.94 KB
Loading

‎share/gmoccapy/icons/classic/32x32/actions/delete.png‎

8.15 KB
Loading

‎share/gmoccapy/icons/material/32x32/actions/add.symbolic.png‎

147 Bytes
Loading

‎share/gmoccapy/icons/material/32x32/actions/delete.symbolic.png‎

242 Bytes
Loading

‎src/emc/usr_intf/gmoccapy/gmoccapy.glade‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,26 @@
695695
<property name="visible">True</property>
696696
<property name="can-focus">False</property>
697697
</object>
698+
<object class="GtkImage" id="img_tool_delete">
699+
<property name="visible">True</property>
700+
<property name="can-focus">False</property>
701+
</object>
702+
<object class="GtkImage" id="img_tool_save">
703+
<property name="visible">True</property>
704+
<property name="can-focus">False</property>
705+
</object>
706+
<object class="GtkImage" id="img_tool_reload">
707+
<property name="visible">True</property>
708+
<property name="can-focus">False</property>
709+
</object>
710+
<object class="GtkImage" id="img_tool_add">
711+
<property name="visible">True</property>
712+
<property name="can-focus">False</property>
713+
</object>
714+
<object class="GtkImage" id="img_tool_calculator">
715+
<property name="visible">True</property>
716+
<property name="can-focus">False</property>
717+
</object>
698718
<object class="GtkListStore" id="lstst_icon_themes">
699719
<columns>
700720
<!-- column-name path -->
@@ -7405,18 +7425,11 @@ MDI history</property>
74057425
<property name="visible">True</property>
74067426
<property name="can-focus">False</property>
74077427
<child>
7408-
<object class="GtkButton" id="btn_delete_tool">
7409-
<property name="label" translatable="yes">Delete</property>
7410-
<property name="use-action-appearance">False</property>
7428+
<object class="GtkLabel" id="lbl_empty_0_tool">
74117429
<property name="width-request">90</property>
74127430
<property name="height-request">56</property>
74137431
<property name="visible">True</property>
7414-
<property name="can-focus">True</property>
7415-
<property name="receives-default">True</property>
7416-
<property name="tooltip-text" translatable="yes">delete selected tool or tools</property>
7417-
<property name="halign">center</property>
7418-
<property name="valign">center</property>
7419-
<signal name="clicked" handler="on_btn_delete_tool_clicked" swapped="no"/>
7432+
<property name="can-focus">False</property>
74207433
</object>
74217434
<packing>
74227435
<property name="expand">False</property>
@@ -7425,18 +7438,11 @@ MDI history</property>
74257438
</packing>
74267439
</child>
74277440
<child>
7428-
<object class="GtkButton" id="btn_add_tool">
7429-
<property name="label" translatable="yes">Add</property>
7430-
<property name="use-action-appearance">False</property>
7441+
<object class="GtkLabel" id="lbl_empty_1_tool">
74317442
<property name="width-request">90</property>
74327443
<property name="height-request">56</property>
74337444
<property name="visible">True</property>
7434-
<property name="can-focus">True</property>
7435-
<property name="receives-default">True</property>
7436-
<property name="tooltip-text" translatable="yes">add a new tool to tool table</property>
7437-
<property name="halign">center</property>
7438-
<property name="valign">center</property>
7439-
<signal name="clicked" handler="on_btn_add_tool_clicked" swapped="no"/>
7445+
<property name="can-focus">False</property>
74407446
</object>
74417447
<packing>
74427448
<property name="expand">False</property>
@@ -7445,18 +7451,11 @@ MDI history</property>
74457451
</packing>
74467452
</child>
74477453
<child>
7448-
<object class="GtkButton" id="btn_reload_tooltable">
7449-
<property name="label" translatable="yes">Reload</property>
7450-
<property name="use-action-appearance">False</property>
7454+
<object class="GtkLabel" id="lbl_empty_2_tool">
74517455
<property name="width-request">90</property>
74527456
<property name="height-request">56</property>
74537457
<property name="visible">True</property>
7454-
<property name="can-focus">True</property>
7455-
<property name="receives-default">True</property>
7456-
<property name="tooltip-text" translatable="yes">reload tool table from file</property>
7457-
<property name="halign">center</property>
7458-
<property name="valign">center</property>
7459-
<signal name="clicked" handler="on_btn_reload_tooltable_clicked" swapped="no"/>
7458+
<property name="can-focus">False</property>
74607459
</object>
74617460
<packing>
74627461
<property name="expand">False</property>
@@ -7465,18 +7464,11 @@ MDI history</property>
74657464
</packing>
74667465
</child>
74677466
<child>
7468-
<object class="GtkButton" id="btn_apply_tool_changes">
7469-
<property name="label" translatable="yes">Apply</property>
7470-
<property name="use-action-appearance">False</property>
7467+
<object class="GtkLabel" id="lbl_empty_3_tool">
74717468
<property name="width-request">90</property>
74727469
<property name="height-request">56</property>
74737470
<property name="visible">True</property>
7474-
<property name="can-focus">True</property>
7475-
<property name="receives-default">True</property>
7476-
<property name="tooltip-text" translatable="yes">apply the changes you made, G43 will be executed only if it is active G-code</property>
7477-
<property name="halign">center</property>
7478-
<property name="valign">center</property>
7479-
<signal name="clicked" handler="on_btn_apply_tool_changes_clicked" swapped="no"/>
7471+
<property name="can-focus">False</property>
74807472
</object>
74817473
<packing>
74827474
<property name="expand">False</property>

‎src/emc/usr_intf/gmoccapy/gmoccapy.py‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,47 @@ def _init_tooleditor(self):
19571957
if not self.get_ini_info.get_lathe_wear_offsets():
19581958
# hide the wear offset tabs
19591959
self.widgets.tooledit1.set_lathe_display(False)
1960-
self.widgets.tooledit1.hide_buttonbox(True)
1960+
# Modify the button box at the bottom
1961+
buttonbox = self.widgets.tooledit1.wTree.get_object("buttonbox")
1962+
buttonbox.set_layout(Gtk.ButtonBoxStyle.EDGE)
1963+
buttonbox.set_property("homogeneous", True)
1964+
# Delete button
1965+
btn_delete = self.widgets.tooledit1.wTree.get_object("delete")
1966+
btn_delete.set_size_request(56, 56)
1967+
btn_delete.set_label("")
1968+
btn_delete.set_image(self.widgets.img_tool_delete)
1969+
btn_delete.set_always_show_image(True)
1970+
# Add button
1971+
btn_add = self.widgets.tooledit1.wTree.get_object("add")
1972+
btn_add.set_size_request(56, 56)
1973+
btn_add.set_label("")
1974+
btn_add.set_image(self.widgets.img_tool_add)
1975+
btn_add.set_always_show_image(True)
1976+
# Reload button
1977+
btn_reload = self.widgets.tooledit1.wTree.get_object("reload")
1978+
btn_reload.set_size_request(56, 56)
1979+
btn_reload.set_label("")
1980+
btn_reload.set_image(self.widgets.img_tool_reload)
1981+
btn_reload.set_always_show_image(True)
1982+
# Save button
1983+
btn_save = self.widgets.tooledit1.wTree.get_object("apply")
1984+
btn_save.set_size_request(56, 56)
1985+
btn_save.set_label("")
1986+
btn_save.set_image(self.widgets.img_tool_save)
1987+
btn_save.set_always_show_image(True)
1988+
# Empty space in between
1989+
spacer = Gtk.Label()
1990+
spacer.show_all()
1991+
buttonbox.pack_start(spacer,True,True,0)
1992+
# Calculator button
1993+
btn_calculator = Gtk.ToggleButton()
1994+
btn_calculator.set_size_request(56, 56)
1995+
btn_calculator.set_image(self.widgets.img_tool_calculator)
1996+
btn_calculator.set_tooltip_text(_("Use calculator to edit numeric values"))
1997+
btn_calculator.show_all()
1998+
btn_calculator.set_active(self.toolpage_use_calc)
1999+
btn_calculator.connect("toggled", self.on_use_calculator_toggled)
2000+
buttonbox.pack_start(btn_calculator,False,False,50)
19612001
column_cell_ids = ["toggle", "tool#1", "pos1", "x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
19622002
"d1", "front1", "back1", "orient1", "cell_comments1"]
19632003
for col, name in enumerate(column_cell_ids):
@@ -2006,6 +2046,9 @@ def on_tree_navigate_key_press(self, treeview, event, filter):
20062046
else:
20072047
pass
20082048

2049+
def on_use_calculator_toggled(self,widget):
2050+
self.toolpage_use_calc = widget.get_active()
2051+
20092052
def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
20102053
if not self.toolpage_use_calc:
20112054
return
@@ -4783,6 +4826,12 @@ def _set_icon_theme(self, name):
47834826
("img_tool_clear", "clear", 24),
47844827
("img_tool_path", "toolpath", 24),
47854828
("img_dimensions", "dimensions", 24),
4829+
# tooledit frame controls
4830+
("img_tool_delete", "delete", 32),
4831+
("img_tool_add", "add", 32),
4832+
("img_tool_reload", "refresh", 32),
4833+
("img_tool_save", "save", 32),
4834+
("img_tool_calculator", "calculator_open", 32),
47864835
# coolant
47874836
("img_coolant_on", "coolant_flood_active", 48),
47884837
("img_coolant_off", "coolant_flood_inactive", 48),
@@ -5276,7 +5325,7 @@ def on_btn_reload_tooltable_clicked(self, widget, data=None):
52765325
self.widgets.tooledit1.reload(None)
52775326
self.widgets.tooledit1.set_selected_tool(self.stat.tool_in_spindle)
52785327

5279-
def on_btn_apply_tool_changes_clicked(self, widget, data=None):
5328+
def on_btn_save_tool_changes_clicked(self, widget, data=None):
52805329
self.widgets.tooledit1.save(None)
52815330
self.widgets.tooledit1.set_selected_tool(self.stat.tool_in_spindle)
52825331

0 commit comments

Comments
 (0)