← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main/settings.c

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs
  • Date: 2009-08-12 19:21:05 UTC
  • Revision ID: james.westby@ubuntu.com-20090812192105-dw40gql5mdqvgx84
Tags: 3.1.1-1
http://bugs.debian.org/539190
http://bugs.debian.org/539880
* New upstream release (bugfix)

* debian/copyright updates:
  - help/* is GFDL and referencing license file as per policy 3.8.2
  - updated copyright holders (Gnomesword -> Xiphos)

* debian/control:
  - Bumped standards version (Changed debian/copyright as above)
  - Updated VCS-Bzr field to point to a working URL
  - Fixed typo in debian/control (Closes: #539190)
  - Updated extended description of xiphos package (Closes: #539880)
  - Significantly improved wording of all descriptions
  - Added Conflicts: xiphos-svn - upstream deb package name for svn builds

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/settings.c
2
2
 * Xiphos Bible Study Tool
3
3
 * settings.c - Guess what?
4
4
 *
5
 
 * Copyright (C) 2000-2008 Xiphos Developer Team
 
5
 * Copyright (C) 2000-2009 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
388
388
                xml_set_value("Xiphos", "lexicons", "defaultdictionary",
389
389
                              settings.DefaultDict);
390
390
        }
391
 
 
392
 
//      settings.inViewer = atoi(xml_get_value("lexicons", "inviewer"));
393
 
//      settings.inDictpane = atoi(xml_get_value("lexicons", "indictpane"));
394
 
        settings.useDefaultDict = atoi(xml_get_value("lexicons","usedefaultdict"));
 
391
        settings.useDefaultDict = atoi((buf = xml_get_value("lexicons","usedefaultdict"))
 
392
                                       ? buf : "0");
395
393
 
396
394
        /* mod mgr stuff */ 
397
 
        if (xml_get_value("modmgr", "mod_mgr_source"))
398
 
                settings.mod_mgr_source = atoi(xml_get_value("modmgr", "mod_mgr_source"));
 
395
        if ((buf = xml_get_value("modmgr", "mod_mgr_source")))
 
396
                settings.mod_mgr_source = atoi(buf);
399
397
        else {
400
398
                xml_add_new_section_to_settings_doc("modmgr");
401
399
                xml_add_new_item_to_section("modmgr", "mod_mgr_source", "1");
402
400
                settings.mod_mgr_source = 1;
403
401
        }        
404
 
        if (xml_get_value("modmgr", "mod_mgr_destination"))
405
 
                settings.mod_mgr_destination = atoi(xml_get_value("modmgr", "mod_mgr_destination"));
 
402
        if ((buf = xml_get_value("modmgr", "mod_mgr_destination")))
 
403
                settings.mod_mgr_destination = atoi(buf);
406
404
        else {
407
405
                xml_add_new_item_to_section("modmgr", "mod_mgr_destination", "0");
408
406
                settings.mod_mgr_destination = 0;
409
407
        }               
410
 
        if (xml_get_value("modmgr", "mod_mgr_local_source_index"))
411
 
                settings.mod_mgr_local_source_index = 
412
 
                        atoi(xml_get_value("modmgr", "mod_mgr_local_source_index"));
 
408
        if ((buf = xml_get_value("modmgr", "mod_mgr_local_source_index")))
 
409
                settings.mod_mgr_local_source_index = atoi(buf);
413
410
        else {
414
411
                xml_add_new_item_to_section("modmgr", "mod_mgr_local_source_index", "0");
415
412
                settings.mod_mgr_local_source_index = 0;
416
413
        }               
417
 
        if (xml_get_value("modmgr", "mod_mgr_remote_source_index"))
418
 
                settings.mod_mgr_remote_source_index =
419
 
                        atoi(xml_get_value("modmgr", "mod_mgr_remote_source_index"));
 
414
        if ((buf = xml_get_value("modmgr", "mod_mgr_remote_source_index")))
 
415
                settings.mod_mgr_remote_source_index = atoi(buf);
420
416
        else {
421
417
                xml_add_new_item_to_section("modmgr", "mod_mgr_remote_source_index", "0");
422
418
                settings.mod_mgr_remote_source_index = 0;
448
444
                settings.tab_page = 0;
449
445
        }
450
446
 
451
 
        settings.sidebar_width =
452
 
                atoi(xml_get_value("layout", "shortcutbar"));
453
 
        if (xml_get_value("layout", "vltoppaneheight"))
454
 
                settings.verselist_toppane_height =
455
 
                        atoi(xml_get_value("layout", "vltoppaneheight"));
 
447
        settings.sidebar_width = atoi((buf = xml_get_value("layout", "shortcutbar"))
 
448
                                      ? buf : "100");
 
449
        if ((buf = xml_get_value("layout", "vltoppaneheight")))
 
450
                settings.verselist_toppane_height = atoi(buf);
456
451
        else {
457
452
                xml_add_new_item_to_section("layout", "vltoppaneheight", "210");
458
453
                settings.verselist_toppane_height = 210;
459
454
        }
460
 
        if (xml_get_value("layout", "sidebar_notebook_hight"))
461
 
                settings.sidebar_notebook_hight =
462
 
                        atoi(xml_get_value("layout", "sidebar_notebook_hight"));
 
455
        if ((buf = xml_get_value("layout", "sidebar_notebook_hight")))
 
456
                settings.sidebar_notebook_hight = atoi(buf);
463
457
        else {
464
458
                xml_add_new_item_to_section("layout", "sidebar_notebook_hight", "300");
465
459
                settings.sidebar_notebook_hight = 250;
466
460
        }
467
 
        settings.gs_hight = atoi(xml_get_value("layout", "hight"));
468
 
        settings.gs_width = atoi(xml_get_value("layout", "width"));
 
461
        settings.gs_hight = atoi((buf = xml_get_value("layout", "hight")) ? buf : "500");
 
462
        settings.gs_width = atoi((buf = xml_get_value("layout", "width")) ? buf : "500");
469
463
        
470
 
        if (xml_get_value("layout", "app_x"))
471
 
                settings.app_x = atoi(xml_get_value("layout", "app_x"));
 
464
        if ((buf = xml_get_value("layout", "app_x")))
 
465
                settings.app_x = atoi(buf);
472
466
        else {
473
467
                xml_add_new_item_to_section("layout", "app_x", "40");
474
468
                settings.app_x = 40;
475
469
        }
476
 
        if (xml_get_value("layout", "app_y"))
477
 
                settings.app_y = atoi(xml_get_value("layout", "app_y"));
 
470
        if ((buf = xml_get_value("layout", "app_y")))
 
471
                settings.app_y = atoi(buf);
478
472
        else{
479
473
                xml_add_new_item_to_section("layout", "app_y", "40");
480
474
                settings.app_y = 40;
481
475
        }
482
476
        
483
 
        settings.biblepane_width =
484
 
            atoi(xml_get_value("layout", "textpane"));
485
 
        settings.upperpane_hight =
486
 
            atoi(xml_get_value("layout", "uperpane"));
 
477
        settings.biblepane_width = atoi((buf = xml_get_value("layout", "textpane"))
 
478
                                        ? buf : "0");
 
479
        settings.upperpane_hight = atoi((buf = xml_get_value("layout", "uperpane"))
 
480
                                        ? buf : "0");
487
481
 
488
 
        if (xml_get_value("layout", "biblehight"))
489
 
                settings.biblepane_hight = atoi(xml_get_value("layout", "biblehight"));
 
482
        if ((buf = xml_get_value("layout", "biblehight")))
 
483
                settings.biblepane_hight = atoi(buf);
490
484
        else {
491
485
                xml_add_new_item_to_section("layout", "biblehight", "340");
492
486
                settings.biblepane_hight = 250;
493
487
        }
494
488
 
495
 
        if (xml_get_value("layout", "commentaryhight"))
496
 
                settings.commpane_hight = atoi(xml_get_value("layout", "commentaryhight"));
 
489
        if ((buf = xml_get_value("layout", "commentaryhight")))
 
490
                settings.commpane_hight = atoi(buf);
497
491
        else {
498
492
                xml_add_new_item_to_section("layout", "commentaryhight", "240");
499
493
                settings.commpane_hight = 240;
500
494
        }
501
495
        
502
 
        settings.verse_num_font_size_str = xml_get_value("fontsize", "versenum");
503
 
        settings.verse_num_font_size = atoi(settings.verse_num_font_size_str);
 
496
        if ((buf = xml_get_value("fontsize", "versenum"))) {
 
497
                settings.verse_num_font_size_str = buf;
 
498
                settings.verse_num_font_size = atoi(buf);
 
499
        } else {
 
500
                settings.verse_num_font_size_str = g_strdup("-1");
 
501
                settings.verse_num_font_size = -1;
 
502
        }
504
503
 
505
504
        if ((buf = xml_get_value("fontsize", "basefontsize"))) {
506
 
                settings.base_font_size_str = g_strdup(buf);
 
505
                settings.base_font_size_str = buf;
507
506
                settings.base_font_size = atoi(settings.base_font_size_str);
508
507
        } else {
509
508
#ifndef WIN32
647
646
                settings.parallel_greekaccents = 1;
648
647
        }
649
648
        
650
 
        buf = xml_get_value("parallel", "parallel");
651
 
        if (buf)
652
 
        settings.parallelpage = atoi(buf);
 
649
        if ((buf = xml_get_value("parallel", "parallel")))
 
650
                settings.parallelpage = atoi(buf);
653
651
 
654
652
        
655
653
        /*  Misc stuff  */
656
654
        
657
 
        settings.showtexts = atoi(xml_get_value("misc", "showtexts"));
658
 
        settings.showcomms = atoi(xml_get_value("misc", "showcomms"));
659
 
        settings.showdicts = atoi(xml_get_value("misc", "showdicts"));
 
655
        settings.showtexts = atoi((buf = xml_get_value("misc", "showtexts")) ? buf : "1");
 
656
        settings.showcomms = atoi((buf = xml_get_value("misc", "showcomms")) ? buf : "1");
 
657
        settings.showdicts = atoi((buf = xml_get_value("misc", "showdicts")) ? buf : "1");
660
658
        if (xml_get_value("misc", "showpreview"))
661
659
                settings.showpreview = atol(xml_get_value("misc", "showpreview"));
662
660
        else {
678
676
                settings.showparatab = 0;
679
677
        }       
680
678
        
681
 
        settings.showsplash = atoi(xml_get_value("misc", "splash"));
 
679
        settings.showsplash = atoi((buf = xml_get_value("misc", "splash")) ? buf : "1");
682
680
        
683
681
        settings.showdevotional =
684
 
            atoi(xml_get_value("misc", "dailydevotional"));
685
 
        settings.versestyle = atoi(xml_get_value("misc", "versestyle"));
 
682
            atoi((buf = xml_get_value("misc", "dailydevotional")) ? buf : "1");
 
683
        settings.versestyle =
 
684
            atoi((buf = xml_get_value("misc", "versestyle")) ? buf : "1");
686
685
 
687
686
        if ((buf = xml_get_value("misc", "pinnedtabs")))
688
687
                settings.linkedtabs = atoi(buf);
719
718
                settings.doublespace = 0;
720
719
        }
721
720
 
722
 
        settings.usedefault = atoi(xml_get_value("misc", "usedefault"));
723
 
        
724
721
        if ((buf = xml_get_value("misc", "chapter-scroll"))) {
725
722
                settings.chapter_scroll = atoi(buf);
726
723
        } else {
735
732
                settings.imageresize = 1;
736
733
        }
737
734
 
738
 
        if (xml_get_value("editor", "spell_language"))
739
 
                settings.spell_language = xml_get_value("editor","spell_language");
 
735
        if ((buf = xml_get_value("editor", "spell_language")))
 
736
                settings.spell_language = g_strdup(buf);
740
737
        else {
741
738
                xml_add_new_item_to_section("editor","spell_language","unknown");
742
739
                settings.spell_language = "unknown";
743
740
        }
744
741
 
745
 
 
746
742
        settings.studypadfilename =
747
743
            xml_get_value("studypad", "lastfile");
748
744
        settings.studypaddir = xml_get_value("studypad", "directory");
749
 
/*
750
 
        if (buf = xml_get_value("shortcutbar", "shortcutbar"))
751
 
                settings.showshortcutbar = atoi(buf);
752
 
        
753
 
        if (buf = xml_get_value("shortcutbar", "docked"))
754
 
                settings.docked =  atoi(buf);
755
 
        
756
 
*/              
757
 
        if (xml_get_value("misc", "show_sidebar")) {
758
 
                buf = xml_get_value("misc", "show_sidebar");
 
745
 
 
746
        if ((buf = xml_get_value("misc", "show_sidebar"))) {
759
747
                settings.showshortcutbar = atoi(buf);
760
748
        } else {
761
749
                xml_add_new_item_to_section("misc","show_sidebar","1");
762
750
                settings.showshortcutbar = 1;
763
751
        }               
764
 
        if (xml_get_value("misc", "sidebar_docked")) {
765
 
                buf = xml_get_value("misc", "sidebar_docked");
 
752
        if ((buf = xml_get_value("misc", "sidebar_docked"))) {
766
753
                settings.docked = atoi(buf);
767
754
        } else {
768
755
                xml_add_new_item_to_section("misc","sidebar_docked","1");
769
756
                settings.docked = 1;
770
757
        }
771
758
        
772
 
        if (xml_get_value("misc", "prayerlist")) {
773
 
                buf = xml_get_value("misc", "prayerlist");
 
759
        if ((buf = xml_get_value("misc", "prayerlist"))) {
774
760
                settings.prayerlist =  atoi(buf);
775
761
        } else {
776
762
                xml_add_new_item_to_section("misc","prayerlist","1");
778
764
        }
779
765
 
780
766
        
781
 
        if (xml_get_value("tabs", "browsing")) {
782
 
                buf = xml_get_value("tabs", "browsing");
 
767
        if ((buf = xml_get_value("tabs", "browsing"))) {
783
768
                settings.browsing =  atoi(buf);
784
769
        } else {
785
770
                xml_add_new_item_to_section("tabs","browsing","1");
786
771
                settings.browsing = 1;
787
772
        }
788
 
        /*
789
 
           settings. = xml_get_value("", "");
790
 
           settings. = xml_get_value("", "");
791
 
           settings. = xml_get_value("", "");
792
 
           settings. = xml_get_value("", "");
793
 
           settings. = xml_get_value("", "");
794
 
         */
795
773
}
796
774
 
797
775