← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/gnome2/parallel_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/parallel_dialog.c
2
2
 * Xiphos Bible Study Tool
3
3
 * parallel_dialog.c - dialog for detached parallel
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
24
24
#endif
25
25
 
26
26
#include <gtk/gtk.h>
27
 
#include <glade/glade-xml.h>
28
 
#ifdef USE_GTKMOZEMBED
29
 
#ifdef WIN32
30
 
#include "geckowin/gecko-html.h"
31
 
#else
32
 
#include "gecko/gecko-html.h"
33
 
#endif
34
 
#else
 
27
#ifdef GTKHTML
35
28
#include <gtkhtml/gtkhtml.h>
36
29
#include "gui/html.h"
37
 
#endif  /* USE_GTKMOZEMBED */
 
30
#endif
 
31
#ifndef USE_GTKBUILDER
 
32
  #include <glade/glade-xml.h>
 
33
#endif
 
34
#include "../xiphos_html/xiphos_html.h"
38
35
 
39
36
#include "gui/parallel_dialog.h"
40
37
#include "gui/parallel_view.h"
76
73
static void sync_with_main(void);
77
74
 
78
75
 
79
 
#ifdef USE_GTKMOZEMBED
 
76
#ifdef USE_XIPHOS_HTML
80
77
static void
81
 
_popupmenu_requested_cb(GeckoHtml *html,
 
78
_popupmenu_requested_cb(XiphosHtml *html,
82
79
                        gchar *uri,
83
80
                        gpointer user_data)
84
81
{
179
176
 *   void
180
177
 */
181
178
 
182
 
static void on_dlgparallel_destroy(GtkObject * object,
 
179
static void on_dlgparallel_destroy(GObject * object,
183
180
                                      gpointer user_data)
184
181
{
185
182
 
246
243
 
247
244
void gui_keep_parallel_dialog_in_sync(void)
248
245
{
249
 
        if (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync)->active)
 
246
        if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(navbar_parallel.button_sync)))
250
247
                sync_with_main();
251
248
}
252
249
 
323
320
        gint y;
324
321
 
325
322
        gdk_window_get_root_origin(
326
 
            GDK_WINDOW(dialog_parallel->window), &x, &y);
 
323
            GDK_WINDOW(gtk_widget_get_window (dialog_parallel)), &x, &y);
327
324
 
328
325
        settings.parallel_width  = event->width;
329
326
        settings.parallel_height = event->height;
372
369
        GtkWidget *hbuttonbox4;
373
370
        GtkWidget *btnDockInt;
374
371
#ifdef USE_GTKMOZEMBED
375
 
        GtkWidget *eventbox;
376
372
        GtkWidget *frame;
377
373
#else
378
374
        GtkWidget *scrolled_window;
391
387
                                    settings.parallel_height);
392
388
        gtk_window_set_resizable(GTK_WINDOW(dialog_parallel), TRUE);
393
389
 
394
 
        dialog_vbox25 = GTK_DIALOG(dialog_parallel)->vbox;
 
390
        dialog_vbox25 = gtk_dialog_get_content_area (GTK_DIALOG(dialog_parallel));
395
391
        g_object_set_data(G_OBJECT(dialog_parallel),
396
392
                          "dialog_vbox25", dialog_vbox25);
397
393
        gtk_widget_show(dialog_vbox25);
398
394
 
399
 
 
400
 
 
401
395
        vboxInt = gtk_vbox_new(FALSE, 0);
402
396
        gtk_widget_show(vboxInt);
403
397
        gtk_box_pack_start(GTK_BOX(dialog_vbox25), vboxInt, TRUE, TRUE,
432
426
                }
433
427
        }
434
428
#endif /* 0 */
435
 
 
436
 
#ifdef USE_GTKMOZEMBED
437
 
        frame = gtk_frame_new(NULL);
438
 
        gtk_widget_show(frame);
439
 
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
440
 
        gtk_box_pack_start(GTK_BOX(vboxInt), frame, TRUE, TRUE,0);
441
 
 
442
 
        eventbox = gtk_event_box_new ();
443
 
        gtk_widget_show (eventbox);
444
 
        gtk_container_add(GTK_CONTAINER(frame), eventbox);
445
 
 
446
 
        widgets.html_parallel_dialog = GTK_WIDGET(gecko_html_new(NULL, FALSE, PARALLEL_TYPE));
447
 
        gtk_widget_show(widgets.html_parallel_dialog);
448
 
        gtk_container_add(GTK_CONTAINER(eventbox),
449
 
                          widgets.html_parallel_dialog);
450
 
        g_signal_connect((gpointer)widgets.html_parallel_dialog,
451
 
                         "popupmenu_requested",
452
 
                         G_CALLBACK (_popupmenu_requested_cb),
453
 
                         NULL);
454
 
#else
 
429
    
 
430
#ifndef  USE_GTKMOZEMBED
455
431
        scrolled_window = gtk_scrolled_window_new(NULL, NULL);
456
432
        gtk_widget_show(scrolled_window);
457
433
        gtk_box_pack_start(GTK_BOX(vboxInt), scrolled_window, TRUE, TRUE,0);
460
436
                                       GTK_POLICY_ALWAYS);
461
437
        gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)scrolled_window,
462
438
                                             settings.shadow_type);
 
439
#endif
 
440
 
 
441
#ifdef USE_XIPHOS_HTML
 
442
        widgets.html_parallel_dialog = GTK_WIDGET(XIPHOS_HTML_NEW(NULL, FALSE, PARALLEL_TYPE));
 
443
        gtk_widget_show(widgets.html_parallel_dialog);
 
444
 #ifdef USE_WEBKIT 
 
445
        gtk_container_add(GTK_CONTAINER(scrolled_window),
 
446
                          widgets.html_parallel_dialog);
 
447
 #else    
 
448
        frame = gtk_frame_new(NULL);
 
449
        gtk_widget_show(frame);
 
450
        gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
 
451
        gtk_box_pack_start(GTK_BOX(vboxInt), frame, TRUE, TRUE,0);      
 
452
        gtk_container_add(GTK_CONTAINER(frame),
 
453
                          widgets.html_parallel_dialog);    
 
454
 #endif /* USE_WEBKIT */ 
 
455
        g_signal_connect((gpointer)widgets.html_parallel_dialog,
 
456
                         "popupmenu_requested",
 
457
                         G_CALLBACK (_popupmenu_requested_cb),
 
458
                         NULL);
 
459
#else
463
460
 
464
461
        widgets.html_parallel_dialog = gtk_html_new();
465
462
        gtk_widget_show(widgets.html_parallel_dialog);
466
463
        gtk_html_load_empty(GTK_HTML(widgets.html_parallel_dialog));
467
464
        gtk_container_add(GTK_CONTAINER(scrolled_window),
468
465
                          widgets.html_parallel_dialog);
469
 
        g_signal_connect(GTK_OBJECT(widgets.html_parallel_dialog),
 
466
        g_signal_connect(G_OBJECT(widgets.html_parallel_dialog),
470
467
                         "button_release_event",
471
468
                         G_CALLBACK (_popupmenu_requested_cb),
472
469
                         NULL);
473
 
        g_signal_connect(GTK_OBJECT(widgets.html_parallel_dialog),
 
470
        g_signal_connect(G_OBJECT(widgets.html_parallel_dialog),
474
471
                         "url_requested",
475
472
                         G_CALLBACK(url_requested), NULL);
476
473
#endif
477
474
        dialog_action_area25 =
478
 
            GTK_DIALOG(dialog_parallel)->action_area;
 
475
            gtk_dialog_get_action_area (GTK_DIALOG(dialog_parallel));
479
476
        g_object_set_data(G_OBJECT(dialog_parallel),
480
477
                          "dialog_action_area25",
481
478
                          dialog_action_area25);
493
490
        btnDockInt = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
494
491
        gtk_widget_show(btnDockInt);
495
492
        gtk_container_add(GTK_CONTAINER(hbuttonbox4), btnDockInt);
496
 
        GTK_WIDGET_SET_FLAGS(btnDockInt, GTK_CAN_DEFAULT);
497
 
 
498
 
 
499
 
        g_signal_connect(GTK_OBJECT(dialog_parallel), "destroy",
 
493
        gtk_widget_set_can_default (btnDockInt, 1);
 
494
 
 
495
 
 
496
        g_signal_connect(G_OBJECT(dialog_parallel), "destroy",
500
497
                           G_CALLBACK(on_dlgparallel_destroy),
501
498
                           NULL);
502
 
        g_signal_connect(GTK_OBJECT(btnDockInt), "clicked",
 
499
        g_signal_connect(G_OBJECT(btnDockInt), "clicked",
503
500
                           G_CALLBACK(gui_btnDockInt_clicked),
504
501
                           NULL);
505
502