← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gnome2/bookmark_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/bookmark_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * bookmark_dialog.c - gui to popup a dialog for adding a bookmark
4
4
 *
5
 
 * Copyright (C) 2005-2010 Xiphos Developer Team
 
5
 * Copyright (C) 2005-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
24
24
#endif
25
25
 
26
26
#include <gtk/gtk.h>
27
 
#include <glade/glade-xml.h>
 
27
#ifndef USE_GTKBUILDER
 
28
  #include <glade/glade-xml.h>
 
29
#endif
28
30
 
29
31
#include "gui/bookmark_dialog.h"
30
32
#include "gui/bookmarks_menu.h"
37
39
#include "main/settings.h"
38
40
#include "main/xml.h"
39
41
 
 
42
#include "../xiphos_html/xiphos_html.h"
 
43
 
40
44
#include "gui/debug_glib_null.h"
41
45
 
42
46
extern GtkTreeStore *model;
297
301
        case GTK_RESPONSE_ACCEPT: /*  mark the verse  */
298
302
                xml_set_list_item("osisrefmarkedverses", "markedverse",
299
303
                                  reference, (note ?
300
 
#ifdef USE_GTKMOZEMBED
 
304
#ifdef USE_XIPHOS_HTML
301
305
                                              note
302
306
#else
303
307
                                              g_strdelimit(note, "\"", '\'')
304
 
#endif /* !USE_GTKMOZEMBED */
 
308
#endif /* !USE_XIPHOS_HTML */
305
309
                                              : "user content"));
306
310
                marked_cache_fill(settings.MainWindowModule, settings.currentverse);
307
311
                main_display_bible(NULL, settings.currentverse);
434
438
                                          gchar * module,
435
439
                                          gchar * key)
436
440
{
 
441
#ifdef USE_GTKBUILDER
 
442
        GtkBuilder *gxml;
 
443
#else
437
444
        GladeXML *gxml;
438
 
        gchar *glade_file;
439
 
 
440
 
        glade_file = gui_general_user_file ("bookmarks.glade", TRUE);
 
445
#endif
 
446
        gchar *glade_file = gui_general_user_file ("bookmarks" UI_SUFFIX, TRUE);
441
447
        g_return_val_if_fail(glade_file != NULL, NULL);
442
448
        GS_message(("%s",glade_file));
443
449
 
444
450
        /* build the widget */
 
451
#ifdef USE_GTKBUILDER
 
452
        gxml = gtk_builder_new ();
 
453
        gtk_builder_add_from_file (gxml, glade_file, NULL);
 
454
#else
445
455
        gxml = glade_xml_new (glade_file, NULL, NULL);
 
456
#endif
446
457
        g_free (glade_file);
447
458
        g_return_val_if_fail(gxml != NULL, NULL);
448
459
 
449
460
        /* lookup the root widget */
450
 
        bookmark_dialog = glade_xml_get_widget (gxml, "dialog");
 
461
        bookmark_dialog = UI_GET_ITEM(gxml, "dialog");
451
462
        g_signal_connect(bookmark_dialog, "response",
452
463
                         G_CALLBACK(on_dialog_response), NULL);
453
464
 
454
465
        /* treeview */
455
 
        treeview = glade_xml_get_widget (gxml, "treeview");
 
466
        treeview = UI_GET_ITEM(gxml, "treeview");
456
467
        setup_treeview();
457
468
        g_signal_connect(treeview, "button-release-event",
458
469
                         G_CALLBACK(on_treeview_button_release_event), NULL);
459
470
        /* entrys */
460
 
        entry_label = glade_xml_get_widget (gxml, "entry1");
461
 
        entry_key = glade_xml_get_widget (gxml, "entry2");
462
 
        entry_module = glade_xml_get_widget (gxml, "entry3");
 
471
        entry_label = UI_GET_ITEM(gxml, "entry1");
 
472
        entry_key = UI_GET_ITEM(gxml, "entry2");
 
473
        entry_module = UI_GET_ITEM(gxml, "entry3");
 
474
 
463
475
        gtk_entry_set_text(GTK_ENTRY(entry_label), label);
464
476
        gtk_entry_set_text(GTK_ENTRY(entry_key), key);
465
477
        gtk_entry_set_text(GTK_ENTRY(entry_module), module);
471
483
                         G_CALLBACK(on_dialog_enter), NULL);
472
484
 
473
485
        /* dialog buttons */
474
 
        button_new_folder = glade_xml_get_widget (gxml, "button1");
475
 
        button_add_bookmark = glade_xml_get_widget (gxml, "button3");
 
486
        button_new_folder = UI_GET_ITEM(gxml, "button1");
 
487
        button_add_bookmark = UI_GET_ITEM(gxml, "button3");
476
488
 
477
489
        return bookmark_dialog;
478
490
}
495
507
static GtkWidget *_create_mark_verse_dialog(gchar * module,
496
508
                                            gchar * key)
497
509
{
 
510
#ifdef USE_GTKBUILDER
 
511
        GtkBuilder *gxml;
 
512
#else
498
513
        GladeXML *gxml;
499
 
        gchar *glade_file;
 
514
#endif
500
515
        GtkWidget *sw;
501
516
        gchar osisreference[100];
502
517
        gchar *old_note = NULL;
503
518
 
 
519
        gchar *glade_file = gui_general_user_file("markverse" UI_SUFFIX, TRUE);
 
520
        g_return_val_if_fail(glade_file != NULL, NULL);
 
521
        GS_message(("%s",glade_file));
 
522
 
504
523
        g_snprintf(osisreference,  100, "%s %s", module,
505
524
                   main_get_osisref_from_key((const char *)module,
506
525
                                             (const char *)key));
507
526
        note = NULL;
508
527
 
509
 
        glade_file = gui_general_user_file("markverse.glade", TRUE);
510
 
        g_return_val_if_fail(glade_file != NULL, NULL);
511
 
        GS_message(("%s",glade_file));
512
 
 
513
528
        /* build the widget */
 
529
#ifdef USE_GTKBUILDER
 
530
        gxml = gtk_builder_new ();
 
531
        gtk_builder_add_from_file (gxml, glade_file, NULL);
 
532
#else
514
533
        gxml = glade_xml_new(glade_file, NULL, NULL);
 
534
#endif
515
535
        g_free(glade_file);
516
536
        g_return_val_if_fail(gxml != NULL, NULL);
517
537
 
518
538
        /* lookup the root widget */
519
 
        mark_verse_dialog = glade_xml_get_widget(gxml, "dialog");
 
539
        mark_verse_dialog = UI_GET_ITEM(gxml, "dialog");
520
540
        gtk_window_set_default_size (GTK_WINDOW (mark_verse_dialog),
521
541
                                   300, 350);
522
542
 
524
544
                         G_CALLBACK(on_mark_verse_response), NULL);
525
545
 
526
546
        /* entrys */
527
 
        entry_key = glade_xml_get_widget(gxml, "entry2");
528
 
        entry_module = glade_xml_get_widget(gxml, "entry3");
529
 
        textview = glade_xml_get_widget(gxml, "textview");
 
547
        entry_key = UI_GET_ITEM(gxml, "entry2");
 
548
        entry_module = UI_GET_ITEM(gxml, "entry3");
 
549
        textview = UI_GET_ITEM(gxml, "textview");
 
550
 
530
551
        textbuffer = gtk_text_view_get_buffer ((GtkTextView*)textview);
531
552
        gtk_entry_set_text(GTK_ENTRY(entry_key), key);
532
553
        gtk_entry_set_text(GTK_ENTRY(entry_module), module);
533
 
        sw = glade_xml_get_widget(gxml, "scrolledwindow1");
 
554
 
 
555
        sw = UI_GET_ITEM(gxml, "scrolledwindow1");
534
556
 
535
557
        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
536
558
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),