← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xiphos/trusty

« back to all changes in this revision

Viewing changes to src/gnome2/preferences_dialog.c

  • Committer: Package Import Robot
  • Author(s): Dmitrijs Ledkovs, Dmitrijs Ledkovs
  • Date: 2012-03-11 18:43:32 UTC
  • mfrom: (17.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20120311184332-splq3ecpx7tyi87d
Tags: 3.1.5+dfsg-1
http://bugs.debian.org/654511
[ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> ]  
* New upstream release.
* Build using webkit backend
* Contains unpacked source for waf binary (Closes: #654511)
* Update debian/copyright to latest specification

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gnome2/preferences_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * preferences_dialog.c - get user preferences
4
4
 *
5
 
 * Copyright (C) 2000-2010 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2011 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
31
31
 
32
32
#include <gtk/gtk.h>
33
33
#include <gtk/gtk.h>
34
 
#include <glade/glade-xml.h>
 
34
#ifndef USE_GTKBUILDER
 
35
  #include <glade/glade-xml.h>
 
36
#endif
35
37
 
36
38
#include "gui/bibletext.h"
37
39
#include "gui/dialog.h"
102
104
        GtkWidget *use_linked_tabs;
103
105
        GtkWidget *use_chapter_scroll;
104
106
        GtkWidget *use_imageresize;
 
107
        GtkWidget *use_verse_num_bold;
 
108
        GtkWidget *use_verse_num_bracket;
 
109
        GtkWidget *use_verse_num_superscript;
105
110
        GtkWidget *readaloud;
106
111
        GtkWidget *show_verse_num;
107
112
        GtkWidget *versehighlight;
577
582
on_checkbutton1_toggled(GtkToggleButton * togglebutton,
578
583
                        gpointer user_data)
579
584
{
580
 
        gui_tabs_on_off (togglebutton->active);
 
585
        gui_tabs_on_off (gtk_toggle_button_get_active (togglebutton));
581
586
/*      if (togglebutton->active) {
582
587
                xml_set_value("Xiphos", "tabs", "browsing", "1");
583
588
                settings.browsing = TRUE;
614
619
on_checkbutton2_toggled(GtkToggleButton * togglebutton,
615
620
                        gpointer user_data)
616
621
{
617
 
        if (togglebutton->active)
 
622
        if (gtk_toggle_button_get_active (togglebutton))
618
623
                xml_set_value("Xiphos", "misc", "showtexts", "1");
619
624
        else
620
625
                xml_set_value("Xiphos", "misc", "showtexts", "0");
621
626
        settings.showtexts = atoi(xml_get_value("misc", "showtexts"));
622
 
        GTK_CHECK_MENU_ITEM(widgets.viewtexts_item)->active =
623
 
            settings.showtexts;
624
 
        gui_show_hide_texts(togglebutton->active);
 
627
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewtexts_item),
 
628
            settings.showtexts);
 
629
        gui_show_hide_texts(gtk_toggle_button_get_active (togglebutton));
625
630
}
626
631
 
627
632
/******************************************************************************
645
650
on_checkbutton3_toggled(GtkToggleButton * togglebutton,
646
651
                        gpointer user_data)
647
652
{
648
 
        if (togglebutton->active)
 
653
        if (gtk_toggle_button_get_active (togglebutton))
649
654
                xml_set_value("Xiphos", "misc", "showcomms", "1");
650
655
        else
651
656
                xml_set_value("Xiphos", "misc", "showcomms", "0");
652
657
        settings.showcomms = atoi(xml_get_value("misc", "showcomms"));
653
 
        GTK_CHECK_MENU_ITEM(widgets.viewcomms_item)->active =
654
 
            settings.showcomms;
655
 
        gui_show_hide_comms(togglebutton->active);
 
658
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewcomms_item),
 
659
            settings.showcomms);
 
660
        gui_show_hide_comms(gtk_toggle_button_get_active (togglebutton));
656
661
}
657
662
 
658
663
/******************************************************************************
676
681
on_checkbutton9_toggled(GtkToggleButton * togglebutton,
677
682
                        gpointer user_data)
678
683
{
679
 
        if (togglebutton->active)
 
684
        if (gtk_toggle_button_get_active (togglebutton))
680
685
                xml_set_value("Xiphos", "misc", "showpreview", "1");
681
686
        else
682
687
                xml_set_value("Xiphos", "misc", "showpreview", "0");
683
688
        settings.showpreview = atoi(xml_get_value("misc", "showpreview"));
684
 
        GTK_CHECK_MENU_ITEM(widgets.viewpreview_item)->active =
685
 
            settings.showpreview;
686
 
        gui_show_hide_preview(togglebutton->active);
 
689
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewpreview_item),
 
690
            settings.showpreview);
 
691
        gui_show_hide_preview(gtk_toggle_button_get_active (togglebutton));
687
692
}
688
693
 
689
694
/******************************************************************************
707
712
on_checkbutton4_toggled(GtkToggleButton *togglebutton,
708
713
                        gpointer user_data)
709
714
{
710
 
        if (togglebutton->active)
 
715
        if (gtk_toggle_button_get_active (togglebutton))
711
716
                xml_set_value("Xiphos", "misc", "showdicts", "1");
712
717
        else
713
718
                xml_set_value("Xiphos", "misc", "showdicts", "0");
714
719
        settings.showdicts = atoi(xml_get_value("misc", "showdicts"));
715
 
        GTK_CHECK_MENU_ITEM(widgets.viewdicts_item)->active =
716
 
            settings.showdicts;
717
 
        gui_show_hide_dicts(togglebutton->active);
 
720
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widgets.viewdicts_item),
 
721
            settings.showdicts);
 
722
        gui_show_hide_dicts(gtk_toggle_button_get_active (togglebutton));
718
723
}
719
724
 
720
725
/******************************************************************************
739
744
                         gpointer user_data)
740
745
{
741
746
        xml_set_value("Xiphos", "misc", "pinnedtabs",
742
 
                      (togglebutton->active ? "1" : "0"));
 
747
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
743
748
        settings.linkedtabs = atoi(xml_get_value("misc", "pinnedtabs"));
744
749
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
745
750
                               (widgets.linkedtabs_item),
769
774
                         gpointer user_data)
770
775
{
771
776
        xml_set_value("Xiphos", "misc", "showparatab",
772
 
                      (togglebutton->active ? "1" : "0"));
773
 
        if (togglebutton->active)
 
777
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
778
        if (gtk_toggle_button_get_active (togglebutton))
774
779
                gui_open_parallel_view_in_new_tab();
775
780
        else
776
781
                gui_close_passage_tab(1);
801
806
                         gpointer user_data)
802
807
{
803
808
        xml_set_value("Xiphos", "misc", "readaloud",
804
 
                      (togglebutton->active ? "1" : "0"));
 
809
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
805
810
        settings.readaloud = atoi(xml_get_value("misc", "readaloud"));
806
811
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
807
812
                               (widgets.readaloud_item),
831
836
                         gpointer user_data)
832
837
{
833
838
        xml_set_value("Xiphos", "misc", "showversenum",
834
 
                      (togglebutton->active ? "1" : "0"));
 
839
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
835
840
        settings.showversenum = atoi(xml_get_value("misc", "showversenum"));
836
841
 
837
842
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
862
867
                        gpointer user_data)
863
868
{
864
869
        xml_set_value("Xiphos", "lexicons", "usedefaultdict",
865
 
                      (togglebutton->active ? "1" : "0"));
866
 
        settings.useDefaultDict = togglebutton->active;
 
870
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
871
        settings.useDefaultDict = gtk_toggle_button_get_active (togglebutton);
867
872
}
868
873
 
869
874
 
889
894
                        gpointer user_data)
890
895
{
891
896
        xml_set_value("Xiphos", "misc", "dailydevotional",
892
 
                      (togglebutton->active ? "1" : "0"));
893
 
        settings.showdevotional = togglebutton->active;
 
897
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
898
        settings.showdevotional = gtk_toggle_button_get_active (togglebutton);
894
899
}
895
900
 
896
901
 
916
921
                        gpointer user_data)
917
922
{
918
923
        xml_set_value("Xiphos", "misc", "splash",
919
 
                      (togglebutton->active ? "1" : "0"));
920
 
        settings.showsplash = togglebutton->active;
 
924
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
925
        settings.showsplash = gtk_toggle_button_get_active (togglebutton);
921
926
}
922
927
 
923
928
 
943
948
                              gpointer user_data)
944
949
{
945
950
        xml_set_value("Xiphos", "misc", "chapter-scroll",
946
 
                      (togglebutton->active ? "1" : "0"));
947
 
        settings.chapter_scroll = togglebutton->active;
 
951
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
952
        settings.chapter_scroll = gtk_toggle_button_get_active (togglebutton);
948
953
}
949
954
 
950
955
/******************************************************************************
969
974
                                   gpointer user_data)
970
975
{
971
976
        xml_set_value("Xiphos", "misc", "imageresize",
972
 
                      (togglebutton->active ? "1" : "0"));
973
 
        settings.imageresize =  togglebutton->active;
974
 
}
 
977
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
978
        settings.imageresize =  gtk_toggle_button_get_active (togglebutton);
 
979
}
 
980
 
 
981
/******************************************************************************
 
982
 * Name
 
983
 *   on_checkbutton_verse_num_bold_toggled
 
984
 *
 
985
 * Synopsis
 
986
 *   #include "preferences_dialog.h"
 
987
 *
 
988
 *   void on_checkbutton_verse_num_bold_toggled(GtkToggleButton * togglebutton, gpointer user_data)
 
989
 *
 
990
 * Description
 
991
 *
 
992
 *
 
993
 *
 
994
 * Return value
 
995
 *   void
 
996
 */
 
997
 
 
998
void
 
999
on_checkbutton_verse_num_bold_toggled(GtkToggleButton * togglebutton,
 
1000
                                      gpointer user_data)
 
1001
{
 
1002
        xml_set_value("Xiphos", "misc", "verse_num_bold",
 
1003
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1004
        settings.verse_num_bold = atoi(xml_get_value("misc", "verse_num_bold"));
 
1005
        char *url = g_strdup_printf("sword:///%s", settings.currentverse);
 
1006
        main_url_handler(url, TRUE);
 
1007
        g_free(url);
 
1008
}
 
1009
 
 
1010
 
 
1011
/******************************************************************************
 
1012
 * Name
 
1013
 *   on_checkbutton_verse_num_bracket_toggled
 
1014
 *
 
1015
 * Synopsis
 
1016
 *   #include "preferences_dialog.h"
 
1017
 *
 
1018
 *   void on_checkbutton_verse_num_bracket_toggled(GtkToggleButton * togglebutton, gpointer user_data)
 
1019
 *
 
1020
 * Description
 
1021
 *
 
1022
 *
 
1023
 *
 
1024
 * Return value
 
1025
 *   void
 
1026
 */
 
1027
 
 
1028
void
 
1029
on_checkbutton_verse_num_bracket_toggled(GtkToggleButton * togglebutton,
 
1030
                                         gpointer user_data)
 
1031
{
 
1032
        xml_set_value("Xiphos", "misc", "verse_num_bracket",
 
1033
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1034
        settings.verse_num_bracket = atoi(xml_get_value("misc", "verse_num_bracket"));
 
1035
        char *url = g_strdup_printf("sword:///%s", settings.currentverse);
 
1036
        main_url_handler(url, TRUE);
 
1037
        g_free(url);
 
1038
}
 
1039
 
 
1040
 
 
1041
/******************************************************************************
 
1042
 * Name
 
1043
 *   on_checkbutton_verse_num_superscript_toggled
 
1044
 *
 
1045
 * Synopsis
 
1046
 *   #include "preferences_dialog.h"
 
1047
 *
 
1048
 *   void on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * togglebutton, gpointer user_data)
 
1049
 *
 
1050
 * Description
 
1051
 *
 
1052
 *
 
1053
 *
 
1054
 * Return value
 
1055
 *   void
 
1056
 */
 
1057
 
 
1058
void
 
1059
on_checkbutton_verse_num_superscript_toggled(GtkToggleButton * togglebutton,
 
1060
                                             gpointer user_data)
 
1061
{
 
1062
        xml_set_value("Xiphos", "misc", "verse_num_superscript",
 
1063
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1064
        settings.verse_num_superscript = atoi(xml_get_value("misc", "verse_num_superscript"));
 
1065
        char *url = g_strdup_printf("sword:///%s", settings.currentverse);
 
1066
        main_url_handler(url, TRUE);
 
1067
        g_free(url);
 
1068
}
 
1069
 
975
1070
 
976
1071
/******************************************************************************
977
1072
 * Name
995
1090
                                      gpointer user_data)
996
1091
{
997
1092
        xml_set_value("Xiphos", "misc", "versehighlight",
998
 
                      (togglebutton->active ? "1" : "0"));
999
 
        settings.versehighlight = togglebutton->active;
 
1093
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1094
        settings.versehighlight = gtk_toggle_button_get_active (togglebutton);
1000
1095
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
1001
1096
                               (widgets.versehighlight_item),
1002
1097
                               settings.versehighlight);
1024
1119
                                      gpointer user_data)
1025
1120
{
1026
1121
        xml_set_value("Xiphos", "misc", "annotatehighlight",
1027
 
                      (togglebutton->active ? "1" : "0"));
1028
 
        settings.annotate_highlight = togglebutton->active;
 
1122
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1123
        settings.annotate_highlight = gtk_toggle_button_get_active (togglebutton);
1029
1124
        main_display_bible(settings.MainWindowModule, settings.currentverse);
1030
1125
}
1031
1126
 
1050
1145
                                           gpointer user_data)
1051
1146
{
1052
1147
        xml_set_value("Xiphos", "misc", "xrefsinverselist",
1053
 
                      (togglebutton->active ? "1" : "0"));
1054
 
        settings.xrefs_in_verse_list = togglebutton->active;
 
1148
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1149
        settings.xrefs_in_verse_list = gtk_toggle_button_get_active (togglebutton);
1055
1150
}
1056
1151
 
1057
1152
/******************************************************************************
1076
1171
                                  gpointer user_data)
1077
1172
{
1078
1173
        xml_set_value("Xiphos", "misc", "prayerlist",
1079
 
                      (togglebutton->active ? "1" : "0"));
1080
 
        settings.prayerlist = togglebutton->active;
 
1174
                      (gtk_toggle_button_get_active (togglebutton) ? "1" : "0"));
 
1175
        settings.prayerlist = gtk_toggle_button_get_active (togglebutton);
1081
1176
 
1082
1177
        /* update module list to show choice */
1083
1178
        if (settings.prayerlist)
1692
1787
        model = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_INT);
1693
1788
 
1694
1789
        gtk_tree_store_append(model, &iter, NULL);
1695
 
        gtk_tree_store_set(model, &iter, 0, _("Fonts"), -1);
1696
 
 
1697
 
        gtk_tree_store_append(model, &child_iter, &iter);
1698
 
        gtk_tree_store_set(model, &child_iter, 0, _("Color"), 1, 1, -1);
1699
 
 
1700
 
        gtk_tree_store_append(model, &child_iter, &iter);
1701
 
        gtk_tree_store_set(model, &child_iter, 0, _("Sizes and Faces"), 1, 2, -1);
1702
 
 
1703
 
 
1704
 
        gtk_tree_store_append(model, &iter, NULL);
1705
1790
        gtk_tree_store_set(model, &iter, 0, _("General"), -1);
1706
1791
 
1707
1792
        /* the former element "3" was previously here,
1713
1798
 
1714
1799
 
1715
1800
        gtk_tree_store_append(model, &iter, NULL);
 
1801
        gtk_tree_store_set(model, &iter, 0, _("Fonts"), -1);
 
1802
 
 
1803
        gtk_tree_store_append(model, &child_iter, &iter);
 
1804
        gtk_tree_store_set(model, &child_iter, 0, _("Color"), 1, 1, -1);
 
1805
 
 
1806
        gtk_tree_store_append(model, &child_iter, &iter);
 
1807
        gtk_tree_store_set(model, &child_iter, 0, _("Sizes and Faces"), 1, 2, -1);
 
1808
 
 
1809
 
 
1810
        gtk_tree_store_append(model, &iter, NULL);
1716
1811
        gtk_tree_store_set(model, &iter, 0, _("Modules"), -1);
1717
1812
 
1718
1813
        /* the former element "5" was previously here,
1862
1957
                                     (check_button.use_imageresize),
1863
1958
                                     settings.imageresize);
1864
1959
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
 
1960
                                     (check_button.use_verse_num_bold),
 
1961
                                     settings.verse_num_bold);
 
1962
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
 
1963
                                     (check_button.use_verse_num_bracket),
 
1964
                                     settings.verse_num_bracket);
 
1965
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
 
1966
                                     (check_button.use_verse_num_superscript),
 
1967
                                     settings.verse_num_superscript);
 
1968
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
1865
1969
                                     (check_button.versehighlight),
1866
1970
                                     settings.versehighlight);
1867
1971
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
1898
2002
                         G_CALLBACK(on_checkbutton_scroll_toggled), NULL);
1899
2003
        g_signal_connect(check_button.use_imageresize, "toggled",
1900
2004
                         G_CALLBACK(on_checkbutton_imageresize_toggled), NULL);
 
2005
        g_signal_connect(check_button.use_verse_num_bold, "toggled",
 
2006
                         G_CALLBACK(on_checkbutton_verse_num_bold_toggled), NULL);
 
2007
        g_signal_connect(check_button.use_verse_num_bracket, "toggled",
 
2008
                         G_CALLBACK(on_checkbutton_verse_num_bracket_toggled), NULL);
 
2009
        g_signal_connect(check_button.use_verse_num_superscript, "toggled",
 
2010
                         G_CALLBACK(on_checkbutton_verse_num_superscript_toggled), NULL);
1901
2011
        g_signal_connect(check_button.versehighlight, "toggled",
1902
2012
                         G_CALLBACK(on_checkbutton_versehighlight_toggled), NULL);
1903
2013
        g_signal_connect(check_button.annotate_highlight, "toggled",
2233
2343
                return;
2234
2344
        }
2235
2345
 
2236
 
        gtk_tree_model_get(model, &selected, 0, &mod, -1);
 
2346
        gtk_tree_model_get(model, &selected, UTIL_COL_MODULE, &mod, -1);
2237
2347
        if (mod) {
2238
2348
                g_free(module_selected);
2239
2349
                module_selected = mod;
2287
2397
        char *parallels = g_strdup(""), *newhold;
2288
2398
        int count;
2289
2399
 
2290
 
        if (!module_selected)
 
2400
        if (!module_selected) {
 
2401
                g_free(parallels);
2291
2402
                return;
 
2403
        }
2292
2404
 
2293
2405
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(parallel_select.listview));
2294
2406
        list_store = GTK_LIST_STORE(model);
2425
2537
 */
2426
2538
void ps_button_add(GtkButton * button, gpointer user_data)
2427
2539
{
2428
 
        gchar *glade_file;
 
2540
#ifdef USE_GTKBUILDER
 
2541
        GtkBuilder *gxml;
 
2542
#else
2429
2543
        GladeXML *gxml;
2430
 
 
2431
 
        glade_file = gui_general_user_file("prefs.glade", FALSE);
 
2544
#endif
 
2545
        gchar *glade_file = gui_general_user_file("prefs" UI_SUFFIX, FALSE);
2432
2546
        g_return_if_fail(glade_file != NULL);
2433
2547
 
 
2548
#ifdef USE_GTKBUILDER
 
2549
        gxml = gtk_builder_new ();
 
2550
        gtk_builder_add_from_file (gxml, glade_file, NULL);
 
2551
#else
2434
2552
        gxml = glade_xml_new(glade_file, "mod_sel_dialog", NULL);
2435
 
        parallel_select.mod_sel_dialog = glade_xml_get_widget(gxml, "mod_sel_dialog");
2436
 
        parallel_select.mod_sel_close  = glade_xml_get_widget(gxml, "mod_sel_button_close");
2437
 
        parallel_select.mod_sel_add    = glade_xml_get_widget(gxml, "mod_sel_button_add");
 
2553
#endif
 
2554
        parallel_select.mod_sel_dialog = UI_GET_ITEM(gxml, "mod_sel_dialog");
 
2555
        parallel_select.mod_sel_close  = UI_GET_ITEM(gxml, "mod_sel_button_close");
 
2556
        parallel_select.mod_sel_add    = UI_GET_ITEM(gxml, "mod_sel_button_add");
2438
2557
 
2439
2558
        g_signal_connect((gpointer)parallel_select.mod_sel_close, "clicked",
2440
2559
                         G_CALLBACK(on_mod_sel_close_clicked), NULL);
2441
2560
        g_signal_connect((gpointer)parallel_select.mod_sel_add, "clicked",
2442
2561
                         G_CALLBACK(on_mod_sel_add_clicked), NULL);
2443
2562
 
2444
 
        parallel_select.mod_sel_treeview = glade_xml_get_widget(gxml, "mod_sel_treeview");
 
2563
        parallel_select.mod_sel_treeview = UI_GET_ITEM(gxml, "mod_sel_treeview");
2445
2564
        ps_setup_treeview(parallel_select.mod_sel_treeview);
2446
2565
 
2447
2566
        gtk_widget_show(parallel_select.mod_sel_dialog);
2472
2591
static void
2473
2592
create_preferences_dialog(void)
2474
2593
{
 
2594
#ifdef USE_GTKBUILDER
 
2595
        GtkBuilder *gxml;
 
2596
#else
2475
2597
        GladeXML *gxml;
2476
 
        gchar *glade_file;
 
2598
#endif
2477
2599
        GtkWidget *dialog_prefs;
2478
2600
        GtkWidget *treeview;
2479
2601
        GtkTreeModel *model;
2480
2602
        GObject *selection;
2481
2603
        GtkWidget *chooser;
2482
2604
        gint index = 0;
 
2605
        gchar *glade_file = gui_general_user_file ("prefs" UI_SUFFIX, TRUE);
2483
2606
 
2484
 
        glade_file = gui_general_user_file ("prefs.glade", TRUE);
2485
2607
        g_return_if_fail(glade_file != NULL);
2486
2608
 
2487
2609
        /* build the widget */
 
2610
#ifdef USE_GTKBUILDER
 
2611
        gxml = gtk_builder_new ();
 
2612
        gtk_builder_add_from_file (gxml, glade_file, NULL);
 
2613
#else
2488
2614
        gxml = glade_xml_new (glade_file, NULL, NULL);
 
2615
#endif
2489
2616
        g_free (glade_file);
2490
2617
        g_return_if_fail (gxml != NULL);
2491
2618
 
2492
2619
        /* lookup the root widget */
2493
 
        dialog_prefs = glade_xml_get_widget (gxml, "dialog_prefs");
 
2620
        dialog_prefs = UI_GET_ITEM(gxml, "dialog_prefs");
2494
2621
        g_signal_connect(dialog_prefs, "response",
2495
2622
                         G_CALLBACK(on_dialog_prefs_response), NULL);
2496
 
/*      g_signal_connect(, "",
2497
 
                         G_CALLBACK(), NULL);
2498
 
*/
 
2623
 
2499
2624
        /* color pickers */
2500
 
        color_picker.text_background = glade_xml_get_widget (gxml, "colorbutton1");
 
2625
        color_picker.text_background = UI_GET_ITEM(gxml, "colorbutton1");
 
2626
        color_picker.text = UI_GET_ITEM(gxml, "colorbutton2");
 
2627
        color_picker.text_current_verse = UI_GET_ITEM(gxml, "colorbutton3");
 
2628
        color_picker.verse_numbers = UI_GET_ITEM(gxml, "colorbutton4");
 
2629
        color_picker.href_links = UI_GET_ITEM(gxml, "colorbutton5");
 
2630
        color_picker.highlight_fg = UI_GET_ITEM(gxml, "colorbutton6");
 
2631
        color_picker.highlight_bg = UI_GET_ITEM(gxml, "colorbutton7");
 
2632
 
 
2633
        color_picker.invert_normal = UI_GET_ITEM(gxml, "invert_normal");
 
2634
        color_picker.invert_highlight = UI_GET_ITEM(gxml, "invert_highlight");
 
2635
 
 
2636
        check_button.enable_tabbed_browsing = UI_GET_ITEM(gxml, "checkbutton1");
 
2637
        check_button.show_bible_pane = UI_GET_ITEM(gxml,"checkbutton2");
 
2638
        check_button.show_preview_pane = UI_GET_ITEM(gxml, "checkbutton9");
 
2639
        check_button.show_commentary_pane = UI_GET_ITEM(gxml, "checkbutton3");
 
2640
        check_button.show_dictionary_pane = UI_GET_ITEM(gxml, "checkbutton4");
 
2641
        check_button.use_linked_tabs = UI_GET_ITEM(gxml, "checkbutton10");
 
2642
        check_button.readaloud = UI_GET_ITEM(gxml, "checkbutton11");
 
2643
        check_button.show_verse_num = UI_GET_ITEM(gxml, "checkbutton12");
 
2644
        check_button.use_default_dictionary = UI_GET_ITEM(gxml, "checkbutton6");
 
2645
        check_button.show_devotion = UI_GET_ITEM(gxml, "checkbutton7");
 
2646
        check_button.show_splash_screen = UI_GET_ITEM(gxml, "checkbutton8");
 
2647
        check_button.use_chapter_scroll = UI_GET_ITEM(gxml, "checkbutton_scroll");
 
2648
 
 
2649
        check_button.use_imageresize = UI_GET_ITEM(gxml, "checkbutton_imageresize");
 
2650
#ifdef WIN32
 
2651
        /* webkit image hackery requires resize always be enabled. */
 
2652
        gtk_widget_hide(check_button.use_imageresize);
 
2653
#endif
 
2654
        check_button.use_verse_num_bold = UI_GET_ITEM(gxml, "checkbutton_verse_num_bold");
 
2655
        check_button.use_verse_num_bracket = UI_GET_ITEM(gxml, "checkbutton_verse_num_bracket");
 
2656
        check_button.use_verse_num_superscript = UI_GET_ITEM(gxml, "checkbutton_verse_num_superscript");
 
2657
        check_button.versehighlight = UI_GET_ITEM(gxml, "checkbutton_versehighlight");
 
2658
        check_button.annotate_highlight = UI_GET_ITEM(gxml, "checkbutton_annotate_highlight");
 
2659
        check_button.xrefs_in_verse_list = UI_GET_ITEM(gxml, "checkbutton_xrefs_in_verse_list");
 
2660
        check_button.prayerlist = UI_GET_ITEM(gxml, "checkbutton_prayerlist");
 
2661
 
 
2662
        check_button.show_paratab = UI_GET_ITEM(gxml, "checkbutton_paratab");
 
2663
 
2501
2664
        g_signal_connect(color_picker.text_background, "color_set",
2502
2665
                         G_CALLBACK(on_colorbutton1_color_set), NULL);
2503
 
        color_picker.text = glade_xml_get_widget (gxml, "colorbutton2");
2504
2666
        g_signal_connect(color_picker.text, "color_set",
2505
2667
                         G_CALLBACK(on_colorbutton2_color_set), NULL);
2506
 
        color_picker.text_current_verse = glade_xml_get_widget (gxml, "colorbutton3");
2507
2668
        g_signal_connect(color_picker.text_current_verse, "color_set",
2508
2669
                         G_CALLBACK(on_colorbutton3_color_set), NULL);
2509
 
        color_picker.verse_numbers = glade_xml_get_widget (gxml, "colorbutton4");
2510
2670
        g_signal_connect(color_picker.verse_numbers, "color_set",
2511
2671
                         G_CALLBACK(on_colorbutton4_color_set), NULL);
2512
 
        color_picker.href_links = glade_xml_get_widget (gxml, "colorbutton5");
2513
2672
        g_signal_connect(color_picker.href_links, "color_set",
2514
2673
                         G_CALLBACK(on_colorbutton5_color_set), NULL);
2515
 
        color_picker.highlight_fg = glade_xml_get_widget (gxml, "colorbutton6");
2516
2674
        g_signal_connect(color_picker.highlight_fg, "color_set",
2517
2675
                         G_CALLBACK(on_colorbutton6_color_set), NULL);
2518
 
        color_picker.highlight_bg = glade_xml_get_widget (gxml, "colorbutton7");
2519
2676
        g_signal_connect(color_picker.highlight_bg, "color_set",
2520
2677
                         G_CALLBACK(on_colorbutton7_color_set), NULL);
2521
2678
        setup_color_pickers();
2522
2679
 
2523
2680
        /* color inverters */
2524
 
        color_picker.invert_normal = glade_xml_get_widget (gxml, "invert_normal");
2525
2681
        g_signal_connect((gpointer)color_picker.invert_normal, "clicked",
2526
2682
                         G_CALLBACK(on_invert), (void*)1);
2527
 
        color_picker.invert_highlight = glade_xml_get_widget (gxml, "invert_highlight");
2528
2683
        g_signal_connect((gpointer)color_picker.invert_highlight, "clicked",
2529
2684
                         G_CALLBACK(on_invert), (void*)0);
2530
2685
 
2531
2686
        /* check buttons */
2532
 
        check_button.enable_tabbed_browsing = glade_xml_get_widget(gxml, "checkbutton1");
2533
 
        check_button.show_bible_pane = glade_xml_get_widget(gxml,"checkbutton2");
2534
 
        check_button.show_preview_pane = glade_xml_get_widget(gxml, "checkbutton9");
2535
 
        check_button.show_commentary_pane = glade_xml_get_widget(gxml, "checkbutton3");
2536
 
        check_button.show_dictionary_pane = glade_xml_get_widget(gxml, "checkbutton4");
2537
 
        check_button.use_linked_tabs = glade_xml_get_widget(gxml, "checkbutton10");
2538
 
        check_button.readaloud = glade_xml_get_widget(gxml, "checkbutton11");
2539
 
        check_button.show_verse_num = glade_xml_get_widget(gxml, "checkbutton12");
2540
 
        check_button.use_default_dictionary = glade_xml_get_widget(gxml, "checkbutton6");
2541
 
        check_button.show_devotion = glade_xml_get_widget(gxml, "checkbutton7");
2542
 
        check_button.show_splash_screen = glade_xml_get_widget(gxml, "checkbutton8");
2543
 
        check_button.use_chapter_scroll = glade_xml_get_widget(gxml, "checkbutton_scroll");
2544
 
#ifdef USE_GTKMOZEMBED
 
2687
#ifdef USE_WEBKIT
2545
2688
        gtk_widget_hide(check_button.use_chapter_scroll);
2546
2689
#endif
2547
 
        check_button.use_imageresize = glade_xml_get_widget(gxml, "checkbutton_imageresize");
2548
 
        check_button.versehighlight = glade_xml_get_widget(gxml, "checkbutton_versehighlight");
2549
 
        check_button.annotate_highlight = glade_xml_get_widget(gxml, "checkbutton_annotate_highlight");
2550
 
        check_button.xrefs_in_verse_list = glade_xml_get_widget(gxml, "checkbutton_xrefs_in_verse_list");
2551
 
        check_button.prayerlist = glade_xml_get_widget(gxml, "checkbutton_prayerlist");
2552
 
 
2553
 
        check_button.show_paratab = glade_xml_get_widget(gxml, "checkbutton_paratab");
2554
2690
 
2555
2691
        gtk_widget_hide(check_button.show_paratab);
2556
2692
 
2558
2694
 
2559
2695
        /* verse number size */
2560
2696
        index = get_font_size_index(settings.verse_num_font_size_str);
2561
 
        combo.verse_number_size = glade_xml_get_widget(gxml, "combobox1");
 
2697
        combo.verse_number_size = UI_GET_ITEM(gxml, "combobox1");
2562
2698
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo.verse_number_size), index);
2563
2699
        g_signal_connect(combo.verse_number_size, "changed",
2564
2700
                         G_CALLBACK(on_combobox1_changed), NULL);
2565
2701
 
2566
2702
        /* base font size */
2567
2703
        index = get_font_size_index(settings.base_font_size_str);
2568
 
        combo.base_font_size = glade_xml_get_widget(gxml, "basecombobox1");
 
2704
        combo.base_font_size = UI_GET_ITEM(gxml, "basecombobox1");
2569
2705
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo.base_font_size), index);
2570
2706
        g_signal_connect(combo.base_font_size, "changed",
2571
2707
                         G_CALLBACK(on_basecombobox1_changed), NULL);
2572
2708
 
2573
2709
        /* module combos */
2574
 
        combo.default_dictionary_module = glade_xml_get_widget (gxml, "combobox5");
2575
 
        combo.percomm_module = glade_xml_get_widget (gxml, "combobox6");
2576
 
        combo.devotion_module = glade_xml_get_widget (gxml, "combobox12");
2577
 
        combo.hebrew_lex__module = glade_xml_get_widget (gxml, "combobox13");
2578
 
        combo.greek_lex__module = glade_xml_get_widget (gxml, "combobox14");
 
2710
        combo.default_dictionary_module = UI_GET_ITEM(gxml, "combobox5");
 
2711
        combo.percomm_module = UI_GET_ITEM(gxml, "combobox6");
 
2712
        combo.devotion_module = UI_GET_ITEM(gxml, "combobox12");
 
2713
        combo.hebrew_lex__module = UI_GET_ITEM(gxml, "combobox13");
 
2714
        combo.greek_lex__module = UI_GET_ITEM(gxml, "combobox14");
2579
2715
        setup_module_comboboxes();
2580
2716
 
2581
 
        combo.special_locale = glade_xml_get_widget (gxml, "combobox16");
 
2717
        combo.special_locale = UI_GET_ITEM(gxml, "combobox16");
2582
2718
        setup_locale_combobox();
2583
 
        combo.font_prefs = glade_xml_get_widget (gxml, "combobox17");
 
2719
 
 
2720
        combo.font_prefs = UI_GET_ITEM(gxml, "combobox17");
2584
2721
        setup_font_prefs_combobox();
2585
2722
 
2586
2723
        /* studypad directory chooserbutton */
2587
 
        chooser = glade_xml_get_widget (gxml, "filechooserbutton1");
 
2724
        chooser = UI_GET_ITEM(gxml, "filechooserbutton1");
2588
2725
        gtk_file_chooser_set_current_folder((GtkFileChooser *)chooser,
2589
2726
                                             settings.studypaddir);
2590
2727
        g_signal_connect(chooser, "current_folder_changed",
2592
2729
 
2593
2730
 
2594
2731
        /* prefs notebook */
2595
 
        notebook = glade_xml_get_widget (gxml, "notebook");
 
2732
        notebook = UI_GET_ITEM(gxml, "notebook");
2596
2733
        /* setup treeview */
2597
2734
        model = create_model();
2598
 
        treeview = glade_xml_get_widget (gxml, "treeview");
 
2735
        treeview = UI_GET_ITEM(gxml, "treeview");
2599
2736
        gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), model);
2600
2737
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
2601
2738
        gtk_widget_set_size_request(treeview, 130, -1);
2603
2740
        gtk_tree_view_expand_all(GTK_TREE_VIEW(treeview));
2604
2741
        selection = G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)));
2605
2742
        /* connect signals and data */
 
2743
#ifdef USE_GTKBUILDER
 
2744
        gtk_builder_connect_signals_full
 
2745
                (gxml, (GtkBuilderConnectFunc)gui_glade_signal_connect_func, NULL);
 
2746
#else
2606
2747
        glade_xml_signal_autoconnect_full
2607
2748
                (gxml, (GladeXMLConnectFunc)gui_glade_signal_connect_func, NULL);
 
2749
#endif
2608
2750
 
2609
2751
        g_signal_connect(selection, "changed",
2610
2752
                         G_CALLBACK(tree_selection_changed), model);
2612
2754
        /*
2613
2755
         * parallel select dialog: chooser and button connectivity
2614
2756
         */
2615
 
        parallel_select.button_clear = glade_xml_get_widget(gxml, "ps_toolbutton_clear");
2616
 
        parallel_select.button_cut   = glade_xml_get_widget(gxml, "ps_toolbutton_cut");
2617
 
        parallel_select.button_add   = glade_xml_get_widget(gxml, "ps_toolbutton_add");
2618
 
        parallel_select.listview     = glade_xml_get_widget(gxml, "ps_listview");
 
2757
        parallel_select.button_clear = UI_GET_ITEM(gxml, "ps_toolbutton_clear");
 
2758
        parallel_select.button_cut   = UI_GET_ITEM(gxml, "ps_toolbutton_cut");
 
2759
        parallel_select.button_add   = UI_GET_ITEM(gxml, "ps_toolbutton_add");
 
2760
        parallel_select.listview     = UI_GET_ITEM(gxml, "ps_listview");
2619
2761
 
2620
2762
        g_signal_connect(parallel_select.button_clear, "clicked",
2621
2763
                         G_CALLBACK(ps_button_clear), NULL);