← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main/navbar.cc

  • 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/main/navbar.cc
2
2
 * Xiphos Bible Study Tool
3
3
 * navbar.cc - glue between all navbars and sword
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
71
71
 
72
72
        do_display = FALSE;
73
73
 
74
 
        vkey.AutoNormalize(1);
 
74
        vkey.setAutoNormalize(1);
75
75
        vkey = key;
76
76
 
77
77
        if ((backend->module_has_testament(navbar.module_name, 1))
78
 
                                && (vkey.Testament() == 2))
79
 
                book = 39 + vkey.Book();
 
78
            && (vkey.getTestament() == 2))
 
79
                book = 39 + vkey.getBook();
80
80
        else
81
 
                book = vkey.Book();
 
81
                book = vkey.getBook();
82
82
 
83
83
        gtk_combo_box_set_active((GtkComboBox *)navbar.comboboxentry_book,
84
84
                                             book-1);
86
86
        gtk_list_store_clear(GTK_LIST_STORE(chapter_store));
87
87
        //char xtestament = vkey.Testament() ;
88
88
        //char xbook = vkey.Book();
89
 
        int xchapter = vkey.Chapter();
90
 
        int xverse = vkey.Verse();
 
89
        int xchapter = vkey.getChapter();
 
90
        int xverse = vkey.getVerse();
91
91
        x = (vkey.getChapterMax());
92
92
        for(i=1; i <= x; i++) {
93
93
                char *num = main_format_number(i);
105
105
        gtk_list_store_clear(GTK_LIST_STORE(verse_store));
106
106
        //xtestament = vkey.Testament() ;
107
107
        //xbook = vkey.Book();
108
 
        xchapter = vkey.Chapter();
109
 
        xverse = vkey.Verse();
 
108
        xchapter = vkey.getChapter();
 
109
        xverse = vkey.getVerse();
110
110
        x = (vkey.getVerseMax());
111
111
        for(i=1; i <= x; i++) {
112
112
                char *num = main_format_number(i);
147
147
        gtk_list_store_clear(GTK_LIST_STORE(book_model));
148
148
        if (backend->module_has_testament(navbar.module_name, 1)) {
149
149
                while (i < key.BMAX[0]) {
150
 
                        key.Testament(1);
151
 
                        key.Book(i+1);
 
150
                        key.setTestament(1);
 
151
                        key.setBook(i+1);
152
152
                        book = strdup((const char *) key.getBookName());
153
153
                        char *mykey = g_strdup_printf("%s 1:1",book);
154
154
                        if (!main_get_raw_text(navbar.module_name, mykey)){
171
171
        i = 0;
172
172
        if (backend->module_has_testament(navbar.module_name, 2)) {
173
173
                while (i < key.BMAX[1]) {
174
 
                        key.Testament(2);
175
 
                        key.Book(i+1);
 
174
                        key.setTestament(2);
 
175
                        key.setBook(i+1);
176
176
                        book = strdup((const char *) key.getBookName());
177
177
                        char *mykey = g_strdup_printf("%s 1:1",book);
178
178
                        if (!main_get_raw_text(navbar.module_name, mykey)){