Skip to content

Commit 0861a97

Browse files
hansuhansu
committed
gmoccapy: remove "use calculator for offset page" from settings page as there is a button now
Further restore the two independent preferences: toolpage_use_calc and offsetpage_use_calc
1 parent 7008464 commit 0861a97

File tree

2 files changed

+27
-75
lines changed

2 files changed

+27
-75
lines changed

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

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ uncomment selection</property>
403403
<property name="visible">True</property>
404404
<property name="can-focus">False</property>
405405
</object>
406+
<object class="GtkImage" id="img_offset_calculator">
407+
<property name="visible">True</property>
408+
<property name="can-focus">False</property>
409+
</object>
406410
<object class="GtkImage" id="img_open">
407411
<property name="visible">True</property>
408412
<property name="can-focus">False</property>
@@ -762,10 +766,6 @@ uncomment selection</property>
762766
<property name="visible">True</property>
763767
<property name="can-focus">False</property>
764768
</object>
765-
<object class="GtkImage" id="img_offset_calculator">
766-
<property name="visible">True</property>
767-
<property name="can-focus">False</property>
768-
</object>
769769
<object class="GtkListStore" id="lstst_icon_themes">
770770
<columns>
771771
<!-- column-name path -->
@@ -4010,55 +4010,6 @@ uncomment selection</property>
40104010
<property name="position">1</property>
40114011
</packing>
40124012
</child>
4013-
<child>
4014-
<object class="GtkFrame" id="frm_use_calc">
4015-
<property name="visible">True</property>
4016-
<property name="can-focus">False</property>
4017-
<property name="label-xalign">0.5</property>
4018-
<child>
4019-
<object class="GtkBox" id="vbox_use_calc">
4020-
<property name="visible">True</property>
4021-
<property name="can-focus">False</property>
4022-
<property name="margin-start">3</property>
4023-
<property name="margin-end">3</property>
4024-
<property name="margin-top">5</property>
4025-
<property name="margin-bottom">5</property>
4026-
<property name="orientation">vertical</property>
4027-
<child>
4028-
<object class="GtkCheckButton" id="chk_offsetpage_use_calc">
4029-
<property name="label" translatable="yes">Use calculator for offset page</property>
4030-
<property name="use-action-appearance">True</property>
4031-
<property name="visible">True</property>
4032-
<property name="can-focus">True</property>
4033-
<property name="receives-default">False</property>
4034-
<property name="tooltip-text" translatable="yes">Pup up the calculator when editing numerical values in the offset page</property>
4035-
<property name="active">True</property>
4036-
<property name="draw-indicator">True</property>
4037-
<signal name="toggled" handler="on_chk_offsetpage_use_calc_toggled" swapped="no"/>
4038-
</object>
4039-
<packing>
4040-
<property name="expand">False</property>
4041-
<property name="fill">True</property>
4042-
<property name="position">0</property>
4043-
</packing>
4044-
</child>
4045-
</object>
4046-
</child>
4047-
<child type="label">
4048-
<object class="GtkLabel" id="lbl_frm_use_calc">
4049-
<property name="visible">True</property>
4050-
<property name="can-focus">False</property>
4051-
<property name="label" translatable="yes">&lt;b&gt;Calculator&lt;/b&gt;</property>
4052-
<property name="use-markup">True</property>
4053-
</object>
4054-
</child>
4055-
</object>
4056-
<packing>
4057-
<property name="expand">False</property>
4058-
<property name="fill">True</property>
4059-
<property name="position">2</property>
4060-
</packing>
4061-
</child>
40624013
<child>
40634014
<object class="GtkFrame" id="frm_ntb_preview">
40644015
<property name="visible">True</property>
@@ -4120,9 +4071,12 @@ uncomment selection</property>
41204071
<packing>
41214072
<property name="expand">False</property>
41224073
<property name="fill">False</property>
4123-
<property name="position">3</property>
4074+
<property name="position">2</property>
41244075
</packing>
41254076
</child>
4077+
<child>
4078+
<placeholder/>
4079+
</child>
41264080
</object>
41274081
<packing>
41284082
<property name="expand">False</property>

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

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ def _startup_message(self):
549549
"Automatic reactivation of G43 is possible using a REMAP.\n"\
550550
"Examples can be found in the Gmoccapy sim configurations."),
551551
_("<b>3.5.1 (LinuxCNC 2.10.0)</b>\n• The tool table and offset page uses now the calculator for entering values by default. "\
552-
"This can be changed in the settings/by a button.\n• A button to call the calculator was added in MDI and G-code edit modes."),
552+
"This can be changed by a button/setting.\n• A button to call the calculator was added in MDI and G-code edit modes."),
553553
# _("<b>3.5.2 (LinuxCNC 2.10.x): </b> Example for new feature"),
554554
]
555555
hide_message = self.prefs.getpref("hide_startup_messsage", 0, int)
@@ -649,16 +649,16 @@ def _get_pref_data(self):
649649
# Activate the recently open tab page
650650
self.widgets.ntb_tool_and_code_info.set_current_page(self.prefs.getpref("info_tab_page", 0, int))
651651

652-
653652
self.jog_btn_size = self.prefs.getpref("jog_btn_size", 48, int)
654653
self.widgets.adj_jog_btn_size.set_value(self.jog_btn_size)
655654

656655
jog_box_width = self.prefs.getpref("jog_box_width", 360, int)
657656
self.widgets.adj_jog_box_width.set_value(jog_box_width)
658657
self.widgets.vbx_jog.set_size_request(jog_box_width, -1)
659658

660-
# calculator use in offset pages
661-
self.offsetpages_use_calc = self.prefs.getpref("offsetpages_use_calc", False, bool)
659+
# calculator use in offset page/tool table
660+
self.toolpage_use_calc = self.prefs.getpref("toolpage_use_calc", True, bool)
661+
self.offsetpage_use_calc = self.prefs.getpref("offsetpage_use_calc", True, bool)
662662

663663
###############################################################################
664664
## create widgets dynamically ##
@@ -1977,9 +1977,8 @@ def _init_tooleditor(self):
19771977
btn_calculator.set_image(self.widgets.img_tool_calculator)
19781978
btn_calculator.set_tooltip_text(_("Use calculator to edit numeric values"))
19791979
btn_calculator.show_all()
1980-
1981-
btn_calculator.set_active(self.offsetpages_use_calc)
1982-
btn_calculator.connect("toggled", self.on_use_calculator_toggled)
1980+
btn_calculator.set_active(self.toolpage_use_calc)
1981+
btn_calculator.connect("toggled", self.on_toolpage_use_calc_toggled)
19831982
self.widgets.tooledit1.btn_calculator = btn_calculator
19841983

19851984
buttonbox.pack_start(btn_calculator,False,False,50)
@@ -2037,12 +2036,12 @@ def on_tree_navigate_key_press(self, treeview, event, filter):
20372036
else:
20382037
pass
20392038

2040-
def on_use_calculator_toggled(self,widget):
2041-
self.offsetpages_use_calc = widget.get_active()
2042-
self.prefs.putpref("offsetpages_use_calc", self.offsetpages_use_calc)
2039+
def on_toolpage_use_calc_toggled(self,widget):
2040+
self.toolpage_use_calc = widget.get_active()
2041+
self.prefs.putpref("toolpage_use_calc", self.toolpage_use_calc)
20432042

20442043
def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
2045-
if not self.offsetpages_use_calc:
2044+
if not self.toolpage_use_calc:
20462045
return
20472046
captations = ["toggle", "Tool#", "Pocket",
20482047
"X-offset", "Y-offset", "Z-offset",
@@ -2394,8 +2393,8 @@ def _init_offsetpage(self):
23942393
btn_calculator.set_image(self.widgets.img_offset_calculator)
23952394
btn_calculator.set_tooltip_text(_("Use calculator to edit numeric values"))
23962395
btn_calculator.show_all()
2397-
btn_calculator.set_active(self.offsetpages_use_calc)
2398-
btn_calculator.connect("toggled", self.on_use_calculator_toggled)
2396+
btn_calculator.set_active(self.offsetpage_use_calc)
2397+
btn_calculator.connect("toggled", self.on_offsetpage_use_calc_toggled)
23992398
self.widgets.offsetpage1.btn_calculator = btn_calculator
24002399
buttonbox.pack_start(btn_calculator,False,False,50)
24012400

@@ -2415,9 +2414,12 @@ def _init_offsetpage(self):
24152414
temp = self.widgets.offsetpage1.wTree.get_object("cell_%s" % name)
24162415
temp.connect('editing-started', self.on_offset_col_edit_started, col)
24172416

2418-
2417+
def on_offsetpage_use_calc_toggled(self,widget):
2418+
self.offsetpage_use_calc = widget.get_active()
2419+
self.prefs.putpref("offsetpage_use_calc", self.offsetpage_use_calc)
2420+
24192421
def on_offset_col_edit_started(self, widget, filtered_path, new_text, col):
2420-
if not self.offsetpages_use_calc:
2422+
if not self.offsetpage_use_calc:
24212423
return
24222424
offsetpage = self.widgets.offsetpage1
24232425
offsetview = offsetpage.view2
@@ -2581,7 +2583,7 @@ def _show_offset_tab(self, state):
25812583
return
25822584
if state:
25832585
page.show()
2584-
self.widgets.offsetpage1.btn_calculator.set_active(self.offsetpages_use_calc)
2586+
self.widgets.offsetpage1.btn_calculator.set_active(self.offsetpage_use_calc)
25852587
self.widgets.ntb_preview.set_property("show-tabs", state)
25862588
self.widgets.ntb_preview.set_current_page(1)
25872589
self.widgets.offsetpage1.mark_active((self.system_list[self.stat.g5x_index]).lower())
@@ -2605,7 +2607,7 @@ def _show_tooledit_tab(self, state):
26052607
return
26062608
if state:
26072609
page.show()
2608-
self.widgets.tooledit1.btn_calculator.set_active(self.offsetpages_use_calc)
2610+
self.widgets.tooledit1.btn_calculator.set_active(self.toolpage_use_calc)
26092611
self.widgets.ntb_preview.set_property("show-tabs", not state)
26102612
self.widgets.vbx_jog.hide()
26112613
self.widgets.ntb_preview.set_current_page(2)
@@ -5135,10 +5137,6 @@ def on_chk_use_kb_on_mdi_toggled(self, widget, data=None):
51355137

51365138
def on_chk_use_kb_on_file_selection_toggled(self, widget, data=None):
51375139
self.prefs.putpref("show_keyboard_on_file_selection", widget.get_active())
5138-
5139-
def on_chk_offsetpage_use_calc_toggled(self, widget, data=None):
5140-
self.offsetpage_use_calc = widget.get_active()
5141-
self.prefs.putpref("offsetpage_use_calc", self.offsetpage_use_calc)
51425140

51435141
def on_chk_use_kb_shortcuts_toggled(self, widget, data=None):
51445142
self.prefs.putpref("use_keyboard_shortcuts", widget.get_active())

0 commit comments

Comments
 (0)