Skip to content

Commit 0f49b14

Browse files
authored
Merge pull request #3457 from Sigma1912/Gmoccapy_modify-offsetpage-widget
Gmoccapy: improvements to the offsetpage widget
2 parents 9b976bb + 1f22f1e commit 0f49b14

3 files changed

Lines changed: 235 additions & 162 deletions

File tree

lib/python/gladevcp/offsetpage.glade

Lines changed: 119 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.38.2 -->
2+
<!-- Generated with glade 3.40.0 -->
33
<interface>
44
<requires lib="gtk+" version="3.24"/>
55
<object class="GtkListStore" id="liststore2">
@@ -24,6 +24,8 @@
2424
<column type="gchararray"/>
2525
<!-- column-name W -->
2626
<column type="gchararray"/>
27+
<!-- column-name Rot -->
28+
<column type="gchararray"/>
2729
<!-- column-name display_row -->
2830
<column type="gboolean"/>
2931
<!-- column-name editable -->
@@ -47,14 +49,15 @@
4749
<col id="7">0</col>
4850
<col id="8">0</col>
4951
<col id="9">0</col>
50-
<col id="10">True</col>
51-
<col id="11">False</col>
52-
<col id="12">0</col>
53-
<col id="13">black</col>
54-
<col id="14" translatable="yes">Tool</col>
52+
<col id="10">0</col>
53+
<col id="11">True</col>
54+
<col id="12">False</col>
55+
<col id="13">0</col>
56+
<col id="14">black</col>
57+
<col id="15" translatable="yes">0</col>
5558
</row>
5659
<row>
57-
<col id="0">G5x</col>
60+
<col id="0">G28</col>
5861
<col id="1">0</col>
5962
<col id="2">0</col>
6063
<col id="3">0</col>
@@ -64,14 +67,15 @@
6467
<col id="7">0</col>
6568
<col id="8">0</col>
6669
<col id="9">0</col>
67-
<col id="10">True</col>
68-
<col id="11">False</col>
69-
<col id="12">0</col>
70-
<col id="13">black</col>
71-
<col id="14">G5x</col>
70+
<col id="10">0</col>
71+
<col id="11">True</col>
72+
<col id="12">False</col>
73+
<col id="13">0</col>
74+
<col id="14">black</col>
75+
<col id="15">0</col>
7276
</row>
7377
<row>
74-
<col id="0">Rot</col>
78+
<col id="0">G30</col>
7579
<col id="1">0</col>
7680
<col id="2">0</col>
7781
<col id="3">0</col>
@@ -81,11 +85,12 @@
8185
<col id="7">0</col>
8286
<col id="8">0</col>
8387
<col id="9">0</col>
84-
<col id="10">True</col>
85-
<col id="11">False</col>
86-
<col id="12">0</col>
87-
<col id="13">black</col>
88-
<col id="14" translatable="yes">Rotation of Z</col>
88+
<col id="10">0</col>
89+
<col id="11">True</col>
90+
<col id="12">False</col>
91+
<col id="13">0</col>
92+
<col id="14">black</col>
93+
<col id="15">0</col>
8994
</row>
9095
<row>
9196
<col id="0">G92</col>
@@ -98,11 +103,12 @@
98103
<col id="7">0</col>
99104
<col id="8">0</col>
100105
<col id="9">0</col>
101-
<col id="10">True</col>
102-
<col id="11">False</col>
103-
<col id="12">0</col>
104-
<col id="13">black</col>
105-
<col id="14">G92</col>
106+
<col id="10">0</col>
107+
<col id="11">True</col>
108+
<col id="12">False</col>
109+
<col id="13">0</col>
110+
<col id="14">black</col>
111+
<col id="15">0</col>
106112
</row>
107113
<row>
108114
<col id="0">G54</col>
@@ -115,11 +121,12 @@
115121
<col id="7">0</col>
116122
<col id="8">0</col>
117123
<col id="9">0</col>
118-
<col id="10">True</col>
119-
<col id="11">False</col>
120-
<col id="12">0</col>
121-
<col id="13">black</col>
122-
<col id="14">G54</col>
124+
<col id="10">0</col>
125+
<col id="11">True</col>
126+
<col id="12">False</col>
127+
<col id="13">0</col>
128+
<col id="14">black</col>
129+
<col id="15">0</col>
123130
</row>
124131
<row>
125132
<col id="0">G55</col>
@@ -132,11 +139,12 @@
132139
<col id="7">0</col>
133140
<col id="8">0</col>
134141
<col id="9">0</col>
135-
<col id="10">True</col>
136-
<col id="11">False</col>
137-
<col id="12">0</col>
138-
<col id="13">black</col>
139-
<col id="14">G55</col>
142+
<col id="10">0</col>
143+
<col id="11">True</col>
144+
<col id="12">False</col>
145+
<col id="13">0</col>
146+
<col id="14">black</col>
147+
<col id="15">0</col>
140148
</row>
141149
<row>
142150
<col id="0">G56</col>
@@ -149,11 +157,12 @@
149157
<col id="7">0</col>
150158
<col id="8">0</col>
151159
<col id="9">0</col>
152-
<col id="10">True</col>
153-
<col id="11">False</col>
154-
<col id="12">0</col>
155-
<col id="13">black</col>
156-
<col id="14">G56</col>
160+
<col id="10">0</col>
161+
<col id="11">True</col>
162+
<col id="12">False</col>
163+
<col id="13">0</col>
164+
<col id="14">black</col>
165+
<col id="15">0</col>
157166
</row>
158167
<row>
159168
<col id="0">G57</col>
@@ -166,11 +175,12 @@
166175
<col id="7">0</col>
167176
<col id="8">0</col>
168177
<col id="9">0</col>
169-
<col id="10">True</col>
170-
<col id="11">False</col>
171-
<col id="12">0</col>
172-
<col id="13">black</col>
173-
<col id="14">G57</col>
178+
<col id="10">0</col>
179+
<col id="11">True</col>
180+
<col id="12">False</col>
181+
<col id="13">0</col>
182+
<col id="14">black</col>
183+
<col id="15">0</col>
174184
</row>
175185
<row>
176186
<col id="0">G58</col>
@@ -183,11 +193,12 @@
183193
<col id="7">0</col>
184194
<col id="8">0</col>
185195
<col id="9">0</col>
186-
<col id="10">True</col>
187-
<col id="11">False</col>
188-
<col id="12">0</col>
189-
<col id="13">black</col>
190-
<col id="14">G58</col>
196+
<col id="10">0</col>
197+
<col id="11">True</col>
198+
<col id="12">False</col>
199+
<col id="13">0</col>
200+
<col id="14">black</col>
201+
<col id="15">0</col>
191202
</row>
192203
<row>
193204
<col id="0">G59</col>
@@ -200,11 +211,12 @@
200211
<col id="7">0</col>
201212
<col id="8">0</col>
202213
<col id="9">0</col>
203-
<col id="10">True</col>
204-
<col id="11">False</col>
205-
<col id="12">0</col>
206-
<col id="13">black</col>
207-
<col id="14">G59</col>
214+
<col id="10">0</col>
215+
<col id="11">True</col>
216+
<col id="12">False</col>
217+
<col id="13">0</col>
218+
<col id="14">black</col>
219+
<col id="15">0</col>
208220
</row>
209221
<row>
210222
<col id="0">G59.1</col>
@@ -217,11 +229,12 @@
217229
<col id="7">0</col>
218230
<col id="8">0</col>
219231
<col id="9">0</col>
220-
<col id="10">True</col>
221-
<col id="11">False</col>
222-
<col id="12">0</col>
223-
<col id="13">black</col>
224-
<col id="14">G59.1</col>
232+
<col id="10">0</col>
233+
<col id="11">True</col>
234+
<col id="12">False</col>
235+
<col id="13">0</col>
236+
<col id="14">black</col>
237+
<col id="15">0</col>
225238
</row>
226239
<row>
227240
<col id="0">G59.2</col>
@@ -234,11 +247,12 @@
234247
<col id="7">0</col>
235248
<col id="8">0</col>
236249
<col id="9">0</col>
237-
<col id="10">True</col>
238-
<col id="11">False</col>
239-
<col id="12">0</col>
240-
<col id="13">black</col>
241-
<col id="14">G59.2</col>
250+
<col id="10">0</col>
251+
<col id="11">True</col>
252+
<col id="12">False</col>
253+
<col id="13">0</col>
254+
<col id="14">black</col>
255+
<col id="15">0</col>
242256
</row>
243257
<row>
244258
<col id="0">G59.3</col>
@@ -251,11 +265,12 @@
251265
<col id="7">0</col>
252266
<col id="8">0</col>
253267
<col id="9">0</col>
254-
<col id="10">True</col>
255-
<col id="11">False</col>
256-
<col id="12">0</col>
257-
<col id="13">black</col>
258-
<col id="14">G59.3</col>
268+
<col id="10">0</col>
269+
<col id="11">True</col>
270+
<col id="12">False</col>
271+
<col id="13">0</col>
272+
<col id="14">black</col>
273+
<col id="15">0</col>
259274
</row>
260275
</data>
261276
</object>
@@ -292,7 +307,7 @@
292307
<child>
293308
<object class="GtkCellRendererText" id="cell_offset"/>
294309
<attributes>
295-
<attribute name="foreground">13</attribute>
310+
<attribute name="foreground">14</attribute>
296311
<attribute name="text">0</attribute>
297312
</attributes>
298313
</child>
@@ -304,8 +319,8 @@
304319
<child>
305320
<object class="GtkCellRendererText" id="cell_X"/>
306321
<attributes>
307-
<attribute name="editable">11</attribute>
308-
<attribute name="foreground">13</attribute>
322+
<attribute name="editable">12</attribute>
323+
<attribute name="foreground">14</attribute>
309324
<attribute name="text">1</attribute>
310325
</attributes>
311326
</child>
@@ -317,8 +332,8 @@
317332
<child>
318333
<object class="GtkCellRendererText" id="cell_Y"/>
319334
<attributes>
320-
<attribute name="editable">11</attribute>
321-
<attribute name="foreground">13</attribute>
335+
<attribute name="editable">12</attribute>
336+
<attribute name="foreground">14</attribute>
322337
<attribute name="text">2</attribute>
323338
</attributes>
324339
</child>
@@ -330,8 +345,8 @@
330345
<child>
331346
<object class="GtkCellRendererText" id="cell_Z"/>
332347
<attributes>
333-
<attribute name="editable">11</attribute>
334-
<attribute name="foreground">13</attribute>
348+
<attribute name="editable">12</attribute>
349+
<attribute name="foreground">14</attribute>
335350
<attribute name="text">3</attribute>
336351
</attributes>
337352
</child>
@@ -344,8 +359,8 @@
344359
<child>
345360
<object class="GtkCellRendererText" id="cell_A"/>
346361
<attributes>
347-
<attribute name="editable">11</attribute>
348-
<attribute name="foreground">13</attribute>
362+
<attribute name="editable">12</attribute>
363+
<attribute name="foreground">14</attribute>
349364
<attribute name="text">4</attribute>
350365
</attributes>
351366
</child>
@@ -357,8 +372,8 @@
357372
<child>
358373
<object class="GtkCellRendererText" id="cell_B"/>
359374
<attributes>
360-
<attribute name="editable">11</attribute>
361-
<attribute name="foreground">13</attribute>
375+
<attribute name="editable">12</attribute>
376+
<attribute name="foreground">14</attribute>
362377
<attribute name="text">5</attribute>
363378
</attributes>
364379
</child>
@@ -370,8 +385,8 @@
370385
<child>
371386
<object class="GtkCellRendererText" id="cell_C"/>
372387
<attributes>
373-
<attribute name="editable">11</attribute>
374-
<attribute name="foreground">13</attribute>
388+
<attribute name="editable">12</attribute>
389+
<attribute name="foreground">14</attribute>
375390
<attribute name="text">6</attribute>
376391
</attributes>
377392
</child>
@@ -383,8 +398,8 @@
383398
<child>
384399
<object class="GtkCellRendererText" id="cell_U"/>
385400
<attributes>
386-
<attribute name="editable">11</attribute>
387-
<attribute name="foreground">13</attribute>
401+
<attribute name="editable">12</attribute>
402+
<attribute name="foreground">14</attribute>
388403
<attribute name="text">7</attribute>
389404
</attributes>
390405
</child>
@@ -396,8 +411,8 @@
396411
<child>
397412
<object class="GtkCellRendererText" id="cell_V"/>
398413
<attributes>
399-
<attribute name="editable">11</attribute>
400-
<attribute name="foreground">13</attribute>
414+
<attribute name="editable">12</attribute>
415+
<attribute name="foreground">14</attribute>
401416
<attribute name="text">8</attribute>
402417
</attributes>
403418
</child>
@@ -409,22 +424,35 @@
409424
<child>
410425
<object class="GtkCellRendererText" id="cell_W"/>
411426
<attributes>
412-
<attribute name="editable">11</attribute>
413-
<attribute name="foreground">13</attribute>
427+
<attribute name="editable">12</attribute>
428+
<attribute name="foreground">14</attribute>
414429
<attribute name="text">9</attribute>
415430
</attributes>
416431
</child>
417432
</object>
418433
</child>
434+
<child>
435+
<object class="GtkTreeViewColumn" id="Rot">
436+
<property name="title" translatable="yes">Rot</property>
437+
<child>
438+
<object class="GtkCellRendererText" id="cell_Rot"/>
439+
<attributes>
440+
<attribute name="editable">12</attribute>
441+
<attribute name="foreground">14</attribute>
442+
<attribute name="text">10</attribute>
443+
</attributes>
444+
</child>
445+
</object>
446+
</child>
419447
<child>
420448
<object class="GtkTreeViewColumn" id="name">
421-
<property name="title" translatable="yes">Offset Name</property>
449+
<property name="title" translatable="yes">Comment</property>
422450
<child>
423451
<object class="GtkCellRendererText" id="cell_name"/>
424452
<attributes>
425-
<attribute name="editable">11</attribute>
426-
<attribute name="foreground">13</attribute>
427-
<attribute name="text">14</attribute>
453+
<attribute name="editable">12</attribute>
454+
<attribute name="foreground">14</attribute>
455+
<attribute name="text">15</attribute>
428456
</attributes>
429457
</child>
430458
</object>

0 commit comments

Comments
 (0)