Skip to content

Commit fd9d3f1

Browse files
hansuhansu
committed
gmoccapy: add embedded tab location "box_dro_side"
1 parent c7bcd79 commit fd9d3f1

2 files changed

Lines changed: 62 additions & 32 deletions

File tree

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

Lines changed: 59 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,47 +1234,71 @@
12341234
<property name="can-focus">False</property>
12351235
<property name="orientation">vertical</property>
12361236
<child>
1237-
<!-- n-columns=2 n-rows=5 -->
1238-
<object class="GtkGrid" id="grid_DRO">
1237+
<object class="GtkBox" id="box_dro">
12391238
<property name="visible">True</property>
12401239
<property name="can-focus">False</property>
1241-
<property name="column-spacing">3</property>
1242-
<property name="row-homogeneous">True</property>
1243-
<property name="column-homogeneous">True</property>
12441240
<child>
1245-
<placeholder/>
1246-
</child>
1247-
<child>
1248-
<placeholder/>
1249-
</child>
1250-
<child>
1251-
<placeholder/>
1252-
</child>
1253-
<child>
1254-
<placeholder/>
1255-
</child>
1256-
<child>
1257-
<placeholder/>
1258-
</child>
1259-
<child>
1260-
<placeholder/>
1261-
</child>
1262-
<child>
1263-
<placeholder/>
1264-
</child>
1265-
<child>
1266-
<placeholder/>
1267-
</child>
1268-
<child>
1269-
<placeholder/>
1241+
<!-- n-columns=2 n-rows=5 -->
1242+
<object class="GtkGrid" id="grid_DRO">
1243+
<property name="visible">True</property>
1244+
<property name="can-focus">False</property>
1245+
<property name="column-spacing">3</property>
1246+
<property name="row-homogeneous">True</property>
1247+
<property name="column-homogeneous">True</property>
1248+
<child>
1249+
<placeholder/>
1250+
</child>
1251+
<child>
1252+
<placeholder/>
1253+
</child>
1254+
<child>
1255+
<placeholder/>
1256+
</child>
1257+
<child>
1258+
<placeholder/>
1259+
</child>
1260+
<child>
1261+
<placeholder/>
1262+
</child>
1263+
<child>
1264+
<placeholder/>
1265+
</child>
1266+
<child>
1267+
<placeholder/>
1268+
</child>
1269+
<child>
1270+
<placeholder/>
1271+
</child>
1272+
<child>
1273+
<placeholder/>
1274+
</child>
1275+
<child>
1276+
<placeholder/>
1277+
</child>
1278+
</object>
1279+
<packing>
1280+
<property name="expand">True</property>
1281+
<property name="fill">True</property>
1282+
<property name="position">0</property>
1283+
</packing>
12701284
</child>
12711285
<child>
1272-
<placeholder/>
1286+
<object class="GtkBox" id="box_dro_side">
1287+
<property name="can-focus">False</property>
1288+
<child>
1289+
<placeholder/>
1290+
</child>
1291+
</object>
1292+
<packing>
1293+
<property name="expand">False</property>
1294+
<property name="fill">True</property>
1295+
<property name="position">1</property>
1296+
</packing>
12731297
</child>
12741298
</object>
12751299
<packing>
12761300
<property name="expand">False</property>
1277-
<property name="fill">False</property>
1301+
<property name="fill">True</property>
12781302
<property name="position">0</property>
12791303
</packing>
12801304
</child>
@@ -1739,6 +1763,9 @@
17391763
<property name="position">1</property>
17401764
</packing>
17411765
</child>
1766+
<child>
1767+
<placeholder/>
1768+
</child>
17421769
</object>
17431770
<packing>
17441771
<property name="resize">False</property>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,6 +1920,9 @@ def set_up_user_tab_widgets(self, tab_locations):
19201920
widgetlist = ["vbx_jog_button", "vbtb_jog_incr"]
19211921
for widget in widgetlist:
19221922
self.widgets[widget].hide()
1923+
1924+
if "box_dro_side" in tab_locations:
1925+
self.widgets.box_dro_side.show()
19231926

19241927
# Dynamic tabs handling End
19251928
# =============================================================

0 commit comments

Comments
 (0)