From b481d6e612fb150f24216902ba01daed6f59bb9b Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Sun, 12 Jan 2025 19:08:14 +0100 Subject: [PATCH 1/2] gmoccapy: revert "remember position of hbox2 (GtkPaned)" This is also needed in conjunction with "gmoccapy: revert "added Gtk.Paned for upper main area" (5862ea035d83b847846c6b8e148a2b2031199b2e) This reverts commit 603d3e26bc9d04172653304da6472bac5e138ea1. --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index c95636f32fc..fb8cc57e4c7 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -5183,7 +5183,6 @@ def on_IconFileSelection1_exit(self, widget): # edit a program or make a new one def on_btn_edit_clicked(self, widget, data=None): - self.hbox2_position = self.widgets.hbox2.get_position() self.widgets.ntb_button.set_current_page(_BB_EDIT) self.widgets.ntb_preview.hide() self.widgets.grid_DRO.hide() @@ -5267,7 +5266,6 @@ def on_ntb_button_switch_page(self, *args): self.widgets.grid_DRO.show() self.widgets.vbox14.show() self.widgets.box_dro_side.show() - self.widgets.hbox2.set_position(self.hbox2_position) self.widgets.gcode_view.set_sensitive(False) self.widgets.btn_save.set_sensitive(True) self.widgets.hal_action_reload.emit("activate") From a3b4071cb90b77fd2075fe25199e15669fd7ead3 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Sun, 12 Jan 2025 19:36:26 +0100 Subject: [PATCH 2/2] gmoccapy: expand G-code editor in edit mode This was not needed with the Gtk.Paned, but without this needs to be done manually. --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index fb8cc57e4c7..1aad3cd4db2 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -5187,6 +5187,7 @@ def on_btn_edit_clicked(self, widget, data=None): self.widgets.ntb_preview.hide() self.widgets.grid_DRO.hide() self.widgets.vbox14.hide() + self.widgets.vbox_jog.set_hexpand(True) self.widgets.box_dro_side.hide() if not self.widgets.vbx_jog.get_visible(): self.widgets.vbx_jog.set_visible(True) @@ -5265,6 +5266,7 @@ def on_ntb_button_switch_page(self, *args): self.widgets.ntb_preview.show() self.widgets.grid_DRO.show() self.widgets.vbox14.show() + self.widgets.vbox_jog.set_hexpand(False) self.widgets.box_dro_side.show() self.widgets.gcode_view.set_sensitive(False) self.widgets.btn_save.set_sensitive(True)