← Back to branch summary

~ubuntu-branches/debian/sid/xiphos/sid

« back to all changes in this revision

Viewing changes to src/gnome2/font_dialog.c

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-07-12 17:08:46 UTC
  • mfrom: (1.3.3)
  • Revision ID: package-import@ubuntu.com-20140712170846-ja9jzhgt51d3fkrd
Tags: 3.2.2+dfsg1-1
* New upstream release.
* Bump standards version.
* Switch uscan to sf.net redirector.
* Unpack waf in get-orig-source target.
* Bump to debhelper 9.
* Add uuid-dev build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/font_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * font_dialog.c - dialog to set module font
4
4
 *
5
 
 * Copyright (C) 2000-2011 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2014 Xiphos Developer Team
6
6
 *
7
7
 * This program is free software; you can redistribute it and/or modify
8
8
 * it under the terms of the GNU General Public License as published by
310
310
                          "dialog_vbox21", dialog_vbox21);
311
311
        gtk_widget_show(dialog_vbox21);
312
312
 
313
 
        vbox56 = gtk_vbox_new(FALSE, 0);
 
313
        UI_VBOX(vbox56, FALSE, 0);
314
314
        gtk_widget_show(vbox56);
315
315
        gtk_box_pack_start(GTK_BOX(dialog_vbox21), vbox56, TRUE, TRUE,
316
316
                           0);
317
317
 
318
 
        hbox67 = gtk_hbox_new(FALSE, 0);
 
318
        UI_HBOX(hbox67, FALSE, 0);
319
319
        gtk_widget_show(hbox67);
320
320
        gtk_box_pack_start(GTK_BOX(vbox56), hbox67, TRUE, TRUE, 0);
321
321
 
322
322
        pixmap6 =
 
323
#ifdef HAVE_GTK_310
 
324
            gtk_image_new_from_icon_name ("gtk-select-font",
 
325
                                    GTK_ICON_SIZE_DND);
 
326
#else                        
 
327
                
323
328
            gtk_image_new_from_stock(GTK_STOCK_SELECT_FONT,
324
329
                                     GTK_ICON_SIZE_DND);
 
330
#endif                                        
325
331
        gtk_widget_show(pixmap6);
326
332
        gtk_box_pack_start(GTK_BOX(hbox67), pixmap6, TRUE, TRUE, 0);
327
333
 
328
 
        vbox57 = gtk_vbox_new(FALSE, 0);
 
334
        UI_VBOX(vbox57, FALSE, 0);
329
335
        gtk_widget_show(vbox57);
330
336
        gtk_box_pack_start(GTK_BOX(hbox67), vbox57, TRUE, TRUE, 0);
331
337
 
343
349
                           FALSE, 0);
344
350
 
345
351
 
346
 
        hbox_picker = gtk_hbox_new(FALSE, 6);
 
352
        UI_HBOX(hbox_picker, FALSE, 6);
347
353
        gtk_widget_show(hbox_picker);
348
354
        gtk_box_pack_start(GTK_BOX(vbox56), hbox_picker, FALSE, FALSE,
349
355
                           0);
405
411
        gtk_container_set_border_width(GTK_CONTAINER
406
412
                                       (dialog_action_area21), 10);
407
413
 
 
414
#ifdef USE_GTK_3
 
415
        hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 
416
#else
408
417
        hbuttonbox1 = gtk_hbutton_box_new();
 
418
#endif
409
419
        gtk_widget_show(hbuttonbox1);
410
420
        gtk_box_pack_start(GTK_BOX(dialog_action_area21), hbuttonbox1,
411
421
                           TRUE, TRUE, 0);
412
422
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1),
413
423
                                  GTK_BUTTONBOX_EDGE);
414
424
 
415
 
        button_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 
425
        button_cancel = 
 
426
#ifdef HAVE_GTK_310
 
427
                gtk_button_new_from_icon_name ("gtk-cancel",
 
428
                               GTK_ICON_SIZE_BUTTON);
 
429
#else   
 
430
                gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 
431
#endif                                        
416
432
        gtk_widget_show(button_cancel);
417
433
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), button_cancel);
418
434
        gtk_widget_set_can_default (button_cancel, 1);
419
 
 
420
 
        button_ok = gtk_button_new_from_stock(GTK_STOCK_OK);
 
435
        button_ok = 
 
436
#ifdef HAVE_GTK_310
 
437
        gtk_button_new_from_icon_name ("gtk-ok",
 
438
                               GTK_ICON_SIZE_BUTTON);
 
439
#else   
 
440
        gtk_button_new_from_stock(GTK_STOCK_OK);
 
441
#endif                                        
 
442
        
421
443
        gtk_widget_show(button_ok);
422
444
        gtk_container_add(GTK_CONTAINER(hbuttonbox1), button_ok);
423
445
        gtk_widget_set_can_default (button_ok, 1);