Skip to content

Commit 7d4698f

Browse files
committed
gmoccapy: add button to show preview beside edit window (split view)
1 parent 0597634 commit 7d4698f

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed
481 Bytes
Loading
353 Bytes
Loading
353 Bytes
Loading

src/emc/usr_intf/gmoccapy/gmoccapy.glade

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,10 @@ uncomment selection</property>
603603
<property name="visible">True</property>
604604
<property name="can-focus">False</property>
605605
</object>
606+
<object class="GtkImage" id="img_split_view">
607+
<property name="visible">True</property>
608+
<property name="can-focus">False</property>
609+
</object>
606610
<object class="GtkImage" id="img_step">
607611
<property name="visible">True</property>
608612
<property name="can-focus">False</property>
@@ -7327,15 +7331,20 @@ MDI history</property>
73277331
<property name="can-focus">False</property>
73287332
<property name="homogeneous">True</property>
73297333
<child>
7330-
<object class="GtkLabel" id="lbl_space_6">
7334+
<object class="GtkToggleButton" id="tbtn_split_view">
73317335
<property name="width-request">90</property>
73327336
<property name="height-request">56</property>
73337337
<property name="visible">True</property>
7334-
<property name="can-focus">False</property>
7338+
<property name="can-focus">True</property>
7339+
<property name="receives-default">True</property>
7340+
<property name="halign">center</property>
7341+
<property name="valign">center</property>
7342+
<property name="image">img_split_view</property>
7343+
<signal name="toggled" handler="on_tbtn_split_view_toggled" swapped="no"/>
73357344
</object>
73367345
<packing>
7337-
<property name="expand">False</property>
7338-
<property name="fill">False</property>
7346+
<property name="expand">True</property>
7347+
<property name="fill">True</property>
73397348
<property name="position">0</property>
73407349
</packing>
73417350
</child>

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4904,6 +4904,7 @@ def _set_icon_theme(self, name):
49044904
("img_down", "chevron_down", 24),
49054905
("img_edit-undo", "edit_undo", 32),
49064906
("img_edit-redo", "edit_redo", 32),
4907+
("img_split_view", "split_view", 32),
49074908
("img_edit_menu_reload", "refresh", 32),
49084909
("img_edit_menu_save", "save", 32),
49094910
("img_edit_menu_save_as", "save_as", 32),
@@ -5583,11 +5584,12 @@ def on_IconFileSelection1_exit(self, widget):
55835584

55845585
# edit a program or make a new one
55855586
def on_btn_edit_clicked(self, widget, data=None):
5587+
if not self.widgets.tbtn_split_view.get_active():
5588+
self.widgets.ntb_preview.hide()
5589+
self.widgets.vbox14.hide()
5590+
self.widgets.vbox_jog.set_hexpand(True)
55865591
self.widgets.ntb_button.set_current_page(_BB_EDIT)
5587-
self.widgets.ntb_preview.hide()
55885592
self.widgets.grid_DRO.hide()
5589-
self.widgets.vbox14.hide()
5590-
self.widgets.vbox_jog.set_hexpand(True)
55915593
self.widgets.box_dro_side.hide()
55925594
if not self.widgets.vbx_jog.get_visible():
55935595
self.widgets.vbx_jog.set_visible(True)
@@ -5755,6 +5757,14 @@ def on_tbtn_switch_mode_toggled(self, widget, data=None):
57555757
else:
57565758
self.widgets.tbtn_switch_mode.set_label(_("World\nmode"))
57575759
self._set_motion_mode(1)
5760+
5761+
def on_tbtn_split_view_toggled(self, widget, data=None):
5762+
if widget.get_active():
5763+
self.widgets.ntb_preview.show()
5764+
self.widgets.vbox14.show()
5765+
else:
5766+
self.widgets.ntb_preview.hide()
5767+
self.widgets.vbox14.hide()
57585768

57595769
# =========================================================
57605770
# Hal Pin Handling Start

0 commit comments

Comments
 (0)