/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: 2007-04-03 17:16:07 UTC
  • mfrom: (187 trunk)
  • mto: This revision was merged to the branch mainline in revision 188.
  • Revision ID: jelmer@samba.org-20070403171607-0zaskazouokrm4cq
Tags: bzr-gtk-0.15.2
Prepare for 0.15.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
52
52
                      <signal name="activate" handler="on_menuitem_add_files_activate" last_modification_time="Fri, 21 Jul 2006 11:38:39 GMT"/>
53
53
 
54
54
                      <child internal-child="image">
55
 
                        <widget class="GtkImage" id="image232">
 
55
                        <widget class="GtkImage" id="image241">
56
56
                          <property name="visible">True</property>
57
57
                          <property name="stock">gtk-add</property>
58
58
                          <property name="icon_size">1</property>
73
73
                      <signal name="activate" handler="on_menuitem_remove_file_activate" last_modification_time="Fri, 21 Jul 2006 13:54:07 GMT"/>
74
74
 
75
75
                      <child internal-child="image">
76
 
                        <widget class="GtkImage" id="image233">
 
76
                        <widget class="GtkImage" id="image242">
77
77
                          <property name="visible">True</property>
78
78
                          <property name="stock">gtk-remove</property>
79
79
                          <property name="icon_size">1</property>
124
124
                      <signal name="activate" handler="on_menuitem_file_move_activate" last_modification_time="Mon, 17 Jul 2006 08:56:08 GMT"/>
125
125
                    </widget>
126
126
                  </child>
 
127
                  
 
128
                  <child>
 
129
                    <widget class="GtkMenuItem" id="menuitem_file_annotate">
 
130
                      <property name="visible">True</property>
 
131
                      <property name="label" translatable="yes">_Annotate...</property>
 
132
                      <property name="use_underline">True</property>
 
133
                      <signal name="activate" handler="on_menuitem_file_annotate_activate" last_modification_time="Mon, 18 Dec 2006 10:17:00 GMT"/>
 
134
                    </widget>
 
135
                  </child>
127
136
 
128
137
                  <child>
129
138
                    <widget class="GtkSeparatorMenuItem" id="separator_file2">
233
242
                      <signal name="activate" handler="on_menuitem_branch_pull_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
234
243
 
235
244
                      <child internal-child="image">
236
 
                        <widget class="GtkImage" id="image234">
 
245
                        <widget class="GtkImage" id="image243">
237
246
                          <property name="visible">True</property>
238
 
                          <property name="pixbuf">pull16.png</property>
 
247
                          <property name="pixbuf">icons/pull16.png</property>
239
248
                          <property name="xalign">0.5</property>
240
249
                          <property name="yalign">0.5</property>
241
250
                          <property name="xpad">0</property>
253
262
                      <signal name="activate" handler="on_menuitem_branch_push_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
254
263
 
255
264
                      <child internal-child="image">
256
 
                        <widget class="GtkImage" id="image235">
 
265
                        <widget class="GtkImage" id="image244">
257
266
                          <property name="visible">True</property>
258
 
                          <property name="pixbuf">push16.png</property>
 
267
                          <property name="pixbuf">icons/push16.png</property>
259
268
                          <property name="xalign">0.5</property>
260
269
                          <property name="yalign">0.5</property>
261
270
                          <property name="xpad">0</property>
272
281
                  </child>
273
282
 
274
283
                  <child>
 
284
                    <widget class="GtkMenuItem" id="menuitem_branch_revert">
 
285
                      <property name="visible">True</property>
 
286
                      <property name="label" translatable="yes">_Revert all changes</property>
 
287
                      <property name="use_underline">True</property>
 
288
                      <signal name="activate" handler="on_menuitem_branch_revert_activate" last_modification_time="Tue, 30 Jan 2007 13:20:00 GMT"/>
 
289
                    </widget>
 
290
                  </child>
 
291
                  
 
292
                  <child>
 
293
                    <widget class="GtkMenuItem" id="menuitem_branch_merge">
 
294
                      <property name="visible">True</property>
 
295
                      <property name="label" translatable="yes">_Merge...</property>
 
296
                      <property name="use_underline">True</property>
 
297
                      <signal name="activate" handler="on_menuitem_branch_merge_activate" last_modification_time="Mon, 09 Oct 2006 18:24:06 GMT"/>
 
298
                    </widget>
 
299
                  </child>
 
300
 
 
301
                  <child>
275
302
                    <widget class="GtkImageMenuItem" id="menuitem_branch_commit">
276
303
                      <property name="visible">True</property>
277
304
                      <property name="label" translatable="yes">_Commit...</property>
279
306
                      <signal name="activate" handler="on_menuitem_branch_commit_activate" last_modification_time="Mon, 17 Jul 2006 08:53:37 GMT"/>
280
307
 
281
308
                      <child internal-child="image">
282
 
                        <widget class="GtkImage" id="image236">
 
309
                        <widget class="GtkImage" id="image245">
283
310
                          <property name="visible">True</property>
284
 
                          <property name="pixbuf">commit16.png</property>
 
311
                          <property name="pixbuf">icons/commit16.png</property>
285
312
                          <property name="xalign">0.5</property>
286
313
                          <property name="yalign">0.5</property>
287
314
                          <property name="xpad">0</property>
309
336
                  <child>
310
337
                    <widget class="GtkMenuItem" id="menuitem_branch_missing_revisions">
311
338
                      <property name="visible">True</property>
312
 
                      <property name="label" translatable="yes">_Missing revisions</property>
 
339
                      <property name="label" translatable="yes">Missing _revisions</property>
313
340
                      <property name="use_underline">True</property>
314
341
                      <signal name="activate" handler="on_menuitem_branch_missing_revisions_activate" last_modification_time="Sat, 02 Sep 2006 14:01:29 GMT"/>
315
342
                    </widget>
316
343
                  </child>
 
344
                  
 
345
                  <child>
 
346
                    <widget class="GtkMenuItem" id="menuitem_branch_conflicts">
 
347
                      <property name="visible">True</property>
 
348
                      <property name="label" translatable="yes">Con_flicts...</property>
 
349
                      <property name="use_underline">True</property>
 
350
                      <signal name="activate" handler="on_menuitem_branch_conflicts_activate" last_modification_time="Sun, 04 Feb 2007 12:54:00 GMT"/>
 
351
                    </widget>
 
352
                  </child>
317
353
                </widget>
318
354
              </child>
319
355
            </widget>
336
372
                      <signal name="activate" handler="on_menuitem_stats_diff_activate" last_modification_time="Thu, 03 Aug 2006 11:35:30 GMT"/>
337
373
 
338
374
                      <child internal-child="image">
339
 
                        <widget class="GtkImage" id="image237">
 
375
                        <widget class="GtkImage" id="image246">
340
376
                          <property name="visible">True</property>
341
 
                          <property name="pixbuf">diff16.png</property>
 
377
                          <property name="pixbuf">icons/diff16.png</property>
342
378
                          <property name="xalign">0.5</property>
343
379
                          <property name="yalign">0.5</property>
344
380
                          <property name="xpad">0</property>
356
392
                      <signal name="activate" handler="on_menuitem_stats_log_activate" last_modification_time="Thu, 03 Aug 2006 11:35:43 GMT"/>
357
393
 
358
394
                      <child internal-child="image">
359
 
                        <widget class="GtkImage" id="image238">
 
395
                        <widget class="GtkImage" id="image247">
360
396
                          <property name="visible">True</property>
361
 
                          <property name="pixbuf">log16.png</property>
 
397
                          <property name="pixbuf">icons/log16.png</property>
362
398
                          <property name="xalign">0.5</property>
363
399
                          <property name="yalign">0.5</property>
364
400
                          <property name="xpad">0</property>
423
459
              <property name="visible">True</property>
424
460
              <property name="label" translatable="yes">Refresh</property>
425
461
              <property name="use_underline">True</property>
426
 
              <property name="icon">refresh.png</property>
 
462
              <property name="icon">icons/refresh.png</property>
427
463
              <property name="visible_horizontal">True</property>
428
464
              <property name="visible_vertical">True</property>
429
465
              <property name="is_important">False</property>
440
476
              <property name="visible">True</property>
441
477
              <property name="label" translatable="yes">Diff</property>
442
478
              <property name="use_underline">True</property>
443
 
              <property name="icon">diff.png</property>
 
479
              <property name="icon">icons/diff.png</property>
444
480
              <property name="visible_horizontal">True</property>
445
481
              <property name="visible_vertical">True</property>
446
482
              <property name="is_important">False</property>
457
493
              <property name="visible">True</property>
458
494
              <property name="label" translatable="yes">Log</property>
459
495
              <property name="use_underline">True</property>
460
 
              <property name="icon">log.png</property>
 
496
              <property name="icon">icons/log.png</property>
461
497
              <property name="visible_horizontal">True</property>
462
498
              <property name="visible_vertical">True</property>
463
499
              <property name="is_important">False</property>
487
523
              <property name="visible">True</property>
488
524
              <property name="label" translatable="yes">Commit</property>
489
525
              <property name="use_underline">True</property>
490
 
              <property name="icon">commit.png</property>
 
526
              <property name="icon">icons/commit.png</property>
491
527
              <property name="visible_horizontal">True</property>
492
528
              <property name="visible_vertical">True</property>
493
529
              <property name="is_important">False</property>
517
553
              <property name="visible">True</property>
518
554
              <property name="label" translatable="yes">Pull</property>
519
555
              <property name="use_underline">True</property>
520
 
              <property name="icon">pull.png</property>
 
556
              <property name="icon">icons/pull.png</property>
521
557
              <property name="visible_horizontal">True</property>
522
558
              <property name="visible_vertical">True</property>
523
559
              <property name="is_important">False</property>
534
570
              <property name="visible">True</property>
535
571
              <property name="label" translatable="yes">Push</property>
536
572
              <property name="use_underline">True</property>
537
 
              <property name="icon">push.png</property>
 
573
              <property name="icon">icons/push.png</property>
538
574
              <property name="visible_horizontal">True</property>
539
575
              <property name="visible_vertical">True</property>
540
576
              <property name="is_important">False</property>
591
627
          </child>
592
628
 
593
629
          <child>
594
 
            <widget class="GtkScrolledWindow" id="scrolledwindow_right">
595
 
              <property name="visible">True</property>
596
 
              <property name="can_focus">True</property>
597
 
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
598
 
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
599
 
              <property name="shadow_type">GTK_SHADOW_NONE</property>
600
 
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
601
 
 
602
 
              <child>
603
 
                <widget class="GtkTreeView" id="treeview_right">
604
 
                  <property name="visible">True</property>
605
 
                  <property name="can_focus">True</property>
606
 
                  <property name="headers_visible">False</property>
607
 
                  <property name="rules_hint">False</property>
608
 
                  <property name="reorderable">False</property>
609
 
                  <property name="enable_search">True</property>
610
 
                  <property name="fixed_height_mode">False</property>
611
 
                  <property name="hover_selection">False</property>
612
 
                  <property name="hover_expand">False</property>
613
 
                  <signal name="row_activated" handler="on_treeview_right_row_activated" last_modification_time="Thu, 20 Jul 2006 11:31:38 GMT"/>
614
 
                  <signal name="button_press_event" handler="on_treeview_right_button_press_event" last_modification_time="Wed, 02 Aug 2006 17:16:29 GMT"/>
615
 
                </widget>
616
 
              </child>
617
 
            </widget>
618
 
            <packing>
619
 
              <property name="shrink">True</property>
620
 
              <property name="resize">True</property>
621
 
            </packing>
622
 
          </child>
623
 
        </widget>
624
 
        <packing>
625
 
          <property name="padding">0</property>
626
 
          <property name="expand">True</property>
627
 
          <property name="fill">True</property>
628
 
        </packing>
629
 
      </child>
630
 
 
631
 
      <child>
632
 
        <widget class="GtkStatusbar" id="statusbar">
633
 
          <property name="visible">True</property>
634
 
          <property name="has_resize_grip">True</property>
635
 
        </widget>
636
 
        <packing>
637
 
          <property name="padding">0</property>
638
 
          <property name="expand">False</property>
639
 
          <property name="fill">False</property>
640
 
        </packing>
641
 
      </child>
642
 
    </widget>
643
 
  </child>
644
 
</widget>
645
 
 
646
 
<widget class="GtkWindow" id="window_commit">
647
 
  <property name="width_request">400</property>
648
 
  <property name="height_request">400</property>
649
 
  <property name="title" translatable="yes">Olive - Commit</property>
650
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
651
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
652
 
  <property name="modal">False</property>
653
 
  <property name="resizable">True</property>
654
 
  <property name="destroy_with_parent">False</property>
655
 
  <property name="icon">oliveicon2.png</property>
656
 
  <property name="decorated">True</property>
657
 
  <property name="skip_taskbar_hint">False</property>
658
 
  <property name="skip_pager_hint">False</property>
659
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
660
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
661
 
  <property name="focus_on_map">True</property>
662
 
  <property name="urgency_hint">False</property>
663
 
 
664
 
  <child>
665
 
    <widget class="GtkVBox" id="vbox_commit">
666
 
      <property name="border_width">5</property>
667
 
      <property name="visible">True</property>
668
 
      <property name="homogeneous">False</property>
669
 
      <property name="spacing">3</property>
670
 
 
671
 
      <child>
672
 
        <widget class="GtkVPaned" id="vpaned_commit">
673
 
          <property name="visible">True</property>
674
 
          <property name="can_focus">True</property>
675
 
          <property name="position">120</property>
676
 
 
677
 
          <child>
678
 
            <widget class="GtkVBox" id="vbox_commit_select">
 
630
            <widget class="GtkVBox" id="vbox_main_right">
679
631
              <property name="visible">True</property>
680
632
              <property name="homogeneous">False</property>
681
633
              <property name="spacing">0</property>
682
634
 
683
635
              <child>
684
 
                <widget class="GtkLabel" id="label_commit_select">
685
 
                  <property name="visible">True</property>
686
 
                  <property name="label" translatable="yes">Please select the file(s) to commit:</property>
687
 
                  <property name="use_underline">False</property>
688
 
                  <property name="use_markup">False</property>
689
 
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
690
 
                  <property name="wrap">False</property>
691
 
                  <property name="selectable">False</property>
692
 
                  <property name="xalign">0</property>
693
 
                  <property name="yalign">0.5</property>
694
 
                  <property name="xpad">0</property>
695
 
                  <property name="ypad">0</property>
696
 
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
697
 
                  <property name="width_chars">-1</property>
698
 
                  <property name="single_line_mode">False</property>
699
 
                  <property name="angle">0</property>
700
 
                </widget>
701
 
                <packing>
702
 
                  <property name="padding">0</property>
703
 
                  <property name="expand">False</property>
704
 
                  <property name="fill">False</property>
705
 
                </packing>
 
636
                <placeholder/>
706
637
              </child>
707
638
 
708
639
              <child>
709
 
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
 
640
                <widget class="GtkScrolledWindow" id="scrolledwindow_right">
710
641
                  <property name="visible">True</property>
711
642
                  <property name="can_focus">True</property>
712
643
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
715
646
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
716
647
 
717
648
                  <child>
718
 
                    <widget class="GtkTreeView" id="treeview_commit_select">
 
649
                    <widget class="GtkTreeView" id="treeview_right">
719
650
                      <property name="visible">True</property>
720
651
                      <property name="can_focus">True</property>
721
 
                      <property name="headers_visible">True</property>
 
652
                      <property name="headers_visible">False</property>
722
653
                      <property name="rules_hint">False</property>
723
654
                      <property name="reorderable">False</property>
724
655
                      <property name="enable_search">True</property>
725
656
                      <property name="fixed_height_mode">False</property>
726
657
                      <property name="hover_selection">False</property>
727
658
                      <property name="hover_expand">False</property>
728
 
                    </widget>
729
 
                  </child>
730
 
                </widget>
731
 
                <packing>
732
 
                  <property name="padding">0</property>
733
 
                  <property name="expand">True</property>
734
 
                  <property name="fill">True</property>
735
 
                </packing>
736
 
              </child>
737
 
            </widget>
738
 
            <packing>
739
 
              <property name="shrink">True</property>
740
 
              <property name="resize">False</property>
741
 
            </packing>
742
 
          </child>
743
 
 
744
 
          <child>
745
 
            <widget class="GtkVBox" id="vbox_commit_message">
746
 
              <property name="visible">True</property>
747
 
              <property name="homogeneous">False</property>
748
 
              <property name="spacing">0</property>
749
 
 
750
 
              <child>
751
 
                <widget class="GtkLabel" id="label_commit_message">
752
 
                  <property name="visible">True</property>
753
 
                  <property name="label" translatable="yes">Please specify a commit message:</property>
754
 
                  <property name="use_underline">False</property>
755
 
                  <property name="use_markup">False</property>
756
 
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
757
 
                  <property name="wrap">False</property>
758
 
                  <property name="selectable">False</property>
759
 
                  <property name="xalign">0</property>
760
 
                  <property name="yalign">0.5</property>
761
 
                  <property name="xpad">0</property>
762
 
                  <property name="ypad">0</property>
763
 
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
764
 
                  <property name="width_chars">-1</property>
765
 
                  <property name="single_line_mode">False</property>
766
 
                  <property name="angle">0</property>
767
 
                </widget>
768
 
                <packing>
769
 
                  <property name="padding">0</property>
770
 
                  <property name="expand">False</property>
771
 
                  <property name="fill">False</property>
772
 
                </packing>
773
 
              </child>
774
 
 
775
 
              <child>
776
 
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_message">
777
 
                  <property name="visible">True</property>
778
 
                  <property name="can_focus">True</property>
779
 
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
780
 
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
781
 
                  <property name="shadow_type">GTK_SHADOW_NONE</property>
782
 
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
783
 
 
784
 
                  <child>
785
 
                    <widget class="GtkTextView" id="textview_commit">
786
 
                      <property name="visible">True</property>
787
 
                      <property name="can_focus">True</property>
788
 
                      <property name="editable">True</property>
789
 
                      <property name="overwrite">False</property>
790
 
                      <property name="accepts_tab">True</property>
791
 
                      <property name="justification">GTK_JUSTIFY_LEFT</property>
792
 
                      <property name="wrap_mode">GTK_WRAP_NONE</property>
793
 
                      <property name="cursor_visible">True</property>
794
 
                      <property name="pixels_above_lines">0</property>
795
 
                      <property name="pixels_below_lines">0</property>
796
 
                      <property name="pixels_inside_wrap">0</property>
797
 
                      <property name="left_margin">0</property>
798
 
                      <property name="right_margin">0</property>
799
 
                      <property name="indent">0</property>
800
 
                      <property name="text" translatable="yes"></property>
 
659
                      <signal name="row_activated" handler="on_treeview_right_row_activated" last_modification_time="Thu, 20 Jul 2006 11:31:38 GMT"/>
 
660
                      <signal name="button_press_event" handler="on_treeview_right_button_press_event" last_modification_time="Wed, 02 Aug 2006 17:16:29 GMT"/>
801
661
                    </widget>
802
662
                  </child>
803
663
                </widget>
822
682
      </child>
823
683
 
824
684
      <child>
825
 
        <widget class="GtkCheckButton" id="checkbutton_commit_local">
826
 
          <property name="can_focus">True</property>
827
 
          <property name="label" translatable="yes">_Local only commit (works in checkouts)</property>
828
 
          <property name="use_underline">True</property>
829
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
830
 
          <property name="focus_on_click">True</property>
831
 
          <property name="active">False</property>
832
 
          <property name="inconsistent">False</property>
833
 
          <property name="draw_indicator">True</property>
834
 
        </widget>
835
 
        <packing>
836
 
          <property name="padding">0</property>
837
 
          <property name="expand">False</property>
838
 
          <property name="fill">False</property>
839
 
        </packing>
840
 
      </child>
841
 
 
842
 
      <child>
843
 
        <widget class="GtkCheckButton" id="checkbutton_commit_strict">
844
 
          <property name="visible">True</property>
845
 
          <property name="can_focus">True</property>
846
 
          <property name="label" translatable="yes">_Strict commit (fails if unknown files are present)</property>
847
 
          <property name="use_underline">True</property>
848
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
849
 
          <property name="focus_on_click">True</property>
850
 
          <property name="active">False</property>
851
 
          <property name="inconsistent">False</property>
852
 
          <property name="draw_indicator">True</property>
853
 
        </widget>
854
 
        <packing>
855
 
          <property name="padding">0</property>
856
 
          <property name="expand">False</property>
857
 
          <property name="fill">False</property>
858
 
        </packing>
859
 
      </child>
860
 
 
861
 
      <child>
862
 
        <widget class="GtkCheckButton" id="checkbutton_commit_force">
863
 
          <property name="visible">True</property>
864
 
          <property name="can_focus">True</property>
865
 
          <property name="label" translatable="yes">_Force commit (even do it if nothing has changed)</property>
866
 
          <property name="use_underline">True</property>
867
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
868
 
          <property name="focus_on_click">True</property>
869
 
          <property name="active">False</property>
870
 
          <property name="inconsistent">False</property>
871
 
          <property name="draw_indicator">True</property>
872
 
        </widget>
873
 
        <packing>
874
 
          <property name="padding">0</property>
875
 
          <property name="expand">False</property>
876
 
          <property name="fill">False</property>
877
 
        </packing>
878
 
      </child>
879
 
 
880
 
      <child>
881
 
        <widget class="GtkHButtonBox" id="hbuttonbox_commit">
882
 
          <property name="visible">True</property>
883
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
884
 
          <property name="spacing">3</property>
885
 
 
886
 
          <child>
887
 
            <widget class="GtkButton" id="button_commit_cancel">
888
 
              <property name="visible">True</property>
889
 
              <property name="can_default">True</property>
890
 
              <property name="can_focus">True</property>
891
 
              <property name="label">gtk-cancel</property>
892
 
              <property name="use_stock">True</property>
893
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
894
 
              <property name="focus_on_click">True</property>
895
 
              <signal name="clicked" handler="on_button_commit_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:52 GMT"/>
896
 
            </widget>
897
 
          </child>
898
 
 
899
 
          <child>
900
 
            <widget class="GtkButton" id="button_commit_commit">
901
 
              <property name="visible">True</property>
902
 
              <property name="can_default">True</property>
903
 
              <property name="has_default">True</property>
904
 
              <property name="can_focus">True</property>
905
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
906
 
              <property name="focus_on_click">True</property>
907
 
              <signal name="clicked" handler="on_button_commit_commit_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:57 GMT"/>
908
 
 
909
 
              <child>
910
 
                <widget class="GtkAlignment" id="alignment5">
911
 
                  <property name="visible">True</property>
912
 
                  <property name="xalign">0.5</property>
913
 
                  <property name="yalign">0.5</property>
914
 
                  <property name="xscale">0</property>
915
 
                  <property name="yscale">0</property>
916
 
                  <property name="top_padding">0</property>
917
 
                  <property name="bottom_padding">0</property>
918
 
                  <property name="left_padding">0</property>
919
 
                  <property name="right_padding">0</property>
920
 
 
921
 
                  <child>
922
 
                    <widget class="GtkHBox" id="hbox7">
923
 
                      <property name="visible">True</property>
924
 
                      <property name="homogeneous">False</property>
925
 
                      <property name="spacing">2</property>
926
 
 
927
 
                      <child>
928
 
                        <widget class="GtkImage" id="image49">
929
 
                          <property name="visible">True</property>
930
 
                          <property name="stock">gtk-redo</property>
931
 
                          <property name="icon_size">4</property>
932
 
                          <property name="xalign">0.5</property>
933
 
                          <property name="yalign">0.5</property>
934
 
                          <property name="xpad">0</property>
935
 
                          <property name="ypad">0</property>
936
 
                        </widget>
937
 
                        <packing>
938
 
                          <property name="padding">0</property>
939
 
                          <property name="expand">False</property>
940
 
                          <property name="fill">False</property>
941
 
                        </packing>
942
 
                      </child>
943
 
 
944
 
                      <child>
945
 
                        <widget class="GtkLabel" id="label11">
946
 
                          <property name="visible">True</property>
947
 
                          <property name="label" translatable="yes">_Commit</property>
948
 
                          <property name="use_underline">True</property>
949
 
                          <property name="use_markup">False</property>
950
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
951
 
                          <property name="wrap">False</property>
952
 
                          <property name="selectable">False</property>
953
 
                          <property name="xalign">0.5</property>
954
 
                          <property name="yalign">0.5</property>
955
 
                          <property name="xpad">0</property>
956
 
                          <property name="ypad">0</property>
957
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
958
 
                          <property name="width_chars">-1</property>
959
 
                          <property name="single_line_mode">False</property>
960
 
                          <property name="angle">0</property>
961
 
                        </widget>
962
 
                        <packing>
963
 
                          <property name="padding">0</property>
964
 
                          <property name="expand">False</property>
965
 
                          <property name="fill">False</property>
966
 
                        </packing>
967
 
                      </child>
968
 
                    </widget>
969
 
                  </child>
970
 
                </widget>
971
 
              </child>
972
 
            </widget>
973
 
          </child>
974
 
        </widget>
975
 
        <packing>
976
 
          <property name="padding">0</property>
977
 
          <property name="expand">False</property>
978
 
          <property name="fill">False</property>
979
 
        </packing>
980
 
      </child>
981
 
    </widget>
982
 
  </child>
983
 
</widget>
984
 
 
985
 
<widget class="GtkWindow" id="window_branch">
986
 
  <property name="width_request">350</property>
987
 
  <property name="title" translatable="yes">Olive - Branch</property>
988
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
989
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
990
 
  <property name="modal">False</property>
991
 
  <property name="resizable">True</property>
992
 
  <property name="destroy_with_parent">False</property>
993
 
  <property name="icon">oliveicon2.png</property>
994
 
  <property name="decorated">True</property>
995
 
  <property name="skip_taskbar_hint">False</property>
996
 
  <property name="skip_pager_hint">False</property>
997
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
998
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
999
 
  <property name="focus_on_map">True</property>
1000
 
  <property name="urgency_hint">False</property>
1001
 
 
1002
 
  <child>
1003
 
    <widget class="GtkVBox" id="vbox_branch">
1004
 
      <property name="border_width">5</property>
1005
 
      <property name="visible">True</property>
1006
 
      <property name="homogeneous">False</property>
1007
 
      <property name="spacing">3</property>
1008
 
 
1009
 
      <child>
1010
 
        <widget class="GtkTable" id="table_branch">
1011
 
          <property name="visible">True</property>
1012
 
          <property name="n_rows">3</property>
1013
 
          <property name="n_columns">2</property>
1014
 
          <property name="homogeneous">False</property>
1015
 
          <property name="row_spacing">3</property>
1016
 
          <property name="column_spacing">3</property>
1017
 
 
1018
 
          <child>
1019
 
            <widget class="GtkLabel" id="label_branch_location">
1020
 
              <property name="visible">True</property>
1021
 
              <property name="label" translatable="yes">Branch location:</property>
1022
 
              <property name="use_underline">False</property>
1023
 
              <property name="use_markup">False</property>
1024
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1025
 
              <property name="wrap">False</property>
1026
 
              <property name="selectable">False</property>
1027
 
              <property name="xalign">0</property>
1028
 
              <property name="yalign">0.5</property>
1029
 
              <property name="xpad">0</property>
1030
 
              <property name="ypad">0</property>
1031
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1032
 
              <property name="width_chars">-1</property>
1033
 
              <property name="single_line_mode">False</property>
1034
 
              <property name="angle">0</property>
1035
 
            </widget>
1036
 
            <packing>
1037
 
              <property name="left_attach">0</property>
1038
 
              <property name="right_attach">1</property>
1039
 
              <property name="top_attach">0</property>
1040
 
              <property name="bottom_attach">1</property>
1041
 
              <property name="x_options">fill</property>
1042
 
              <property name="y_options"></property>
1043
 
            </packing>
1044
 
          </child>
1045
 
 
1046
 
          <child>
1047
 
            <widget class="GtkLabel" id="label_branch_destination">
1048
 
              <property name="visible">True</property>
1049
 
              <property name="label" translatable="yes">Destination:</property>
1050
 
              <property name="use_underline">False</property>
1051
 
              <property name="use_markup">False</property>
1052
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1053
 
              <property name="wrap">False</property>
1054
 
              <property name="selectable">False</property>
1055
 
              <property name="xalign">0</property>
1056
 
              <property name="yalign">0.5</property>
1057
 
              <property name="xpad">0</property>
1058
 
              <property name="ypad">0</property>
1059
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1060
 
              <property name="width_chars">-1</property>
1061
 
              <property name="single_line_mode">False</property>
1062
 
              <property name="angle">0</property>
1063
 
            </widget>
1064
 
            <packing>
1065
 
              <property name="left_attach">0</property>
1066
 
              <property name="right_attach">1</property>
1067
 
              <property name="top_attach">1</property>
1068
 
              <property name="bottom_attach">2</property>
1069
 
              <property name="x_options">fill</property>
1070
 
              <property name="y_options"></property>
1071
 
            </packing>
1072
 
          </child>
1073
 
 
1074
 
          <child>
1075
 
            <widget class="GtkFileChooserButton" id="filechooserbutton_branch">
1076
 
              <property name="visible">True</property>
1077
 
              <property name="title" translatable="yes">Please select a folder</property>
1078
 
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
1079
 
              <property name="local_only">True</property>
1080
 
              <property name="show_hidden">False</property>
1081
 
              <property name="do_overwrite_confirmation">False</property>
1082
 
              <property name="width_chars">-1</property>
1083
 
            </widget>
1084
 
            <packing>
1085
 
              <property name="left_attach">1</property>
1086
 
              <property name="right_attach">2</property>
1087
 
              <property name="top_attach">1</property>
1088
 
              <property name="bottom_attach">2</property>
1089
 
              <property name="y_options">fill</property>
1090
 
            </packing>
1091
 
          </child>
1092
 
 
1093
 
          <child>
1094
 
            <widget class="GtkEntry" id="entry_branch_location">
1095
 
              <property name="visible">True</property>
1096
 
              <property name="can_focus">True</property>
1097
 
              <property name="editable">True</property>
1098
 
              <property name="visibility">True</property>
1099
 
              <property name="max_length">0</property>
1100
 
              <property name="text" translatable="yes"></property>
1101
 
              <property name="has_frame">True</property>
1102
 
              <property name="invisible_char">●</property>
1103
 
              <property name="activates_default">False</property>
1104
 
            </widget>
1105
 
            <packing>
1106
 
              <property name="left_attach">1</property>
1107
 
              <property name="right_attach">2</property>
1108
 
              <property name="top_attach">0</property>
1109
 
              <property name="bottom_attach">1</property>
1110
 
              <property name="y_options"></property>
1111
 
            </packing>
1112
 
          </child>
1113
 
 
1114
 
          <child>
1115
 
            <widget class="GtkLabel" id="label_branch_revno">
1116
 
              <property name="visible">True</property>
1117
 
              <property name="label" translatable="yes">Revision number:</property>
1118
 
              <property name="use_underline">False</property>
1119
 
              <property name="use_markup">False</property>
1120
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1121
 
              <property name="wrap">False</property>
1122
 
              <property name="selectable">False</property>
1123
 
              <property name="xalign">0</property>
1124
 
              <property name="yalign">0.5</property>
1125
 
              <property name="xpad">0</property>
1126
 
              <property name="ypad">0</property>
1127
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1128
 
              <property name="width_chars">-1</property>
1129
 
              <property name="single_line_mode">False</property>
1130
 
              <property name="angle">0</property>
1131
 
            </widget>
1132
 
            <packing>
1133
 
              <property name="left_attach">0</property>
1134
 
              <property name="right_attach">1</property>
1135
 
              <property name="top_attach">2</property>
1136
 
              <property name="bottom_attach">3</property>
1137
 
              <property name="x_options">fill</property>
1138
 
              <property name="y_options"></property>
1139
 
            </packing>
1140
 
          </child>
1141
 
 
1142
 
          <child>
1143
 
            <widget class="GtkSpinButton" id="spinbutton_branch_revno">
1144
 
              <property name="visible">True</property>
1145
 
              <property name="can_focus">True</property>
1146
 
              <property name="climb_rate">1</property>
1147
 
              <property name="digits">0</property>
1148
 
              <property name="numeric">False</property>
1149
 
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
1150
 
              <property name="snap_to_ticks">False</property>
1151
 
              <property name="wrap">False</property>
1152
 
              <property name="adjustment">0 0 100000 1 10 10</property>
1153
 
            </widget>
1154
 
            <packing>
1155
 
              <property name="left_attach">1</property>
1156
 
              <property name="right_attach">2</property>
1157
 
              <property name="top_attach">2</property>
1158
 
              <property name="bottom_attach">3</property>
1159
 
              <property name="y_options"></property>
1160
 
            </packing>
1161
 
          </child>
1162
 
        </widget>
1163
 
        <packing>
1164
 
          <property name="padding">0</property>
1165
 
          <property name="expand">True</property>
1166
 
          <property name="fill">True</property>
1167
 
        </packing>
1168
 
      </child>
1169
 
 
1170
 
      <child>
1171
 
        <widget class="GtkHButtonBox" id="hbuttonbox_branch">
1172
 
          <property name="visible">True</property>
1173
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1174
 
          <property name="spacing">3</property>
1175
 
 
1176
 
          <child>
1177
 
            <widget class="GtkButton" id="button_branch_cancel">
1178
 
              <property name="visible">True</property>
1179
 
              <property name="can_default">True</property>
1180
 
              <property name="can_focus">True</property>
1181
 
              <property name="label">gtk-cancel</property>
1182
 
              <property name="use_stock">True</property>
1183
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1184
 
              <property name="focus_on_click">True</property>
1185
 
              <signal name="clicked" handler="on_button_branch_cancel_clicked" last_modification_time="Mon, 17 Jul 2006 16:26:15 GMT"/>
1186
 
            </widget>
1187
 
          </child>
1188
 
 
1189
 
          <child>
1190
 
            <widget class="GtkButton" id="button_branch_branch">
1191
 
              <property name="visible">True</property>
1192
 
              <property name="can_default">True</property>
1193
 
              <property name="has_default">True</property>
1194
 
              <property name="can_focus">True</property>
1195
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1196
 
              <property name="focus_on_click">True</property>
1197
 
              <signal name="clicked" handler="on_button_branch_branch_clicked" last_modification_time="Mon, 17 Jul 2006 16:25:30 GMT"/>
1198
 
 
1199
 
              <child>
1200
 
                <widget class="GtkAlignment" id="alignment2">
1201
 
                  <property name="visible">True</property>
1202
 
                  <property name="xalign">0.5</property>
1203
 
                  <property name="yalign">0.5</property>
1204
 
                  <property name="xscale">0</property>
1205
 
                  <property name="yscale">0</property>
1206
 
                  <property name="top_padding">0</property>
1207
 
                  <property name="bottom_padding">0</property>
1208
 
                  <property name="left_padding">0</property>
1209
 
                  <property name="right_padding">0</property>
1210
 
 
1211
 
                  <child>
1212
 
                    <widget class="GtkHBox" id="hbox4">
1213
 
                      <property name="visible">True</property>
1214
 
                      <property name="homogeneous">False</property>
1215
 
                      <property name="spacing">2</property>
1216
 
 
1217
 
                      <child>
1218
 
                        <widget class="GtkImage" id="image2">
1219
 
                          <property name="visible">True</property>
1220
 
                          <property name="stock">gtk-apply</property>
1221
 
                          <property name="icon_size">4</property>
1222
 
                          <property name="xalign">0.5</property>
1223
 
                          <property name="yalign">0.5</property>
1224
 
                          <property name="xpad">0</property>
1225
 
                          <property name="ypad">0</property>
1226
 
                        </widget>
1227
 
                        <packing>
1228
 
                          <property name="padding">0</property>
1229
 
                          <property name="expand">False</property>
1230
 
                          <property name="fill">False</property>
1231
 
                        </packing>
1232
 
                      </child>
1233
 
 
1234
 
                      <child>
1235
 
                        <widget class="GtkLabel" id="label6">
1236
 
                          <property name="visible">True</property>
1237
 
                          <property name="label" translatable="yes">_Branch</property>
1238
 
                          <property name="use_underline">True</property>
1239
 
                          <property name="use_markup">False</property>
1240
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
1241
 
                          <property name="wrap">False</property>
1242
 
                          <property name="selectable">False</property>
1243
 
                          <property name="xalign">0.5</property>
1244
 
                          <property name="yalign">0.5</property>
1245
 
                          <property name="xpad">0</property>
1246
 
                          <property name="ypad">0</property>
1247
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1248
 
                          <property name="width_chars">-1</property>
1249
 
                          <property name="single_line_mode">False</property>
1250
 
                          <property name="angle">0</property>
1251
 
                        </widget>
1252
 
                        <packing>
1253
 
                          <property name="padding">0</property>
1254
 
                          <property name="expand">False</property>
1255
 
                          <property name="fill">False</property>
1256
 
                        </packing>
1257
 
                      </child>
1258
 
                    </widget>
1259
 
                  </child>
1260
 
                </widget>
1261
 
              </child>
1262
 
            </widget>
1263
 
          </child>
 
685
        <widget class="GtkStatusbar" id="statusbar">
 
686
          <property name="visible">True</property>
 
687
          <property name="has_resize_grip">True</property>
1264
688
        </widget>
1265
689
        <packing>
1266
690
          <property name="padding">0</property>
1285
709
  <property name="logo">oliveicon2.png</property>
1286
710
</widget>
1287
711
 
1288
 
<widget class="GtkWindow" id="window_add">
 
712
<widget class="GtkDialog" id="window_add">
1289
713
  <property name="visible">True</property>
1290
714
  <property name="title" translatable="yes">Olive - Add file(s)</property>
1291
715
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1301
725
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1302
726
  <property name="focus_on_map">True</property>
1303
727
  <property name="urgency_hint">False</property>
 
728
  <property name="has_separator">True</property>
1304
729
 
1305
 
  <child>
 
730
  <child internal-child="vbox">
1306
731
    <widget class="GtkVBox" id="vbox_add">
1307
 
      <property name="border_width">5</property>
1308
732
      <property name="visible">True</property>
1309
733
      <property name="homogeneous">False</property>
1310
734
      <property name="spacing">3</property>
1311
735
 
1312
 
      <child>
1313
 
        <widget class="GtkLabel" id="label_add_question">
1314
 
          <property name="visible">True</property>
1315
 
          <property name="label" translatable="yes">Which file(s) do you want to add?</property>
1316
 
          <property name="use_underline">False</property>
1317
 
          <property name="use_markup">False</property>
1318
 
          <property name="justify">GTK_JUSTIFY_LEFT</property>
1319
 
          <property name="wrap">False</property>
1320
 
          <property name="selectable">False</property>
1321
 
          <property name="xalign">0.5</property>
1322
 
          <property name="yalign">0.5</property>
1323
 
          <property name="xpad">0</property>
1324
 
          <property name="ypad">0</property>
1325
 
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1326
 
          <property name="width_chars">-1</property>
1327
 
          <property name="single_line_mode">False</property>
1328
 
          <property name="angle">0</property>
1329
 
        </widget>
1330
 
        <packing>
1331
 
          <property name="padding">0</property>
1332
 
          <property name="expand">False</property>
1333
 
          <property name="fill">False</property>
1334
 
        </packing>
1335
 
      </child>
1336
 
 
1337
 
      <child>
1338
 
        <widget class="GtkRadioButton" id="radiobutton_add_selected">
1339
 
          <property name="visible">True</property>
1340
 
          <property name="can_focus">True</property>
1341
 
          <property name="label" translatable="yes">Selected only</property>
1342
 
          <property name="use_underline">True</property>
1343
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1344
 
          <property name="focus_on_click">True</property>
1345
 
          <property name="active">False</property>
1346
 
          <property name="inconsistent">False</property>
1347
 
          <property name="draw_indicator">True</property>
1348
 
        </widget>
1349
 
        <packing>
1350
 
          <property name="padding">0</property>
1351
 
          <property name="expand">False</property>
1352
 
          <property name="fill">False</property>
1353
 
        </packing>
1354
 
      </child>
1355
 
 
1356
 
      <child>
1357
 
        <widget class="GtkRadioButton" id="radiobutton_add_unknown">
1358
 
          <property name="visible">True</property>
1359
 
          <property name="can_focus">True</property>
1360
 
          <property name="label" translatable="yes">All unknowns recursively</property>
1361
 
          <property name="use_underline">True</property>
1362
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1363
 
          <property name="focus_on_click">True</property>
1364
 
          <property name="active">False</property>
1365
 
          <property name="inconsistent">False</property>
1366
 
          <property name="draw_indicator">True</property>
1367
 
          <property name="group">radiobutton_add_selected</property>
1368
 
        </widget>
1369
 
        <packing>
1370
 
          <property name="padding">0</property>
1371
 
          <property name="expand">False</property>
1372
 
          <property name="fill">False</property>
1373
 
        </packing>
1374
 
      </child>
1375
 
 
1376
 
      <child>
 
736
      <child internal-child="action_area">
1377
737
        <widget class="GtkHButtonBox" id="hbuttonbox_add">
1378
738
          <property name="visible">True</property>
1379
739
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1380
 
          <property name="spacing">3</property>
1381
740
 
1382
741
          <child>
1383
742
            <widget class="GtkButton" id="button_add_cancel">
1388
747
              <property name="use_stock">True</property>
1389
748
              <property name="relief">GTK_RELIEF_NORMAL</property>
1390
749
              <property name="focus_on_click">True</property>
 
750
              <property name="response_id">0</property>
1391
751
              <signal name="clicked" handler="on_button_add_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 11:37:02 GMT"/>
1392
752
            </widget>
1393
753
          </child>
1400
760
              <property name="can_focus">True</property>
1401
761
              <property name="relief">GTK_RELIEF_NORMAL</property>
1402
762
              <property name="focus_on_click">True</property>
 
763
              <property name="response_id">0</property>
1403
764
              <signal name="clicked" handler="on_button_add_add_clicked" last_modification_time="Fri, 21 Jul 2006 11:37:11 GMT"/>
1404
765
 
1405
766
              <child>
1472
833
          <property name="padding">0</property>
1473
834
          <property name="expand">True</property>
1474
835
          <property name="fill">True</property>
 
836
          <property name="pack_type">GTK_PACK_END</property>
 
837
        </packing>
 
838
      </child>
 
839
 
 
840
      <child>
 
841
        <widget class="GtkLabel" id="label_add_question">
 
842
          <property name="visible">True</property>
 
843
          <property name="label" translatable="yes">Which file(s) do you want to add?</property>
 
844
          <property name="use_underline">False</property>
 
845
          <property name="use_markup">False</property>
 
846
          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
847
          <property name="wrap">False</property>
 
848
          <property name="selectable">False</property>
 
849
          <property name="xalign">0.5</property>
 
850
          <property name="yalign">0.5</property>
 
851
          <property name="xpad">0</property>
 
852
          <property name="ypad">0</property>
 
853
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
854
          <property name="width_chars">-1</property>
 
855
          <property name="single_line_mode">False</property>
 
856
          <property name="angle">0</property>
 
857
        </widget>
 
858
        <packing>
 
859
          <property name="padding">0</property>
 
860
          <property name="expand">False</property>
 
861
          <property name="fill">False</property>
 
862
        </packing>
 
863
      </child>
 
864
 
 
865
      <child>
 
866
        <widget class="GtkRadioButton" id="radiobutton_add_selected">
 
867
          <property name="visible">True</property>
 
868
          <property name="can_focus">True</property>
 
869
          <property name="label" translatable="yes">Selected only</property>
 
870
          <property name="use_underline">True</property>
 
871
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
872
          <property name="focus_on_click">True</property>
 
873
          <property name="active">False</property>
 
874
          <property name="inconsistent">False</property>
 
875
          <property name="draw_indicator">True</property>
 
876
        </widget>
 
877
        <packing>
 
878
          <property name="padding">0</property>
 
879
          <property name="expand">False</property>
 
880
          <property name="fill">False</property>
 
881
        </packing>
 
882
      </child>
 
883
 
 
884
      <child>
 
885
        <widget class="GtkRadioButton" id="radiobutton_add_unknown">
 
886
          <property name="visible">True</property>
 
887
          <property name="can_focus">True</property>
 
888
          <property name="label" translatable="yes">All unknowns recursively</property>
 
889
          <property name="use_underline">True</property>
 
890
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
891
          <property name="focus_on_click">True</property>
 
892
          <property name="active">False</property>
 
893
          <property name="inconsistent">False</property>
 
894
          <property name="draw_indicator">True</property>
 
895
          <property name="group">radiobutton_add_selected</property>
 
896
        </widget>
 
897
        <packing>
 
898
          <property name="padding">0</property>
 
899
          <property name="expand">False</property>
 
900
          <property name="fill">False</property>
1475
901
        </packing>
1476
902
      </child>
1477
903
    </widget>
1478
904
  </child>
1479
905
</widget>
1480
906
 
1481
 
<widget class="GtkWindow" id="window_remove">
 
907
<widget class="GtkDialog" id="window_remove">
1482
908
  <property name="visible">True</property>
1483
909
  <property name="title" translatable="yes">Olive - Remove file(s)</property>
1484
910
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1494
920
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1495
921
  <property name="focus_on_map">True</property>
1496
922
  <property name="urgency_hint">False</property>
 
923
  <property name="has_separator">True</property>
1497
924
 
1498
 
  <child>
 
925
  <child internal-child="vbox">
1499
926
    <widget class="GtkVBox" id="vbox_remove">
1500
 
      <property name="border_width">5</property>
1501
927
      <property name="visible">True</property>
1502
928
      <property name="homogeneous">False</property>
1503
929
      <property name="spacing">3</property>
1504
930
 
1505
 
      <child>
1506
 
        <widget class="GtkLabel" id="label_remove_question">
1507
 
          <property name="visible">True</property>
1508
 
          <property name="label" translatable="yes">Which file(s) do you want to remove?</property>
1509
 
          <property name="use_underline">False</property>
1510
 
          <property name="use_markup">False</property>
1511
 
          <property name="justify">GTK_JUSTIFY_LEFT</property>
1512
 
          <property name="wrap">False</property>
1513
 
          <property name="selectable">False</property>
1514
 
          <property name="xalign">0.5</property>
1515
 
          <property name="yalign">0.5</property>
1516
 
          <property name="xpad">0</property>
1517
 
          <property name="ypad">0</property>
1518
 
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1519
 
          <property name="width_chars">-1</property>
1520
 
          <property name="single_line_mode">False</property>
1521
 
          <property name="angle">0</property>
1522
 
        </widget>
1523
 
        <packing>
1524
 
          <property name="padding">0</property>
1525
 
          <property name="expand">False</property>
1526
 
          <property name="fill">False</property>
1527
 
        </packing>
1528
 
      </child>
1529
 
 
1530
 
      <child>
1531
 
        <widget class="GtkRadioButton" id="radiobutton_remove_selected">
1532
 
          <property name="visible">True</property>
1533
 
          <property name="can_focus">True</property>
1534
 
          <property name="label" translatable="yes">Selected only</property>
1535
 
          <property name="use_underline">True</property>
1536
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1537
 
          <property name="focus_on_click">True</property>
1538
 
          <property name="active">False</property>
1539
 
          <property name="inconsistent">False</property>
1540
 
          <property name="draw_indicator">True</property>
1541
 
        </widget>
1542
 
        <packing>
1543
 
          <property name="padding">0</property>
1544
 
          <property name="expand">False</property>
1545
 
          <property name="fill">False</property>
1546
 
        </packing>
1547
 
      </child>
1548
 
 
1549
 
      <child>
1550
 
        <widget class="GtkRadioButton" id="radiobutton_remove_new">
1551
 
          <property name="visible">True</property>
1552
 
          <property name="can_focus">True</property>
1553
 
          <property name="label" translatable="yes">All files with status 'added'</property>
1554
 
          <property name="use_underline">True</property>
1555
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1556
 
          <property name="focus_on_click">True</property>
1557
 
          <property name="active">False</property>
1558
 
          <property name="inconsistent">False</property>
1559
 
          <property name="draw_indicator">True</property>
1560
 
          <property name="group">radiobutton_remove_selected</property>
1561
 
        </widget>
1562
 
        <packing>
1563
 
          <property name="padding">0</property>
1564
 
          <property name="expand">False</property>
1565
 
          <property name="fill">False</property>
1566
 
        </packing>
1567
 
      </child>
1568
 
 
1569
 
      <child>
 
931
      <child internal-child="action_area">
1570
932
        <widget class="GtkHButtonBox" id="hbuttonbox_remove">
1571
933
          <property name="visible">True</property>
1572
934
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1573
 
          <property name="spacing">3</property>
1574
935
 
1575
936
          <child>
1576
937
            <widget class="GtkButton" id="button_remove_cancel">
1581
942
              <property name="use_stock">True</property>
1582
943
              <property name="relief">GTK_RELIEF_NORMAL</property>
1583
944
              <property name="focus_on_click">True</property>
 
945
              <property name="response_id">0</property>
1584
946
              <signal name="clicked" handler="on_button_remove_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 14:22:58 GMT"/>
1585
947
            </widget>
1586
948
          </child>
1593
955
              <property name="can_focus">True</property>
1594
956
              <property name="relief">GTK_RELIEF_NORMAL</property>
1595
957
              <property name="focus_on_click">True</property>
 
958
              <property name="response_id">0</property>
1596
959
              <signal name="clicked" handler="on_button_remove_remove_clicked" last_modification_time="Fri, 21 Jul 2006 14:22:51 GMT"/>
1597
960
 
1598
961
              <child>
1665
1028
          <property name="padding">0</property>
1666
1029
          <property name="expand">True</property>
1667
1030
          <property name="fill">True</property>
1668
 
        </packing>
1669
 
      </child>
1670
 
    </widget>
1671
 
  </child>
1672
 
</widget>
1673
 
 
1674
 
<widget class="GtkWindow" id="window_push">
1675
 
  <property name="width_request">320</property>
1676
 
  <property name="title" translatable="yes">Olive - Push</property>
1677
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1678
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
1679
 
  <property name="modal">False</property>
1680
 
  <property name="resizable">True</property>
1681
 
  <property name="destroy_with_parent">False</property>
1682
 
  <property name="icon">oliveicon2.png</property>
1683
 
  <property name="decorated">True</property>
1684
 
  <property name="skip_taskbar_hint">False</property>
1685
 
  <property name="skip_pager_hint">False</property>
1686
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1687
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1688
 
  <property name="focus_on_map">True</property>
1689
 
  <property name="urgency_hint">False</property>
1690
 
 
1691
 
  <child>
1692
 
    <widget class="GtkVBox" id="vbox_push">
1693
 
      <property name="border_width">5</property>
1694
 
      <property name="visible">True</property>
1695
 
      <property name="homogeneous">False</property>
1696
 
      <property name="spacing">3</property>
1697
 
 
1698
 
      <child>
1699
 
        <widget class="GtkRadioButton" id="radiobutton_push_stored">
1700
 
          <property name="visible">True</property>
1701
 
          <property name="can_focus">True</property>
1702
 
          <property name="label" translatable="yes">Push to _default location</property>
1703
 
          <property name="use_underline">True</property>
1704
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1705
 
          <property name="focus_on_click">True</property>
1706
 
          <property name="active">False</property>
1707
 
          <property name="inconsistent">False</property>
1708
 
          <property name="draw_indicator">True</property>
1709
 
          <signal name="toggled" handler="on_radiobutton_push_stored_toggled" last_modification_time="Fri, 21 Jul 2006 16:39:36 GMT"/>
1710
 
        </widget>
1711
 
        <packing>
1712
 
          <property name="padding">0</property>
1713
 
          <property name="expand">False</property>
1714
 
          <property name="fill">False</property>
1715
 
        </packing>
1716
 
      </child>
1717
 
 
1718
 
      <child>
1719
 
        <widget class="GtkEntry" id="entry_push_stored">
1720
 
          <property name="visible">True</property>
1721
 
          <property name="can_focus">True</property>
1722
 
          <property name="editable">False</property>
1723
 
          <property name="visibility">True</property>
1724
 
          <property name="max_length">0</property>
1725
 
          <property name="text" translatable="yes">(no location known)</property>
1726
 
          <property name="has_frame">True</property>
1727
 
          <property name="invisible_char">●</property>
1728
 
          <property name="activates_default">False</property>
1729
 
        </widget>
1730
 
        <packing>
1731
 
          <property name="padding">0</property>
1732
 
          <property name="expand">False</property>
1733
 
          <property name="fill">False</property>
1734
 
        </packing>
1735
 
      </child>
1736
 
 
1737
 
      <child>
1738
 
        <widget class="GtkRadioButton" id="radiobutton_push_specific">
1739
 
          <property name="visible">True</property>
1740
 
          <property name="can_focus">True</property>
1741
 
          <property name="label" translatable="yes">Push to _specific location</property>
1742
 
          <property name="use_underline">True</property>
1743
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1744
 
          <property name="focus_on_click">True</property>
1745
 
          <property name="active">False</property>
1746
 
          <property name="inconsistent">False</property>
1747
 
          <property name="draw_indicator">True</property>
1748
 
          <property name="group">radiobutton_push_stored</property>
1749
 
          <signal name="toggled" handler="on_radiobutton_push_specify_toggled" last_modification_time="Fri, 21 Jul 2006 16:39:41 GMT"/>
1750
 
        </widget>
1751
 
        <packing>
1752
 
          <property name="padding">0</property>
1753
 
          <property name="expand">False</property>
1754
 
          <property name="fill">False</property>
1755
 
        </packing>
1756
 
      </child>
1757
 
 
1758
 
      <child>
1759
 
        <widget class="GtkEntry" id="entry_push_location">
1760
 
          <property name="visible">True</property>
1761
 
          <property name="can_focus">True</property>
1762
 
          <property name="editable">True</property>
1763
 
          <property name="visibility">True</property>
1764
 
          <property name="max_length">0</property>
1765
 
          <property name="text" translatable="yes"></property>
1766
 
          <property name="has_frame">True</property>
1767
 
          <property name="invisible_char">●</property>
1768
 
          <property name="activates_default">False</property>
1769
 
        </widget>
1770
 
        <packing>
1771
 
          <property name="padding">0</property>
1772
 
          <property name="expand">False</property>
1773
 
          <property name="fill">False</property>
1774
 
        </packing>
1775
 
      </child>
1776
 
 
1777
 
      <child>
1778
 
        <widget class="GtkCheckButton" id="checkbutton_push_remember">
1779
 
          <property name="visible">True</property>
1780
 
          <property name="can_focus">True</property>
1781
 
          <property name="label" translatable="yes">_Remember as default location</property>
1782
 
          <property name="use_underline">True</property>
1783
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1784
 
          <property name="focus_on_click">True</property>
1785
 
          <property name="active">False</property>
1786
 
          <property name="inconsistent">False</property>
1787
 
          <property name="draw_indicator">True</property>
1788
 
        </widget>
1789
 
        <packing>
1790
 
          <property name="padding">0</property>
1791
 
          <property name="expand">False</property>
1792
 
          <property name="fill">False</property>
1793
 
        </packing>
1794
 
      </child>
1795
 
 
1796
 
      <child>
1797
 
        <widget class="GtkCheckButton" id="checkbutton_push_create">
1798
 
          <property name="visible">True</property>
1799
 
          <property name="can_focus">True</property>
1800
 
          <property name="label" translatable="yes">_Create the path leading up to the location</property>
1801
 
          <property name="use_underline">True</property>
1802
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1803
 
          <property name="focus_on_click">True</property>
1804
 
          <property name="active">False</property>
1805
 
          <property name="inconsistent">False</property>
1806
 
          <property name="draw_indicator">True</property>
1807
 
        </widget>
1808
 
        <packing>
1809
 
          <property name="padding">0</property>
1810
 
          <property name="expand">False</property>
1811
 
          <property name="fill">False</property>
1812
 
        </packing>
1813
 
      </child>
1814
 
 
1815
 
      <child>
1816
 
        <widget class="GtkCheckButton" id="checkbutton_push_overwrite">
1817
 
          <property name="visible">True</property>
1818
 
          <property name="can_focus">True</property>
1819
 
          <property name="label" translatable="yes">_Overwrite target if diverged</property>
1820
 
          <property name="use_underline">True</property>
1821
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1822
 
          <property name="focus_on_click">True</property>
1823
 
          <property name="active">False</property>
1824
 
          <property name="inconsistent">False</property>
1825
 
          <property name="draw_indicator">True</property>
1826
 
        </widget>
1827
 
        <packing>
1828
 
          <property name="padding">0</property>
1829
 
          <property name="expand">False</property>
1830
 
          <property name="fill">False</property>
1831
 
        </packing>
1832
 
      </child>
1833
 
 
1834
 
      <child>
1835
 
        <widget class="GtkHBox" id="hbox_push_test">
1836
 
          <property name="visible">True</property>
1837
 
          <property name="homogeneous">False</property>
1838
 
          <property name="spacing">5</property>
1839
 
 
1840
 
          <child>
1841
 
            <widget class="GtkImage" id="image_push_test">
1842
 
              <property name="width_request">22</property>
1843
 
              <property name="height_request">22</property>
1844
 
              <property name="visible">True</property>
1845
 
              <property name="icon_size">4</property>
1846
 
              <property name="icon_name">gtk-dialog-info</property>
1847
 
              <property name="xalign">0.5</property>
1848
 
              <property name="yalign">0.5</property>
1849
 
              <property name="xpad">0</property>
1850
 
              <property name="ypad">0</property>
1851
 
            </widget>
1852
 
            <packing>
1853
 
              <property name="padding">0</property>
1854
 
              <property name="expand">False</property>
1855
 
              <property name="fill">False</property>
1856
 
            </packing>
1857
 
          </child>
1858
 
 
1859
 
          <child>
1860
 
            <widget class="GtkLabel" id="label_push_test">
1861
 
              <property name="visible">True</property>
1862
 
              <property name="label" translatable="yes">(click the Test button to check write access)</property>
1863
 
              <property name="use_underline">False</property>
1864
 
              <property name="use_markup">False</property>
1865
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1866
 
              <property name="wrap">False</property>
1867
 
              <property name="selectable">False</property>
1868
 
              <property name="xalign">0.5</property>
1869
 
              <property name="yalign">0.5</property>
1870
 
              <property name="xpad">0</property>
1871
 
              <property name="ypad">0</property>
1872
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1873
 
              <property name="width_chars">-1</property>
1874
 
              <property name="single_line_mode">False</property>
1875
 
              <property name="angle">0</property>
1876
 
            </widget>
1877
 
            <packing>
1878
 
              <property name="padding">0</property>
1879
 
              <property name="expand">False</property>
1880
 
              <property name="fill">False</property>
1881
 
            </packing>
1882
 
          </child>
1883
 
        </widget>
1884
 
        <packing>
1885
 
          <property name="padding">0</property>
1886
 
          <property name="expand">False</property>
1887
 
          <property name="fill">False</property>
1888
 
        </packing>
1889
 
      </child>
1890
 
 
1891
 
      <child>
1892
 
        <widget class="GtkHButtonBox" id="hbuttonbox_push">
1893
 
          <property name="visible">True</property>
1894
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1895
 
          <property name="spacing">3</property>
1896
 
 
1897
 
          <child>
1898
 
            <widget class="GtkButton" id="button_push_test">
1899
 
              <property name="visible">True</property>
1900
 
              <property name="can_default">True</property>
1901
 
              <property name="can_focus">True</property>
1902
 
              <property name="label" translatable="yes">_Test</property>
1903
 
              <property name="use_underline">True</property>
1904
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1905
 
              <property name="focus_on_click">True</property>
1906
 
              <signal name="clicked" handler="on_button_push_test_clicked" last_modification_time="Sun, 20 Aug 2006 20:01:01 GMT"/>
1907
 
            </widget>
1908
 
          </child>
1909
 
 
1910
 
          <child>
1911
 
            <widget class="GtkButton" id="button_push_cancel">
1912
 
              <property name="visible">True</property>
1913
 
              <property name="can_default">True</property>
1914
 
              <property name="can_focus">True</property>
1915
 
              <property name="label">gtk-cancel</property>
1916
 
              <property name="use_stock">True</property>
1917
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1918
 
              <property name="focus_on_click">True</property>
1919
 
              <signal name="clicked" handler="on_button_push_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 16:38:55 GMT"/>
1920
 
            </widget>
1921
 
          </child>
1922
 
 
1923
 
          <child>
1924
 
            <widget class="GtkButton" id="button_push_push">
1925
 
              <property name="visible">True</property>
1926
 
              <property name="can_default">True</property>
1927
 
              <property name="has_default">True</property>
1928
 
              <property name="can_focus">True</property>
1929
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1930
 
              <property name="focus_on_click">True</property>
1931
 
              <signal name="clicked" handler="on_button_push_push_clicked" last_modification_time="Fri, 21 Jul 2006 16:39:01 GMT"/>
1932
 
 
1933
 
              <child>
1934
 
                <widget class="GtkAlignment" id="alignment6">
1935
 
                  <property name="visible">True</property>
1936
 
                  <property name="xalign">0.5</property>
1937
 
                  <property name="yalign">0.5</property>
1938
 
                  <property name="xscale">0</property>
1939
 
                  <property name="yscale">0</property>
1940
 
                  <property name="top_padding">0</property>
1941
 
                  <property name="bottom_padding">0</property>
1942
 
                  <property name="left_padding">0</property>
1943
 
                  <property name="right_padding">0</property>
1944
 
 
1945
 
                  <child>
1946
 
                    <widget class="GtkHBox" id="hbox8">
1947
 
                      <property name="visible">True</property>
1948
 
                      <property name="homogeneous">False</property>
1949
 
                      <property name="spacing">2</property>
1950
 
 
1951
 
                      <child>
1952
 
                        <widget class="GtkImage" id="image50">
1953
 
                          <property name="visible">True</property>
1954
 
                          <property name="stock">gtk-goto-top</property>
1955
 
                          <property name="icon_size">4</property>
1956
 
                          <property name="xalign">0.5</property>
1957
 
                          <property name="yalign">0.5</property>
1958
 
                          <property name="xpad">0</property>
1959
 
                          <property name="ypad">0</property>
1960
 
                        </widget>
1961
 
                        <packing>
1962
 
                          <property name="padding">0</property>
1963
 
                          <property name="expand">False</property>
1964
 
                          <property name="fill">False</property>
1965
 
                        </packing>
1966
 
                      </child>
1967
 
 
1968
 
                      <child>
1969
 
                        <widget class="GtkLabel" id="label12">
1970
 
                          <property name="visible">True</property>
1971
 
                          <property name="label" translatable="yes">_Push</property>
1972
 
                          <property name="use_underline">True</property>
1973
 
                          <property name="use_markup">False</property>
1974
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
1975
 
                          <property name="wrap">False</property>
1976
 
                          <property name="selectable">False</property>
1977
 
                          <property name="xalign">0.5</property>
1978
 
                          <property name="yalign">0.5</property>
1979
 
                          <property name="xpad">0</property>
1980
 
                          <property name="ypad">0</property>
1981
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1982
 
                          <property name="width_chars">-1</property>
1983
 
                          <property name="single_line_mode">False</property>
1984
 
                          <property name="angle">0</property>
1985
 
                        </widget>
1986
 
                        <packing>
1987
 
                          <property name="padding">0</property>
1988
 
                          <property name="expand">False</property>
1989
 
                          <property name="fill">False</property>
1990
 
                        </packing>
1991
 
                      </child>
1992
 
                    </widget>
1993
 
                  </child>
1994
 
                </widget>
1995
 
              </child>
1996
 
            </widget>
1997
 
          </child>
1998
 
        </widget>
1999
 
        <packing>
2000
 
          <property name="padding">0</property>
2001
 
          <property name="expand">False</property>
2002
 
          <property name="fill">False</property>
2003
 
        </packing>
2004
 
      </child>
2005
 
    </widget>
2006
 
  </child>
2007
 
</widget>
2008
 
 
2009
 
<widget class="GtkWindow" id="window_checkout">
2010
 
  <property name="width_request">350</property>
2011
 
  <property name="title" translatable="yes">Olive - Checkout</property>
2012
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2013
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
2014
 
  <property name="modal">False</property>
2015
 
  <property name="resizable">True</property>
2016
 
  <property name="destroy_with_parent">False</property>
2017
 
  <property name="icon">oliveicon2.png</property>
2018
 
  <property name="decorated">True</property>
2019
 
  <property name="skip_taskbar_hint">False</property>
2020
 
  <property name="skip_pager_hint">False</property>
2021
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2022
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2023
 
  <property name="focus_on_map">True</property>
2024
 
  <property name="urgency_hint">False</property>
2025
 
 
2026
 
  <child>
2027
 
    <widget class="GtkVBox" id="vbox_checkout">
2028
 
      <property name="border_width">5</property>
2029
 
      <property name="visible">True</property>
2030
 
      <property name="homogeneous">False</property>
2031
 
      <property name="spacing">3</property>
2032
 
 
2033
 
      <child>
2034
 
        <widget class="GtkTable" id="table_checkout">
2035
 
          <property name="visible">True</property>
2036
 
          <property name="n_rows">4</property>
2037
 
          <property name="n_columns">2</property>
2038
 
          <property name="homogeneous">False</property>
2039
 
          <property name="row_spacing">3</property>
2040
 
          <property name="column_spacing">3</property>
2041
 
 
2042
 
          <child>
2043
 
            <widget class="GtkLabel" id="label_checkout_location">
2044
 
              <property name="visible">True</property>
2045
 
              <property name="label" translatable="yes">Branch location:</property>
2046
 
              <property name="use_underline">False</property>
2047
 
              <property name="use_markup">False</property>
2048
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2049
 
              <property name="wrap">False</property>
2050
 
              <property name="selectable">False</property>
2051
 
              <property name="xalign">0</property>
2052
 
              <property name="yalign">0.5</property>
2053
 
              <property name="xpad">0</property>
2054
 
              <property name="ypad">0</property>
2055
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2056
 
              <property name="width_chars">-1</property>
2057
 
              <property name="single_line_mode">False</property>
2058
 
              <property name="angle">0</property>
2059
 
            </widget>
2060
 
            <packing>
2061
 
              <property name="left_attach">0</property>
2062
 
              <property name="right_attach">1</property>
2063
 
              <property name="top_attach">0</property>
2064
 
              <property name="bottom_attach">1</property>
2065
 
              <property name="x_options">fill</property>
2066
 
              <property name="y_options"></property>
2067
 
            </packing>
2068
 
          </child>
2069
 
 
2070
 
          <child>
2071
 
            <widget class="GtkLabel" id="label_checkout_destination">
2072
 
              <property name="visible">True</property>
2073
 
              <property name="label" translatable="yes">Destination:</property>
2074
 
              <property name="use_underline">False</property>
2075
 
              <property name="use_markup">False</property>
2076
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2077
 
              <property name="wrap">False</property>
2078
 
              <property name="selectable">False</property>
2079
 
              <property name="xalign">0</property>
2080
 
              <property name="yalign">0.5</property>
2081
 
              <property name="xpad">0</property>
2082
 
              <property name="ypad">0</property>
2083
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2084
 
              <property name="width_chars">-1</property>
2085
 
              <property name="single_line_mode">False</property>
2086
 
              <property name="angle">0</property>
2087
 
            </widget>
2088
 
            <packing>
2089
 
              <property name="left_attach">0</property>
2090
 
              <property name="right_attach">1</property>
2091
 
              <property name="top_attach">1</property>
2092
 
              <property name="bottom_attach">2</property>
2093
 
              <property name="x_options">fill</property>
2094
 
              <property name="y_options"></property>
2095
 
            </packing>
2096
 
          </child>
2097
 
 
2098
 
          <child>
2099
 
            <widget class="GtkFileChooserButton" id="filechooserbutton_checkout">
2100
 
              <property name="visible">True</property>
2101
 
              <property name="title" translatable="yes">Please select a folder</property>
2102
 
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
2103
 
              <property name="local_only">True</property>
2104
 
              <property name="show_hidden">False</property>
2105
 
              <property name="do_overwrite_confirmation">False</property>
2106
 
              <property name="width_chars">-1</property>
2107
 
            </widget>
2108
 
            <packing>
2109
 
              <property name="left_attach">1</property>
2110
 
              <property name="right_attach">2</property>
2111
 
              <property name="top_attach">1</property>
2112
 
              <property name="bottom_attach">2</property>
2113
 
              <property name="y_options">fill</property>
2114
 
            </packing>
2115
 
          </child>
2116
 
 
2117
 
          <child>
2118
 
            <widget class="GtkEntry" id="entry_checkout_location">
2119
 
              <property name="visible">True</property>
2120
 
              <property name="can_focus">True</property>
2121
 
              <property name="editable">True</property>
2122
 
              <property name="visibility">True</property>
2123
 
              <property name="max_length">0</property>
2124
 
              <property name="text" translatable="yes"></property>
2125
 
              <property name="has_frame">True</property>
2126
 
              <property name="invisible_char">●</property>
2127
 
              <property name="activates_default">False</property>
2128
 
            </widget>
2129
 
            <packing>
2130
 
              <property name="left_attach">1</property>
2131
 
              <property name="right_attach">2</property>
2132
 
              <property name="top_attach">0</property>
2133
 
              <property name="bottom_attach">1</property>
2134
 
              <property name="y_options"></property>
2135
 
            </packing>
2136
 
          </child>
2137
 
 
2138
 
          <child>
2139
 
            <widget class="GtkLabel" id="label_checkout_revno">
2140
 
              <property name="visible">True</property>
2141
 
              <property name="label" translatable="yes">Revision number:</property>
2142
 
              <property name="use_underline">False</property>
2143
 
              <property name="use_markup">False</property>
2144
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2145
 
              <property name="wrap">False</property>
2146
 
              <property name="selectable">False</property>
2147
 
              <property name="xalign">0</property>
2148
 
              <property name="yalign">0.5</property>
2149
 
              <property name="xpad">0</property>
2150
 
              <property name="ypad">0</property>
2151
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2152
 
              <property name="width_chars">-1</property>
2153
 
              <property name="single_line_mode">False</property>
2154
 
              <property name="angle">0</property>
2155
 
            </widget>
2156
 
            <packing>
2157
 
              <property name="left_attach">0</property>
2158
 
              <property name="right_attach">1</property>
2159
 
              <property name="top_attach">2</property>
2160
 
              <property name="bottom_attach">3</property>
2161
 
              <property name="x_options">fill</property>
2162
 
              <property name="y_options"></property>
2163
 
            </packing>
2164
 
          </child>
2165
 
 
2166
 
          <child>
2167
 
            <widget class="GtkSpinButton" id="spinbutton_checkout_revno">
2168
 
              <property name="visible">True</property>
2169
 
              <property name="can_focus">True</property>
2170
 
              <property name="climb_rate">1</property>
2171
 
              <property name="digits">0</property>
2172
 
              <property name="numeric">False</property>
2173
 
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
2174
 
              <property name="snap_to_ticks">False</property>
2175
 
              <property name="wrap">False</property>
2176
 
              <property name="adjustment">0 0 100000 1 10 10</property>
2177
 
            </widget>
2178
 
            <packing>
2179
 
              <property name="left_attach">1</property>
2180
 
              <property name="right_attach">2</property>
2181
 
              <property name="top_attach">2</property>
2182
 
              <property name="bottom_attach">3</property>
2183
 
              <property name="y_options"></property>
2184
 
            </packing>
2185
 
          </child>
2186
 
 
2187
 
          <child>
2188
 
            <widget class="GtkCheckButton" id="checkbutton_checkout_lightweight">
2189
 
              <property name="visible">True</property>
2190
 
              <property name="can_focus">True</property>
2191
 
              <property name="label" translatable="yes">Lightweight checkout</property>
2192
 
              <property name="use_underline">True</property>
2193
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2194
 
              <property name="focus_on_click">True</property>
2195
 
              <property name="active">False</property>
2196
 
              <property name="inconsistent">False</property>
2197
 
              <property name="draw_indicator">True</property>
2198
 
            </widget>
2199
 
            <packing>
2200
 
              <property name="left_attach">1</property>
2201
 
              <property name="right_attach">2</property>
2202
 
              <property name="top_attach">3</property>
2203
 
              <property name="bottom_attach">4</property>
2204
 
              <property name="x_options">fill</property>
2205
 
              <property name="y_options"></property>
2206
 
            </packing>
2207
 
          </child>
2208
 
        </widget>
2209
 
        <packing>
2210
 
          <property name="padding">0</property>
2211
 
          <property name="expand">True</property>
2212
 
          <property name="fill">True</property>
2213
 
        </packing>
2214
 
      </child>
2215
 
 
2216
 
      <child>
2217
 
        <widget class="GtkHButtonBox" id="hbuttonbox_checkout">
2218
 
          <property name="visible">True</property>
2219
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2220
 
          <property name="spacing">3</property>
2221
 
 
2222
 
          <child>
2223
 
            <widget class="GtkButton" id="button_checkout_cancel">
2224
 
              <property name="visible">True</property>
2225
 
              <property name="can_default">True</property>
2226
 
              <property name="can_focus">True</property>
2227
 
              <property name="label">gtk-cancel</property>
2228
 
              <property name="use_stock">True</property>
2229
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2230
 
              <property name="focus_on_click">True</property>
2231
 
              <signal name="clicked" handler="on_button_checkout_cancel_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:19 GMT"/>
2232
 
            </widget>
2233
 
          </child>
2234
 
 
2235
 
          <child>
2236
 
            <widget class="GtkButton" id="button_checkout_checkout">
2237
 
              <property name="visible">True</property>
2238
 
              <property name="can_default">True</property>
2239
 
              <property name="has_default">True</property>
2240
 
              <property name="can_focus">True</property>
2241
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2242
 
              <property name="focus_on_click">True</property>
2243
 
              <signal name="clicked" handler="on_button_checkout_checkout_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:11 GMT"/>
2244
 
 
2245
 
              <child>
2246
 
                <widget class="GtkAlignment" id="alignment7">
2247
 
                  <property name="visible">True</property>
2248
 
                  <property name="xalign">0.5</property>
2249
 
                  <property name="yalign">0.5</property>
2250
 
                  <property name="xscale">0</property>
2251
 
                  <property name="yscale">0</property>
2252
 
                  <property name="top_padding">0</property>
2253
 
                  <property name="bottom_padding">0</property>
2254
 
                  <property name="left_padding">0</property>
2255
 
                  <property name="right_padding">0</property>
2256
 
 
2257
 
                  <child>
2258
 
                    <widget class="GtkHBox" id="hbox9">
2259
 
                      <property name="visible">True</property>
2260
 
                      <property name="homogeneous">False</property>
2261
 
                      <property name="spacing">2</property>
2262
 
 
2263
 
                      <child>
2264
 
                        <widget class="GtkImage" id="image51">
2265
 
                          <property name="visible">True</property>
2266
 
                          <property name="stock">gtk-apply</property>
2267
 
                          <property name="icon_size">4</property>
2268
 
                          <property name="xalign">0.5</property>
2269
 
                          <property name="yalign">0.5</property>
2270
 
                          <property name="xpad">0</property>
2271
 
                          <property name="ypad">0</property>
2272
 
                        </widget>
2273
 
                        <packing>
2274
 
                          <property name="padding">0</property>
2275
 
                          <property name="expand">False</property>
2276
 
                          <property name="fill">False</property>
2277
 
                        </packing>
2278
 
                      </child>
2279
 
 
2280
 
                      <child>
2281
 
                        <widget class="GtkLabel" id="label16">
2282
 
                          <property name="visible">True</property>
2283
 
                          <property name="label" translatable="yes">C_heckout</property>
2284
 
                          <property name="use_underline">True</property>
2285
 
                          <property name="use_markup">False</property>
2286
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
2287
 
                          <property name="wrap">False</property>
2288
 
                          <property name="selectable">False</property>
2289
 
                          <property name="xalign">0.5</property>
2290
 
                          <property name="yalign">0.5</property>
2291
 
                          <property name="xpad">0</property>
2292
 
                          <property name="ypad">0</property>
2293
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2294
 
                          <property name="width_chars">-1</property>
2295
 
                          <property name="single_line_mode">False</property>
2296
 
                          <property name="angle">0</property>
2297
 
                        </widget>
2298
 
                        <packing>
2299
 
                          <property name="padding">0</property>
2300
 
                          <property name="expand">False</property>
2301
 
                          <property name="fill">False</property>
2302
 
                        </packing>
2303
 
                      </child>
2304
 
                    </widget>
2305
 
                  </child>
2306
 
                </widget>
2307
 
              </child>
2308
 
            </widget>
2309
 
          </child>
2310
 
        </widget>
2311
 
        <packing>
2312
 
          <property name="padding">0</property>
2313
 
          <property name="expand">False</property>
2314
 
          <property name="fill">False</property>
2315
 
        </packing>
2316
 
      </child>
2317
 
    </widget>
2318
 
  </child>
2319
 
</widget>
2320
 
 
2321
 
<widget class="GtkWindow" id="window_diff">
2322
 
  <property name="width_request">600</property>
2323
 
  <property name="height_request">400</property>
2324
 
  <property name="title" translatable="yes">Olive - Diff</property>
2325
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2326
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
2327
 
  <property name="modal">False</property>
2328
 
  <property name="resizable">True</property>
2329
 
  <property name="destroy_with_parent">False</property>
2330
 
  <property name="icon">oliveicon2.png</property>
2331
 
  <property name="decorated">True</property>
2332
 
  <property name="skip_taskbar_hint">False</property>
2333
 
  <property name="skip_pager_hint">False</property>
2334
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
2335
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2336
 
  <property name="focus_on_map">True</property>
2337
 
  <property name="urgency_hint">False</property>
2338
 
 
2339
 
  <child>
2340
 
    <widget class="GtkVBox" id="vbox_diff">
2341
 
      <property name="border_width">5</property>
2342
 
      <property name="visible">True</property>
2343
 
      <property name="homogeneous">False</property>
2344
 
      <property name="spacing">3</property>
2345
 
 
2346
 
      <child>
2347
 
        <widget class="GtkHPaned" id="hpaned_diff">
2348
 
          <property name="visible">True</property>
2349
 
          <property name="can_focus">True</property>
2350
 
          <property name="position">200</property>
2351
 
 
2352
 
          <child>
2353
 
            <widget class="GtkScrolledWindow" id="scrolledwindow_diff_files">
2354
 
              <property name="visible">True</property>
2355
 
              <property name="can_focus">True</property>
2356
 
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2357
 
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2358
 
              <property name="shadow_type">GTK_SHADOW_IN</property>
2359
 
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
2360
 
 
2361
 
              <child>
2362
 
                <widget class="GtkTreeView" id="treeview_diff_files">
2363
 
                  <property name="visible">True</property>
2364
 
                  <property name="can_focus">True</property>
2365
 
                  <property name="headers_visible">False</property>
2366
 
                  <property name="rules_hint">False</property>
2367
 
                  <property name="reorderable">False</property>
2368
 
                  <property name="enable_search">True</property>
2369
 
                  <property name="fixed_height_mode">False</property>
2370
 
                  <property name="hover_selection">False</property>
2371
 
                  <property name="hover_expand">False</property>
2372
 
                  <signal name="cursor_changed" handler="on_treeview_diff_files_cursor_changed" last_modification_time="Thu, 03 Aug 2006 09:02:37 GMT"/>
2373
 
                </widget>
2374
 
              </child>
2375
 
            </widget>
2376
 
            <packing>
2377
 
              <property name="shrink">True</property>
2378
 
              <property name="resize">False</property>
2379
 
            </packing>
2380
 
          </child>
2381
 
 
2382
 
          <child>
2383
 
            <widget class="GtkScrolledWindow" id="scrolledwindow_diff_diff">
2384
 
              <property name="visible">True</property>
2385
 
              <property name="can_focus">True</property>
2386
 
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2387
 
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2388
 
              <property name="shadow_type">GTK_SHADOW_IN</property>
2389
 
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
2390
 
 
2391
 
              <child>
2392
 
                <placeholder/>
2393
 
              </child>
2394
 
            </widget>
2395
 
            <packing>
2396
 
              <property name="shrink">True</property>
2397
 
              <property name="resize">True</property>
2398
 
            </packing>
2399
 
          </child>
2400
 
        </widget>
2401
 
        <packing>
2402
 
          <property name="padding">0</property>
2403
 
          <property name="expand">True</property>
2404
 
          <property name="fill">True</property>
2405
 
        </packing>
2406
 
      </child>
2407
 
 
2408
 
      <child>
2409
 
        <widget class="GtkHButtonBox" id="hbuttonbox_diff">
2410
 
          <property name="visible">True</property>
2411
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2412
 
          <property name="spacing">0</property>
2413
 
 
2414
 
          <child>
2415
 
            <widget class="GtkButton" id="button_diff_close">
2416
 
              <property name="visible">True</property>
2417
 
              <property name="can_default">True</property>
2418
 
              <property name="has_default">True</property>
2419
 
              <property name="can_focus">True</property>
2420
 
              <property name="label">gtk-close</property>
2421
 
              <property name="use_stock">True</property>
2422
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2423
 
              <property name="focus_on_click">True</property>
2424
 
              <signal name="clicked" handler="on_button_diff_close_clicked" last_modification_time="Wed, 02 Aug 2006 22:55:53 GMT"/>
2425
 
            </widget>
2426
 
          </child>
2427
 
        </widget>
2428
 
        <packing>
2429
 
          <property name="padding">0</property>
2430
 
          <property name="expand">False</property>
2431
 
          <property name="fill">True</property>
2432
 
        </packing>
2433
 
      </child>
2434
 
    </widget>
2435
 
  </child>
2436
 
</widget>
2437
 
 
2438
 
<widget class="GtkWindow" id="window_status">
 
1031
          <property name="pack_type">GTK_PACK_END</property>
 
1032
        </packing>
 
1033
      </child>
 
1034
 
 
1035
      <child>
 
1036
        <widget class="GtkLabel" id="label_remove_question">
 
1037
          <property name="visible">True</property>
 
1038
          <property name="label" translatable="yes">Which file(s) do you want to remove?</property>
 
1039
          <property name="use_underline">False</property>
 
1040
          <property name="use_markup">False</property>
 
1041
          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1042
          <property name="wrap">False</property>
 
1043
          <property name="selectable">False</property>
 
1044
          <property name="xalign">0.5</property>
 
1045
          <property name="yalign">0.5</property>
 
1046
          <property name="xpad">0</property>
 
1047
          <property name="ypad">0</property>
 
1048
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1049
          <property name="width_chars">-1</property>
 
1050
          <property name="single_line_mode">False</property>
 
1051
          <property name="angle">0</property>
 
1052
        </widget>
 
1053
        <packing>
 
1054
          <property name="padding">0</property>
 
1055
          <property name="expand">False</property>
 
1056
          <property name="fill">False</property>
 
1057
        </packing>
 
1058
      </child>
 
1059
 
 
1060
      <child>
 
1061
        <widget class="GtkRadioButton" id="radiobutton_remove_selected">
 
1062
          <property name="visible">True</property>
 
1063
          <property name="can_focus">True</property>
 
1064
          <property name="label" translatable="yes">Selected only</property>
 
1065
          <property name="use_underline">True</property>
 
1066
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1067
          <property name="focus_on_click">True</property>
 
1068
          <property name="active">False</property>
 
1069
          <property name="inconsistent">False</property>
 
1070
          <property name="draw_indicator">True</property>
 
1071
        </widget>
 
1072
        <packing>
 
1073
          <property name="padding">0</property>
 
1074
          <property name="expand">False</property>
 
1075
          <property name="fill">False</property>
 
1076
        </packing>
 
1077
      </child>
 
1078
 
 
1079
      <child>
 
1080
        <widget class="GtkRadioButton" id="radiobutton_remove_new">
 
1081
          <property name="visible">True</property>
 
1082
          <property name="can_focus">True</property>
 
1083
          <property name="label" translatable="yes">All files with status 'added'</property>
 
1084
          <property name="use_underline">True</property>
 
1085
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1086
          <property name="focus_on_click">True</property>
 
1087
          <property name="active">False</property>
 
1088
          <property name="inconsistent">False</property>
 
1089
          <property name="draw_indicator">True</property>
 
1090
          <property name="group">radiobutton_remove_selected</property>
 
1091
        </widget>
 
1092
        <packing>
 
1093
          <property name="padding">0</property>
 
1094
          <property name="expand">False</property>
 
1095
          <property name="fill">False</property>
 
1096
        </packing>
 
1097
      </child>
 
1098
    </widget>
 
1099
  </child>
 
1100
</widget>
 
1101
 
 
1102
<widget class="GtkDialog" id="window_status">
2439
1103
  <property name="width_request">400</property>
2440
1104
  <property name="height_request">300</property>
2441
1105
  <property name="title" translatable="yes">Olive - Status</property>
2448
1112
  <property name="decorated">True</property>
2449
1113
  <property name="skip_taskbar_hint">False</property>
2450
1114
  <property name="skip_pager_hint">False</property>
2451
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
 
1115
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2452
1116
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2453
1117
  <property name="focus_on_map">True</property>
2454
1118
  <property name="urgency_hint">False</property>
 
1119
  <property name="has_separator">True</property>
2455
1120
 
2456
 
  <child>
 
1121
  <child internal-child="vbox">
2457
1122
    <widget class="GtkVBox" id="vbox_status">
2458
 
      <property name="border_width">5</property>
2459
1123
      <property name="visible">True</property>
2460
1124
      <property name="homogeneous">False</property>
2461
1125
      <property name="spacing">3</property>
2462
1126
 
 
1127
      <child internal-child="action_area">
 
1128
        <widget class="GtkHButtonBox" id="hbuttonbox_status">
 
1129
          <property name="visible">True</property>
 
1130
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
1131
 
 
1132
          <child>
 
1133
            <widget class="GtkButton" id="button_status_close">
 
1134
              <property name="visible">True</property>
 
1135
              <property name="can_default">True</property>
 
1136
              <property name="has_default">True</property>
 
1137
              <property name="can_focus">True</property>
 
1138
              <property name="label">gtk-close</property>
 
1139
              <property name="use_stock">True</property>
 
1140
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1141
              <property name="focus_on_click">True</property>
 
1142
              <property name="response_id">0</property>
 
1143
              <signal name="clicked" handler="on_button_status_close_clicked" last_modification_time="Thu, 03 Aug 2006 13:45:17 GMT"/>
 
1144
            </widget>
 
1145
          </child>
 
1146
        </widget>
 
1147
        <packing>
 
1148
          <property name="padding">0</property>
 
1149
          <property name="expand">False</property>
 
1150
          <property name="fill">True</property>
 
1151
          <property name="pack_type">GTK_PACK_END</property>
 
1152
        </packing>
 
1153
      </child>
 
1154
 
2463
1155
      <child>
2464
1156
        <widget class="GtkScrolledWindow" id="scrolledwindow_status">
2465
1157
          <property name="visible">True</property>
2489
1181
          <property name="fill">True</property>
2490
1182
        </packing>
2491
1183
      </child>
2492
 
 
2493
 
      <child>
2494
 
        <widget class="GtkHButtonBox" id="hbuttonbox_status">
2495
 
          <property name="visible">True</property>
2496
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2497
 
          <property name="spacing">0</property>
2498
 
 
2499
 
          <child>
2500
 
            <widget class="GtkButton" id="button_status_close">
2501
 
              <property name="visible">True</property>
2502
 
              <property name="can_default">True</property>
2503
 
              <property name="has_default">True</property>
2504
 
              <property name="can_focus">True</property>
2505
 
              <property name="label">gtk-close</property>
2506
 
              <property name="use_stock">True</property>
2507
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2508
 
              <property name="focus_on_click">True</property>
2509
 
              <signal name="clicked" handler="on_button_status_close_clicked" last_modification_time="Thu, 03 Aug 2006 13:45:17 GMT"/>
2510
 
            </widget>
2511
 
          </child>
2512
 
        </widget>
2513
 
        <packing>
2514
 
          <property name="padding">0</property>
2515
 
          <property name="expand">False</property>
2516
 
          <property name="fill">True</property>
2517
 
        </packing>
2518
 
      </child>
2519
1184
    </widget>
2520
1185
  </child>
2521
1186
</widget>
2522
1187
 
2523
 
<widget class="GtkWindow" id="window_mkdir">
 
1188
<widget class="GtkDialog" id="window_mkdir">
2524
1189
  <property name="visible">True</property>
2525
1190
  <property name="title" translatable="yes">Olive - Make directory</property>
2526
1191
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2536
1201
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2537
1202
  <property name="focus_on_map">True</property>
2538
1203
  <property name="urgency_hint">False</property>
 
1204
  <property name="has_separator">True</property>
2539
1205
 
2540
 
  <child>
 
1206
  <child internal-child="vbox">
2541
1207
    <widget class="GtkVBox" id="vbox_mkdir">
2542
 
      <property name="border_width">5</property>
2543
1208
      <property name="visible">True</property>
2544
1209
      <property name="homogeneous">False</property>
2545
1210
      <property name="spacing">3</property>
2546
1211
 
2547
 
      <child>
2548
 
        <widget class="GtkEntry" id="entry_mkdir">
2549
 
          <property name="visible">True</property>
2550
 
          <property name="can_focus">True</property>
2551
 
          <property name="has_focus">True</property>
2552
 
          <property name="editable">True</property>
2553
 
          <property name="visibility">True</property>
2554
 
          <property name="max_length">0</property>
2555
 
          <property name="text" translatable="yes"></property>
2556
 
          <property name="has_frame">True</property>
2557
 
          <property name="invisible_char">●</property>
2558
 
          <property name="activates_default">False</property>
2559
 
        </widget>
2560
 
        <packing>
2561
 
          <property name="padding">0</property>
2562
 
          <property name="expand">False</property>
2563
 
          <property name="fill">False</property>
2564
 
        </packing>
2565
 
      </child>
2566
 
 
2567
 
      <child>
2568
 
        <widget class="GtkCheckButton" id="checkbutton_mkdir_versioned">
2569
 
          <property name="visible">True</property>
2570
 
          <property name="can_focus">True</property>
2571
 
          <property name="label" translatable="yes">_Versioned directory</property>
2572
 
          <property name="use_underline">True</property>
2573
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
2574
 
          <property name="focus_on_click">True</property>
2575
 
          <property name="active">True</property>
2576
 
          <property name="inconsistent">False</property>
2577
 
          <property name="draw_indicator">True</property>
2578
 
        </widget>
2579
 
        <packing>
2580
 
          <property name="padding">0</property>
2581
 
          <property name="expand">False</property>
2582
 
          <property name="fill">False</property>
2583
 
        </packing>
2584
 
      </child>
2585
 
 
2586
 
      <child>
 
1212
      <child internal-child="action_area">
2587
1213
        <widget class="GtkHButtonBox" id="hbuttonbox_mkdir">
2588
1214
          <property name="visible">True</property>
2589
1215
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2590
 
          <property name="spacing">3</property>
2591
1216
 
2592
1217
          <child>
2593
1218
            <widget class="GtkButton" id="button_mkdir_cancel">
2598
1223
              <property name="use_stock">True</property>
2599
1224
              <property name="relief">GTK_RELIEF_NORMAL</property>
2600
1225
              <property name="focus_on_click">True</property>
 
1226
              <property name="response_id">0</property>
2601
1227
              <signal name="clicked" handler="on_button_mkdir_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 12:33:49 GMT"/>
2602
1228
            </widget>
2603
1229
          </child>
2610
1236
              <property name="can_focus">True</property>
2611
1237
              <property name="relief">GTK_RELIEF_NORMAL</property>
2612
1238
              <property name="focus_on_click">True</property>
 
1239
              <property name="response_id">0</property>
2613
1240
              <signal name="clicked" handler="on_button_mkdir_mkdir_clicked" last_modification_time="Wed, 09 Aug 2006 12:33:54 GMT"/>
2614
1241
 
2615
1242
              <child>
2682
1309
          <property name="padding">0</property>
2683
1310
          <property name="expand">False</property>
2684
1311
          <property name="fill">False</property>
 
1312
          <property name="pack_type">GTK_PACK_END</property>
 
1313
        </packing>
 
1314
      </child>
 
1315
 
 
1316
      <child>
 
1317
        <widget class="GtkEntry" id="entry_mkdir">
 
1318
          <property name="visible">True</property>
 
1319
          <property name="can_focus">True</property>
 
1320
          <property name="has_focus">True</property>
 
1321
          <property name="editable">True</property>
 
1322
          <property name="visibility">True</property>
 
1323
          <property name="max_length">0</property>
 
1324
          <property name="text" translatable="yes"></property>
 
1325
          <property name="has_frame">True</property>
 
1326
          <property name="invisible_char">●</property>
 
1327
          <property name="activates_default">False</property>
 
1328
        </widget>
 
1329
        <packing>
 
1330
          <property name="padding">0</property>
 
1331
          <property name="expand">False</property>
 
1332
          <property name="fill">False</property>
 
1333
        </packing>
 
1334
      </child>
 
1335
 
 
1336
      <child>
 
1337
        <widget class="GtkCheckButton" id="checkbutton_mkdir_versioned">
 
1338
          <property name="visible">True</property>
 
1339
          <property name="can_focus">True</property>
 
1340
          <property name="label" translatable="yes">_Versioned directory</property>
 
1341
          <property name="use_underline">True</property>
 
1342
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1343
          <property name="focus_on_click">True</property>
 
1344
          <property name="active">True</property>
 
1345
          <property name="inconsistent">False</property>
 
1346
          <property name="draw_indicator">True</property>
 
1347
        </widget>
 
1348
        <packing>
 
1349
          <property name="padding">0</property>
 
1350
          <property name="expand">False</property>
 
1351
          <property name="fill">False</property>
2685
1352
        </packing>
2686
1353
      </child>
2687
1354
    </widget>
2688
1355
  </child>
2689
1356
</widget>
2690
1357
 
2691
 
<widget class="GtkWindow" id="window_move">
 
1358
<widget class="GtkDialog" id="window_move">
2692
1359
  <property name="width_request">250</property>
2693
1360
  <property name="title" translatable="yes">Olive - Move</property>
2694
1361
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2704
1371
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2705
1372
  <property name="focus_on_map">True</property>
2706
1373
  <property name="urgency_hint">False</property>
 
1374
  <property name="has_separator">True</property>
2707
1375
 
2708
 
  <child>
 
1376
  <child internal-child="vbox">
2709
1377
    <widget class="GtkVBox" id="vbox_move">
2710
 
      <property name="border_width">5</property>
2711
1378
      <property name="visible">True</property>
2712
1379
      <property name="homogeneous">False</property>
2713
1380
      <property name="spacing">3</property>
2714
1381
 
2715
 
      <child>
2716
 
        <widget class="GtkHBox" id="hbox_move">
2717
 
          <property name="visible">True</property>
2718
 
          <property name="homogeneous">False</property>
2719
 
          <property name="spacing">5</property>
2720
 
 
2721
 
          <child>
2722
 
            <widget class="GtkLabel" id="label_move">
2723
 
              <property name="visible">True</property>
2724
 
              <property name="label" translatable="yes">Move to</property>
2725
 
              <property name="use_underline">False</property>
2726
 
              <property name="use_markup">False</property>
2727
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2728
 
              <property name="wrap">False</property>
2729
 
              <property name="selectable">False</property>
2730
 
              <property name="xalign">0.5</property>
2731
 
              <property name="yalign">0.5</property>
2732
 
              <property name="xpad">0</property>
2733
 
              <property name="ypad">0</property>
2734
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2735
 
              <property name="width_chars">-1</property>
2736
 
              <property name="single_line_mode">False</property>
2737
 
              <property name="angle">0</property>
2738
 
            </widget>
2739
 
            <packing>
2740
 
              <property name="padding">0</property>
2741
 
              <property name="expand">False</property>
2742
 
              <property name="fill">False</property>
2743
 
            </packing>
2744
 
          </child>
2745
 
 
2746
 
          <child>
2747
 
            <widget class="GtkFileChooserButton" id="filechooserbutton_move">
2748
 
              <property name="visible">True</property>
2749
 
              <property name="title" translatable="yes">Select a directory</property>
2750
 
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
2751
 
              <property name="local_only">True</property>
2752
 
              <property name="show_hidden">False</property>
2753
 
              <property name="do_overwrite_confirmation">False</property>
2754
 
              <property name="width_chars">-1</property>
2755
 
            </widget>
2756
 
            <packing>
2757
 
              <property name="padding">0</property>
2758
 
              <property name="expand">True</property>
2759
 
              <property name="fill">True</property>
2760
 
            </packing>
2761
 
          </child>
2762
 
        </widget>
2763
 
        <packing>
2764
 
          <property name="padding">0</property>
2765
 
          <property name="expand">True</property>
2766
 
          <property name="fill">True</property>
2767
 
        </packing>
2768
 
      </child>
2769
 
 
2770
 
      <child>
 
1382
      <child internal-child="action_area">
2771
1383
        <widget class="GtkHButtonBox" id="hbuttonbox_move">
2772
1384
          <property name="visible">True</property>
2773
1385
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2774
 
          <property name="spacing">3</property>
2775
1386
 
2776
1387
          <child>
2777
1388
            <widget class="GtkButton" id="button_move_cancel">
2782
1393
              <property name="use_stock">True</property>
2783
1394
              <property name="relief">GTK_RELIEF_NORMAL</property>
2784
1395
              <property name="focus_on_click">True</property>
 
1396
              <property name="response_id">0</property>
2785
1397
              <signal name="clicked" handler="on_button_move_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:11 GMT"/>
2786
1398
            </widget>
2787
1399
          </child>
2794
1406
              <property name="can_focus">True</property>
2795
1407
              <property name="relief">GTK_RELIEF_NORMAL</property>
2796
1408
              <property name="focus_on_click">True</property>
 
1409
              <property name="response_id">0</property>
2797
1410
              <signal name="clicked" handler="on_button_move_move_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:24 GMT"/>
2798
1411
 
2799
1412
              <child>
2865
1478
        <packing>
2866
1479
          <property name="padding">0</property>
2867
1480
          <property name="expand">False</property>
2868
 
          <property name="fill">False</property>
 
1481
          <property name="fill">True</property>
 
1482
          <property name="pack_type">GTK_PACK_END</property>
 
1483
        </packing>
 
1484
      </child>
 
1485
 
 
1486
      <child>
 
1487
        <widget class="GtkHBox" id="hbox_move">
 
1488
          <property name="visible">True</property>
 
1489
          <property name="homogeneous">False</property>
 
1490
          <property name="spacing">5</property>
 
1491
 
 
1492
          <child>
 
1493
            <widget class="GtkLabel" id="label_move">
 
1494
              <property name="visible">True</property>
 
1495
              <property name="label" translatable="yes">Move to</property>
 
1496
              <property name="use_underline">False</property>
 
1497
              <property name="use_markup">False</property>
 
1498
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1499
              <property name="wrap">False</property>
 
1500
              <property name="selectable">False</property>
 
1501
              <property name="xalign">0.5</property>
 
1502
              <property name="yalign">0.5</property>
 
1503
              <property name="xpad">0</property>
 
1504
              <property name="ypad">0</property>
 
1505
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1506
              <property name="width_chars">-1</property>
 
1507
              <property name="single_line_mode">False</property>
 
1508
              <property name="angle">0</property>
 
1509
            </widget>
 
1510
            <packing>
 
1511
              <property name="padding">0</property>
 
1512
              <property name="expand">False</property>
 
1513
              <property name="fill">False</property>
 
1514
            </packing>
 
1515
          </child>
 
1516
 
 
1517
          <child>
 
1518
            <widget class="GtkFileChooserButton" id="filechooserbutton_move">
 
1519
              <property name="visible">True</property>
 
1520
              <property name="title" translatable="yes">Select a directory</property>
 
1521
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 
1522
              <property name="local_only">True</property>
 
1523
              <property name="show_hidden">False</property>
 
1524
              <property name="do_overwrite_confirmation">False</property>
 
1525
              <property name="width_chars">-1</property>
 
1526
            </widget>
 
1527
            <packing>
 
1528
              <property name="padding">0</property>
 
1529
              <property name="expand">True</property>
 
1530
              <property name="fill">True</property>
 
1531
            </packing>
 
1532
          </child>
 
1533
        </widget>
 
1534
        <packing>
 
1535
          <property name="padding">0</property>
 
1536
          <property name="expand">True</property>
 
1537
          <property name="fill">True</property>
2869
1538
        </packing>
2870
1539
      </child>
2871
1540
    </widget>
2872
1541
  </child>
2873
1542
</widget>
2874
1543
 
2875
 
<widget class="GtkWindow" id="window_rename">
 
1544
<widget class="GtkDialog" id="window_rename">
2876
1545
  <property name="title" translatable="yes">Olive - Rename</property>
2877
1546
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2878
1547
  <property name="window_position">GTK_WIN_POS_NONE</property>
2887
1556
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2888
1557
  <property name="focus_on_map">True</property>
2889
1558
  <property name="urgency_hint">False</property>
 
1559
  <property name="has_separator">True</property>
2890
1560
 
2891
 
  <child>
 
1561
  <child internal-child="vbox">
2892
1562
    <widget class="GtkVBox" id="vbox_rename">
2893
 
      <property name="border_width">5</property>
2894
1563
      <property name="visible">True</property>
2895
1564
      <property name="homogeneous">False</property>
2896
1565
      <property name="spacing">3</property>
2897
1566
 
2898
 
      <child>
2899
 
        <widget class="GtkHBox" id="hbox_rename">
2900
 
          <property name="visible">True</property>
2901
 
          <property name="homogeneous">False</property>
2902
 
          <property name="spacing">5</property>
2903
 
 
2904
 
          <child>
2905
 
            <widget class="GtkLabel" id="label_rename">
2906
 
              <property name="visible">True</property>
2907
 
              <property name="label" translatable="yes">Rename to</property>
2908
 
              <property name="use_underline">False</property>
2909
 
              <property name="use_markup">False</property>
2910
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2911
 
              <property name="wrap">False</property>
2912
 
              <property name="selectable">False</property>
2913
 
              <property name="xalign">0.5</property>
2914
 
              <property name="yalign">0.5</property>
2915
 
              <property name="xpad">0</property>
2916
 
              <property name="ypad">0</property>
2917
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2918
 
              <property name="width_chars">-1</property>
2919
 
              <property name="single_line_mode">False</property>
2920
 
              <property name="angle">0</property>
2921
 
            </widget>
2922
 
            <packing>
2923
 
              <property name="padding">0</property>
2924
 
              <property name="expand">False</property>
2925
 
              <property name="fill">False</property>
2926
 
            </packing>
2927
 
          </child>
2928
 
 
2929
 
          <child>
2930
 
            <widget class="GtkEntry" id="entry_rename">
2931
 
              <property name="visible">True</property>
2932
 
              <property name="can_focus">True</property>
2933
 
              <property name="has_focus">True</property>
2934
 
              <property name="editable">True</property>
2935
 
              <property name="visibility">True</property>
2936
 
              <property name="max_length">0</property>
2937
 
              <property name="text" translatable="yes"></property>
2938
 
              <property name="has_frame">True</property>
2939
 
              <property name="invisible_char">●</property>
2940
 
              <property name="activates_default">False</property>
2941
 
            </widget>
2942
 
            <packing>
2943
 
              <property name="padding">0</property>
2944
 
              <property name="expand">True</property>
2945
 
              <property name="fill">True</property>
2946
 
            </packing>
2947
 
          </child>
2948
 
        </widget>
2949
 
        <packing>
2950
 
          <property name="padding">0</property>
2951
 
          <property name="expand">True</property>
2952
 
          <property name="fill">True</property>
2953
 
        </packing>
2954
 
      </child>
2955
 
 
2956
 
      <child>
 
1567
      <child internal-child="action_area">
2957
1568
        <widget class="GtkHButtonBox" id="hbuttonbox_rename">
2958
1569
          <property name="visible">True</property>
2959
1570
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2960
 
          <property name="spacing">3</property>
2961
1571
 
2962
1572
          <child>
2963
1573
            <widget class="GtkButton" id="button_rename_cancel">
2968
1578
              <property name="use_stock">True</property>
2969
1579
              <property name="relief">GTK_RELIEF_NORMAL</property>
2970
1580
              <property name="focus_on_click">True</property>
 
1581
              <property name="response_id">0</property>
2971
1582
              <signal name="clicked" handler="on_button_rename_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 14:29:00 GMT"/>
2972
1583
            </widget>
2973
1584
          </child>
2980
1591
              <property name="can_focus">True</property>
2981
1592
              <property name="relief">GTK_RELIEF_NORMAL</property>
2982
1593
              <property name="focus_on_click">True</property>
 
1594
              <property name="response_id">0</property>
2983
1595
              <signal name="clicked" handler="on_button_rename_rename_clicked" last_modification_time="Wed, 09 Aug 2006 14:28:53 GMT"/>
2984
1596
 
2985
1597
              <child>
3051
1663
        <packing>
3052
1664
          <property name="padding">0</property>
3053
1665
          <property name="expand">False</property>
3054
 
          <property name="fill">False</property>
 
1666
          <property name="fill">True</property>
 
1667
          <property name="pack_type">GTK_PACK_END</property>
 
1668
        </packing>
 
1669
      </child>
 
1670
 
 
1671
      <child>
 
1672
        <widget class="GtkHBox" id="hbox_rename">
 
1673
          <property name="visible">True</property>
 
1674
          <property name="homogeneous">False</property>
 
1675
          <property name="spacing">5</property>
 
1676
 
 
1677
          <child>
 
1678
            <widget class="GtkLabel" id="label_rename">
 
1679
              <property name="visible">True</property>
 
1680
              <property name="label" translatable="yes">Rename to</property>
 
1681
              <property name="use_underline">False</property>
 
1682
              <property name="use_markup">False</property>
 
1683
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1684
              <property name="wrap">False</property>
 
1685
              <property name="selectable">False</property>
 
1686
              <property name="xalign">0.5</property>
 
1687
              <property name="yalign">0.5</property>
 
1688
              <property name="xpad">0</property>
 
1689
              <property name="ypad">0</property>
 
1690
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1691
              <property name="width_chars">-1</property>
 
1692
              <property name="single_line_mode">False</property>
 
1693
              <property name="angle">0</property>
 
1694
            </widget>
 
1695
            <packing>
 
1696
              <property name="padding">0</property>
 
1697
              <property name="expand">False</property>
 
1698
              <property name="fill">False</property>
 
1699
            </packing>
 
1700
          </child>
 
1701
 
 
1702
          <child>
 
1703
            <widget class="GtkEntry" id="entry_rename">
 
1704
              <property name="visible">True</property>
 
1705
              <property name="can_focus">True</property>
 
1706
              <property name="has_focus">True</property>
 
1707
              <property name="editable">True</property>
 
1708
              <property name="visibility">True</property>
 
1709
              <property name="max_length">0</property>
 
1710
              <property name="text" translatable="yes"></property>
 
1711
              <property name="has_frame">True</property>
 
1712
              <property name="invisible_char">●</property>
 
1713
              <property name="activates_default">False</property>
 
1714
            </widget>
 
1715
            <packing>
 
1716
              <property name="padding">0</property>
 
1717
              <property name="expand">True</property>
 
1718
              <property name="fill">True</property>
 
1719
            </packing>
 
1720
          </child>
 
1721
        </widget>
 
1722
        <packing>
 
1723
          <property name="padding">0</property>
 
1724
          <property name="expand">True</property>
 
1725
          <property name="fill">True</property>
3055
1726
        </packing>
3056
1727
      </child>
3057
1728
    </widget>
3058
1729
  </child>
3059
1730
</widget>
3060
1731
 
3061
 
<widget class="GtkWindow" id="window_info">
 
1732
<widget class="GtkDialog" id="window_info">
3062
1733
  <property name="title" translatable="yes">Olive - Information</property>
3063
1734
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
3064
1735
  <property name="window_position">GTK_WIN_POS_NONE</property>
3073
1744
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
3074
1745
  <property name="focus_on_map">True</property>
3075
1746
  <property name="urgency_hint">False</property>
 
1747
  <property name="has_separator">True</property>
3076
1748
 
3077
 
  <child>
 
1749
  <child internal-child="vbox">
3078
1750
    <widget class="GtkVBox" id="vbox_info">
3079
 
      <property name="border_width">5</property>
3080
1751
      <property name="visible">True</property>
3081
1752
      <property name="homogeneous">False</property>
3082
1753
      <property name="spacing">3</property>
3083
1754
 
 
1755
      <child internal-child="action_area">
 
1756
        <widget class="GtkHButtonBox" id="hbuttonbox_info">
 
1757
          <property name="visible">True</property>
 
1758
          <property name="can_default">True</property>
 
1759
          <property name="has_default">True</property>
 
1760
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
1761
 
 
1762
          <child>
 
1763
            <widget class="GtkButton" id="button_info_close">
 
1764
              <property name="visible">True</property>
 
1765
              <property name="can_default">True</property>
 
1766
              <property name="has_default">True</property>
 
1767
              <property name="can_focus">True</property>
 
1768
              <property name="label">gtk-close</property>
 
1769
              <property name="use_stock">True</property>
 
1770
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1771
              <property name="focus_on_click">True</property>
 
1772
              <property name="response_id">0</property>
 
1773
              <signal name="clicked" handler="on_button_info_close_clicked" last_modification_time="Wed, 09 Aug 2006 20:00:44 GMT"/>
 
1774
            </widget>
 
1775
          </child>
 
1776
        </widget>
 
1777
        <packing>
 
1778
          <property name="padding">0</property>
 
1779
          <property name="expand">False</property>
 
1780
          <property name="fill">False</property>
 
1781
          <property name="pack_type">GTK_PACK_END</property>
 
1782
        </packing>
 
1783
      </child>
 
1784
 
3084
1785
      <child>
3085
1786
        <widget class="GtkExpander" id="expander_info_location">
3086
1787
          <property name="can_focus">True</property>
5325
4026
          <property name="fill">True</property>
5326
4027
        </packing>
5327
4028
      </child>
5328
 
 
5329
 
      <child>
5330
 
        <widget class="GtkHButtonBox" id="hbuttonbox_info">
5331
 
          <property name="visible">True</property>
5332
 
          <property name="can_default">True</property>
5333
 
          <property name="has_default">True</property>
5334
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
5335
 
          <property name="spacing">0</property>
5336
 
 
5337
 
          <child>
5338
 
            <widget class="GtkButton" id="button_info_close">
5339
 
              <property name="visible">True</property>
5340
 
              <property name="can_default">True</property>
5341
 
              <property name="has_default">True</property>
5342
 
              <property name="can_focus">True</property>
5343
 
              <property name="label">gtk-close</property>
5344
 
              <property name="use_stock">True</property>
5345
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5346
 
              <property name="focus_on_click">True</property>
5347
 
              <signal name="clicked" handler="on_button_info_close_clicked" last_modification_time="Wed, 09 Aug 2006 20:00:44 GMT"/>
5348
 
            </widget>
5349
 
          </child>
5350
 
        </widget>
5351
 
        <packing>
5352
 
          <property name="padding">0</property>
5353
 
          <property name="expand">False</property>
5354
 
          <property name="fill">False</property>
5355
 
        </packing>
5356
 
      </child>
5357
4029
    </widget>
5358
4030
  </child>
5359
4031
</widget>
5360
4032
 
5361
 
<widget class="GtkWindow" id="window_bookmark">
 
4033
<widget class="GtkDialog" id="window_merge">
5362
4034
  <property name="visible">True</property>
5363
 
  <property name="title" translatable="yes">Edit bookmark - Olive</property>
 
4035
  <property name="title" translatable="yes">Merge - Olive</property>
5364
4036
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
5365
4037
  <property name="window_position">GTK_WIN_POS_NONE</property>
5366
4038
  <property name="modal">False</property>
5374
4046
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5375
4047
  <property name="focus_on_map">True</property>
5376
4048
  <property name="urgency_hint">False</property>
 
4049
  <property name="has_separator">True</property>
5377
4050
 
5378
 
  <child>
5379
 
    <widget class="GtkVBox" id="vbox_bookmark">
5380
 
      <property name="border_width">5</property>
 
4051
  <child internal-child="vbox">
 
4052
    <widget class="GtkVBox" id="vbox_merge">
5381
4053
      <property name="visible">True</property>
5382
4054
      <property name="homogeneous">False</property>
5383
4055
      <property name="spacing">3</property>
5384
4056
 
 
4057
      <child internal-child="action_area">
 
4058
        <widget class="GtkHButtonBox" id="hbuttonbox_merge">
 
4059
          <property name="visible">True</property>
 
4060
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
4061
 
 
4062
          <child>
 
4063
            <widget class="GtkButton" id="button_merge_cancel">
 
4064
              <property name="visible">True</property>
 
4065
              <property name="can_default">True</property>
 
4066
              <property name="can_focus">True</property>
 
4067
              <property name="label">gtk-cancel</property>
 
4068
              <property name="use_stock">True</property>
 
4069
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
4070
              <property name="focus_on_click">True</property>
 
4071
              <property name="response_id">0</property>
 
4072
              <signal name="clicked" handler="on_button_merge_cancel_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:13 GMT"/>
 
4073
            </widget>
 
4074
          </child>
 
4075
 
 
4076
          <child>
 
4077
            <widget class="GtkButton" id="button_merge_merge">
 
4078
              <property name="visible">True</property>
 
4079
              <property name="can_default">True</property>
 
4080
              <property name="has_default">True</property>
 
4081
              <property name="can_focus">True</property>
 
4082
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
4083
              <property name="focus_on_click">True</property>
 
4084
              <property name="response_id">0</property>
 
4085
              <signal name="clicked" handler="on_button_merge_merge_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:07 GMT"/>
 
4086
 
 
4087
              <child>
 
4088
                <widget class="GtkAlignment" id="alignment19">
 
4089
                  <property name="visible">True</property>
 
4090
                  <property name="xalign">0.5</property>
 
4091
                  <property name="yalign">0.5</property>
 
4092
                  <property name="xscale">0</property>
 
4093
                  <property name="yscale">0</property>
 
4094
                  <property name="top_padding">0</property>
 
4095
                  <property name="bottom_padding">0</property>
 
4096
                  <property name="left_padding">0</property>
 
4097
                  <property name="right_padding">0</property>
 
4098
 
 
4099
                  <child>
 
4100
                    <widget class="GtkHBox" id="hbox14">
 
4101
                      <property name="visible">True</property>
 
4102
                      <property name="homogeneous">False</property>
 
4103
                      <property name="spacing">2</property>
 
4104
 
 
4105
                      <child>
 
4106
                        <widget class="GtkImage" id="image239">
 
4107
                          <property name="visible">True</property>
 
4108
                          <property name="stock">gtk-apply</property>
 
4109
                          <property name="icon_size">4</property>
 
4110
                          <property name="xalign">0.5</property>
 
4111
                          <property name="yalign">0.5</property>
 
4112
                          <property name="xpad">0</property>
 
4113
                          <property name="ypad">0</property>
 
4114
                        </widget>
 
4115
                        <packing>
 
4116
                          <property name="padding">0</property>
 
4117
                          <property name="expand">False</property>
 
4118
                          <property name="fill">False</property>
 
4119
                        </packing>
 
4120
                      </child>
 
4121
 
 
4122
                      <child>
 
4123
                        <widget class="GtkLabel" id="label21">
 
4124
                          <property name="visible">True</property>
 
4125
                          <property name="label" translatable="yes">_Merge</property>
 
4126
                          <property name="use_underline">True</property>
 
4127
                          <property name="use_markup">False</property>
 
4128
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
4129
                          <property name="wrap">False</property>
 
4130
                          <property name="selectable">False</property>
 
4131
                          <property name="xalign">0.5</property>
 
4132
                          <property name="yalign">0.5</property>
 
4133
                          <property name="xpad">0</property>
 
4134
                          <property name="ypad">0</property>
 
4135
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
4136
                          <property name="width_chars">-1</property>
 
4137
                          <property name="single_line_mode">False</property>
 
4138
                          <property name="angle">0</property>
 
4139
                        </widget>
 
4140
                        <packing>
 
4141
                          <property name="padding">0</property>
 
4142
                          <property name="expand">False</property>
 
4143
                          <property name="fill">False</property>
 
4144
                        </packing>
 
4145
                      </child>
 
4146
                    </widget>
 
4147
                  </child>
 
4148
                </widget>
 
4149
              </child>
 
4150
            </widget>
 
4151
          </child>
 
4152
        </widget>
 
4153
        <packing>
 
4154
          <property name="padding">0</property>
 
4155
          <property name="expand">False</property>
 
4156
          <property name="fill">False</property>
 
4157
          <property name="pack_type">GTK_PACK_END</property>
 
4158
        </packing>
 
4159
      </child>
 
4160
 
5385
4161
      <child>
5386
 
        <widget class="GtkTable" id="table_bookmark">
 
4162
        <widget class="GtkHBox" id="hbox_merge">
5387
4163
          <property name="visible">True</property>
5388
 
          <property name="n_rows">2</property>
5389
 
          <property name="n_columns">2</property>
5390
4164
          <property name="homogeneous">False</property>
5391
 
          <property name="row_spacing">3</property>
5392
 
          <property name="column_spacing">3</property>
5393
 
 
5394
 
          <child>
5395
 
            <widget class="GtkLabel" id="label_bookmark_location">
5396
 
              <property name="visible">True</property>
5397
 
              <property name="label" translatable="yes">Location:</property>
5398
 
              <property name="use_underline">False</property>
5399
 
              <property name="use_markup">False</property>
5400
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
5401
 
              <property name="wrap">False</property>
5402
 
              <property name="selectable">False</property>
5403
 
              <property name="xalign">0</property>
5404
 
              <property name="yalign">0.5</property>
5405
 
              <property name="xpad">0</property>
5406
 
              <property name="ypad">0</property>
5407
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5408
 
              <property name="width_chars">-1</property>
5409
 
              <property name="single_line_mode">False</property>
5410
 
              <property name="angle">0</property>
5411
 
            </widget>
5412
 
            <packing>
5413
 
              <property name="left_attach">0</property>
5414
 
              <property name="right_attach">1</property>
5415
 
              <property name="top_attach">0</property>
5416
 
              <property name="bottom_attach">1</property>
5417
 
              <property name="x_options">fill</property>
5418
 
              <property name="y_options"></property>
5419
 
            </packing>
5420
 
          </child>
5421
 
 
5422
 
          <child>
5423
 
            <widget class="GtkLabel" id="label_bookmark_title">
5424
 
              <property name="visible">True</property>
5425
 
              <property name="label" translatable="yes">Title:</property>
5426
 
              <property name="use_underline">False</property>
5427
 
              <property name="use_markup">False</property>
5428
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
5429
 
              <property name="wrap">False</property>
5430
 
              <property name="selectable">False</property>
5431
 
              <property name="xalign">0</property>
5432
 
              <property name="yalign">0.5</property>
5433
 
              <property name="xpad">0</property>
5434
 
              <property name="ypad">0</property>
5435
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5436
 
              <property name="width_chars">-1</property>
5437
 
              <property name="single_line_mode">False</property>
5438
 
              <property name="angle">0</property>
5439
 
            </widget>
5440
 
            <packing>
5441
 
              <property name="left_attach">0</property>
5442
 
              <property name="right_attach">1</property>
5443
 
              <property name="top_attach">1</property>
5444
 
              <property name="bottom_attach">2</property>
5445
 
              <property name="x_options">fill</property>
5446
 
              <property name="y_options"></property>
5447
 
            </packing>
5448
 
          </child>
5449
 
 
5450
 
          <child>
5451
 
            <widget class="GtkEntry" id="entry_bookmark_location">
5452
 
              <property name="visible">True</property>
5453
 
              <property name="can_focus">True</property>
5454
 
              <property name="editable">False</property>
5455
 
              <property name="visibility">True</property>
5456
 
              <property name="max_length">0</property>
5457
 
              <property name="text" translatable="yes"></property>
5458
 
              <property name="has_frame">True</property>
5459
 
              <property name="invisible_char">●</property>
5460
 
              <property name="activates_default">False</property>
5461
 
            </widget>
5462
 
            <packing>
5463
 
              <property name="left_attach">1</property>
5464
 
              <property name="right_attach">2</property>
5465
 
              <property name="top_attach">0</property>
5466
 
              <property name="bottom_attach">1</property>
5467
 
              <property name="y_options"></property>
5468
 
            </packing>
5469
 
          </child>
5470
 
 
5471
 
          <child>
5472
 
            <widget class="GtkEntry" id="entry_bookmark_title">
5473
 
              <property name="visible">True</property>
5474
 
              <property name="can_focus">True</property>
5475
 
              <property name="has_focus">True</property>
 
4165
          <property name="spacing">3</property>
 
4166
 
 
4167
          <child>
 
4168
            <widget class="GtkLabel" id="label_merge">
 
4169
              <property name="visible">True</property>
 
4170
              <property name="label" translatable="yes">Merge from:</property>
 
4171
              <property name="use_underline">False</property>
 
4172
              <property name="use_markup">False</property>
 
4173
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
4174
              <property name="wrap">False</property>
 
4175
              <property name="selectable">False</property>
 
4176
              <property name="xalign">0.5</property>
 
4177
              <property name="yalign">0.5</property>
 
4178
              <property name="xpad">0</property>
 
4179
              <property name="ypad">0</property>
 
4180
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
4181
              <property name="width_chars">-1</property>
 
4182
              <property name="single_line_mode">False</property>
 
4183
              <property name="angle">0</property>
 
4184
            </widget>
 
4185
            <packing>
 
4186
              <property name="padding">0</property>
 
4187
              <property name="expand">False</property>
 
4188
              <property name="fill">False</property>
 
4189
            </packing>
 
4190
          </child>
 
4191
 
 
4192
          <child>
 
4193
            <widget class="GtkEntry" id="entry_merge">
 
4194
              <property name="visible">True</property>
 
4195
              <property name="can_focus">True</property>
5476
4196
              <property name="editable">True</property>
5477
4197
              <property name="visibility">True</property>
5478
4198
              <property name="max_length">0</property>
5482
4202
              <property name="activates_default">False</property>
5483
4203
            </widget>
5484
4204
            <packing>
5485
 
              <property name="left_attach">1</property>
5486
 
              <property name="right_attach">2</property>
5487
 
              <property name="top_attach">1</property>
5488
 
              <property name="bottom_attach">2</property>
5489
 
              <property name="y_options"></property>
5490
 
            </packing>
5491
 
          </child>
5492
 
        </widget>
5493
 
        <packing>
5494
 
          <property name="padding">0</property>
5495
 
          <property name="expand">False</property>
5496
 
          <property name="fill">False</property>
5497
 
        </packing>
5498
 
      </child>
5499
 
 
5500
 
      <child>
5501
 
        <widget class="GtkHButtonBox" id="hbuttonbox_bookmark">
5502
 
          <property name="visible">True</property>
5503
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
5504
 
          <property name="spacing">3</property>
5505
 
 
5506
 
          <child>
5507
 
            <widget class="GtkButton" id="button_bookmark_cancel">
5508
 
              <property name="visible">True</property>
5509
 
              <property name="can_default">True</property>
5510
 
              <property name="can_focus">True</property>
5511
 
              <property name="label">gtk-cancel</property>
5512
 
              <property name="use_stock">True</property>
5513
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5514
 
              <property name="focus_on_click">True</property>
5515
 
              <signal name="clicked" handler="on_button_bookmark_cancel_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:23 GMT"/>
5516
 
            </widget>
5517
 
          </child>
5518
 
 
5519
 
          <child>
5520
 
            <widget class="GtkButton" id="button_bookmark_save">
5521
 
              <property name="visible">True</property>
5522
 
              <property name="can_default">True</property>
5523
 
              <property name="has_default">True</property>
5524
 
              <property name="can_focus">True</property>
5525
 
              <property name="label">gtk-save</property>
5526
 
              <property name="use_stock">True</property>
5527
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5528
 
              <property name="focus_on_click">True</property>
5529
 
              <signal name="clicked" handler="on_button_bookmark_save_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:19 GMT"/>
5530
 
            </widget>
 
4205
              <property name="padding">0</property>
 
4206
              <property name="expand">True</property>
 
4207
              <property name="fill">True</property>
 
4208
            </packing>
 
4209
          </child>
 
4210
 
 
4211
          <child>
 
4212
            <widget class="GtkButton" id="button_merge_open">
 
4213
              <property name="visible">True</property>
 
4214
              <property name="can_focus">True</property>
 
4215
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
4216
              <property name="focus_on_click">True</property>
 
4217
              <signal name="clicked" handler="on_button_merge_open_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:20 GMT"/>
 
4218
 
 
4219
              <child>
 
4220
                <widget class="GtkImage" id="image240">
 
4221
                  <property name="visible">True</property>
 
4222
                  <property name="stock">gtk-open</property>
 
4223
                  <property name="icon_size">4</property>
 
4224
                  <property name="xalign">0.5</property>
 
4225
                  <property name="yalign">0.5</property>
 
4226
                  <property name="xpad">0</property>
 
4227
                  <property name="ypad">0</property>
 
4228
                </widget>
 
4229
              </child>
 
4230
            </widget>
 
4231
            <packing>
 
4232
              <property name="padding">0</property>
 
4233
              <property name="expand">False</property>
 
4234
              <property name="fill">False</property>
 
4235
            </packing>
5531
4236
          </child>
5532
4237
        </widget>
5533
4238
        <packing>