Skip to content

Commit 824434c

Browse files
c-morleyc-morley
authored
Merge pull request #3585 from zz912/pnc-gm-screen-fix
PNCconf - screen.glade - fix Gmoccapy GtkSpinButton size, pos
2 parents 996d94a + c0e66b6 commit 824434c

File tree

1 file changed

+40
-8
lines changed

1 file changed

+40
-8
lines changed

‎src/emc/usr_intf/pncconf/screen.glade‎

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,26 @@
169169
<property name="upper">100</property>
170170
<property name="step-increment">1</property>
171171
</object>
172+
<object class="GtkAdjustment" id="gmcpy_height_adjust">
173+
<property name="upper">3920</property>
174+
<property name="lower">750</property>
175+
<property name="value">750</property>
176+
<property name="step-increment">50</property>
177+
</object>
178+
<object class="GtkAdjustment" id="gmcpy_width_adjust">
179+
<property name="upper">3920</property>
180+
<property name="lower">1000</property>
181+
<property name="value">1000</property>
182+
<property name="step-increment">50</property>
183+
</object>
184+
<object class="GtkAdjustment" id="gmcpy_xpos_adjust">
185+
<property name="upper">1000</property>
186+
<property name="step-increment">10</property>
187+
</object>
188+
<object class="GtkAdjustment" id="gmcpy_ypos_adjust">
189+
<property name="upper">1000</property>
190+
<property name="step-increment">10</property>
191+
</object>
172192
<object class="GtkVBox" id="screen">
173193
<property name="visible">True</property>
174194
<property name="can-focus">False</property>
@@ -492,9 +512,11 @@
492512
</packing>
493513
</child>
494514
<child>
495-
<object class="GtkVSeparator" id="vseparator8">
515+
<object class="GtkBox" id="vseparator8">
496516
<property name="visible">True</property>
497517
<property name="can-focus">False</property>
518+
<property name="orientation">vertical</property>
519+
<property name="width-request">10</property>
498520
</object>
499521
<packing>
500522
<property name="left-attach">3</property>
@@ -988,9 +1010,11 @@
9881010
</packing>
9891011
</child>
9901012
<child>
991-
<object class="GtkVSeparator" id="vseparator7">
1013+
<object class="GtkBox" id="vseparator7">
9921014
<property name="visible">True</property>
9931015
<property name="can-focus">False</property>
1016+
<property name="orientation">vertical</property>
1017+
<property name="width-request">10</property>
9941018
</object>
9951019
<packing>
9961020
<property name="left-attach">3</property>
@@ -1810,9 +1834,11 @@
18101834
<placeholder/>
18111835
</child>
18121836
<child>
1813-
<object class="GtkVSeparator" id="vseparator23">
1837+
<object class="GtkBox" id="vseparator23">
18141838
<property name="visible">True</property>
18151839
<property name="can-focus">False</property>
1840+
<property name="orientation">vertical</property>
1841+
<property name="width-request">10</property>
18161842
</object>
18171843
<packing>
18181844
<property name="left-attach">2</property>
@@ -2783,7 +2809,8 @@
27832809
<property name="invisible-char">●</property>
27842810
<property name="primary-icon-activatable">False</property>
27852811
<property name="secondary-icon-activatable">False</property>
2786-
<property name="adjustment">touchy_height_adjust</property>
2812+
<property name="adjustment">gmcpy_height_adjust</property>
2813+
<property name="width-request">140</property>
27872814
</object>
27882815
<packing>
27892816
<property name="left-attach">4</property>
@@ -2808,7 +2835,8 @@
28082835
<property name="invisible-char">●</property>
28092836
<property name="primary-icon-activatable">False</property>
28102837
<property name="secondary-icon-activatable">False</property>
2811-
<property name="adjustment">touchy_width_adjust</property>
2838+
<property name="adjustment">gmcpy_width_adjust</property>
2839+
<property name="width-request">140</property>
28122840
</object>
28132841
<packing>
28142842
<property name="left-attach">2</property>
@@ -2822,7 +2850,8 @@
28222850
<property name="invisible-char">●</property>
28232851
<property name="primary-icon-activatable">False</property>
28242852
<property name="secondary-icon-activatable">False</property>
2825-
<property name="adjustment">touchy_ypos_adjust</property>
2853+
<property name="adjustment">gmcpy_ypos_adjust</property>
2854+
<property name="width-request">140</property>
28262855
</object>
28272856
<packing>
28282857
<property name="left-attach">4</property>
@@ -2862,7 +2891,8 @@
28622891
<property name="invisible-char">●</property>
28632892
<property name="primary-icon-activatable">False</property>
28642893
<property name="secondary-icon-activatable">False</property>
2865-
<property name="adjustment">touchy_xpos_adjust</property>
2894+
<property name="adjustment">gmcpy_xpos_adjust</property>
2895+
<property name="width-request">140</property>
28662896
</object>
28672897
<packing>
28682898
<property name="left-attach">2</property>
@@ -3007,9 +3037,11 @@
30073037
<placeholder/>
30083038
</child>
30093039
<child>
3010-
<object class="GtkVSeparator" id="vseparator1">
3040+
<object class="GtkBox" id="vseparator1">
30113041
<property name="visible">True</property>
30123042
<property name="can-focus">False</property>
3043+
<property name="orientation">vertical</property>
3044+
<property name="width-request">10</property>
30133045
</object>
30143046
<packing>
30153047
<property name="left-attach">2</property>

0 commit comments

Comments
 (0)