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

« back to all changes in this revision

Viewing changes to src/gnome2/menu_popup.c

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs
  • Date: 2010-03-22 18:15:54 UTC
  • mfrom: (4.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100322181554-qlqchymwhcw28c0c
* New upstream release:
  + Bugfix only
  + Compatible with xulrunner 1.9.2
  + Update translations

* Revert changes introduced in 3.1.2-1ubuntu1. Thank you Chris Coulson
  for temporary fix.
* debian/xiphos.1 - spelling mistake
* waf is now default buildsystem
* help is now licensed under GPL
* Bumped standards version no changes required
* Changed email to @ubuntu.com

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
#include "main/mod_mgr.h"
63
63
#include "main/url.hh"
64
64
 
65
 
#ifdef USE_GTKHTML3_14_23
66
65
#include "editor/slib-editor.h"
67
 
#else
68
 
#include "editor/bonobo-editor.h"
69
 
#endif
70
66
 
71
67
#include "gui/debug_glib_null.h"
72
68
 
78
74
 
79
75
/******************************************************************************
80
76
 * Name
81
 
 *   
 
77
 *
82
78
 *
83
79
 * Synopsis
84
80
 *   #include "gui/menu_popup.h"
85
81
 *
86
 
 *   
 
82
 *
87
83
 *
88
84
 * Description
89
85
 *
90
86
 *
91
87
 * Return value
92
 
 *   
 
88
 *
93
89
 */
94
90
 
95
91
gint  _get_type_mod_list (void)
96
92
{
97
93
        switch (main_get_mod_type(menu_mod_name)) {
98
 
                case TEXT_TYPE: 
 
94
                case TEXT_TYPE:
99
95
                        return TEXT_DESC_LIST;
100
96
                        break;
101
 
                case COMMENTARY_TYPE:   
 
97
                case COMMENTARY_TYPE:
102
98
                case PERCOM_TYPE:
103
 
                        return COMM_DESC_LIST;                  
 
99
                        return COMM_DESC_LIST;
104
100
                        break;
105
 
                case DICTIONARY_TYPE:   
 
101
                case DICTIONARY_TYPE:
106
102
                        return DICT_DESC_LIST;
107
 
                        break;  
108
 
                case BOOK_TYPE: 
 
103
                        break;
 
104
                case BOOK_TYPE:
109
105
                        return GBS_DESC_LIST;
110
 
                        break;  
 
106
                        break;
111
107
                default:
112
108
                        return -1;
113
109
                        break;
117
113
 
118
114
/******************************************************************************
119
115
 * Name
120
 
 *   
 
116
 *
121
117
 *
122
118
 * Synopsis
123
119
 *   #include "gui/menu_popup.h"
124
120
 *
125
 
 *   
 
121
 *
126
122
 *
127
123
 * Description
128
124
 *
129
125
 *
130
126
 * Return value
131
 
 *   
 
127
 *
132
128
 */
133
129
 
134
130
gchar * _get_key (gchar * mod_name)
135
131
{
136
132
        gchar *key = NULL;
137
 
    
 
133
 
138
134
        if (is_dialog) return g_strdup (dialog->key);
139
 
    
 
135
 
140
136
        switch (main_get_mod_type(mod_name)) {
141
137
                case TEXT_TYPE:
142
138
                case COMMENTARY_TYPE:
143
139
                case PERCOM_TYPE:
144
 
                        key = g_strdup (settings.currentverse);                 
 
140
                        key = g_strdup (settings.currentverse);
145
141
                        break;
146
142
                case DICTIONARY_TYPE:
147
143
                        key = g_strdup (settings.dictkey);
148
 
                        break;  
 
144
                        break;
149
145
                case BOOK_TYPE:
150
146
                case PRAYERLIST_TYPE:
151
147
                        key = g_strdup (settings.book_key);
152
 
                        break;          
 
148
                        break;
153
149
        }
154
150
        return key;
155
151
}
157
153
 
158
154
/******************************************************************************
159
155
 * Name
160
 
 *   
 
156
 *
161
157
 *
162
158
 * Synopsis
163
159
 *   #include "gui/menu_popup.h"
164
160
 *
165
 
 *   
 
161
 *
166
162
 *
167
163
 * Description
168
164
 *
169
165
 *
170
166
 * Return value
171
 
 *   
 
167
 *
172
168
 */
173
169
 
174
170
GtkWidget * _get_html (void)
177
173
                return dialog->html;
178
174
        else
179
175
                switch (main_get_mod_type(menu_mod_name)) {
180
 
                case TEXT_TYPE: 
 
176
                case TEXT_TYPE:
181
177
                        return widgets.html_text;
182
178
                        break;
183
179
                case COMMENTARY_TYPE:
184
 
                case PERCOM_TYPE:       
185
 
                        return widgets.html_comm;                       
 
180
                case PERCOM_TYPE:
 
181
                        return widgets.html_comm;
186
182
                        break;
187
 
                case DICTIONARY_TYPE:   
 
183
                case DICTIONARY_TYPE:
188
184
                        return widgets.html_dict;
189
 
                        break;  
190
 
                case BOOK_TYPE: 
 
185
                        break;
 
186
                case BOOK_TYPE:
191
187
                case PRAYERLIST_TYPE:
192
188
                        return widgets.html_book;
193
 
                        break;          
 
189
                        break;
194
190
                }
195
191
        return NULL;
196
192
}
213
209
 *   void
214
210
 */
215
211
 
216
 
static 
 
212
static
217
213
void _global_option_main_pane(GtkMenuItem * menuitem, const gchar * option)
218
214
{
219
215
        gchar *key = _get_key(menu_mod_name);
220
216
        gchar *mod = (gchar*) (is_dialog ? dialog->mod_name : menu_mod_name);
221
 
        
 
217
 
222
218
        if (key) {
223
219
                gchar *url = g_strdup_printf ("sword://%s/%s",
224
220
                                             mod,
225
221
                                             key);
226
222
                main_save_module_options (mod, (gchar*) option,
227
 
                                         GTK_CHECK_MENU_ITEM (menuitem)->active, 
 
223
                                         GTK_CHECK_MENU_ITEM (menuitem)->active,
228
224
                                         is_dialog);
229
225
                if (is_dialog) {
230
226
                        /* show the change */
233
229
                        /* show the change */
234
230
                        main_url_handler (url, TRUE);
235
231
                }
236
 
                
 
232
 
237
233
                g_free (url);
238
234
                g_free (key);
239
235
        }
242
238
 
243
239
/******************************************************************************
244
240
 * Name
245
 
 *   
 
241
 *
246
242
 *
247
243
 * Synopsis
248
244
 *   #include "gui/menu_popup.h"
249
245
 *
250
 
 *   
 
246
 *
251
247
 *
252
248
 * Description
253
249
 *
254
250
 *
255
251
 * Return value
256
 
 *   
 
252
 *
257
253
 */
258
254
 
259
255
static void on_edit_percomm_activate (GtkMenuItem * menuitem, gpointer user_data)
274
270
 
275
271
/******************************************************************************
276
272
 * Name
277
 
 *   
 
273
 *
278
274
 *
279
275
 * Synopsis
280
276
 *   #include "gui/menu_popup.h"
281
277
 *
282
 
 *   
 
278
 *
283
279
 *
284
280
 * Description
285
281
 *
286
282
 *
287
283
 * Return value
288
 
 *   
 
284
 *
289
285
 */
290
286
 
291
287
static void on_edit_prayerlist_activate (GtkMenuItem * menuitem, gpointer user_data)
298
294
                                  dialog->key :
299
295
                                  settings.book_key),
300
296
                                  BOOK_EDITOR);
301
 
    
 
297
 
302
298
}
303
299
 
304
300
 
305
301
/******************************************************************************
306
302
 * Name
307
 
 *   
 
303
 *
308
304
 *
309
305
 * Synopsis
310
306
 *   #include "gui/menu_popup.h"
311
307
 *
312
 
 *   
 
308
 *
313
309
 *
314
310
 * Description
315
311
 *
316
312
 *
317
313
 * Return value
318
 
 *   
 
314
 *
319
315
 */
320
316
 
321
317
G_MODULE_EXPORT void on_popup_about_activate (GtkMenuItem * menuitem, gpointer user_data)
328
324
 
329
325
/******************************************************************************
330
326
 * Name
331
 
 *   
 
327
 *
332
328
 *
333
329
 * Synopsis
334
330
 *   #include "gui/menu_popup.h"
335
331
 *
336
 
 *   
 
332
 *
337
333
 *
338
334
 * Description
339
335
 *
340
336
 *
341
337
 * Return value
342
 
 *   
 
338
 *
343
339
 */
344
340
 
345
341
G_MODULE_EXPORT void on_popup_bookmark_activate        (GtkMenuItem     *menuitem,
346
342
                                        gpointer         user_data)
347
343
{
348
344
        gchar *key;
349
 
        
 
345
 
350
346
        if (is_dialog) return;
351
 
        
 
347
 
352
348
        if ((key = _get_key(menu_mod_name))) {
353
349
                gchar *label = g_strdup_printf("%s, %s",
354
350
                                               key,
356
352
                gui_bookmark_dialog(label,
357
353
                                    menu_mod_name,
358
354
                                    key);
359
 
                g_free (label); 
 
355
                g_free (label);
360
356
                g_free (key);
361
357
        }
362
358
}
364
360
 
365
361
/******************************************************************************
366
362
 * Name
367
 
 *   
 
363
 *
368
364
 *
369
365
 * Synopsis
370
366
 *   #include "gui/menu_popup.h"
371
367
 *
372
 
 *   
 
368
 *
373
369
 *
374
370
 * Description
375
371
 *
376
372
 *
377
373
 * Return value
378
 
 *   
 
374
 *
379
375
 */
380
376
 
381
377
G_MODULE_EXPORT void on_popup_export_passage_activate  (GtkMenuItem     *menuitem,
382
378
                                        gpointer         user_data)
383
 
{       
 
379
{
384
380
        if (is_dialog) return;
385
 
    
 
381
 
386
382
        gui_export_dialog();
387
383
}
388
384
 
389
385
 
390
386
/******************************************************************************
391
387
 * Name
392
 
 *   
 
388
 *
393
389
 *
394
390
 * Synopsis
395
391
 *   #include "gui/menu_popup.h"
396
392
 *
397
 
 *   
 
393
 *
398
394
 *
399
395
 * Description
400
396
 *
401
397
 *
402
398
 * Return value
403
 
 *   
 
399
 *
404
400
 */
405
401
 
406
402
G_MODULE_EXPORT void on_popup_print_activate           (GtkMenuItem     *menuitem,
408
404
{
409
405
        if (is_dialog) {
410
406
#ifdef USE_GTKMOZEMBED
411
 
                gecko_html_print_document (GTK_WINDOW (widgets.app), 
412
 
                                           dialog->mod_name, 
 
407
                gecko_html_print_document (GTK_WINDOW (widgets.app),
 
408
                                           dialog->mod_name,
413
409
                                           dialog);
414
 
        
 
410
 
415
411
#else
416
412
                gui_html_print (dialog->html, FALSE, dialog->mod_name);
417
 
#endif      
 
413
#endif
418
414
        } else {
419
415
#ifdef USE_GTKMOZEMBED
420
 
                gecko_html_print_document (GTK_WINDOW (widgets.app), 
421
 
                                           menu_mod_name, 
 
416
                gecko_html_print_document (GTK_WINDOW (widgets.app),
 
417
                                           menu_mod_name,
422
418
                                           NULL);
423
 
        
 
419
 
424
420
#else
425
421
                gui_html_print (_get_html(), FALSE, menu_mod_name);
426
422
#endif
430
426
 
431
427
/******************************************************************************
432
428
 * Name
433
 
 *   
 
429
 *
434
430
 *
435
431
 * Synopsis
436
432
 *   #include "gui/menu_popup.h"
437
433
 *
438
 
 *   
 
434
 *
439
435
 *
440
436
 * Description
441
437
 *
442
438
 *
443
439
 * Return value
444
 
 *   
 
440
 *
445
441
 */
446
442
 
447
443
G_MODULE_EXPORT void on_close_activate           (GtkMenuItem     *menuitem,
448
444
                                        gpointer         user_data)
449
445
{
450
 
        /* FIXME */    
 
446
        /* FIXME */
451
447
}
452
448
 
453
449
 
454
450
/******************************************************************************
455
451
 * Name
456
 
 *   
 
452
 *
457
453
 *
458
454
 * Synopsis
459
455
 *   #include "gui/menu_popup.h"
460
456
 *
461
 
 *   
 
457
 *
462
458
 *
463
459
 * Description
464
460
 *
465
461
 *
466
462
 * Return value
467
 
 *   
 
463
 *
468
464
 */
469
465
 
470
466
G_MODULE_EXPORT void on_popup_copy_activate            (GtkMenuItem     *menuitem,
481
477
        gecko_html_copy_selection (GECKO_HTML (_get_html ()));
482
478
#else
483
479
        gui_copy_html (_get_html ());
484
 
#endif      
 
480
#endif
485
481
        }
486
482
}
487
483
 
488
484
 
489
485
/******************************************************************************
490
486
 * Name
491
 
 *   
 
487
 *
492
488
 *
493
489
 * Synopsis
494
490
 *   #include "gui/menu_popup.h"
495
491
 *
496
 
 *   
 
492
 *
497
493
 *
498
494
 * Description
499
495
 *
500
496
 *
501
497
 * Return value
502
 
 *   
 
498
 *
503
499
 */
504
500
 
505
501
G_MODULE_EXPORT void on_popup_find_activate            (GtkMenuItem     *menuitem,
508
504
        if (is_dialog)
509
505
                gui_find_dlg (dialog->html, dialog->mod_name, FALSE, NULL);
510
506
        else
511
 
                gui_find_dlg (_get_html (), menu_mod_name, FALSE, NULL);    
 
507
                gui_find_dlg (_get_html (), menu_mod_name, FALSE, NULL);
512
508
}
513
509
 
514
510
 
515
511
/******************************************************************************
516
512
 * Name
517
 
 *   
 
513
 *
518
514
 *
519
515
 * Synopsis
520
516
 *   #include "gui/menu_popup.h"
521
517
 *
522
 
 *   
 
518
 *
523
519
 *
524
520
 * Description
525
521
 *
526
522
 *
527
523
 * Return value
528
 
 *   
 
524
 *
529
525
 */
530
526
 
531
527
G_MODULE_EXPORT void on_popup_font_activate (GtkMenuItem * menuitem, gpointer user_data)
546
542
                                                     key);
547
543
                        gui_set_module_font (menu_mod_name);
548
544
                        /* show the change */
549
 
                        main_url_handler (url, TRUE);           
550
 
                        g_free (url);           
551
 
                        g_free (key); 
 
545
                        main_url_handler (url, TRUE);
 
546
                        g_free (url);
 
547
                        g_free (key);
552
548
                 }
553
549
        }
554
550
}
556
552
 
557
553
/******************************************************************************
558
554
 * Name
559
 
 *   
 
555
 *
560
556
 *
561
557
 * Synopsis
562
558
 *   #include "gui/menu_popup.h"
563
559
 *
564
 
 *   
 
560
 *
565
561
 *
566
562
 * Description
567
563
 *
568
564
 *
569
565
 * Return value
570
 
 *   
 
566
 *
571
567
 */
572
568
 
573
569
G_MODULE_EXPORT void on_words_of_christ_in_red_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
574
570
{
575
 
        _global_option_main_pane((GtkMenuItem*)menuitem, 
 
571
        _global_option_main_pane((GtkMenuItem*)menuitem,
576
572
                                         "Words of Christ in Red"); /* string not seen by user */
577
573
}
578
574
 
579
575
 
580
576
/******************************************************************************
581
577
 * Name
582
 
 *   
 
578
 *
583
579
 *
584
580
 * Synopsis
585
581
 *   #include "gui/menu_popup.h"
586
582
 *
587
 
 *   
 
583
 *
588
584
 *
589
585
 * Description
590
586
 *
591
587
 *
592
588
 * Return value
593
 
 *   
 
589
 *
594
590
 */
595
591
 
596
592
G_MODULE_EXPORT void on_strong_s_numbers_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
601
597
 
602
598
/******************************************************************************
603
599
 * Name
604
 
 *   
 
600
 *
605
601
 *
606
602
 * Synopsis
607
603
 *   #include "gui/menu_popup.h"
608
604
 *
609
 
 *   
 
605
 *
610
606
 *
611
607
 * Description
612
608
 *
613
609
 *
614
610
 * Return value
615
 
 *   
 
611
 *
616
612
 */
617
613
 
618
614
G_MODULE_EXPORT void on_morphological_tags_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
623
619
 
624
620
/******************************************************************************
625
621
 * Name
626
 
 *   
 
622
 *
627
623
 *
628
624
 * Synopsis
629
625
 *   #include "gui/menu_popup.h"
630
626
 *
631
 
 *   
 
627
 *
632
628
 *
633
629
 * Description
634
630
 *
635
631
 *
636
632
 * Return value
637
 
 *   
 
633
 *
638
634
 */
639
635
 
640
636
G_MODULE_EXPORT void on_footnotes_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
645
641
 
646
642
/******************************************************************************
647
643
 * Name
648
 
 *   
 
644
 *
649
645
 *
650
646
 * Synopsis
651
647
 *   #include "gui/menu_popup.h"
652
648
 *
653
 
 *   
 
649
 *
654
650
 *
655
651
 * Description
656
652
 *
657
653
 *
658
654
 * Return value
659
 
 *   
 
655
 *
660
656
 */
661
657
 
662
658
G_MODULE_EXPORT void on_greek_accents_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
667
663
 
668
664
/******************************************************************************
669
665
 * Name
670
 
 *   
 
666
 *
671
667
 *
672
668
 * Synopsis
673
669
 *   #include "gui/menu_popup.h"
674
670
 *
675
 
 *   
 
671
 *
676
672
 *
677
673
 * Description
678
674
 *
679
675
 *
680
676
 * Return value
681
 
 *   
 
677
 *
682
678
 */
683
679
 
684
680
G_MODULE_EXPORT void on_lemmas_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
689
685
 
690
686
/******************************************************************************
691
687
 * Name
692
 
 *   
 
688
 *
693
689
 *
694
690
 * Synopsis
695
691
 *   #include "gui/menu_popup.h"
696
692
 *
697
 
 *   
 
693
 *
698
694
 *
699
695
 * Description
700
696
 *
701
697
 *
702
698
 * Return value
703
 
 *   
 
699
 *
704
700
 */
705
701
 
706
702
G_MODULE_EXPORT void on_scripture_cross_references_activate (GtkCheckMenuItem * menuitem,
712
708
 
713
709
/******************************************************************************
714
710
 * Name
715
 
 *   
 
711
 *
716
712
 *
717
713
 * Synopsis
718
714
 *   #include "gui/menu_popup.h"
719
715
 *
720
 
 *   
 
716
 *
721
717
 *
722
718
 * Description
723
719
 *
724
720
 *
725
721
 * Return value
726
 
 *   
 
722
 *
727
723
 */
728
724
 
729
725
G_MODULE_EXPORT void on_hebrew_vowel_points_activate (GtkCheckMenuItem * menuitem,
735
731
 
736
732
/******************************************************************************
737
733
 * Name
738
 
 *   
 
734
 *
739
735
 *
740
736
 * Synopsis
741
737
 *   #include "gui/menu_popup.h"
742
738
 *
743
 
 *   
 
739
 *
744
740
 *
745
741
 * Description
746
742
 *
747
743
 *
748
744
 * Return value
749
 
 *   
 
745
 *
750
746
 */
751
747
 
752
748
G_MODULE_EXPORT void on_hebrew_cantillation_activate (GtkCheckMenuItem * menuitem,
758
754
 
759
755
/******************************************************************************
760
756
 * Name
761
 
 *   
 
757
 *
762
758
 *
763
759
 * Synopsis
764
760
 *   #include "gui/menu_popup.h"
765
761
 *
766
 
 *   
 
762
 *
767
763
 *
768
764
 * Description
769
765
 *
770
766
 *
771
767
 * Return value
772
 
 *   
 
768
 *
773
769
 */
774
770
 
775
771
G_MODULE_EXPORT void on_headings_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
780
776
 
781
777
/******************************************************************************
782
778
 * Name
783
 
 *   
 
779
 *
784
780
 *
785
781
 * Synopsis
786
782
 *   #include "gui/menu_popup.h"
787
783
 *
788
 
 *   
 
784
 *
789
785
 *
790
786
 * Description
791
787
 *
792
788
 *
793
789
 * Return value
794
 
 *   
 
790
 *
795
791
 */
796
792
 
797
793
G_MODULE_EXPORT void on_transliteration_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
801
797
 
802
798
/******************************************************************************
803
799
 * Name
804
 
 *   
 
800
 *
805
801
 *
806
802
 * Synopsis
807
803
 *   #include "gui/menu_popup.h"
808
804
 *
809
 
 *   
 
805
 *
810
806
 *
811
807
 * Description
812
808
 *
813
809
 *
814
810
 * Return value
815
 
 *   
 
811
 *
816
812
 */
817
813
 
818
814
G_MODULE_EXPORT void on_commentary_by_chapter_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
823
819
 
824
820
/******************************************************************************
825
821
 * Name
826
 
 *   
 
822
 *
827
823
 *
828
824
 * Synopsis
829
825
 *   #include "gui/menu_popup.h"
830
826
 *
831
 
 *   
 
827
 *
832
828
 *
833
829
 * Description
834
830
 *
835
831
 *
836
832
 * Return value
837
 
 *   
 
833
 *
838
834
 */
839
835
 
840
836
G_MODULE_EXPORT void on_primary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
841
837
{
842
838
        gchar *key = NULL;
843
 
    
 
839
 
844
840
        if (is_dialog) {
845
841
                reading_selector(dialog->mod_name,
846
842
                                 dialog->key,
853
849
                                         key,
854
850
                                         NULL,
855
851
                                         (GtkMenuItem*)menuitem,
856
 
                                         GINT_TO_POINTER(0));   
 
852
                                         GINT_TO_POINTER(0));
857
853
                        g_free (key);
858
854
                }
859
855
        }
862
858
 
863
859
/******************************************************************************
864
860
 * Name
865
 
 *   
 
861
 *
866
862
 *
867
863
 * Synopsis
868
864
 *   #include "gui/menu_popup.h"
869
865
 *
870
 
 *   
 
866
 *
871
867
 *
872
868
 * Description
873
869
 *
874
870
 *
875
871
 * Return value
876
 
 *   
 
872
 *
877
873
 */
878
874
 
879
875
G_MODULE_EXPORT void on_secondary_reading_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
880
 
{       
 
876
{
881
877
        gchar *key = NULL;
882
 
    
 
878
 
883
879
        if (is_dialog) {
884
880
                reading_selector(dialog->mod_name,
885
881
                                 dialog->key,
892
888
                                         key,
893
889
                                         NULL,
894
890
                                         (GtkMenuItem*)menuitem,
895
 
                                         GINT_TO_POINTER(1));   
 
891
                                         GINT_TO_POINTER(1));
896
892
                        g_free (key);
897
893
                }
898
894
        }
901
897
 
902
898
/******************************************************************************
903
899
 * Name
904
 
 *   
 
900
 *
905
901
 *
906
902
 * Synopsis
907
903
 *   #include "gui/menu_popup.h"
908
904
 *
909
 
 *   
 
905
 *
910
906
 *
911
907
 * Description
912
908
 *
913
909
 *
914
910
 * Return value
915
 
 *   
 
911
 *
916
912
 */
917
913
 
918
914
G_MODULE_EXPORT void on_all_readings_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
919
 
{       
 
915
{
920
916
        gchar *key = NULL;
921
 
    
 
917
 
922
918
        if (is_dialog) {
923
919
                reading_selector(dialog->mod_name,
924
920
                                 dialog->key,
931
927
                                         key,
932
928
                                         NULL,
933
929
                                         (GtkMenuItem*)menuitem,
934
 
                                         GINT_TO_POINTER(2));   
 
930
                                         GINT_TO_POINTER(2));
935
931
                        g_free (key);
936
932
                }
937
933
        }
941
937
 
942
938
/******************************************************************************
943
939
 * Name
944
 
 *   
 
940
 *
945
941
 *
946
942
 * Synopsis
947
943
 *   #include "gui/menu_popup.h"
948
944
 *
949
 
 *   
 
945
 *
950
946
 *
951
947
 * Description
952
948
 *
953
949
 *
954
950
 * Return value
955
 
 *   
 
951
 *
956
952
 */
957
953
 
958
954
G_MODULE_EXPORT void on_image_content_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
963
959
 
964
960
/******************************************************************************
965
961
 * Name
966
 
 *   
 
962
 *
967
963
 *
968
964
 * Synopsis
969
965
 *   #include "gui/menu_popup.h"
970
966
 *
971
 
 *   
 
967
 *
972
968
 *
973
969
 * Description
974
970
 *
975
971
 *
976
972
 * Return value
977
 
 *   
 
973
 *
978
974
 */
979
975
 
980
976
G_MODULE_EXPORT void on_respect_font_faces_activate (GtkCheckMenuItem * menuitem, gpointer user_data)
985
981
 
986
982
/******************************************************************************
987
983
 * Name
988
 
 *   
 
984
 *
989
985
 *
990
986
 * Synopsis
991
987
 *   #include "gui/menu_popup.h"
992
988
 *
993
 
 *   
 
989
 *
994
990
 *
995
991
 * Description
996
992
 *
997
993
 *
998
994
 * Return value
999
 
 *   
 
995
 *
1000
996
 */
1001
997
 
1002
998
G_MODULE_EXPORT void on_unlock_this_module_activate (GtkMenuItem * menuitem, gpointer user_data)
1004
1000
        gchar *cipher_key;
1005
1001
        gchar *cipher_old;
1006
1002
        gchar *key = NULL;
1007
 
    
 
1003
 
1008
1004
        if (is_dialog) return;
1009
1005
 
1010
1006
        cipher_old = main_get_mod_config_entry (menu_mod_name, "CipherKey");
1023
1019
 
1024
1020
/******************************************************************************
1025
1021
 * Name
1026
 
 *   
 
1022
 *
1027
1023
 *
1028
1024
 * Synopsis
1029
1025
 *   #include "gui/menu_popup.h"
1030
1026
 *
1031
 
 *   
 
1027
 *
1032
1028
 *
1033
1029
 * Description
1034
1030
 *
1035
1031
 *
1036
1032
 * Return value
1037
 
 *   
 
1033
 *
1038
1034
 */
1039
1035
 
1040
1036
G_MODULE_EXPORT void on_display_book_heading_activate (GtkMenuItem * menuitem, gpointer user_data)
1048
1044
 
1049
1045
/******************************************************************************
1050
1046
 * Name
1051
 
 *   
 
1047
 *
1052
1048
 *
1053
1049
 * Synopsis
1054
1050
 *   #include "gui/menu_popup.h"
1055
1051
 *
1056
 
 *   
 
1052
 *
1057
1053
 *
1058
1054
 * Description
1059
1055
 *
1060
1056
 *
1061
1057
 * Return value
1062
 
 *   
 
1058
 *
1063
1059
 */
1064
1060
 
1065
1061
G_MODULE_EXPORT void on_display_chapter_heading_activate (GtkMenuItem * menuitem, gpointer user_data)
1073
1069
 
1074
1070
/******************************************************************************
1075
1071
 * Name
1076
 
 *   
 
1072
 *
1077
1073
 *
1078
1074
 * Synopsis
1079
1075
 *   #include "gui/menu_popup.h"
1080
1076
 *
1081
 
 *   
 
1077
 *
1082
1078
 *
1083
1079
 * Description
1084
1080
 *
1085
1081
 *
1086
1082
 * Return value
1087
 
 *   
 
1083
 *
1088
1084
 */
1089
1085
 
1090
1086
G_MODULE_EXPORT void on_use_current_dictionary_activate (GtkMenuItem * menuitem, gpointer user_data)
1091
 
{                       
 
1087
{
1092
1088
#ifdef USE_GTKMOZEMBED
1093
1089
        gecko_html_copy_selection(GECKO_HTML(_get_html()));
1094
1090
        gtk_editable_select_region((GtkEditable *)widgets.entry_dict,0,-1);
1120
1116
 */
1121
1117
 
1122
1118
G_MODULE_EXPORT void on_lookup_google_activate (GtkMenuItem * menuitem, gpointer user_data)
1123
 
{                       
 
1119
{
1124
1120
        gchar *dict_key, *showstr;
1125
1121
 
1126
1122
#ifdef USE_GTKMOZEMBED
1146
1142
 
1147
1143
/******************************************************************************
1148
1144
 * Name
1149
 
 *   
 
1145
 *
1150
1146
 *
1151
1147
 * Synopsis
1152
1148
 *   #include "gui/menu_popup.h"
1153
1149
 *
1154
 
 *   
 
1150
 *
1155
1151
 *
1156
1152
 * Description
1157
1153
 *
1158
1154
 *
1159
1155
 * Return value
1160
 
 *   
 
1156
 *
1161
1157
 */
1162
1158
 
1163
1159
G_MODULE_EXPORT void on_rename_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data)
1164
1160
{
1165
1161
        if (is_dialog) return;
1166
 
    
 
1162
 
1167
1163
#if defined(WIN32)
1168
1164
        gui_generic_warning(_("Renaming is not available in Windows.\n\n"
1169
1165
                              "Xiphos is limited by Windows' filesystem,\n"
1297
1293
 
1298
1294
/******************************************************************************
1299
1295
 * Name
1300
 
 *   
 
1296
 *
1301
1297
 *
1302
1298
 * Synopsis
1303
1299
 *   #include "gui/menu_popup.h"
1304
1300
 *
1305
 
 *   
 
1301
 *
1306
1302
 *
1307
1303
 * Description
1308
1304
 *
1309
1305
 *
1310
1306
 * Return value
1311
 
 *   
 
1307
 *
1312
1308
 */
1313
1309
 
1314
1310
G_MODULE_EXPORT void on_dump_perscomm_activate (GtkMenuItem * menuitem, gpointer user_data)
1373
1369
G_MODULE_EXPORT void on_mark_verse_activate (GtkMenuItem * menuitem, gpointer user_data)
1374
1370
{
1375
1371
        gchar *key;
1376
 
        
 
1372
 
1377
1373
        if (is_dialog) return;
1378
 
    
 
1374
 
1379
1375
        if ((key = _get_key(menu_mod_name))) {
1380
1376
                gui_mark_verse_dialog(menu_mod_name, key);
1381
1377
                g_free(key);
1392
1388
 *   GtkWidget * _add_global_opts(const gcahr * module_name)
1393
1389
 *
1394
1390
 * Description
1395
 
 *   
 
1391
 *
1396
1392
 *
1397
1393
 * Return value
1398
1394
 *   GtkWidget*
1399
1395
 */
1400
1396
 
1401
1397
G_MODULE_EXPORT void _add_and_check_global_opts (GladeXML *gxml,
1402
 
                                 const gchar * mod_name, 
1403
 
                                 GtkWidget * submenu, 
 
1398
                                 const gchar * mod_name,
 
1399
                                 GtkWidget * submenu,
1404
1400
                                 DIALOG_DATA * d)
1405
1401
{
1406
 
        GtkWidget * item;    
 
1402
        GtkWidget * item;
1407
1403
        GLOBAL_OPS *ops = NULL;
1408
 
    
1409
 
        if (is_dialog) 
 
1404
 
 
1405
        if (is_dialog)
1410
1406
                ops = main_new_globals((gchar*) mod_name, 1);
1411
1407
        else
1412
1408
                ops = main_new_globals((gchar*) mod_name, 0);
1413
 
    
1414
 
    
 
1409
 
 
1410
 
1415
1411
        item = glade_xml_get_widget (gxml, "words_of_christ_in_red");
1416
1412
        gtk_widget_hide (item);
1417
 
    
 
1413
 
1418
1414
        if ((main_check_for_global_option ((gchar*) mod_name, "GBFRedLetterWords")) ||
1419
 
            (main_check_for_global_option ((gchar*) mod_name, "OSISRedLetterWords"))) {         
 
1415
            (main_check_for_global_option ((gchar*) mod_name, "OSISRedLetterWords"))) {
1420
1416
                gtk_widget_show(item);
1421
1417
                GTK_CHECK_MENU_ITEM(item)->active = ops->words_in_red;
1422
1418
        }
1423
 
    
 
1419
 
1424
1420
        item = glade_xml_get_widget (gxml, "strong's_numbers");
1425
1421
        gtk_widget_hide (item);
1426
 
    
 
1422
 
1427
1423
        if ((main_check_for_global_option((gchar*) mod_name, "GBFStrongs")) ||
1428
1424
            (main_check_for_global_option((gchar*) mod_name, "ThMLStrongs")) ||
1429
 
            (main_check_for_global_option((gchar*) mod_name, "OSISStrongs"))) {         
 
1425
            (main_check_for_global_option((gchar*) mod_name, "OSISStrongs"))) {
1430
1426
                gtk_widget_show(item);
1431
1427
                GTK_CHECK_MENU_ITEM(item)->active = ops->strongs;
1432
1428
        }
1433
 
    
 
1429
 
1434
1430
        item = glade_xml_get_widget (gxml, "morphological_tags");
1435
1431
        gtk_widget_hide (item);
1436
 
    
 
1432
 
1437
1433
        if (main_check_for_global_option((gchar*) mod_name, "GBFMorph") ||
1438
1434
            main_check_for_global_option((gchar*) mod_name, "ThMLMorph") ||
1439
 
            main_check_for_global_option((gchar*) mod_name, "OSISMorph")) {             
 
1435
            main_check_for_global_option((gchar*) mod_name, "OSISMorph")) {
1440
1436
                gtk_widget_show(item);
1441
1437
                GTK_CHECK_MENU_ITEM(item)->active = ops->morphs;
1442
1438
        }
1443
 
    
 
1439
 
1444
1440
        item = glade_xml_get_widget (gxml, "footnotes");
1445
1441
        gtk_widget_hide (item);
1446
 
    
 
1442
 
1447
1443
        if (main_check_for_global_option((gchar*) mod_name, "GBFFootnotes") ||
1448
1444
            main_check_for_global_option((gchar*) mod_name, "ThMLFootnotes") ||
1449
 
            main_check_for_global_option((gchar*) mod_name, "OSISFootnotes")) {         
 
1445
            main_check_for_global_option((gchar*) mod_name, "OSISFootnotes")) {
1450
1446
                gtk_widget_show(item);
1451
1447
                GTK_CHECK_MENU_ITEM(item)->active = ops->footnotes;
1452
1448
        }
1453
 
    
 
1449
 
1454
1450
        item = glade_xml_get_widget (gxml, "greek_accents");
1455
1451
        gtk_widget_hide (item);
1456
 
    
1457
 
        if (main_check_for_global_option((gchar*) mod_name, "UTF8GreekAccents")) {              
 
1452
 
 
1453
        if (main_check_for_global_option((gchar*) mod_name, "UTF8GreekAccents")) {
1458
1454
                gtk_widget_show(item);
1459
1455
                GTK_CHECK_MENU_ITEM(item)->active = ops->greekaccents;
1460
1456
        }
1461
 
    
 
1457
 
1462
1458
        item = glade_xml_get_widget (gxml, "lemmas");
1463
1459
        gtk_widget_hide (item);
1464
 
    
 
1460
 
1465
1461
        if (main_check_for_global_option((gchar*) mod_name, "ThMLLemma") ||
1466
 
            main_check_for_global_option((gchar*) mod_name, "OSISLemma")) {             
 
1462
            main_check_for_global_option((gchar*) mod_name, "OSISLemma")) {
1467
1463
                gtk_widget_show(item);
1468
1464
                GTK_CHECK_MENU_ITEM(item)->active = ops->lemmas;
1469
1465
        }
1470
 
    
 
1466
 
1471
1467
        item = glade_xml_get_widget (gxml, "scripture_cross-references");
1472
1468
        gtk_widget_hide (item);
1473
 
    
 
1469
 
1474
1470
        if (main_check_for_global_option((gchar*) mod_name, "ThMLScripref") ||
1475
 
            main_check_for_global_option((gchar*) mod_name, "OSISScripref")) {          
 
1471
            main_check_for_global_option((gchar*) mod_name, "OSISScripref")) {
1476
1472
                gtk_widget_show(item);
1477
1473
                GTK_CHECK_MENU_ITEM(item)->active = ops->scripturerefs;
1478
1474
        }
1479
 
    
 
1475
 
1480
1476
        item = glade_xml_get_widget (gxml, "hebrew_vowel_points");
1481
1477
        gtk_widget_hide (item);
1482
 
    
1483
 
        if (main_check_for_global_option((gchar*) mod_name, "UTF8HebrewPoints")) {              
 
1478
 
 
1479
        if (main_check_for_global_option((gchar*) mod_name, "UTF8HebrewPoints")) {
1484
1480
                gtk_widget_show(item);
1485
1481
                GTK_CHECK_MENU_ITEM(item)->active = ops->hebrewpoints;
1486
1482
        }
1487
 
    
 
1483
 
1488
1484
        item = glade_xml_get_widget (gxml, "hebrew_cantillation");
1489
1485
        gtk_widget_hide (item);
1490
 
    
1491
 
        if (main_check_for_global_option ((gchar*) mod_name, "UTF8Cantillation")) {             
 
1486
 
 
1487
        if (main_check_for_global_option ((gchar*) mod_name, "UTF8Cantillation")) {
1492
1488
                gtk_widget_show (item);
1493
1489
                GTK_CHECK_MENU_ITEM (item)->active = ops->hebrewcant;
1494
1490
        }
1495
 
    
 
1491
 
1496
1492
        item = glade_xml_get_widget (gxml, "headings");
1497
1493
        gtk_widget_hide (item);
1498
 
    
 
1494
 
1499
1495
        if (main_check_for_global_option ((gchar*) mod_name, "ThMLHeadings") ||
1500
 
            main_check_for_global_option ((gchar*) mod_name, "OSISHeadings")) {         
 
1496
            main_check_for_global_option ((gchar*) mod_name, "OSISHeadings")) {
1501
1497
                gtk_widget_show (item);
1502
1498
                GTK_CHECK_MENU_ITEM (item)->active = ops->headings;
1503
 
        } 
1504
 
    
 
1499
        }
 
1500
 
1505
1501
        item = glade_xml_get_widget (gxml, "transliteration");
1506
1502
        GTK_CHECK_MENU_ITEM (item)->active = ops->transliteration;
1507
1503
 
1508
1504
        item = glade_xml_get_widget (gxml, "variants");
1509
1505
        gtk_widget_hide (item);
1510
 
    
1511
 
        if (main_check_for_global_option ((gchar*) mod_name, "ThMLVariants")) {         
 
1506
 
 
1507
        if (main_check_for_global_option ((gchar*) mod_name, "ThMLVariants")) {
1512
1508
                gtk_widget_show (item);
1513
1509
                item = glade_xml_get_widget (gxml, "primary_reading");
1514
1510
                        GTK_CHECK_MENU_ITEM(item)->active = ops->variants_primary;
1517
1513
                item = glade_xml_get_widget (gxml, "all_readings");
1518
1514
                        GTK_CHECK_MENU_ITEM (item)->active = ops->variants_all;
1519
1515
        }
1520
 
    
 
1516
 
1521
1517
        item = glade_xml_get_widget (gxml, "image_content");
1522
1518
        gtk_widget_hide (item);
1523
 
    
1524
 
        if (ops->image_content != -1) {         
 
1519
 
 
1520
        if (ops->image_content != -1) {
1525
1521
                gtk_widget_show (item);
1526
1522
                GTK_CHECK_MENU_ITEM (item)->active = ops->image_content;
1527
1523
        }
1528
 
    
 
1524
 
1529
1525
        item = glade_xml_get_widget (gxml, "respect_font_faces");
1530
1526
        gtk_widget_hide (item);
1531
 
    
1532
 
        if (ops->respect_font_faces != -1) {            
 
1527
 
 
1528
        if (ops->respect_font_faces != -1) {
1533
1529
                gtk_widget_show(item);
1534
1530
                GTK_CHECK_MENU_ITEM (item)->active = ops->respect_font_faces;
1535
1531
        }
1536
 
    
 
1532
 
1537
1533
        item = glade_xml_get_widget (gxml, "commentary_by_chapter");
1538
1534
        gtk_widget_hide (item);
1539
 
    
 
1535
 
1540
1536
        if (main_get_mod_type((gchar*) (is_dialog ? d->mod_name : mod_name)) == COMMENTARY_TYPE) {
1541
1537
                gtk_widget_show (item);
1542
 
                GTK_CHECK_MENU_ITEM (item)->active = ops->commentary_by_chapter;  
 
1538
                GTK_CHECK_MENU_ITEM (item)->active = ops->commentary_by_chapter;
1543
1539
        }
1544
 
    
 
1540
 
1545
1541
        g_free(ops);
1546
 
    
 
1542
 
1547
1543
}
1548
1544
 
1549
1545
/******************************************************************************
1566
1562
                                 gpointer user_data)
1567
1563
{
1568
1564
        if (is_dialog) return;
1569
 
    
 
1565
 
1570
1566
        gchar *module_name = main_module_name_from_description ((gchar *)user_data);
1571
1567
        gchar *url = NULL;
1572
1568
        gchar *key = NULL;
1573
 
    
 
1569
 
1574
1570
        if (module_name && (key = _get_key(menu_mod_name))) {
1575
1571
                url = g_strdup_printf ("sword://%s/%s",
1576
1572
                                        module_name,
1646
1642
 *   GtkWidget*
1647
1643
 */
1648
1644
 
1649
 
static 
 
1645
static
1650
1646
GtkWidget * _create_popup_menu ( const gchar * mod_name, DIALOG_DATA * d)
1651
1647
{
1652
1648
        gchar *glade_file;
1653
1649
        GladeXML *gxml;
1654
1650
        const gchar *mname = NULL;
1655
 
        
 
1651
 
1656
1652
        glade_file = gui_general_user_file ("xi-menus.glade", FALSE);
1657
1653
        g_return_val_if_fail ((glade_file != NULL), NULL);
1658
 
        
 
1654
 
1659
1655
        gxml = glade_xml_new (glade_file, "menu_popup", NULL);
1660
 
                
 
1656
 
1661
1657
        g_free (glade_file);
1662
1658
        g_return_val_if_fail ((gxml != NULL), NULL);
1663
 
        
 
1659
 
1664
1660
        GtkWidget *menu         = glade_xml_get_widget (gxml, "menu_popup");
1665
 
    
 
1661
 
1666
1662
        GtkWidget *bookmark     = glade_xml_get_widget (gxml, "bookmark");
1667
1663
        GtkWidget *open         = glade_xml_get_widget (gxml, "open_module2"); /*  */
1668
1664
        GtkWidget *export_      = glade_xml_get_widget (gxml, "export_passage");
1670
1666
        GtkWidget *note         = glade_xml_get_widget (gxml, "note"); /*  */
1671
1667
        GtkWidget *mark_verse   = glade_xml_get_widget (gxml, "mark_verse"); /*  */
1672
1668
        GtkWidget *open_edit    = glade_xml_get_widget (gxml, "open_in_editor");
1673
 
        
 
1669
 
1674
1670
        GtkWidget *mod_opt_sub  = GTK_WIDGET (glade_xml_get_widget (gxml, "module_options1_menu")); /*  */
1675
 
        
 
1671
 
1676
1672
        GtkWidget *lookup       = glade_xml_get_widget (gxml, "lookup_selection1"); /*  */
1677
1673
        GtkWidget *lookup_sub   = glade_xml_get_widget (gxml, "lookup_selection1_menu");
1678
 
        GtkWidget *unlock       = glade_xml_get_widget (gxml, "unlock_this_module"); 
 
1674
        GtkWidget *unlock       = glade_xml_get_widget (gxml, "unlock_this_module");
1679
1675
        GtkWidget *book_heading = glade_xml_get_widget (gxml, "display_book_heading");
1680
1676
        GtkWidget *chapter_heading = glade_xml_get_widget (gxml, "display_chapter_heading");
1681
1677
        GtkWidget *rename_percomm = glade_xml_get_widget (gxml, "rename_perscomm");
1682
1678
        GtkWidget *dump_percomm = glade_xml_get_widget (gxml, "dump_perscomm");
1683
 
        
 
1679
 
1684
1680
        GtkWidget *open_sub     = gtk_menu_new ();
1685
1681
        GtkWidget *note_sub     = gtk_menu_new ();
1686
 
        
 
1682
 
1687
1683
        gtk_widget_hide (unlock);
1688
1684
        gtk_widget_hide (book_heading);
1689
1685
        gtk_widget_hide (export_);
1694
1690
        gtk_widget_hide (open_edit);
1695
1691
        gtk_widget_hide (mark_verse);
1696
1692
        gtk_widget_hide (close); /* FIXME: hide until connected to dialog close */
1697
 
    
 
1693
 
1698
1694
        if (is_dialog) {
1699
1695
                mname = dialog->mod_name;
1700
1696
                gtk_widget_hide (open);
1702
1698
                gtk_widget_hide (export_);
1703
1699
        } else {
1704
1700
                mname = mod_name;
1705
 
                gtk_widget_hide (close);            
 
1701
                gtk_widget_hide (close);
1706
1702
                gtk_menu_item_set_submenu (GTK_MENU_ITEM(open),
1707
1703
                                        open_sub);
1708
1704
                gui_add_mods_2_gtk_menu (_get_type_mod_list (), open_sub,
1709
1705
                                (GCallback) on_view_mod_activate);
1710
 
            
 
1706
 
1711
1707
                if (main_has_cipher_tag((gchar*) mod_name)) /* only unlock from main window */
1712
1708
                        gtk_widget_show(unlock);
1713
1709
        }
1714
 
    
 
1710
 
1715
1711
        switch (main_get_mod_type((gchar*) mname)) {
1716
 
        case TEXT_TYPE: 
 
1712
        case TEXT_TYPE:
1717
1713
                gtk_widget_show (export_);
1718
1714
                if (is_dialog) break;
1719
1715
                gtk_widget_show(note);
1722
1718
                gui_add_mods_2_gtk_menu (PERCOMM_LIST, note_sub,
1723
1719
                                (GCallback) on_edit_percomm_activate);
1724
1720
                break;
1725
 
        case COMMENTARY_TYPE:   
 
1721
        case COMMENTARY_TYPE:
1726
1722
                gtk_widget_show(book_heading);
1727
 
                gtk_widget_show(chapter_heading);                       
 
1723
                gtk_widget_show(chapter_heading);
1728
1724
                break;
1729
1725
        case PERCOM_TYPE:
1730
1726
                gtk_widget_show (open_edit);
1731
1727
                g_signal_connect (GTK_OBJECT(open_edit),
1732
1728
                                "activate",
1733
1729
                                G_CALLBACK (on_edit_percomm_activate),
1734
 
                                (gchar*) (is_dialog ? d->mod_name : mod_name)); 
1735
 
                
1736
 
                gtk_widget_show (rename_percomm); 
1737
 
                gtk_widget_show (dump_percomm);   
1738
 
                break;
1739
 
        case DICTIONARY_TYPE:   
1740
 
                
1741
 
                break;  
1742
 
        case BOOK_TYPE: 
1743
 
                
1744
 
                break;  
 
1730
                                (gchar*) (is_dialog ? d->mod_name : mod_name));
 
1731
 
 
1732
                gtk_widget_show (rename_percomm);
 
1733
                gtk_widget_show (dump_percomm);
 
1734
                break;
 
1735
        case DICTIONARY_TYPE:
 
1736
 
 
1737
                break;
 
1738
        case BOOK_TYPE:
 
1739
 
 
1740
                break;
1745
1741
        case PRAYERLIST_TYPE:
1746
1742
                gtk_widget_show (open_edit);
1747
1743
                g_signal_connect (GTK_OBJECT(open_edit),
1748
1744
                                "activate",
1749
1745
                                G_CALLBACK (on_edit_prayerlist_activate),
1750
 
                                (gchar*) (is_dialog ? d->mod_name : mod_name)); 
1751
 
                
 
1746
                                (gchar*) (is_dialog ? d->mod_name : mod_name));
 
1747
 
1752
1748
                break;
1753
 
        }       
1754
 
        
 
1749
        }
 
1750
 
1755
1751
        gtk_menu_item_set_submenu (GTK_MENU_ITEM (lookup),
1756
1752
                                  lookup_sub);
1757
 
    
 
1753
 
1758
1754
        gui_add_mods_2_gtk_menu (DICT_DESC_LIST, lookup_sub,
1759
1755
                                (GCallback) _lookup_selection);
1760
1756
 
1761
1757
        /* = glade_xml_get_widget (gxml, ""); */
1762
1758
        _add_and_check_global_opts (gxml,
1763
 
                                    (char*)(is_dialog ? d->mod_name : mod_name), 
1764
 
                                    mod_opt_sub, 
 
1759
                                    (char*)(is_dialog ? d->mod_name : mod_name),
 
1760
                                    mod_opt_sub,
1765
1761
                                    d);
1766
1762
        /* connect signals and data */
1767
1763
        glade_xml_signal_autoconnect_full
1791
1787
void gui_menu_popup (const gchar * mod_name, DIALOG_DATA * d)
1792
1788
{
1793
1789
        GtkWidget *menu;
1794
 
    
 
1790
 
1795
1791
        if (d) {
1796
1792
                dialog = d;
1797
1793
                menu_mod_name = NULL;
1802
1798
                is_dialog = FALSE;
1803
1799
        } else
1804
1800
                return;
1805
 
    
 
1801
 
1806
1802
        menu = _create_popup_menu (mod_name, d);
1807
1803
        gtk_menu_popup ((GtkMenu*)menu, NULL, NULL, NULL, NULL, 2,
1808
1804
                                        gtk_get_current_event_time());