| blob | 2b689f281138fb775cedca903e8bcb025347e08b |
1 --- galeon-2.0.7.orig/src/galeon-prefs-dialog.c 2008-07-04 18:30:50.000000000 +0200
2 +++ galeon-2.0.7/src/galeon-prefs-dialog.c 2008-10-07 00:42:30.000000000 +0200
3 @@ -95,6 +95,8 @@
5 gboolean fonts_ignore_updates;
6 char *fonts_encoding;
7 + GtkWidget *fonts_default_serif;
8 + GtkWidget *fonts_default_sans;
9 GtkWidget *fonts_serif;
10 GtkWidget *fonts_sans;
11 GtkWidget *fonts_cursive;
12 @@ -784,6 +786,23 @@
13 }
15 static void
16 +fonts_load_default (GaleonPrefsDialog *self)
17 +{
18 + GaleonPrefsDialogPrivate *p = self->priv;
19 + char gconf_key[256];
20 + const gchar* value;
21 +
22 + fonts_make_gconf_key (gconf_key, sizeof(gconf_key),
23 + "default", p->fonts_encoding);
24 + value = eel_gconf_get_string (gconf_key);
25 + if (value && strcmp(value, "sans-serif") == 0) {
26 + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p->fonts_default_sans), TRUE);
27 + } else {
28 + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(p->fonts_default_serif), TRUE);
29 + }
30 +}
31 +
32 +static void
33 fonts_update_widgets (GaleonPrefsDialog *self)
34 {
35 GaleonPrefsDialogPrivate *p = self->priv;
36 @@ -793,6 +812,8 @@
38 p->fonts_ignore_updates = TRUE;
40 + fonts_load_default (self);
41 +
42 fonts_load_font (self, "serif", p->fonts_serif);
43 fonts_load_font (self, "sans-serif", p->fonts_sans);
44 fonts_load_font (self, "cursive", p->fonts_cursive);
45 @@ -865,6 +886,43 @@
46 }
48 static void
49 +on_fonts_radio_changed(GtkRadioButton *button, GaleonPrefsDialog *self)
50 +{
51 + GaleonPrefsDialogPrivate *p = self->priv;
52 + gboolean active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
53 + const char* value;
54 + char gconf_key[256];
55 +
56 + if (p->fonts_ignore_updates) return;
57 +
58 + if (active) {
59 + const gchar* name = gtk_widget_get_name(GTK_WIDGET(button));
60 + if (strcmp(name, "fonts_proportional_sans") == 0)
61 + value = "sans-serif";
62 + else
63 + value = "serif";
64 +
65 + fonts_make_gconf_key(gconf_key, sizeof(gconf_key),
66 + "default", p->fonts_encoding);
67 + eel_gconf_set_string(gconf_key, value);
68 + }
69 +}
70 +
71 +static void
72 +fonts_connect_radio (GaleonPrefsDialog *self, GladeXML *gxml,
73 + const char* widget_name, GtkWidget **widget)
74 +{
75 + g_return_if_fail(GLADE_IS_XML(gxml));
76 + g_return_if_fail(widget_name != NULL);
77 +
78 + *widget = glade_xml_get_widget(gxml, widget_name);
79 + g_return_if_fail(GTK_IS_RADIO_BUTTON(*widget));
80 +
81 + g_signal_connect(G_OBJECT(*widget), "clicked",
82 + G_CALLBACK(on_fonts_radio_changed), self);
83 +}
84 +
85 +static void
86 fonts_connect_combo (GaleonPrefsDialog *self, GladeXML *gxml,
87 const char *type,
88 const char *widget_name, GtkWidget **widget)
89 @@ -1000,10 +1058,15 @@
90 "fonts_encoding_label",
91 NULL);
93 - gul_glade_gconf_connect_radio (gxml, CONF_RENDERING_DEFAULT_FONT,
94 - "fonts_proportional_serif", "0",
95 - "fonts_proportional_sans", "1",
96 - NULL);
97 + // gul_glade_gconf_connect_radio (gxml, CONF_RENDERING_DEFAULT_FONT,
98 + // "fonts_proportional_serif", "0",
99 + // "fonts_proportional_sans", "1",
100 + // NULL);
101 +
102 + fonts_connect_radio (self, gxml, "fonts_proportional_serif",
103 + &p->fonts_default_serif);
104 + fonts_connect_radio (self, gxml, "fonts_proportional_sans",
105 + &p->fonts_default_sans);
107 fonts_connect_combo (self, gxml, "serif", "fonts_serif",
108 &p->fonts_serif);
109 --- galeon-2.0.7.orig/mozilla/mozilla-notifiers.cpp 2008-07-18 06:41:08.000000000 +0200
110 +++ galeon-2.0.7/mozilla/mozilla-notifiers.cpp 2008-10-07 01:08:44.000000000 +0200
111 @@ -409,7 +409,16 @@
112 key,
113 (GConfClientNotifyFunc)generic_mozilla_int_notifier,
114 info);
115 - font_infos = g_list_append (font_infos, info);
116 + font_infos = g_list_append (font_infos, info);
117 +
118 + /* default font notifier */
119 + sprintf (key, "%s_default_%s", CONF_RENDERING_FONT, language);
120 + info = g_strconcat ("font.default", ".", language, NULL);
121 + add_notification_and_notify (client,
122 + key,
123 + (GConfClientNotifyFunc)generic_mozilla_string_notifier,
124 + info);
125 + font_infos = g_list_append (font_infos, info);
126 }
127 }
129 --- galeon-2.0.7.orig/ui/prefs-dialog.glade 2008-07-04 18:30:59.000000000 +0200
130 +++ galeon-2.0.7/ui/prefs-dialog.glade 2008-10-07 00:59:21.000000000 +0200
131 @@ -1006,96 +1091,6 @@
132 <property name="spacing">6</property>
134 <child>
135 - <widget class="GtkHBox" id="hbox54">
136 - <property name="visible">True</property>
137 - <property name="homogeneous">False</property>
138 - <property name="spacing">6</property>
139 -
140 - <child>
141 - <widget class="GtkLabel" id="fonts_proportional_label">
142 - <property name="visible">True</property>
143 - <property name="label" translatable="yes">Default:</property>
144 - <property name="use_underline">False</property>
145 - <property name="use_markup">False</property>
146 - <property name="justify">GTK_JUSTIFY_LEFT</property>
147 - <property name="wrap">False</property>
148 - <property name="selectable">False</property>
149 - <property name="xalign">0</property>
150 - <property name="yalign">0.5</property>
151 - <property name="xpad">0</property>
152 - <property name="ypad">0</property>
153 - </widget>
154 - <packing>
155 - <property name="padding">0</property>
156 - <property name="expand">False</property>
157 - <property name="fill">False</property>
158 - </packing>
159 - </child>
160 -
161 - <child>
162 - <widget class="GtkHBox" id="hbox11">
163 - <property name="visible">True</property>
164 - <property name="homogeneous">False</property>
165 - <property name="spacing">12</property>
166 -
167 - <child>
168 - <widget class="GtkRadioButton" id="fonts_proportional_serif">
169 - <property name="visible">True</property>
170 - <property name="can_focus">True</property>
171 - <property name="label" translatable="yes">_Serif</property>
172 - <property name="use_underline">True</property>
173 - <property name="relief">GTK_RELIEF_NORMAL</property>
174 - <property name="focus_on_click">True</property>
175 - <property name="active">False</property>
176 - <property name="inconsistent">False</property>
177 - <property name="draw_indicator">True</property>
178 - </widget>
179 - <packing>
180 - <property name="padding">0</property>
181 - <property name="expand">False</property>
182 - <property name="fill">False</property>
183 - </packing>
184 - </child>
185 -
186 - <child>
187 - <widget class="GtkRadioButton" id="fonts_proportional_sans">
188 - <property name="visible">True</property>
189 - <property name="can_focus">True</property>
190 - <property name="label" translatable="yes">S_ans serif</property>
191 - <property name="use_underline">True</property>
192 - <property name="relief">GTK_RELIEF_NORMAL</property>
193 - <property name="focus_on_click">True</property>
194 - <property name="active">False</property>
195 - <property name="inconsistent">False</property>
196 - <property name="draw_indicator">True</property>
197 - <property name="group">fonts_proportional_serif</property>
198 - </widget>
199 - <packing>
200 - <property name="padding">0</property>
201 - <property name="expand">False</property>
202 - <property name="fill">False</property>
203 - </packing>
204 - </child>
205 - </widget>
206 - <packing>
207 - <property name="padding">0</property>
208 - <property name="expand">True</property>
209 - <property name="fill">True</property>
210 - </packing>
211 - </child>
212 - </widget>
213 - <packing>
214 - <property name="padding">0</property>
215 - <property name="expand">True</property>
216 - <property name="fill">True</property>
217 - </packing>
218 - </child>
219 -
220 - <child>
221 - <placeholder/>
222 - </child>
223 -
224 - <child>
225 <widget class="GtkHBox" id="hbox55">
226 <property name="visible">True</property>
227 <property name="homogeneous">False</property>
228 @@ -1171,250 +1176,493 @@
229 </child>
231 <child>
232 - <widget class="GtkTable" id="table5">
233 + <widget class="GtkVBox" id="vbox58">
234 <property name="visible">True</property>
235 - <property name="n_rows">8</property>
236 - <property name="n_columns">5</property>
237 <property name="homogeneous">False</property>
238 - <property name="row_spacing">6</property>
239 - <property name="column_spacing">6</property>
240 + <property name="spacing">0</property>
242 <child>
243 - <widget class="GtkLabel" id="label19">
244 + <widget class="GtkHBox" id="hbox54">
245 <property name="visible">True</property>
246 - <property name="label" translatable="yes">Se_rif:</property>
247 - <property name="use_underline">True</property>
248 - <property name="use_markup">False</property>
249 - <property name="justify">GTK_JUSTIFY_LEFT</property>
250 - <property name="wrap">False</property>
251 - <property name="selectable">False</property>
252 - <property name="xalign">0</property>
253 - <property name="yalign">0.5</property>
254 - <property name="xpad">0</property>
255 - <property name="ypad">0</property>
256 - <property name="mnemonic_widget">fonts_serif</property>
257 - </widget>
258 - <packing>
259 - <property name="left_attach">0</property>
260 - <property name="right_attach">1</property>
261 - <property name="top_attach">0</property>
262 - <property name="bottom_attach">1</property>
263 - <property name="x_options">fill</property>
264 - <property name="y_options"></property>
265 - </packing>
266 - </child>
267 + <property name="homogeneous">False</property>
268 + <property name="spacing">6</property>
270 - <child>
271 - <widget class="GtkLabel" id="label20">
272 - <property name="visible">True</property>
273 - <property name="label" translatable="yes">Sa_ns serif:</property>
274 - <property name="use_underline">True</property>
275 - <property name="use_markup">False</property>
276 - <property name="justify">GTK_JUSTIFY_LEFT</property>
277 - <property name="wrap">False</property>
278 - <property name="selectable">False</property>
279 - <property name="xalign">0</property>
280 - <property name="yalign">0.5</property>
281 - <property name="xpad">0</property>
282 - <property name="ypad">0</property>
283 - <property name="mnemonic_widget">fonts_sans</property>
284 - </widget>
285 - <packing>
286 - <property name="left_attach">0</property>
287 - <property name="right_attach">1</property>
288 - <property name="top_attach">1</property>
289 - <property name="bottom_attach">2</property>
290 - <property name="x_options">fill</property>
291 - <property name="y_options"></property>
292 - </packing>
293 - </child>
294 + <child>
295 + <widget class="GtkLabel" id="fonts_proportional_label">
296 + <property name="visible">True</property>
297 + <property name="label" translatable="yes">Default:</property>
298 + <property name="use_underline">False</property>
299 + <property name="use_markup">False</property>
300 + <property name="justify">GTK_JUSTIFY_LEFT</property>
301 + <property name="wrap">False</property>
302 + <property name="selectable">False</property>
303 + <property name="xalign">0</property>
304 + <property name="yalign">0.5</property>
305 + <property name="xpad">0</property>
306 + <property name="ypad">0</property>
307 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
308 + <property name="width_chars">-1</property>
309 + <property name="single_line_mode">False</property>
310 + <property name="angle">0</property>
311 + </widget>
312 + <packing>
313 + <property name="padding">0</property>
314 + <property name="expand">False</property>
315 + <property name="fill">False</property>
316 + </packing>
317 + </child>
319 - <child>
320 - <widget class="GtkLabel" id="label21">
321 - <property name="visible">True</property>
322 - <property name="label" translatable="yes">_Monospace:</property>
323 - <property name="use_underline">True</property>
324 - <property name="use_markup">False</property>
325 - <property name="justify">GTK_JUSTIFY_LEFT</property>
326 - <property name="wrap">False</property>
327 - <property name="selectable">False</property>
328 - <property name="xalign">0</property>
329 - <property name="yalign">0.5</property>
330 - <property name="xpad">0</property>
331 - <property name="ypad">0</property>
332 - <property name="mnemonic_widget">fonts_monospace</property>
333 - </widget>
334 - <packing>
335 - <property name="left_attach">0</property>
336 - <property name="right_attach">1</property>
337 - <property name="top_attach">5</property>
338 - <property name="bottom_attach">6</property>
339 - <property name="x_options">fill</property>
340 - <property name="y_options"></property>
341 - </packing>
342 - </child>
343 + <child>
344 + <widget class="GtkHBox" id="hbox11">
345 + <property name="visible">True</property>
346 + <property name="homogeneous">False</property>
347 + <property name="spacing">12</property>
349 - <child>
350 - <widget class="GtkLabel" id="label25">
351 - <property name="visible">True</property>
352 - <property name="label" translatable="yes">Cursi_ve:</property>
353 - <property name="use_underline">True</property>
354 - <property name="use_markup">False</property>
355 - <property name="justify">GTK_JUSTIFY_LEFT</property>
356 - <property name="wrap">False</property>
357 - <property name="selectable">False</property>
358 - <property name="xalign">0</property>
359 - <property name="yalign">0.5</property>
360 - <property name="xpad">0</property>
361 - <property name="ypad">0</property>
362 - <property name="mnemonic_widget">fonts_cursive</property>
363 - </widget>
364 - <packing>
365 - <property name="left_attach">0</property>
366 - <property name="right_attach">1</property>
367 - <property name="top_attach">2</property>
368 - <property name="bottom_attach">3</property>
369 - <property name="x_options">fill</property>
370 - <property name="y_options"></property>
371 - </packing>
372 - </child>
373 + <child>
374 + <widget class="GtkRadioButton" id="fonts_proportional_serif">
375 + <property name="visible">True</property>
376 + <property name="can_focus">True</property>
377 + <property name="label" translatable="yes">_Serif</property>
378 + <property name="use_underline">True</property>
379 + <property name="relief">GTK_RELIEF_NORMAL</property>
380 + <property name="focus_on_click">True</property>
381 + <property name="active">False</property>
382 + <property name="inconsistent">False</property>
383 + <property name="draw_indicator">True</property>
384 + </widget>
385 + <packing>
386 + <property name="padding">0</property>
387 + <property name="expand">False</property>
388 + <property name="fill">False</property>
389 + </packing>
390 + </child>
392 - <child>
393 - <widget class="GtkLabel" id="label26">
394 - <property name="visible">True</property>
395 - <property name="label" translatable="yes">_Fantasy:</property>
396 - <property name="use_underline">True</property>
397 - <property name="use_markup">False</property>
398 - <property name="justify">GTK_JUSTIFY_LEFT</property>
399 - <property name="wrap">False</property>
400 - <property name="selectable">False</property>
401 - <property name="xalign">0</property>
402 - <property name="yalign">0.5</property>
403 - <property name="xpad">0</property>
404 - <property name="ypad">0</property>
405 - <property name="mnemonic_widget">fonts_fantasy</property>
406 + <child>
407 + <widget class="GtkRadioButton" id="fonts_proportional_sans">
408 + <property name="visible">True</property>
409 + <property name="can_focus">True</property>
410 + <property name="label" translatable="yes">S_ans serif</property>
411 + <property name="use_underline">True</property>
412 + <property name="relief">GTK_RELIEF_NORMAL</property>
413 + <property name="focus_on_click">True</property>
414 + <property name="active">False</property>
415 + <property name="inconsistent">False</property>
416 + <property name="draw_indicator">True</property>
417 + <property name="group">fonts_proportional_serif</property>
418 + </widget>
419 + <packing>
420 + <property name="padding">0</property>
421 + <property name="expand">False</property>
422 + <property name="fill">False</property>
423 + </packing>
424 + </child>
425 + </widget>
426 + <packing>
427 + <property name="padding">0</property>
428 + <property name="expand">True</property>
429 + <property name="fill">True</property>
430 + </packing>
431 + </child>
432 </widget>
433 <packing>
434 - <property name="left_attach">0</property>
435 - <property name="right_attach">1</property>
436 - <property name="top_attach">3</property>
437 - <property name="bottom_attach">4</property>
438 - <property name="x_options">fill</property>
439 - <property name="y_options"></property>
440 + <property name="padding">0</property>
441 + <property name="expand">True</property>
442 + <property name="fill">True</property>
443 </packing>
444 </child>
446 <child>
447 - <widget class="GtkHBox" id="hbox9">
448 + <widget class="GtkTable" id="table5">
449 <property name="visible">True</property>
450 + <property name="n_rows">8</property>
451 + <property name="n_columns">5</property>
452 <property name="homogeneous">False</property>
453 - <property name="spacing">6</property>
454 + <property name="row_spacing">6</property>
455 + <property name="column_spacing">6</property>
456 +
457 + <child>
458 + <widget class="GtkLabel" id="label19">
459 + <property name="visible">True</property>
460 + <property name="label" translatable="yes">Se_rif:</property>
461 + <property name="use_underline">True</property>
462 + <property name="use_markup">False</property>
463 + <property name="justify">GTK_JUSTIFY_LEFT</property>
464 + <property name="wrap">False</property>
465 + <property name="selectable">False</property>
466 + <property name="xalign">0</property>
467 + <property name="yalign">0.5</property>
468 + <property name="xpad">0</property>
469 + <property name="ypad">0</property>
470 + <property name="mnemonic_widget">fonts_serif</property>
471 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
472 + <property name="width_chars">-1</property>
473 + <property name="single_line_mode">False</property>
474 + <property name="angle">0</property>
475 + </widget>
476 + <packing>
477 + <property name="left_attach">0</property>
478 + <property name="right_attach">1</property>
479 + <property name="top_attach">0</property>
480 + <property name="bottom_attach">1</property>
481 + <property name="x_options">fill</property>
482 + <property name="y_options"></property>
483 + </packing>
484 + </child>
485 +
486 + <child>
487 + <widget class="GtkLabel" id="label20">
488 + <property name="visible">True</property>
489 + <property name="label" translatable="yes">Sa_ns serif:</property>
490 + <property name="use_underline">True</property>
491 + <property name="use_markup">False</property>
492 + <property name="justify">GTK_JUSTIFY_LEFT</property>
493 + <property name="wrap">False</property>
494 + <property name="selectable">False</property>
495 + <property name="xalign">0</property>
496 + <property name="yalign">0.5</property>
497 + <property name="xpad">0</property>
498 + <property name="ypad">0</property>
499 + <property name="mnemonic_widget">fonts_sans</property>
500 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
501 + <property name="width_chars">-1</property>
502 + <property name="single_line_mode">False</property>
503 + <property name="angle">0</property>
504 + </widget>
505 + <packing>
506 + <property name="left_attach">0</property>
507 + <property name="right_attach">1</property>
508 + <property name="top_attach">1</property>
509 + <property name="bottom_attach">2</property>
510 + <property name="x_options">fill</property>
511 + <property name="y_options"></property>
512 + </packing>
513 + </child>
514 +
515 + <child>
516 + <widget class="GtkLabel" id="label21">
517 + <property name="visible">True</property>
518 + <property name="label" translatable="yes">_Monospace:</property>
519 + <property name="use_underline">True</property>
520 + <property name="use_markup">False</property>
521 + <property name="justify">GTK_JUSTIFY_LEFT</property>
522 + <property name="wrap">False</property>
523 + <property name="selectable">False</property>
524 + <property name="xalign">0</property>
525 + <property name="yalign">0.5</property>
526 + <property name="xpad">0</property>
527 + <property name="ypad">0</property>
528 + <property name="mnemonic_widget">fonts_monospace</property>
529 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
530 + <property name="width_chars">-1</property>
531 + <property name="single_line_mode">False</property>
532 + <property name="angle">0</property>
533 + </widget>
534 + <packing>
535 + <property name="left_attach">0</property>
536 + <property name="right_attach">1</property>
537 + <property name="top_attach">5</property>
538 + <property name="bottom_attach">6</property>
539 + <property name="x_options">fill</property>
540 + <property name="y_options"></property>
541 + </packing>
542 + </child>
543 +
544 + <child>
545 + <widget class="GtkLabel" id="label25">
546 + <property name="visible">True</property>
547 + <property name="label" translatable="yes">Cursi_ve:</property>
548 + <property name="use_underline">True</property>
549 + <property name="use_markup">False</property>
550 + <property name="justify">GTK_JUSTIFY_LEFT</property>
551 + <property name="wrap">False</property>
552 + <property name="selectable">False</property>
553 + <property name="xalign">0</property>
554 + <property name="yalign">0.5</property>
555 + <property name="xpad">0</property>
556 + <property name="ypad">0</property>
557 + <property name="mnemonic_widget">fonts_cursive</property>
558 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
559 + <property name="width_chars">-1</property>
560 + <property name="single_line_mode">False</property>
561 + <property name="angle">0</property>
562 + </widget>
563 + <packing>
564 + <property name="left_attach">0</property>
565 + <property name="right_attach">1</property>
566 + <property name="top_attach">2</property>
567 + <property name="bottom_attach">3</property>
568 + <property name="x_options">fill</property>
569 + <property name="y_options"></property>
570 + </packing>
571 + </child>
572 +
573 + <child>
574 + <widget class="GtkLabel" id="label26">
575 + <property name="visible">True</property>
576 + <property name="label" translatable="yes">_Fantasy:</property>
577 + <property name="use_underline">True</property>
578 + <property name="use_markup">False</property>
579 + <property name="justify">GTK_JUSTIFY_LEFT</property>
580 + <property name="wrap">False</property>
581 + <property name="selectable">False</property>
582 + <property name="xalign">0</property>
583 + <property name="yalign">0.5</property>
584 + <property name="xpad">0</property>
585 + <property name="ypad">0</property>
586 + <property name="mnemonic_widget">fonts_fantasy</property>
587 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
588 + <property name="width_chars">-1</property>
589 + <property name="single_line_mode">False</property>
590 + <property name="angle">0</property>
591 + </widget>
592 + <packing>
593 + <property name="left_attach">0</property>
594 + <property name="right_attach">1</property>
595 + <property name="top_attach">3</property>
596 + <property name="bottom_attach">4</property>
597 + <property name="x_options">fill</property>
598 + <property name="y_options"></property>
599 + </packing>
600 + </child>
601 +
602 + <child>
603 + <widget class="GtkHBox" id="hbox9">
604 + <property name="visible">True</property>
605 + <property name="homogeneous">False</property>
606 + <property name="spacing">6</property>
607 +
608 + <child>
609 + <widget class="GtkSpinButton" id="fonts_monospace_size">
610 + <property name="visible">True</property>
611 + <property name="can_focus">True</property>
612 + <property name="climb_rate">1</property>
613 + <property name="digits">0</property>
614 + <property name="numeric">False</property>
615 + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
616 + <property name="snap_to_ticks">False</property>
617 + <property name="wrap">False</property>
618 + <property name="adjustment">16 8 72 1 10 10</property>
619 + </widget>
620 + <packing>
621 + <property name="padding">0</property>
622 + <property name="expand">True</property>
623 + <property name="fill">True</property>
624 + </packing>
625 + </child>
626 +
627 + <child>
628 + <widget class="GtkLabel" id="label32">
629 + <property name="visible">True</property>
630 + <property name="label" translatable="yes">points</property>
631 + <property name="use_underline">False</property>
632 + <property name="use_markup">False</property>
633 + <property name="justify">GTK_JUSTIFY_LEFT</property>
634 + <property name="wrap">False</property>
635 + <property name="selectable">False</property>
636 + <property name="xalign">0.5</property>
637 + <property name="yalign">0.5</property>
638 + <property name="xpad">0</property>
639 + <property name="ypad">0</property>
640 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
641 + <property name="width_chars">-1</property>
642 + <property name="single_line_mode">False</property>
643 + <property name="angle">0</property>
644 + </widget>
645 + <packing>
646 + <property name="padding">0</property>
647 + <property name="expand">False</property>
648 + <property name="fill">False</property>
649 + </packing>
650 + </child>
651 + </widget>
652 + <packing>
653 + <property name="left_attach">4</property>
654 + <property name="right_attach">5</property>
655 + <property name="top_attach">5</property>
656 + <property name="bottom_attach">6</property>
657 + <property name="x_options">fill</property>
658 + <property name="y_options">fill</property>
659 + </packing>
660 + </child>
661 +
662 + <child>
663 + <widget class="GtkLabel" id="label31">
664 + <property name="visible">True</property>
665 + <property name="label" translatable="yes">Si_ze:</property>
666 + <property name="use_underline">True</property>
667 + <property name="use_markup">False</property>
668 + <property name="justify">GTK_JUSTIFY_LEFT</property>
669 + <property name="wrap">False</property>
670 + <property name="selectable">False</property>
671 + <property name="xalign">0.5</property>
672 + <property name="yalign">0.5</property>
673 + <property name="xpad">0</property>
674 + <property name="ypad">0</property>
675 + <property name="mnemonic_widget">notebook</property>
676 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
677 + <property name="width_chars">-1</property>
678 + <property name="single_line_mode">False</property>
679 + <property name="angle">0</property>
680 + </widget>
681 + <packing>
682 + <property name="left_attach">3</property>
683 + <property name="right_attach">4</property>
684 + <property name="top_attach">5</property>
685 + <property name="bottom_attach">6</property>
686 + <property name="x_options">fill</property>
687 + <property name="y_options"></property>
688 + </packing>
689 + </child>
690 +
691 + <child>
692 + <widget class="GtkHBox" id="hbox14">
693 + <property name="visible">True</property>
694 + <property name="homogeneous">False</property>
695 + <property name="spacing">6</property>
696 +
697 + <child>
698 + <widget class="GtkSpinButton" id="fonts_minimum_size">
699 + <property name="visible">True</property>
700 + <property name="can_focus">True</property>
701 + <property name="climb_rate">1</property>
702 + <property name="digits">0</property>
703 + <property name="numeric">False</property>
704 + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
705 + <property name="snap_to_ticks">False</property>
706 + <property name="wrap">False</property>
707 + <property name="adjustment">16 4 48 1 10 10</property>
708 + </widget>
709 + <packing>
710 + <property name="padding">0</property>
711 + <property name="expand">True</property>
712 + <property name="fill">True</property>
713 + </packing>
714 + </child>
715 +
716 + <child>
717 + <widget class="GtkLabel" id="label39">
718 + <property name="visible">True</property>
719 + <property name="label" translatable="yes">points</property>
720 + <property name="use_underline">False</property>
721 + <property name="use_markup">False</property>
722 + <property name="justify">GTK_JUSTIFY_LEFT</property>
723 + <property name="wrap">False</property>
724 + <property name="selectable">False</property>
725 + <property name="xalign">0.5</property>
726 + <property name="yalign">0.5</property>
727 + <property name="xpad">0</property>
728 + <property name="ypad">0</property>
729 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
730 + <property name="width_chars">-1</property>
731 + <property name="single_line_mode">False</property>
732 + <property name="angle">0</property>
733 + </widget>
734 + <packing>
735 + <property name="padding">0</property>
736 + <property name="expand">False</property>
737 + <property name="fill">False</property>
738 + </packing>
739 + </child>
740 + </widget>
741 + <packing>
742 + <property name="left_attach">4</property>
743 + <property name="right_attach">5</property>
744 + <property name="top_attach">7</property>
745 + <property name="bottom_attach">8</property>
746 + <property name="x_options">fill</property>
747 + </packing>
748 + </child>
750 <child>
751 - <widget class="GtkSpinButton" id="fonts_monospace_size">
752 + <widget class="GtkLabel" id="label41">
753 <property name="visible">True</property>
754 - <property name="can_focus">True</property>
755 - <property name="climb_rate">1</property>
756 - <property name="digits">0</property>
757 - <property name="numeric">False</property>
758 - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
759 - <property name="snap_to_ticks">False</property>
760 + <property name="label" translatable="yes"></property>
761 + <property name="use_underline">False</property>
762 + <property name="use_markup">False</property>
763 + <property name="justify">GTK_JUSTIFY_LEFT</property>
764 <property name="wrap">False</property>
765 - <property name="adjustment">16 8 72 1 10 10</property>
766 + <property name="selectable">False</property>
767 + <property name="xalign">0</property>
768 + <property name="yalign">0.5</property>
769 + <property name="xpad">0</property>
770 + <property name="ypad">0</property>
771 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
772 + <property name="width_chars">-1</property>
773 + <property name="single_line_mode">False</property>
774 + <property name="angle">0</property>
775 </widget>
776 <packing>
777 - <property name="padding">0</property>
778 - <property name="expand">True</property>
779 - <property name="fill">True</property>
780 + <property name="left_attach">0</property>
781 + <property name="right_attach">2</property>
782 + <property name="top_attach">4</property>
783 + <property name="bottom_attach">5</property>
784 + <property name="x_options">fill</property>
785 + <property name="y_options"></property>
786 </packing>
787 </child>
789 <child>
790 - <widget class="GtkLabel" id="label32">
791 + <widget class="GtkLabel" id="label42">
792 <property name="visible">True</property>
793 - <property name="label" translatable="yes">points</property>
794 + <property name="label" translatable="yes"></property>
795 <property name="use_underline">False</property>
796 <property name="use_markup">False</property>
797 <property name="justify">GTK_JUSTIFY_LEFT</property>
798 <property name="wrap">False</property>
799 <property name="selectable">False</property>
800 - <property name="xalign">0.5</property>
801 + <property name="xalign">0</property>
802 <property name="yalign">0.5</property>
803 <property name="xpad">0</property>
804 <property name="ypad">0</property>
805 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
806 + <property name="width_chars">-1</property>
807 + <property name="single_line_mode">False</property>
808 + <property name="angle">0</property>
809 </widget>
810 <packing>
811 - <property name="padding">0</property>
812 - <property name="expand">False</property>
813 - <property name="fill">False</property>
814 + <property name="left_attach">0</property>
815 + <property name="right_attach">1</property>
816 + <property name="top_attach">6</property>
817 + <property name="bottom_attach">7</property>
818 + <property name="x_options">fill</property>
819 + <property name="y_options"></property>
820 </packing>
821 </child>
822 - </widget>
823 - <packing>
824 - <property name="left_attach">4</property>
825 - <property name="right_attach">5</property>
826 - <property name="top_attach">5</property>
827 - <property name="bottom_attach">6</property>
828 - <property name="x_options">fill</property>
829 - <property name="y_options">fill</property>
830 - </packing>
831 - </child>
832 -
833 - <child>
834 - <widget class="GtkLabel" id="label31">
835 - <property name="visible">True</property>
836 - <property name="label" translatable="yes">Si_ze:</property>
837 - <property name="use_underline">True</property>
838 - <property name="use_markup">False</property>
839 - <property name="justify">GTK_JUSTIFY_LEFT</property>
840 - <property name="wrap">False</property>
841 - <property name="selectable">False</property>
842 - <property name="xalign">0.5</property>
843 - <property name="yalign">0.5</property>
844 - <property name="xpad">0</property>
845 - <property name="ypad">0</property>
846 - <property name="mnemonic_widget">notebook</property>
847 - </widget>
848 - <packing>
849 - <property name="left_attach">3</property>
850 - <property name="right_attach">4</property>
851 - <property name="top_attach">5</property>
852 - <property name="bottom_attach">6</property>
853 - <property name="x_options">fill</property>
854 - <property name="y_options"></property>
855 - </packing>
856 - </child>
857 -
858 - <child>
859 - <widget class="GtkHBox" id="hbox14">
860 - <property name="visible">True</property>
861 - <property name="homogeneous">False</property>
862 - <property name="spacing">6</property>
864 <child>
865 - <widget class="GtkSpinButton" id="fonts_minimum_size">
866 + <widget class="GtkLabel" id="label38">
867 <property name="visible">True</property>
868 - <property name="can_focus">True</property>
869 - <property name="climb_rate">1</property>
870 - <property name="digits">0</property>
871 - <property name="numeric">False</property>
872 - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
873 - <property name="snap_to_ticks">False</property>
874 + <property name="label" translatable="yes">Minimum siz_e:</property>
875 + <property name="use_underline">True</property>
876 + <property name="use_markup">False</property>
877 + <property name="justify">GTK_JUSTIFY_LEFT</property>
878 <property name="wrap">False</property>
879 - <property name="adjustment">16 4 48 1 10 10</property>
880 + <property name="selectable">False</property>
881 + <property name="xalign">1</property>
882 + <property name="yalign">0.5</property>
883 + <property name="xpad">0</property>
884 + <property name="ypad">0</property>
885 + <property name="mnemonic_widget">notebook</property>
886 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
887 + <property name="width_chars">-1</property>
888 + <property name="single_line_mode">False</property>
889 + <property name="angle">0</property>
890 </widget>
891 <packing>
892 - <property name="padding">0</property>
893 - <property name="expand">True</property>
894 - <property name="fill">True</property>
895 + <property name="left_attach">2</property>
896 + <property name="right_attach">4</property>
897 + <property name="top_attach">7</property>
898 + <property name="bottom_attach">8</property>
899 + <property name="x_options">fill</property>
900 + <property name="y_options"></property>
901 </packing>
902 </child>
904 <child>
905 - <widget class="GtkLabel" id="label39">
906 + <widget class="GtkLabel" id="label29">
907 <property name="visible">True</property>
908 - <property name="label" translatable="yes">points</property>
909 - <property name="use_underline">False</property>
910 + <property name="label" translatable="yes">S_ize:</property>
911 + <property name="use_underline">True</property>
912 <property name="use_markup">False</property>
913 <property name="justify">GTK_JUSTIFY_LEFT</property>
914 <property name="wrap">False</property>
915 @@ -1423,244 +1671,166 @@
916 <property name="yalign">0.5</property>
917 <property name="xpad">0</property>
918 <property name="ypad">0</property>
919 + <property name="mnemonic_widget">notebook</property>
920 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
921 + <property name="width_chars">-1</property>
922 + <property name="single_line_mode">False</property>
923 + <property name="angle">0</property>
924 </widget>
925 <packing>
926 - <property name="padding">0</property>
927 - <property name="expand">False</property>
928 - <property name="fill">False</property>
929 + <property name="left_attach">3</property>
930 + <property name="right_attach">4</property>
931 + <property name="top_attach">0</property>
932 + <property name="bottom_attach">1</property>
933 + <property name="x_options">fill</property>
934 + <property name="y_options"></property>
935 </packing>
936 </child>
937 - </widget>
938 - <packing>
939 - <property name="left_attach">4</property>
940 - <property name="right_attach">5</property>
941 - <property name="top_attach">7</property>
942 - <property name="bottom_attach">8</property>
943 - <property name="x_options">fill</property>
944 - </packing>
945 - </child>
946 -
947 - <child>
948 - <widget class="GtkLabel" id="label41">
949 - <property name="visible">True</property>
950 - <property name="label" translatable="yes"></property>
951 - <property name="use_underline">False</property>
952 - <property name="use_markup">False</property>
953 - <property name="justify">GTK_JUSTIFY_LEFT</property>
954 - <property name="wrap">False</property>
955 - <property name="selectable">False</property>
956 - <property name="xalign">0</property>
957 - <property name="yalign">0.5</property>
958 - <property name="xpad">0</property>
959 - <property name="ypad">0</property>
960 - </widget>
961 - <packing>
962 - <property name="left_attach">0</property>
963 - <property name="right_attach">2</property>
964 - <property name="top_attach">4</property>
965 - <property name="bottom_attach">5</property>
966 - <property name="x_options">fill</property>
967 - <property name="y_options"></property>
968 - </packing>
969 - </child>
970 -
971 - <child>
972 - <widget class="GtkLabel" id="label42">
973 - <property name="visible">True</property>
974 - <property name="label" translatable="yes"></property>
975 - <property name="use_underline">False</property>
976 - <property name="use_markup">False</property>
977 - <property name="justify">GTK_JUSTIFY_LEFT</property>
978 - <property name="wrap">False</property>
979 - <property name="selectable">False</property>
980 - <property name="xalign">0</property>
981 - <property name="yalign">0.5</property>
982 - <property name="xpad">0</property>
983 - <property name="ypad">0</property>
984 - </widget>
985 - <packing>
986 - <property name="left_attach">0</property>
987 - <property name="right_attach">1</property>
988 - <property name="top_attach">6</property>
989 - <property name="bottom_attach">7</property>
990 - <property name="x_options">fill</property>
991 - <property name="y_options"></property>
992 - </packing>
993 - </child>
995 - <child>
996 - <widget class="GtkLabel" id="label38">
997 - <property name="visible">True</property>
998 - <property name="label" translatable="yes">Minimum siz_e:</property>
999 - <property name="use_underline">True</property>
1000 - <property name="use_markup">False</property>
1001 - <property name="justify">GTK_JUSTIFY_LEFT</property>
1002 - <property name="wrap">False</property>
1003 - <property name="selectable">False</property>
1004 - <property name="xalign">1</property>
1005 - <property name="yalign">0.5</property>
1006 - <property name="xpad">0</property>
1007 - <property name="ypad">0</property>
1008 - <property name="mnemonic_widget">notebook</property>
1009 - </widget>
1010 - <packing>
1011 - <property name="left_attach">2</property>
1012 - <property name="right_attach">4</property>
1013 - <property name="top_attach">7</property>
1014 - <property name="bottom_attach">8</property>
1015 - <property name="x_options">fill</property>
1016 - <property name="y_options"></property>
1017 - </packing>
1018 - </child>
1019 + <child>
1020 + <widget class="GtkHBox" id="hbox8">
1021 + <property name="visible">True</property>
1022 + <property name="homogeneous">False</property>
1023 + <property name="spacing">6</property>
1025 - <child>
1026 - <widget class="GtkLabel" id="label29">
1027 - <property name="visible">True</property>
1028 - <property name="label" translatable="yes">S_ize:</property>
1029 - <property name="use_underline">True</property>
1030 - <property name="use_markup">False</property>
1031 - <property name="justify">GTK_JUSTIFY_LEFT</property>
1032 - <property name="wrap">False</property>
1033 - <property name="selectable">False</property>
1034 - <property name="xalign">0.5</property>
1035 - <property name="yalign">0.5</property>
1036 - <property name="xpad">0</property>
1037 - <property name="ypad">0</property>
1038 - <property name="mnemonic_widget">notebook</property>
1039 - </widget>
1040 - <packing>
1041 - <property name="left_attach">3</property>
1042 - <property name="right_attach">4</property>
1043 - <property name="top_attach">0</property>
1044 - <property name="bottom_attach">1</property>
1045 - <property name="x_options">fill</property>
1046 - <property name="y_options"></property>
1047 - </packing>
1048 - </child>
1049 + <child>
1050 + <widget class="GtkSpinButton" id="fonts_proportional_size">
1051 + <property name="visible">True</property>
1052 + <property name="can_focus">True</property>
1053 + <property name="climb_rate">1</property>
1054 + <property name="digits">0</property>
1055 + <property name="numeric">False</property>
1056 + <property name="update_policy">GTK_UPDATE_ALWAYS</property>
1057 + <property name="snap_to_ticks">False</property>
1058 + <property name="wrap">False</property>
1059 + <property name="adjustment">16 8 72 1 10 10</property>
1060 + </widget>
1061 + <packing>
1062 + <property name="padding">0</property>
1063 + <property name="expand">True</property>
1064 + <property name="fill">True</property>
1065 + </packing>
1066 + </child>
1068 - <child>
1069 - <widget class="GtkHBox" id="hbox8">
1070 - <property name="visible">True</property>
1071 - <property name="homogeneous">False</property>
1072 - <property name="spacing">6</property>
1073 + <child>
1074 + <widget class="GtkLabel" id="label30">
1075 + <property name="visible">True</property>
1076 + <property name="label" translatable="yes">points</property>
1077 + <property name="use_underline">False</property>
1078 + <property name="use_markup">False</property>
1079 + <property name="justify">GTK_JUSTIFY_LEFT</property>
1080 + <property name="wrap">False</property>
1081 + <property name="selectable">False</property>
1082 + <property name="xalign">0.5</property>
1083 + <property name="yalign">0.5</property>
1084 + <property name="xpad">0</property>
1085 + <property name="ypad">0</property>
1086 + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1087 + <property name="width_chars">-1</property>
1088 + <property name="single_line_mode">False</property>
1089 + <property name="angle">0</property>
1090 + </widget>
1091 + <packing>
1092 + <property name="padding">0</property>
1093 + <property name="expand">False</property>
1094 + <property name="fill">False</property>
1095 + </packing>
1096 + </child>
1097 + </widget>
1098 + <packing>
1099 + <property name="left_attach">4</property>
1100 + <property name="right_attach">5</property>
1101 + <property name="top_attach">0</property>
1102 + <property name="bottom_attach">1</property>
1103 + <property name="x_options">fill</property>
1104 + <property name="y_options">fill</property>
1105 + </packing>
1106 + </child>
1108 <child>
1109 - <widget class="GtkSpinButton" id="fonts_proportional_size">
1110 + <widget class="GtkComboBox" id="fonts_serif">
1111 <property name="visible">True</property>
1112 - <property name="can_focus">True</property>
1113 - <property name="climb_rate">1</property>
1114 - <property name="digits">0</property>
1115 - <property name="numeric">False</property>
1116 - <property name="update_policy">GTK_UPDATE_ALWAYS</property>
1117 - <property name="snap_to_ticks">False</property>
1118 - <property name="wrap">False</property>
1119 - <property name="adjustment">16 8 72 1 10 10</property>
1120 + <property name="items" translatable="yes">DYNAMIC</property>
1121 + <property name="add_tearoffs">False</property>
1122 + <property name="focus_on_click">True</property>
1123 </widget>
1124 <packing>
1125 - <property name="padding">0</property>
1126 - <property name="expand">True</property>
1127 - <property name="fill">True</property>
1128 + <property name="left_attach">1</property>
1129 + <property name="right_attach">3</property>
1130 + <property name="top_attach">0</property>
1131 + <property name="bottom_attach">1</property>
1132 + <property name="y_options"></property>
1133 </packing>
1134 </child>
1136 <child>
1137 - <widget class="GtkLabel" id="label30">
1138 + <widget class="GtkComboBox" id="fonts_sans">
1139 <property name="visible">True</property>
1140 - <property name="label" translatable="yes">points</property>
1141 - <property name="use_underline">False</property>
1142 - <property name="use_markup">False</property>
1143 - <property name="justify">GTK_JUSTIFY_LEFT</property>
1144 - <property name="wrap">False</property>
1145 - <property name="selectable">False</property>
1146 - <property name="xalign">0.5</property>
1147 - <property name="yalign">0.5</property>
1148 - <property name="xpad">0</property>
1149 - <property name="ypad">0</property>
1150 + <property name="items" translatable="yes">DYNAMIC</property>
1151 + <property name="add_tearoffs">False</property>
1152 + <property name="focus_on_click">True</property>
1153 </widget>
1154 <packing>
1155 - <property name="padding">0</property>
1156 - <property name="expand">False</property>
1157 - <property name="fill">False</property>
1158 + <property name="left_attach">1</property>
1159 + <property name="right_attach">3</property>
1160 + <property name="top_attach">1</property>
1161 + <property name="bottom_attach">2</property>
1162 + <property name="y_options"></property>
1163 </packing>
1164 </child>
1165 - </widget>
1166 - <packing>
1167 - <property name="left_attach">4</property>
1168 - <property name="right_attach">5</property>
1169 - <property name="top_attach">0</property>
1170 - <property name="bottom_attach">1</property>
1171 - <property name="x_options">fill</property>
1172 - <property name="y_options">fill</property>
1173 - </packing>
1174 - </child>
1175 -
1176 - <child>
1177 - <widget class="GtkComboBox" id="fonts_serif">
1178 - <property name="visible">True</property>
1179 - <property name="items" translatable="yes">DYNAMIC</property>
1180 - </widget>
1181 - <packing>
1182 - <property name="left_attach">1</property>
1183 - <property name="right_attach">3</property>
1184 - <property name="top_attach">0</property>
1185 - <property name="bottom_attach">1</property>
1186 - <property name="y_options"></property>
1187 - </packing>
1188 - </child>
1189 -
1190 - <child>
1191 - <widget class="GtkComboBox" id="fonts_sans">
1192 - <property name="visible">True</property>
1193 - <property name="items" translatable="yes">DYNAMIC</property>
1194 - </widget>
1195 - <packing>
1196 - <property name="left_attach">1</property>
1197 - <property name="right_attach">3</property>
1198 - <property name="top_attach">1</property>
1199 - <property name="bottom_attach">2</property>
1200 - <property name="y_options"></property>
1201 - </packing>
1202 - </child>
1204 - <child>
1205 - <widget class="GtkComboBox" id="fonts_cursive">
1206 - <property name="visible">True</property>
1207 - <property name="items" translatable="yes">DYNAMIC</property>
1208 - </widget>
1209 - <packing>
1210 - <property name="left_attach">1</property>
1211 - <property name="right_attach">3</property>
1212 - <property name="top_attach">2</property>
1213 - <property name="bottom_attach">3</property>
1214 - <property name="y_options"></property>
1215 - </packing>
1216 - </child>
1217 + <child>
1218 + <widget class="GtkComboBox" id="fonts_cursive">
1219 + <property name="visible">True</property>
1220 + <property name="items" translatable="yes">DYNAMIC</property>
1221 + <property name="add_tearoffs">False</property>
1222 + <property name="focus_on_click">True</property>
1223 + </widget>
1224 + <packing>
1225 + <property name="left_attach">1</property>
1226 + <property name="right_attach">3</property>
1227 + <property name="top_attach">2</property>
1228 + <property name="bottom_attach">3</property>
1229 + <property name="y_options"></property>
1230 + </packing>
1231 + </child>
1233 - <child>
1234 - <widget class="GtkComboBox" id="fonts_fantasy">
1235 - <property name="visible">True</property>
1236 - <property name="items" translatable="yes">DYNAMIC</property>
1237 - </widget>
1238 - <packing>
1239 - <property name="left_attach">1</property>
1240 - <property name="right_attach">3</property>
1241 - <property name="top_attach">3</property>
1242 - <property name="bottom_attach">4</property>
1243 - <property name="y_options"></property>
1244 - </packing>
1245 - </child>
1246 + <child>
1247 + <widget class="GtkComboBox" id="fonts_fantasy">
1248 + <property name="visible">True</property>
1249 + <property name="items" translatable="yes">DYNAMIC</property>
1250 + <property name="add_tearoffs">False</property>
1251 + <property name="focus_on_click">True</property>
1252 + </widget>
1253 + <packing>
1254 + <property name="left_attach">1</property>
1255 + <property name="right_attach">3</property>
1256 + <property name="top_attach">3</property>
1257 + <property name="bottom_attach">4</property>
1258 + <property name="y_options"></property>
1259 + </packing>
1260 + </child>
1262 - <child>
1263 - <widget class="GtkComboBox" id="fonts_monospace">
1264 - <property name="visible">True</property>
1265 - <property name="items" translatable="yes">DYNAMIC</property>
1266 + <child>
1267 + <widget class="GtkComboBox" id="fonts_monospace">
1268 + <property name="visible">True</property>
1269 + <property name="items" translatable="yes">DYNAMIC</property>
1270 + <property name="add_tearoffs">False</property>
1271 + <property name="focus_on_click">True</property>
1272 + </widget>
1273 + <packing>
1274 + <property name="left_attach">1</property>
1275 + <property name="right_attach">3</property>
1276 + <property name="top_attach">5</property>
1277 + <property name="bottom_attach">6</property>
1278 + <property name="y_options"></property>
1279 + </packing>
1280 + </child>
1281 </widget>
1282 <packing>
1283 - <property name="left_attach">1</property>
1284 - <property name="right_attach">3</property>
1285 - <property name="top_attach">5</property>
1286 - <property name="bottom_attach">6</property>
1287 - <property name="y_options"></property>
1288 + <property name="padding">0</property>
1289 + <property name="expand">True</property>
1290 + <property name="fill">True</property>
1291 </packing>
1292 </child>
1293 </widget>