/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

Show diffs side-by-side

added added

removed removed

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