Skip to content

Commit f873fd8

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

5 files changed

Lines changed: 26 additions & 7 deletions

File tree

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>
@@ -7347,15 +7351,20 @@ MDI history</property>
73477351
<property name="can-focus">False</property>
73487352
<property name="homogeneous">True</property>
73497353
<child>
7350-
<object class="GtkLabel" id="lbl_space_6">
7354+
<object class="GtkToggleButton" id="tbtn_split_view">
73517355
<property name="width-request">90</property>
73527356
<property name="height-request">56</property>
73537357
<property name="visible">True</property>
7354-
<property name="can-focus">False</property>
7358+
<property name="can-focus">True</property>
7359+
<property name="receives-default">True</property>
7360+
<property name="halign">center</property>
7361+
<property name="valign">center</property>
7362+
<property name="image">img_split_view</property>
7363+
<signal name="toggled" handler="on_tbtn_split_view_toggled" swapped="no"/>
73557364
</object>
73567365
<packing>
7357-
<property name="expand">False</property>
7358-
<property name="fill">False</property>
7366+
<property name="expand">True</property>
7367+
<property name="fill">True</property>
73597368
<property name="position">0</property>
73607369
</packing>
73617370
</child>

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5012,6 +5012,7 @@ def _set_icon_theme(self, name):
50125012
("img_down", "chevron_down", 24),
50135013
("img_edit-undo", "edit_undo", 32),
50145014
("img_edit-redo", "edit_redo", 32),
5015+
("img_split_view", "split_view", 32),
50155016
("img_edit_menu_reload", "refresh", 32),
50165017
("img_edit_menu_save", "save", 32),
50175018
("img_edit_menu_save_as", "save_as", 32),
@@ -5691,11 +5692,12 @@ def on_IconFileSelection1_exit(self, widget):
56915692

56925693
# edit a program or make a new one
56935694
def on_btn_edit_clicked(self, widget, data=None):
5695+
if not self.widgets.tbtn_split_view.get_active():
5696+
self.widgets.ntb_preview.hide()
5697+
self.widgets.vbox14.hide()
5698+
self.widgets.vbox_jog.set_hexpand(True)
56945699
self.widgets.ntb_button.set_current_page(_BB_EDIT)
5695-
self.widgets.ntb_preview.hide()
56965700
self.widgets.grid_DRO.hide()
5697-
self.widgets.vbox14.hide()
5698-
self.widgets.vbox_jog.set_hexpand(True)
56995701
self.widgets.box_dro_side.hide()
57005702
if not self.widgets.vbx_jog.get_visible():
57015703
self.widgets.vbx_jog.set_visible(True)
@@ -5863,6 +5865,14 @@ def on_tbtn_switch_mode_toggled(self, widget, data=None):
58635865
else:
58645866
self.widgets.tbtn_switch_mode.set_label(_("World\nmode"))
58655867
self._set_motion_mode(1)
5868+
5869+
def on_tbtn_split_view_toggled(self, widget, data=None):
5870+
if widget.get_active():
5871+
self.widgets.ntb_preview.show()
5872+
self.widgets.vbox14.show()
5873+
else:
5874+
self.widgets.ntb_preview.hide()
5875+
self.widgets.vbox14.hide()
58665876

58675877
# =========================================================
58685878
# Hal Pin Handling Start

0 commit comments

Comments
 (0)