Skip to content

Commit b23add8

Browse files
committed
docinfo.ui plugin: avoid GtkVBox, GtkHBox, GtkLabel:xpad/ypad & GtkTable
1 parent c43e5ef commit b23add8

File tree

1 file changed

+14
-84
lines changed

1 file changed

+14
-84
lines changed

plugins/docinfo/docinfo.ui

Lines changed: 14 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Generated with glade 3.20.2 -->
33
<!--*- mode: xml -*-->
44
<interface>
5-
<requires lib="gtk+" version="3.0"/>
5+
<requires lib="gtk+" version="3.22"/>
66
<object class="GtkImage" id="image1">
77
<property name="visible">True</property>
88
<property name="can_focus">False</property>
@@ -71,17 +71,16 @@
7171
</packing>
7272
</child>
7373
<child>
74-
<object class="GtkVBox" id="docinfo_dialog_content">
74+
<object class="GtkBox" id="docinfo_dialog_content">
7575
<property name="visible">True</property>
7676
<property name="can_focus">False</property>
7777
<property name="border_width">5</property>
78+
<property name="orientation">vertical</property>
7879
<property name="spacing">6</property>
7980
<child>
8081
<object class="GtkLabel" id="file_name_label">
8182
<property name="visible">True</property>
8283
<property name="can_focus">False</property>
83-
<property name="xpad">0</property>
84-
<property name="ypad">0</property>
8584
<property name="label" translatable="yes">File Name</property>
8685
<property name="use_markup">True</property>
8786
<property name="xalign">0</property>
@@ -97,15 +96,13 @@
9796
</packing>
9897
</child>
9998
<child>
100-
<object class="GtkHBox" id="hbox1">
99+
<object class="GtkBox" id="hbox1">
101100
<property name="visible">True</property>
102101
<property name="can_focus">False</property>
103102
<child>
104103
<object class="GtkLabel" id="label28">
105104
<property name="visible">True</property>
106105
<property name="can_focus">False</property>
107-
<property name="xpad">0</property>
108-
<property name="ypad">0</property>
109106
<property name="label" translatable="yes"> </property>
110107
<property name="xalign">0.5</property>
111108
<property name="yalign">0.5</property>
@@ -117,200 +114,146 @@
117114
</packing>
118115
</child>
119116
<child>
120-
<object class="GtkTable" id="table1">
117+
<object class="GtkGrid" id="table1">
121118
<property name="visible">True</property>
122119
<property name="can_focus">False</property>
123120
<property name="border_width">6</property>
124-
<property name="n_rows">6</property>
125-
<property name="n_columns">2</property>
126-
<property name="column_spacing">18</property>
127121
<property name="row_spacing">6</property>
122+
<property name="column_spacing">18</property>
128123
<child>
129124
<object class="GtkLabel" id="label26">
130125
<property name="visible">True</property>
131126
<property name="can_focus">False</property>
132-
<property name="xpad">0</property>
133-
<property name="ypad">0</property>
134127
<property name="label" translatable="yes">Bytes</property>
135128
<property name="xalign">0</property>
136129
<property name="yalign">0.5</property>
137130
</object>
138131
<packing>
132+
<property name="left_attach">0</property>
139133
<property name="top_attach">5</property>
140-
<property name="bottom_attach">6</property>
141-
<property name="x_options">GTK_FILL</property>
142-
<property name="y_options"/>
143134
</packing>
144135
</child>
145136
<child>
146137
<object class="GtkLabel" id="bytes_label">
147138
<property name="visible">True</property>
148139
<property name="can_focus">False</property>
149-
<property name="xpad">0</property>
150-
<property name="ypad">0</property>
151140
<property name="label">0</property>
152141
<property name="xalign">1</property>
153142
<property name="yalign">0.5</property>
154143
</object>
155144
<packing>
156145
<property name="left_attach">1</property>
157-
<property name="right_attach">2</property>
158146
<property name="top_attach">5</property>
159-
<property name="bottom_attach">6</property>
160-
<property name="x_options">GTK_FILL</property>
161-
<property name="y_options"/>
162147
</packing>
163148
</child>
164149
<child>
165150
<object class="GtkLabel" id="label5">
166151
<property name="visible">True</property>
167152
<property name="can_focus">False</property>
168-
<property name="xpad">0</property>
169-
<property name="ypad">0</property>
170153
<property name="label" translatable="yes">Characters (no spaces)</property>
171154
<property name="xalign">0</property>
172155
<property name="yalign">0.5</property>
173156
</object>
174157
<packing>
158+
<property name="left_attach">0</property>
175159
<property name="top_attach">4</property>
176-
<property name="bottom_attach">5</property>
177-
<property name="x_options">GTK_FILL</property>
178-
<property name="y_options"/>
179160
</packing>
180161
</child>
181162
<child>
182163
<object class="GtkLabel" id="chars_ns_label">
183164
<property name="visible">True</property>
184165
<property name="can_focus">False</property>
185-
<property name="xpad">0</property>
186-
<property name="ypad">0</property>
187166
<property name="label">0</property>
188167
<property name="xalign">1</property>
189168
<property name="yalign">0.5</property>
190169
</object>
191170
<packing>
192171
<property name="left_attach">1</property>
193-
<property name="right_attach">2</property>
194172
<property name="top_attach">4</property>
195-
<property name="bottom_attach">5</property>
196-
<property name="x_options">GTK_FILL</property>
197-
<property name="y_options"/>
198173
</packing>
199174
</child>
200175
<child>
201176
<object class="GtkLabel" id="label4">
202177
<property name="visible">True</property>
203178
<property name="can_focus">False</property>
204-
<property name="xpad">0</property>
205-
<property name="ypad">0</property>
206179
<property name="label" translatable="yes">Characters (with spaces)</property>
207180
<property name="xalign">0</property>
208181
<property name="yalign">0.5</property>
209182
</object>
210183
<packing>
184+
<property name="left_attach">0</property>
211185
<property name="top_attach">3</property>
212-
<property name="bottom_attach">4</property>
213-
<property name="x_options">GTK_FILL</property>
214-
<property name="y_options"/>
215186
</packing>
216187
</child>
217188
<child>
218189
<object class="GtkLabel" id="chars_label">
219190
<property name="visible">True</property>
220191
<property name="can_focus">False</property>
221-
<property name="xpad">0</property>
222-
<property name="ypad">0</property>
223192
<property name="label">0</property>
224193
<property name="xalign">1</property>
225194
<property name="yalign">0.5</property>
226195
</object>
227196
<packing>
228197
<property name="left_attach">1</property>
229-
<property name="right_attach">2</property>
230198
<property name="top_attach">3</property>
231-
<property name="bottom_attach">4</property>
232-
<property name="x_options">GTK_FILL</property>
233-
<property name="y_options"/>
234199
</packing>
235200
</child>
236201
<child>
237202
<object class="GtkLabel" id="words_label">
238203
<property name="visible">True</property>
239204
<property name="can_focus">False</property>
240-
<property name="xpad">0</property>
241-
<property name="ypad">0</property>
242205
<property name="label">0</property>
243206
<property name="xalign">1</property>
244207
<property name="yalign">0.5</property>
245208
</object>
246209
<packing>
247210
<property name="left_attach">1</property>
248-
<property name="right_attach">2</property>
249211
<property name="top_attach">2</property>
250-
<property name="bottom_attach">3</property>
251-
<property name="x_options">GTK_FILL</property>
252-
<property name="y_options"/>
253212
</packing>
254213
</child>
255214
<child>
256215
<object class="GtkLabel" id="label2">
257216
<property name="visible">True</property>
258217
<property name="can_focus">False</property>
259-
<property name="xpad">0</property>
260-
<property name="ypad">0</property>
261218
<property name="label" translatable="yes">Words</property>
262219
<property name="xalign">0</property>
263220
<property name="yalign">0.5</property>
264221
</object>
265222
<packing>
223+
<property name="left_attach">0</property>
266224
<property name="top_attach">2</property>
267-
<property name="bottom_attach">3</property>
268-
<property name="x_options">GTK_FILL</property>
269-
<property name="y_options"/>
270225
</packing>
271226
</child>
272227
<child>
273228
<object class="GtkLabel" id="label6">
274229
<property name="visible">True</property>
275230
<property name="can_focus">False</property>
276-
<property name="xpad">0</property>
277-
<property name="ypad">0</property>
278231
<property name="label" translatable="yes">Lines</property>
279232
<property name="xalign">0</property>
280233
<property name="yalign">0.5</property>
281234
</object>
282235
<packing>
236+
<property name="left_attach">0</property>
283237
<property name="top_attach">1</property>
284-
<property name="bottom_attach">2</property>
285-
<property name="x_options">GTK_FILL</property>
286-
<property name="y_options"/>
287238
</packing>
288239
</child>
289240
<child>
290241
<object class="GtkLabel" id="lines_label">
291242
<property name="visible">True</property>
292243
<property name="can_focus">False</property>
293-
<property name="xpad">0</property>
294-
<property name="ypad">0</property>
295244
<property name="label">0</property>
296245
<property name="xalign">1</property>
297246
<property name="yalign">0.5</property>
298247
</object>
299248
<packing>
300249
<property name="left_attach">1</property>
301-
<property name="right_attach">2</property>
302250
<property name="top_attach">1</property>
303-
<property name="bottom_attach">2</property>
304-
<property name="x_options">GTK_FILL</property>
305-
<property name="y_options"/>
306251
</packing>
307252
</child>
308253
<child>
309254
<object class="GtkLabel" id="label30">
310255
<property name="visible">True</property>
311256
<property name="can_focus">False</property>
312-
<property name="xpad">0</property>
313-
<property name="ypad">0</property>
314257
<property name="label" translatable="yes">Document</property>
315258
<property name="use_markup">True</property>
316259
<property name="use_underline">True</property>
@@ -320,9 +263,7 @@
320263
</object>
321264
<packing>
322265
<property name="left_attach">1</property>
323-
<property name="right_attach">2</property>
324-
<property name="x_options">GTK_FILL</property>
325-
<property name="y_options"/>
266+
<property name="top_attach">0</property>
326267
</packing>
327268
</child>
328269
<child>
@@ -336,17 +277,16 @@
336277
</packing>
337278
</child>
338279
<child>
339-
<object class="GtkVBox" id="selection_vbox">
280+
<object class="GtkBox" id="selection_vbox">
340281
<property name="visible">True</property>
341282
<property name="can_focus">False</property>
342283
<property name="border_width">6</property>
284+
<property name="orientation">vertical</property>
343285
<property name="spacing">6</property>
344286
<child>
345287
<object class="GtkLabel" id="selection_label">
346288
<property name="visible">True</property>
347289
<property name="can_focus">False</property>
348-
<property name="xpad">0</property>
349-
<property name="ypad">0</property>
350290
<property name="label" translatable="yes">Selection</property>
351291
<property name="xalign">0</property>
352292
<property name="yalign">0.5</property>
@@ -361,8 +301,6 @@
361301
<object class="GtkLabel" id="selected_lines_label">
362302
<property name="visible">True</property>
363303
<property name="can_focus">False</property>
364-
<property name="xpad">0</property>
365-
<property name="ypad">0</property>
366304
<property name="label">0</property>
367305
<property name="xalign">1</property>
368306
<property name="yalign">0.5</property>
@@ -377,8 +315,6 @@
377315
<object class="GtkLabel" id="selected_words_label">
378316
<property name="visible">True</property>
379317
<property name="can_focus">False</property>
380-
<property name="xpad">0</property>
381-
<property name="ypad">0</property>
382318
<property name="label">0</property>
383319
<property name="xalign">1</property>
384320
<property name="yalign">0.5</property>
@@ -393,8 +329,6 @@
393329
<object class="GtkLabel" id="selected_chars_label">
394330
<property name="visible">True</property>
395331
<property name="can_focus">False</property>
396-
<property name="xpad">0</property>
397-
<property name="ypad">0</property>
398332
<property name="label">0</property>
399333
<property name="xalign">1</property>
400334
<property name="yalign">0.5</property>
@@ -409,8 +343,6 @@
409343
<object class="GtkLabel" id="selected_chars_ns_label">
410344
<property name="visible">True</property>
411345
<property name="can_focus">False</property>
412-
<property name="xpad">0</property>
413-
<property name="ypad">0</property>
414346
<property name="label">0</property>
415347
<property name="xalign">1</property>
416348
<property name="yalign">0.5</property>
@@ -425,8 +357,6 @@
425357
<object class="GtkLabel" id="selected_bytes_label">
426358
<property name="visible">True</property>
427359
<property name="can_focus">False</property>
428-
<property name="xpad">0</property>
429-
<property name="ypad">0</property>
430360
<property name="label">0</property>
431361
<property name="xalign">1</property>
432362
<property name="yalign">0.5</property>

0 commit comments

Comments
 (0)