← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main/navbar_versekey.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_versekey.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
34
34
#include "gui/navbar_versekey.h"
35
35
#include "gui/tabbed_browser.h"
36
36
 
 
37
#ifdef USE_WEBKIT_EDITOR
 
38
#include "editor/webkit_editor.h"
 
39
#else
37
40
#include "editor/slib-editor.h"
 
41
#endif
38
42
 
39
43
#include "backend/sword_main.hh"
40
44
 
97
101
 
98
102
        tmpkey = backend->get_valid_key(navbar.key->str);
99
103
 
100
 
        vkey.AutoNormalize(1);
 
104
        vkey.setAutoNormalize(1);
101
105
        vkey = tmpkey;
102
106
 
103
 
 
104
 
 
105
 
        book = (direction)?(vkey.Book()+1):(vkey.Book()-1);
106
 
        vkey.Book(book);
107
 
 
 
107
        book = direction ? (vkey.getBook()+1) : (vkey.getBook()-1);
 
108
        vkey.setBook(book);
108
109
 
109
110
        tmpkey = g_strdup_printf("%s 1:1",vkey.getBookName());
110
111
        gtk_entry_set_text(GTK_ENTRY(navbar.lookup_entry), tmpkey);
141
142
 
142
143
        tmpkey = backend->get_valid_key(navbar.key->str);
143
144
 
144
 
        vkey.AutoNormalize(1);
 
145
        vkey.setAutoNormalize(1);
145
146
        vkey = tmpkey;
146
 
        chapter = (direction ? (vkey.Chapter()+1) : (vkey.Chapter()-1));
147
 
        vkey.Chapter(chapter);
148
 
        tmpkey = g_strdup_printf("%s %d:1", vkey.getBookName(), vkey.Chapter());
 
147
        chapter = direction ? (vkey.getChapter()+1) : (vkey.getChapter()-1);
 
148
        vkey.setChapter(chapter);
 
149
        tmpkey = g_strdup_printf("%s %d:1", vkey.getBookName(), vkey.getChapter());
149
150
        gtk_entry_set_text(GTK_ENTRY(navbar.lookup_entry), tmpkey);
150
151
        gtk_widget_activate(navbar.lookup_entry);
151
152
        g_free(tmpkey);
180
181
 
181
182
        tmpkey = backend->get_valid_key(navbar.key->str);
182
183
 
183
 
        vkey.AutoNormalize(1);
 
184
        vkey.setAutoNormalize(1);
184
185
        vkey = tmpkey;
185
 
        verse = (direction)?(vkey.Verse()+1):(vkey.Verse()-1);
186
 
        vkey.Verse(verse);
 
186
        verse = direction ? (vkey.getVerse()+1) : (vkey.getVerse()-1);
 
187
        vkey.setVerse(verse);
187
188
        tmpkey = g_strdup_printf("%s %d:%d", vkey.getBookName(),
188
 
                                 vkey.Chapter(), vkey.Verse());
 
189
                                 vkey.getChapter(), vkey.getVerse());
189
190
        gtk_entry_set_text(GTK_ENTRY(navbar.lookup_entry), tmpkey);
190
191
        gtk_widget_activate(navbar.lookup_entry);
191
192
        g_free(tmpkey);
216
217
        GtkWidget *entry = NULL;
217
218
        int book = GPOINTER_TO_INT(user_data);
218
219
 
219
 
        vkey.AutoNormalize(1);
 
220
        vkey.setAutoNormalize(1);
220
221
        switch (c_type) {
221
222
                case NB_MAIN:
222
223
                        vkey = navbar_versekey.key->str;
238
239
                break;
239
240
        }
240
241
        if (entry) {
241
 
                vkey.Testament(2);
242
 
                vkey.Book(book+1);
 
242
                vkey.setTestament(2);
 
243
                vkey.setBook(book+1);
243
244
                gtk_entry_set_text(GTK_ENTRY(entry),vkey.getText());
244
245
                gtk_widget_activate(entry);
245
246
        }
269
270
        VerseKey vkey;
270
271
        GtkWidget *entry = NULL;
271
272
        int book = GPOINTER_TO_INT(user_data);
272
 
//#ifndef OLD_NAVBAR
273
 
        vkey.AutoNormalize(1);
 
273
        vkey.setAutoNormalize(1);
274
274
 
275
275
        switch (c_type) {
276
276
                case NB_MAIN:
293
293
                break;
294
294
        }
295
295
        if (entry) {
296
 
                vkey.Testament(0);
297
 
                vkey.Book(book+1);
 
296
                vkey.setTestament(0);
 
297
                vkey.setBook(book+1);
298
298
                gtk_entry_set_text(GTK_ENTRY(entry),vkey.getText());
299
299
                gtk_widget_activate(entry);
300
300
        }
301
 
//#endif
302
301
}
303
302
 
304
303
 
326
325
        GtkWidget *entry = NULL;
327
326
        int chapter = GPOINTER_TO_INT(user_data);
328
327
 
329
 
//#ifndef OLD_NAVBAR
330
 
        vkey.AutoNormalize(1);
 
328
        vkey.setAutoNormalize(1);
331
329
 
332
330
        switch (c_type) {
333
331
                case NB_MAIN:
350
348
                break;
351
349
        }
352
350
        if (entry) {
353
 
                vkey.Chapter(chapter);
 
351
                vkey.setChapter(chapter);
354
352
                gtk_entry_set_text(GTK_ENTRY(entry),vkey.getText());
355
353
                gtk_widget_activate(entry);
356
354
        }
357
 
//#endif
358
355
}
359
356
 
360
357
 
382
379
        GtkWidget *entry = NULL;
383
380
        int verse = GPOINTER_TO_INT(user_data);
384
381
 
385
 
//#ifndef OLD_NAVBAR
386
 
        vkey.AutoNormalize(1);
 
382
        vkey.setAutoNormalize(1);
387
383
        switch (c_type) {
388
384
                case NB_MAIN:
389
385
                        vkey = navbar_versekey.key->str;
405
401
                break;
406
402
        }
407
403
        if (entry) {
408
 
                vkey.Verse(verse);
 
404
                vkey.setVerse(verse);
409
405
                gtk_entry_set_text(GTK_ENTRY(entry),vkey.getText());
410
406
                gtk_widget_activate(entry);
411
407
        }
412
 
//#endif
413
408
}
414
409
 
415
410
 
440
435
        if (!navbar.module_name->len)
441
436
                return;
442
437
 
443
 
        vkey.AutoNormalize(1);
 
438
        vkey.setAutoNormalize(1);
444
439
        vkey = key;
445
440
 
446
441
        /*if ((backend->module_has_testament(navbar.module_name->str, 1))
453
448
        tmpbuf = g_strdup_printf("<b>%s</b>", vkey.getBookName());
454
449
        gtk_label_set_label(GTK_LABEL(navbar.label_book_menu), tmpbuf);
455
450
 
456
 
        num = main_format_number(vkey.Chapter());
 
451
        num = main_format_number(vkey.getChapter());
457
452
        tmpbuf = g_strdup_printf("<b>%s</b>", num);
458
453
        g_free(num);
459
454
        gtk_label_set_label(GTK_LABEL(navbar.label_chapter_menu), tmpbuf);
460
455
 
461
 
        num = main_format_number(vkey.Verse());
 
456
        num = main_format_number(vkey.getVerse());
462
457
        tmpbuf = g_strdup_printf("<b>%s</b>", num);
463
458
        g_free(num);
464
459
        gtk_label_set_label(GTK_LABEL(navbar.label_verse_menu), tmpbuf);
508
503
        menu = gtk_menu_new();
509
504
        menu_shell = GTK_MENU_SHELL(menu);
510
505
 
511
 
        vkey.AutoNormalize(1);
 
506
        vkey.setAutoNormalize(1);
512
507
        vkey = navbar.key->str;
513
 
        int xverse = vkey.Verse();
 
508
        int xverse = vkey.getVerse();
514
509
 
515
510
        x = (vkey.getVerseMax());
516
511
        for(i=1; i <= x; i++) {
563
558
{
564
559
        VerseKey vkey;
565
560
        char *num;
566
 
        vkey.AutoNormalize(1);
 
561
        vkey.setAutoNormalize(1);
567
562
        gint i,x;
568
563
        GtkWidget *menu;
569
564
        GtkMenuShell *menu_shell;
578
573
        menu = gtk_menu_new();
579
574
        menu_shell = GTK_MENU_SHELL(menu);
580
575
        vkey = navbar.key->str;
581
 
        int xchapter = vkey.Chapter();
 
576
        int xchapter = vkey.getChapter();
582
577
        x = (vkey.getChapterMax());
583
578
        for(i=1; i <= x; i++) {
584
579
                num = main_format_number(i);
651
646
 
652
647
        if (backend->module_has_testament(navbar.module_name->str, 1)) {
653
648
                while (i < key.BMAX[0]) {
654
 
                        key.Testament(1);
655
 
                        key.Book(i+1);
 
649
                        key.setTestament(1);
 
650
                        key.setBook(i+1);
656
651
                        book = strdup((const char *) key.getBookName());
657
652
                        char *mykey = g_strdup_printf("%s 1:1",book);
658
653
                        char *rawtext = main_get_raw_text(navbar.module_name->str, mykey);
689
684
        i = 0;
690
685
        if (backend->module_has_testament(navbar.module_name->str, 2)) {
691
686
                while (i < key.BMAX[1]) {
692
 
                        key.Testament(2);
693
 
                        key.Book(i+1);
 
687
                        key.setTestament(2);
 
688
                        key.setBook(i+1);
694
689
                        book = strdup((const char *) key.getBookName());
695
690
                        char *mykey = g_strdup_printf("%s 1:1",book);
696
691
                        char *rawtext = main_get_raw_text(navbar.module_name->str, mykey);