/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive.glade

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
1
 
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
1
<?xml version="1.0" encoding="UTF-8"?>
2
2
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
3
3
<!--*- mode: xml -*-->
4
4
<glade-interface>
6
6
    <property name="width_request">700</property>
7
7
    <property name="height_request">400</property>
8
8
    <property name="title" translatable="yes">Olive - Bazaar GUI</property>
9
 
    <property name="icon">oliveicon2.png</property>
 
9
    <property name="icon">icons/oliveicon2.png</property>
10
10
    <signal name="destroy" handler="on_window_main_destroy"/>
11
11
    <signal name="delete_event" handler="on_window_main_delete_event"/>
12
12
    <child>
58
58
                      </widget>
59
59
                    </child>
60
60
                    <child>
 
61
                      <widget class="GtkMenuItem" id="menuitem_file_bookmark">
 
62
                        <property name="visible">True</property>
 
63
                        <property name="label" translatable="yes">_Bookmark current directory</property>
 
64
                        <property name="use_underline">True</property>
 
65
                        <signal name="activate" handler="on_menuitem_file_bookmark_activate"/>
 
66
                      </widget>
 
67
                    </child>
 
68
                    <child>
61
69
                      <widget class="GtkMenuItem" id="menuitem_file_make_directory">
62
70
                        <property name="visible">True</property>
63
71
                        <property name="label" translatable="yes">Make _directory...</property>
129
137
                      </widget>
130
138
                    </child>
131
139
                    <child>
 
140
                      <widget class="GtkCheckMenuItem" id="menuitem_view_show_ignored_files">
 
141
                        <property name="visible">True</property>
 
142
                        <property name="label" translatable="yes">Show _ignored files</property>
 
143
                        <property name="use_underline">True</property>
 
144
                        <signal name="activate" handler="on_menuitem_view_show_ignored_files_activate"/>
 
145
                      </widget>
 
146
                    </child>
 
147
                    <child>
132
148
                      <widget class="GtkSeparatorMenuItem" id="separator_view1">
133
149
                        <property name="visible">True</property>
134
150
                      </widget>
190
206
                        <child internal-child="image">
191
207
                          <widget class="GtkImage" id="image243">
192
208
                            <property name="visible">True</property>
193
 
                            <property name="pixbuf">pull16.png</property>
 
209
                            <property name="pixbuf">icons/pull16.png</property>
194
210
                          </widget>
195
211
                        </child>
196
212
                      </widget>
204
220
                        <child internal-child="image">
205
221
                          <widget class="GtkImage" id="image244">
206
222
                            <property name="visible">True</property>
207
 
                            <property name="pixbuf">push16.png</property>
 
223
                            <property name="pixbuf">icons/push16.png</property>
208
224
                          </widget>
209
225
                        </child>
210
226
                      </widget>
211
227
                    </child>
212
228
                    <child>
 
229
                      <widget class="GtkMenuItem" id="menuitem_branch_update">
 
230
                        <property name="visible">True</property>
 
231
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
232
                        <property name="label" translatable="yes">Update</property>
 
233
                        <property name="use_underline">True</property>
 
234
                        <signal name="activate" handler="on_menuitem_branch_update_activate"/>
 
235
                      </widget>
 
236
                    </child>
 
237
                    <child>
213
238
                      <widget class="GtkSeparatorMenuItem" id="separator_branch2">
214
239
                        <property name="visible">True</property>
215
240
                      </widget>
239
264
                        <child internal-child="image">
240
265
                          <widget class="GtkImage" id="image245">
241
266
                            <property name="visible">True</property>
242
 
                            <property name="pixbuf">commit16.png</property>
 
267
                            <property name="pixbuf">icons/commit16.png</property>
243
268
                          </widget>
244
269
                        </child>
245
270
                      </widget>
301
326
                        <child internal-child="image">
302
327
                          <widget class="GtkImage" id="image246">
303
328
                            <property name="visible">True</property>
304
 
                            <property name="pixbuf">diff16.png</property>
 
329
                            <property name="pixbuf">icons/diff16.png</property>
305
330
                          </widget>
306
331
                        </child>
307
332
                      </widget>
315
340
                        <child internal-child="image">
316
341
                          <widget class="GtkImage" id="image247">
317
342
                            <property name="visible">True</property>
318
 
                            <property name="pixbuf">log16.png</property>
 
343
                            <property name="pixbuf">icons/log16.png</property>
319
344
                          </widget>
320
345
                        </child>
321
346
                      </widget>
361
386
        <child>
362
387
          <widget class="GtkToolbar" id="toolbar">
363
388
            <property name="visible">True</property>
364
 
            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
365
389
            <child>
366
390
              <widget class="GtkToolButton" id="toolbutton_refresh">
367
391
                <property name="visible">True</property>
368
392
                <property name="label">Refresh</property>
369
393
                <property name="use_underline">True</property>
370
 
                <property name="icon">refresh.png</property>
 
394
                <property name="icon">icons/refresh.png</property>
371
395
                <signal name="clicked" handler="on_toolbutton_refresh_clicked"/>
372
396
              </widget>
373
397
              <packing>
379
403
                <property name="visible">True</property>
380
404
                <property name="label">Diff</property>
381
405
                <property name="use_underline">True</property>
382
 
                <property name="icon">diff.png</property>
 
406
                <property name="icon">icons/diff.png</property>
383
407
                <signal name="clicked" handler="on_toolbutton_diff_clicked"/>
384
408
              </widget>
385
409
              <packing>
391
415
                <property name="visible">True</property>
392
416
                <property name="label">Log</property>
393
417
                <property name="use_underline">True</property>
394
 
                <property name="icon">log.png</property>
 
418
                <property name="icon">icons/log.png</property>
395
419
                <signal name="clicked" handler="on_toolbutton_log_clicked"/>
396
420
              </widget>
397
421
              <packing>
410
434
            <child>
411
435
              <widget class="GtkToolButton" id="toolbutton_commit">
412
436
                <property name="visible">True</property>
 
437
                <property name="is_important">True</property>
413
438
                <property name="label">Commit</property>
414
439
                <property name="use_underline">True</property>
415
 
                <property name="icon">commit.png</property>
 
440
                <property name="icon">icons/commit.png</property>
416
441
                <signal name="clicked" handler="on_toolbutton_commit_clicked"/>
417
442
              </widget>
418
443
              <packing>
431
456
            <child>
432
457
              <widget class="GtkToolButton" id="toolbutton_pull">
433
458
                <property name="visible">True</property>
 
459
                <property name="is_important">True</property>
434
460
                <property name="label">Pull</property>
435
461
                <property name="use_underline">True</property>
436
 
                <property name="icon">pull.png</property>
 
462
                <property name="icon">icons/pull.png</property>
437
463
                <signal name="clicked" handler="on_toolbutton_pull_clicked"/>
438
464
              </widget>
439
465
              <packing>
443
469
            <child>
444
470
              <widget class="GtkToolButton" id="toolbutton_push">
445
471
                <property name="visible">True</property>
 
472
                <property name="is_important">True</property>
446
473
                <property name="label">Push</property>
447
474
                <property name="use_underline">True</property>
448
 
                <property name="icon">push.png</property>
 
475
                <property name="icon">icons/push.png</property>
449
476
                <signal name="clicked" handler="on_toolbutton_push_clicked"/>
450
477
              </widget>
451
478
              <packing>
452
479
                <property name="expand">False</property>
453
480
              </packing>
454
481
            </child>
 
482
            <child>
 
483
              <widget class="GtkToolButton" id="toolbutton_update">
 
484
                <property name="visible">True</property>
 
485
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
486
                <property name="label" translatable="yes">Update</property>
 
487
                <property name="icon">icons/pull.png</property>
 
488
                <signal name="clicked" handler="on_toolbutton_update_clicked"/>
 
489
              </widget>
 
490
              <packing>
 
491
                <property name="expand">False</property>
 
492
              </packing>
 
493
            </child>
455
494
          </widget>
456
495
          <packing>
457
496
            <property name="expand">False</property>
476
515
                    <property name="can_focus">True</property>
477
516
                    <property name="headers_visible">False</property>
478
517
                    <signal name="button_press_event" handler="on_treeview_left_button_press_event"/>
 
518
                    <signal name="button_release_event" handler="on_treeview_left_button_release_event"/>
479
519
                    <signal name="row_activated" handler="on_treeview_left_row_activated"/>
480
520
                  </widget>
481
521
                </child>
482
522
              </widget>
483
523
              <packing>
484
524
                <property name="resize">False</property>
 
525
                <property name="shrink">True</property>
485
526
              </packing>
486
527
            </child>
487
528
            <child>
500
541
                        <property name="receives_default">True</property>
501
542
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
502
543
                        <property name="relief">GTK_RELIEF_NONE</property>
 
544
                        <property name="response_id">0</property>
503
545
                        <signal name="clicked" handler="on_button_location_up_clicked"/>
504
546
                        <child>
505
547
                          <widget class="GtkImage" id="image_location_up">
548
590
                        <property name="label" translatable="yes">gtk-jump-to</property>
549
591
                        <property name="relief">GTK_RELIEF_NONE</property>
550
592
                        <property name="use_stock">True</property>
 
593
                        <property name="response_id">0</property>
551
594
                        <signal name="clicked" handler="on_button_location_jump_clicked"/>
552
595
                      </widget>
553
596
                      <packing>
556
599
                        <property name="position">4</property>
557
600
                      </packing>
558
601
                    </child>
 
602
                    <child>
 
603
                      <widget class="GtkVSeparator" id="vseparator">
 
604
                        <property name="visible">True</property>
 
605
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
606
                      </widget>
 
607
                      <packing>
 
608
                        <property name="expand">False</property>
 
609
                        <property name="fill">False</property>
 
610
                        <property name="position">5</property>
 
611
                      </packing>
 
612
                    </child>
 
613
                    <child>
 
614
                      <widget class="GtkCheckButton" id="checkbutton_history">
 
615
                        <property name="visible">True</property>
 
616
                        <property name="can_focus">True</property>
 
617
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
618
                        <property name="label" translatable="yes">H_istory Mode</property>
 
619
                        <property name="use_underline">True</property>
 
620
                        <property name="response_id">0</property>
 
621
                        <property name="draw_indicator">True</property>
 
622
                        <signal name="toggled" handler="on_checkbutton_history_toggled"/>
 
623
                      </widget>
 
624
                      <packing>
 
625
                        <property name="expand">False</property>
 
626
                        <property name="fill">False</property>
 
627
                        <property name="position">6</property>
 
628
                      </packing>
 
629
                    </child>
 
630
                    <child>
 
631
                      <widget class="GtkEntry" id="entry_history_revno">
 
632
                        <property name="width_request">75</property>
 
633
                        <property name="visible">True</property>
 
634
                        <property name="sensitive">False</property>
 
635
                        <property name="can_focus">True</property>
 
636
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
637
                        <signal name="key_press_event" handler="on_entry_history_revno_key_press_event"/>
 
638
                      </widget>
 
639
                      <packing>
 
640
                        <property name="expand">False</property>
 
641
                        <property name="fill">False</property>
 
642
                        <property name="position">7</property>
 
643
                      </packing>
 
644
                    </child>
 
645
                    <child>
 
646
                      <widget class="GtkButton" id="button_history_browse">
 
647
                        <property name="visible">True</property>
 
648
                        <property name="sensitive">False</property>
 
649
                        <property name="can_focus">True</property>
 
650
                        <property name="receives_default">True</property>
 
651
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
652
                        <property name="response_id">0</property>
 
653
                        <signal name="clicked" handler="on_button_history_browse_clicked"/>
 
654
                        <child>
 
655
                          <widget class="GtkImage" id="image_history_browse">
 
656
                            <property name="visible">True</property>
 
657
                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
658
                            <property name="stock">gtk-open</property>
 
659
                          </widget>
 
660
                        </child>
 
661
                      </widget>
 
662
                      <packing>
 
663
                        <property name="expand">False</property>
 
664
                        <property name="fill">False</property>
 
665
                        <property name="position">8</property>
 
666
                      </packing>
 
667
                    </child>
559
668
                  </widget>
560
669
                  <packing>
561
670
                    <property name="expand">False</property>
583
692
                  </packing>
584
693
                </child>
585
694
              </widget>
 
695
              <packing>
 
696
                <property name="resize">True</property>
 
697
                <property name="shrink">True</property>
 
698
              </packing>
586
699
            </child>
587
700
          </widget>
588
701
          <packing>
611
724
    <property name="website_label" translatable="yes">https://launchpad.net/products/olive</property>
612
725
    <property name="authors">Szilveszter Farkas (Phanatic) &lt;szilveszter.farkas@gmail.com&gt;</property>
613
726
    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
614
 
    <property name="logo">oliveicon2.png</property>
 
727
    <property name="logo">icons/oliveicon2.png</property>
615
728
    <child internal-child="vbox">
616
729
      <widget class="GtkVBox" id="dialog-vbox1">
617
730
        <child internal-child="action_area">
629
742
    <property name="visible">True</property>
630
743
    <property name="title" translatable="yes">Olive - Add file(s)</property>
631
744
    <property name="resizable">False</property>
632
 
    <property name="icon">oliveicon2.png</property>
 
745
    <property name="icon">icons/oliveicon2.png</property>
633
746
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
634
747
    <child internal-child="vbox">
635
748
      <widget class="GtkVBox" id="vbox_add">
652
765
            <property name="can_focus">True</property>
653
766
            <property name="label" translatable="yes">Selected only</property>
654
767
            <property name="use_underline">True</property>
 
768
            <property name="response_id">0</property>
655
769
            <property name="draw_indicator">True</property>
656
770
          </widget>
657
771
          <packing>
666
780
            <property name="can_focus">True</property>
667
781
            <property name="label" translatable="yes">All unknowns recursively</property>
668
782
            <property name="use_underline">True</property>
 
783
            <property name="response_id">0</property>
669
784
            <property name="draw_indicator">True</property>
670
785
            <property name="group">radiobutton_add_selected</property>
671
786
          </widget>
686
801
                <property name="can_default">True</property>
687
802
                <property name="label">gtk-cancel</property>
688
803
                <property name="use_stock">True</property>
 
804
                <property name="response_id">0</property>
689
805
                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
690
806
              </widget>
691
807
            </child>
695
811
                <property name="can_focus">True</property>
696
812
                <property name="can_default">True</property>
697
813
                <property name="has_default">True</property>
 
814
                <property name="response_id">0</property>
698
815
                <signal name="clicked" handler="on_button_add_add_clicked"/>
699
816
                <child>
700
817
                  <widget class="GtkAlignment" id="alignment3">
749
866
    <property name="visible">True</property>
750
867
    <property name="title" translatable="yes">Olive - Remove file(s)</property>
751
868
    <property name="resizable">False</property>
752
 
    <property name="icon">oliveicon2.png</property>
 
869
    <property name="icon">icons/oliveicon2.png</property>
753
870
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
754
871
    <child internal-child="vbox">
755
872
      <widget class="GtkVBox" id="vbox_remove">
772
889
            <property name="can_focus">True</property>
773
890
            <property name="label" translatable="yes">Selected only</property>
774
891
            <property name="use_underline">True</property>
 
892
            <property name="response_id">0</property>
775
893
            <property name="draw_indicator">True</property>
776
894
          </widget>
777
895
          <packing>
786
904
            <property name="can_focus">True</property>
787
905
            <property name="label" translatable="yes">All files with status 'added'</property>
788
906
            <property name="use_underline">True</property>
 
907
            <property name="response_id">0</property>
789
908
            <property name="draw_indicator">True</property>
790
909
            <property name="group">radiobutton_remove_selected</property>
791
910
          </widget>
806
925
                <property name="can_default">True</property>
807
926
                <property name="label">gtk-cancel</property>
808
927
                <property name="use_stock">True</property>
 
928
                <property name="response_id">0</property>
809
929
                <signal name="clicked" handler="on_button_remove_cancel_clicked"/>
810
930
              </widget>
811
931
            </child>
815
935
                <property name="can_focus">True</property>
816
936
                <property name="can_default">True</property>
817
937
                <property name="has_default">True</property>
 
938
                <property name="response_id">0</property>
818
939
                <signal name="clicked" handler="on_button_remove_remove_clicked"/>
819
940
                <child>
820
941
                  <widget class="GtkAlignment" id="alignment4">
868
989
  <widget class="GtkDialog" id="window_mkdir">
869
990
    <property name="visible">True</property>
870
991
    <property name="title" translatable="yes">Olive - Make directory</property>
871
 
    <property name="icon">oliveicon2.png</property>
 
992
    <property name="icon">icons/oliveicon2.png</property>
872
993
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
873
994
    <child internal-child="vbox">
874
995
      <widget class="GtkVBox" id="vbox_mkdir">
892
1013
            <property name="can_focus">True</property>
893
1014
            <property name="label" translatable="yes">_Versioned directory</property>
894
1015
            <property name="use_underline">True</property>
 
1016
            <property name="response_id">0</property>
895
1017
            <property name="active">True</property>
896
1018
            <property name="draw_indicator">True</property>
897
1019
          </widget>
912
1034
                <property name="can_default">True</property>
913
1035
                <property name="label">gtk-cancel</property>
914
1036
                <property name="use_stock">True</property>
 
1037
                <property name="response_id">0</property>
915
1038
                <signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
916
1039
              </widget>
917
1040
            </child>
921
1044
                <property name="can_focus">True</property>
922
1045
                <property name="can_default">True</property>
923
1046
                <property name="has_default">True</property>
 
1047
                <property name="response_id">0</property>
924
1048
                <signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
925
1049
                <child>
926
1050
                  <widget class="GtkAlignment" id="alignment8">
975
1099
  <widget class="GtkDialog" id="window_move">
976
1100
    <property name="width_request">250</property>
977
1101
    <property name="title" translatable="yes">Olive - Move</property>
978
 
    <property name="icon">oliveicon2.png</property>
 
1102
    <property name="icon">icons/oliveicon2.png</property>
979
1103
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
980
1104
    <child internal-child="vbox">
981
1105
      <widget class="GtkVBox" id="vbox_move">
1021
1145
                <property name="can_default">True</property>
1022
1146
                <property name="label">gtk-cancel</property>
1023
1147
                <property name="use_stock">True</property>
 
1148
                <property name="response_id">0</property>
1024
1149
                <signal name="clicked" handler="on_button_move_cancel_clicked"/>
1025
1150
              </widget>
1026
1151
            </child>
1030
1155
                <property name="can_focus">True</property>
1031
1156
                <property name="can_default">True</property>
1032
1157
                <property name="has_default">True</property>
 
1158
                <property name="response_id">0</property>
1033
1159
                <signal name="clicked" handler="on_button_move_move_clicked"/>
1034
1160
                <child>
1035
1161
                  <widget class="GtkAlignment" id="alignment9">
1082
1208
  </widget>
1083
1209
  <widget class="GtkDialog" id="window_rename">
1084
1210
    <property name="title" translatable="yes">Olive - Rename</property>
1085
 
    <property name="icon">oliveicon2.png</property>
 
1211
    <property name="icon">icons/oliveicon2.png</property>
1086
1212
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1087
1213
    <child internal-child="vbox">
1088
1214
      <widget class="GtkVBox" id="vbox_rename">
1128
1254
                <property name="can_default">True</property>
1129
1255
                <property name="label">gtk-cancel</property>
1130
1256
                <property name="use_stock">True</property>
 
1257
                <property name="response_id">0</property>
1131
1258
                <signal name="clicked" handler="on_button_rename_cancel_clicked"/>
1132
1259
              </widget>
1133
1260
            </child>
1137
1264
                <property name="can_focus">True</property>
1138
1265
                <property name="can_default">True</property>
1139
1266
                <property name="has_default">True</property>
 
1267
                <property name="response_id">0</property>
1140
1268
                <signal name="clicked" handler="on_button_rename_rename_clicked"/>
1141
1269
                <child>
1142
1270
                  <widget class="GtkAlignment" id="alignment10">
1189
1317
  </widget>
1190
1318
  <widget class="GtkDialog" id="window_info">
1191
1319
    <property name="title" translatable="yes">Olive - Information</property>
1192
 
    <property name="icon">oliveicon2.png</property>
 
1320
    <property name="icon">icons/oliveicon2.png</property>
1193
1321
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
1194
1322
    <child internal-child="vbox">
1195
1323
      <widget class="GtkVBox" id="vbox_info">
2274
2402
                <property name="has_default">True</property>
2275
2403
                <property name="label">gtk-close</property>
2276
2404
                <property name="use_stock">True</property>
 
2405
                <property name="response_id">0</property>
2277
2406
                <signal name="clicked" handler="on_button_info_close_clicked"/>
2278
2407
              </widget>
2279
2408
            </child>
2290
2419
  <widget class="GtkDialog" id="window_merge">
2291
2420
    <property name="visible">True</property>
2292
2421
    <property name="title" translatable="yes">Merge - Olive</property>
2293
 
    <property name="icon">oliveicon2.png</property>
 
2422
    <property name="icon">icons/oliveicon2.png</property>
2294
2423
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2295
2424
    <child internal-child="vbox">
2296
2425
      <widget class="GtkVBox" id="vbox_merge">
2323
2452
              <widget class="GtkButton" id="button_merge_open">
2324
2453
                <property name="visible">True</property>
2325
2454
                <property name="can_focus">True</property>
 
2455
                <property name="response_id">0</property>
2326
2456
                <signal name="clicked" handler="on_button_merge_open_clicked"/>
2327
2457
                <child>
2328
2458
                  <widget class="GtkImage" id="image240">
2355
2485
                <property name="can_default">True</property>
2356
2486
                <property name="label">gtk-cancel</property>
2357
2487
                <property name="use_stock">True</property>
 
2488
                <property name="response_id">0</property>
2358
2489
                <signal name="clicked" handler="on_button_merge_cancel_clicked"/>
2359
2490
              </widget>
2360
2491
            </child>
2364
2495
                <property name="can_focus">True</property>
2365
2496
                <property name="can_default">True</property>
2366
2497
                <property name="has_default">True</property>
 
2498
                <property name="response_id">0</property>
2367
2499
                <signal name="clicked" handler="on_button_merge_merge_clicked"/>
2368
2500
                <child>
2369
2501
                  <widget class="GtkAlignment" id="alignment19">