/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: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

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_merge">
 
285
                      <property name="visible">True</property>
 
286
                      <property name="label" translatable="yes">_Merge...</property>
 
287
                      <property name="use_underline">True</property>
 
288
                      <signal name="activate" handler="on_menuitem_branch_merge_activate" last_modification_time="Mon, 09 Oct 2006 18:24:06 GMT"/>
 
289
                    </widget>
 
290
                  </child>
 
291
 
 
292
                  <child>
275
293
                    <widget class="GtkImageMenuItem" id="menuitem_branch_commit">
276
294
                      <property name="visible">True</property>
277
295
                      <property name="label" translatable="yes">_Commit...</property>
279
297
                      <signal name="activate" handler="on_menuitem_branch_commit_activate" last_modification_time="Mon, 17 Jul 2006 08:53:37 GMT"/>
280
298
 
281
299
                      <child internal-child="image">
282
 
                        <widget class="GtkImage" id="image236">
 
300
                        <widget class="GtkImage" id="image245">
283
301
                          <property name="visible">True</property>
284
 
                          <property name="pixbuf">commit16.png</property>
 
302
                          <property name="pixbuf">icons/commit16.png</property>
285
303
                          <property name="xalign">0.5</property>
286
304
                          <property name="yalign">0.5</property>
287
305
                          <property name="xpad">0</property>
309
327
                  <child>
310
328
                    <widget class="GtkMenuItem" id="menuitem_branch_missing_revisions">
311
329
                      <property name="visible">True</property>
312
 
                      <property name="label" translatable="yes">_Missing revisions</property>
 
330
                      <property name="label" translatable="yes">Missing _revisions</property>
313
331
                      <property name="use_underline">True</property>
314
332
                      <signal name="activate" handler="on_menuitem_branch_missing_revisions_activate" last_modification_time="Sat, 02 Sep 2006 14:01:29 GMT"/>
315
333
                    </widget>
336
354
                      <signal name="activate" handler="on_menuitem_stats_diff_activate" last_modification_time="Thu, 03 Aug 2006 11:35:30 GMT"/>
337
355
 
338
356
                      <child internal-child="image">
339
 
                        <widget class="GtkImage" id="image237">
 
357
                        <widget class="GtkImage" id="image246">
340
358
                          <property name="visible">True</property>
341
 
                          <property name="pixbuf">diff16.png</property>
 
359
                          <property name="pixbuf">icons/diff16.png</property>
342
360
                          <property name="xalign">0.5</property>
343
361
                          <property name="yalign">0.5</property>
344
362
                          <property name="xpad">0</property>
356
374
                      <signal name="activate" handler="on_menuitem_stats_log_activate" last_modification_time="Thu, 03 Aug 2006 11:35:43 GMT"/>
357
375
 
358
376
                      <child internal-child="image">
359
 
                        <widget class="GtkImage" id="image238">
 
377
                        <widget class="GtkImage" id="image247">
360
378
                          <property name="visible">True</property>
361
 
                          <property name="pixbuf">log16.png</property>
 
379
                          <property name="pixbuf">icons/log16.png</property>
362
380
                          <property name="xalign">0.5</property>
363
381
                          <property name="yalign">0.5</property>
364
382
                          <property name="xpad">0</property>
423
441
              <property name="visible">True</property>
424
442
              <property name="label" translatable="yes">Refresh</property>
425
443
              <property name="use_underline">True</property>
426
 
              <property name="icon">refresh.png</property>
 
444
              <property name="icon">icons/refresh.png</property>
427
445
              <property name="visible_horizontal">True</property>
428
446
              <property name="visible_vertical">True</property>
429
447
              <property name="is_important">False</property>
440
458
              <property name="visible">True</property>
441
459
              <property name="label" translatable="yes">Diff</property>
442
460
              <property name="use_underline">True</property>
443
 
              <property name="icon">diff.png</property>
 
461
              <property name="icon">icons/diff.png</property>
444
462
              <property name="visible_horizontal">True</property>
445
463
              <property name="visible_vertical">True</property>
446
464
              <property name="is_important">False</property>
457
475
              <property name="visible">True</property>
458
476
              <property name="label" translatable="yes">Log</property>
459
477
              <property name="use_underline">True</property>
460
 
              <property name="icon">log.png</property>
 
478
              <property name="icon">icons/log.png</property>
461
479
              <property name="visible_horizontal">True</property>
462
480
              <property name="visible_vertical">True</property>
463
481
              <property name="is_important">False</property>
487
505
              <property name="visible">True</property>
488
506
              <property name="label" translatable="yes">Commit</property>
489
507
              <property name="use_underline">True</property>
490
 
              <property name="icon">commit.png</property>
 
508
              <property name="icon">icons/commit.png</property>
491
509
              <property name="visible_horizontal">True</property>
492
510
              <property name="visible_vertical">True</property>
493
511
              <property name="is_important">False</property>
517
535
              <property name="visible">True</property>
518
536
              <property name="label" translatable="yes">Pull</property>
519
537
              <property name="use_underline">True</property>
520
 
              <property name="icon">pull.png</property>
 
538
              <property name="icon">icons/pull.png</property>
521
539
              <property name="visible_horizontal">True</property>
522
540
              <property name="visible_vertical">True</property>
523
541
              <property name="is_important">False</property>
534
552
              <property name="visible">True</property>
535
553
              <property name="label" translatable="yes">Push</property>
536
554
              <property name="use_underline">True</property>
537
 
              <property name="icon">push.png</property>
 
555
              <property name="icon">icons/push.png</property>
538
556
              <property name="visible_horizontal">True</property>
539
557
              <property name="visible_vertical">True</property>
540
558
              <property name="is_important">False</property>
660
678
  </child>
661
679
</widget>
662
680
 
663
 
<widget class="GtkWindow" id="window_commit">
664
 
  <property name="width_request">400</property>
665
 
  <property name="height_request">400</property>
 
681
<widget class="GtkDialog" id="window_commit">
 
682
  <property name="width_request">500</property>
 
683
  <property name="height_request">500</property>
666
684
  <property name="title" translatable="yes">Olive - Commit</property>
667
685
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
668
686
  <property name="window_position">GTK_WIN_POS_NONE</property>
677
695
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
678
696
  <property name="focus_on_map">True</property>
679
697
  <property name="urgency_hint">False</property>
 
698
  <property name="has_separator">True</property>
680
699
 
681
 
  <child>
 
700
  <child internal-child="vbox">
682
701
    <widget class="GtkVBox" id="vbox_commit">
683
 
      <property name="border_width">5</property>
684
702
      <property name="visible">True</property>
685
703
      <property name="homogeneous">False</property>
686
704
      <property name="spacing">3</property>
687
705
 
 
706
      <child internal-child="action_area">
 
707
        <widget class="GtkHButtonBox" id="hbuttonbox_commit">
 
708
          <property name="visible">True</property>
 
709
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
710
 
 
711
          <child>
 
712
            <widget class="GtkButton" id="button_commit_cancel">
 
713
              <property name="visible">True</property>
 
714
              <property name="can_default">True</property>
 
715
              <property name="can_focus">True</property>
 
716
              <property name="label">gtk-cancel</property>
 
717
              <property name="use_stock">True</property>
 
718
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
719
              <property name="focus_on_click">True</property>
 
720
              <property name="response_id">0</property>
 
721
              <signal name="clicked" handler="on_button_commit_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:52 GMT"/>
 
722
            </widget>
 
723
          </child>
 
724
 
 
725
          <child>
 
726
            <widget class="GtkButton" id="button_commit_commit">
 
727
              <property name="visible">True</property>
 
728
              <property name="can_default">True</property>
 
729
              <property name="has_default">True</property>
 
730
              <property name="can_focus">True</property>
 
731
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
732
              <property name="focus_on_click">True</property>
 
733
              <property name="response_id">0</property>
 
734
              <signal name="clicked" handler="on_button_commit_commit_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:57 GMT"/>
 
735
 
 
736
              <child>
 
737
                <widget class="GtkAlignment" id="alignment5">
 
738
                  <property name="visible">True</property>
 
739
                  <property name="xalign">0.5</property>
 
740
                  <property name="yalign">0.5</property>
 
741
                  <property name="xscale">0</property>
 
742
                  <property name="yscale">0</property>
 
743
                  <property name="top_padding">0</property>
 
744
                  <property name="bottom_padding">0</property>
 
745
                  <property name="left_padding">0</property>
 
746
                  <property name="right_padding">0</property>
 
747
 
 
748
                  <child>
 
749
                    <widget class="GtkHBox" id="hbox7">
 
750
                      <property name="visible">True</property>
 
751
                      <property name="homogeneous">False</property>
 
752
                      <property name="spacing">2</property>
 
753
 
 
754
                      <child>
 
755
                        <widget class="GtkImage" id="image49">
 
756
                          <property name="visible">True</property>
 
757
                          <property name="stock">gtk-redo</property>
 
758
                          <property name="icon_size">4</property>
 
759
                          <property name="xalign">0.5</property>
 
760
                          <property name="yalign">0.5</property>
 
761
                          <property name="xpad">0</property>
 
762
                          <property name="ypad">0</property>
 
763
                        </widget>
 
764
                        <packing>
 
765
                          <property name="padding">0</property>
 
766
                          <property name="expand">False</property>
 
767
                          <property name="fill">False</property>
 
768
                        </packing>
 
769
                      </child>
 
770
 
 
771
                      <child>
 
772
                        <widget class="GtkLabel" id="label11">
 
773
                          <property name="visible">True</property>
 
774
                          <property name="label" translatable="yes">_Commit</property>
 
775
                          <property name="use_underline">True</property>
 
776
                          <property name="use_markup">False</property>
 
777
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
778
                          <property name="wrap">False</property>
 
779
                          <property name="selectable">False</property>
 
780
                          <property name="xalign">0.5</property>
 
781
                          <property name="yalign">0.5</property>
 
782
                          <property name="xpad">0</property>
 
783
                          <property name="ypad">0</property>
 
784
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
785
                          <property name="width_chars">-1</property>
 
786
                          <property name="single_line_mode">False</property>
 
787
                          <property name="angle">0</property>
 
788
                        </widget>
 
789
                        <packing>
 
790
                          <property name="padding">0</property>
 
791
                          <property name="expand">False</property>
 
792
                          <property name="fill">False</property>
 
793
                        </packing>
 
794
                      </child>
 
795
                    </widget>
 
796
                  </child>
 
797
                </widget>
 
798
              </child>
 
799
            </widget>
 
800
          </child>
 
801
        </widget>
 
802
        <packing>
 
803
          <property name="padding">0</property>
 
804
          <property name="expand">False</property>
 
805
          <property name="fill">False</property>
 
806
          <property name="pack_type">GTK_PACK_END</property>
 
807
        </packing>
 
808
      </child>
 
809
 
688
810
      <child>
689
811
        <widget class="GtkVPaned" id="vpaned_commit">
690
812
          <property name="visible">True</property>
691
813
          <property name="can_focus">True</property>
692
 
          <property name="position">120</property>
 
814
          <property name="position">250</property>
693
815
 
694
816
          <child>
695
817
            <widget class="GtkVBox" id="vbox_commit_select">
698
820
              <property name="spacing">0</property>
699
821
 
700
822
              <child>
701
 
                <widget class="GtkLabel" id="label_commit_select">
 
823
                <widget class="GtkExpander" id="expander_commit_select">
702
824
                  <property name="visible">True</property>
703
 
                  <property name="label" translatable="yes">Please select the file(s) to commit:</property>
704
 
                  <property name="use_underline">False</property>
705
 
                  <property name="use_markup">False</property>
706
 
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
707
 
                  <property name="wrap">False</property>
708
 
                  <property name="selectable">False</property>
709
 
                  <property name="xalign">0</property>
710
 
                  <property name="yalign">0.5</property>
711
 
                  <property name="xpad">0</property>
712
 
                  <property name="ypad">0</property>
713
 
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
714
 
                  <property name="width_chars">-1</property>
715
 
                  <property name="single_line_mode">False</property>
716
 
                  <property name="angle">0</property>
 
825
                  <property name="can_focus">True</property>
 
826
                  <property name="expanded">True</property>
 
827
                  <property name="spacing">0</property>
 
828
 
 
829
                  <child>
 
830
                    <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
 
831
                      <property name="visible">True</property>
 
832
                      <property name="can_focus">True</property>
 
833
                      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
834
                      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
835
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
836
                      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
837
 
 
838
                      <child>
 
839
                        <widget class="GtkTreeView" id="treeview_commit_select">
 
840
                          <property name="visible">True</property>
 
841
                          <property name="can_focus">True</property>
 
842
                          <property name="headers_visible">True</property>
 
843
                          <property name="rules_hint">False</property>
 
844
                          <property name="reorderable">False</property>
 
845
                          <property name="enable_search">True</property>
 
846
                          <property name="fixed_height_mode">False</property>
 
847
                          <property name="hover_selection">False</property>
 
848
                          <property name="hover_expand">False</property>
 
849
                        </widget>
 
850
                      </child>
 
851
                    </widget>
 
852
                  </child>
 
853
 
 
854
                  <child>
 
855
                    <widget class="GtkLabel" id="label_commit_select">
 
856
                      <property name="visible">True</property>
 
857
                      <property name="label" translatable="yes">Please select the file(s) to commit</property>
 
858
                      <property name="use_underline">False</property>
 
859
                      <property name="use_markup">False</property>
 
860
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
 
861
                      <property name="wrap">False</property>
 
862
                      <property name="selectable">False</property>
 
863
                      <property name="xalign">0.5</property>
 
864
                      <property name="yalign">0.5</property>
 
865
                      <property name="xpad">0</property>
 
866
                      <property name="ypad">0</property>
 
867
                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
868
                      <property name="width_chars">-1</property>
 
869
                      <property name="single_line_mode">False</property>
 
870
                      <property name="angle">0</property>
 
871
                    </widget>
 
872
                    <packing>
 
873
                      <property name="type">label_item</property>
 
874
                    </packing>
 
875
                  </child>
717
876
                </widget>
718
877
                <packing>
719
878
                  <property name="padding">0</property>
720
 
                  <property name="expand">False</property>
721
 
                  <property name="fill">False</property>
 
879
                  <property name="expand">True</property>
 
880
                  <property name="fill">True</property>
722
881
                </packing>
723
882
              </child>
724
883
 
725
884
              <child>
726
 
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
 
885
                <widget class="GtkExpander" id="expander_commit_pending">
727
886
                  <property name="visible">True</property>
728
887
                  <property name="can_focus">True</property>
729
 
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
730
 
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
731
 
                  <property name="shadow_type">GTK_SHADOW_NONE</property>
732
 
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
888
                  <property name="expanded">True</property>
 
889
                  <property name="spacing">0</property>
733
890
 
734
891
                  <child>
735
 
                    <widget class="GtkTreeView" id="treeview_commit_select">
 
892
                    <widget class="GtkScrolledWindow" id="scrolledwindow_commit_pending">
736
893
                      <property name="visible">True</property>
737
894
                      <property name="can_focus">True</property>
738
 
                      <property name="headers_visible">True</property>
739
 
                      <property name="rules_hint">False</property>
740
 
                      <property name="reorderable">False</property>
741
 
                      <property name="enable_search">True</property>
742
 
                      <property name="fixed_height_mode">False</property>
743
 
                      <property name="hover_selection">False</property>
744
 
                      <property name="hover_expand">False</property>
745
 
                    </widget>
 
895
                      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
896
                      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
897
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
898
                      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
899
 
 
900
                      <child>
 
901
                        <widget class="GtkTreeView" id="treeview_commit_pending">
 
902
                          <property name="visible">True</property>
 
903
                          <property name="can_focus">True</property>
 
904
                          <property name="headers_visible">True</property>
 
905
                          <property name="rules_hint">False</property>
 
906
                          <property name="reorderable">False</property>
 
907
                          <property name="enable_search">True</property>
 
908
                          <property name="fixed_height_mode">False</property>
 
909
                          <property name="hover_selection">False</property>
 
910
                          <property name="hover_expand">False</property>
 
911
                        </widget>
 
912
                      </child>
 
913
                    </widget>
 
914
                  </child>
 
915
 
 
916
                  <child>
 
917
                    <widget class="GtkLabel" id="label_commit_pending">
 
918
                      <property name="visible">True</property>
 
919
                      <property name="label" translatable="yes">Pending merges</property>
 
920
                      <property name="use_underline">False</property>
 
921
                      <property name="use_markup">False</property>
 
922
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
 
923
                      <property name="wrap">False</property>
 
924
                      <property name="selectable">False</property>
 
925
                      <property name="xalign">0.5</property>
 
926
                      <property name="yalign">0.5</property>
 
927
                      <property name="xpad">0</property>
 
928
                      <property name="ypad">0</property>
 
929
                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
930
                      <property name="width_chars">-1</property>
 
931
                      <property name="single_line_mode">False</property>
 
932
                      <property name="angle">0</property>
 
933
                    </widget>
 
934
                    <packing>
 
935
                      <property name="type">label_item</property>
 
936
                    </packing>
746
937
                  </child>
747
938
                </widget>
748
939
                <packing>
893
1084
          <property name="fill">False</property>
894
1085
        </packing>
895
1086
      </child>
896
 
 
897
 
      <child>
898
 
        <widget class="GtkHButtonBox" id="hbuttonbox_commit">
899
 
          <property name="visible">True</property>
900
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
901
 
          <property name="spacing">3</property>
902
 
 
903
 
          <child>
904
 
            <widget class="GtkButton" id="button_commit_cancel">
905
 
              <property name="visible">True</property>
906
 
              <property name="can_default">True</property>
907
 
              <property name="can_focus">True</property>
908
 
              <property name="label">gtk-cancel</property>
909
 
              <property name="use_stock">True</property>
910
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
911
 
              <property name="focus_on_click">True</property>
912
 
              <signal name="clicked" handler="on_button_commit_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:52 GMT"/>
913
 
            </widget>
914
 
          </child>
915
 
 
916
 
          <child>
917
 
            <widget class="GtkButton" id="button_commit_commit">
918
 
              <property name="visible">True</property>
919
 
              <property name="can_default">True</property>
920
 
              <property name="has_default">True</property>
921
 
              <property name="can_focus">True</property>
922
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
923
 
              <property name="focus_on_click">True</property>
924
 
              <signal name="clicked" handler="on_button_commit_commit_clicked" last_modification_time="Fri, 21 Jul 2006 15:04:57 GMT"/>
925
 
 
926
 
              <child>
927
 
                <widget class="GtkAlignment" id="alignment5">
928
 
                  <property name="visible">True</property>
929
 
                  <property name="xalign">0.5</property>
930
 
                  <property name="yalign">0.5</property>
931
 
                  <property name="xscale">0</property>
932
 
                  <property name="yscale">0</property>
933
 
                  <property name="top_padding">0</property>
934
 
                  <property name="bottom_padding">0</property>
935
 
                  <property name="left_padding">0</property>
936
 
                  <property name="right_padding">0</property>
937
 
 
938
 
                  <child>
939
 
                    <widget class="GtkHBox" id="hbox7">
940
 
                      <property name="visible">True</property>
941
 
                      <property name="homogeneous">False</property>
942
 
                      <property name="spacing">2</property>
943
 
 
944
 
                      <child>
945
 
                        <widget class="GtkImage" id="image49">
946
 
                          <property name="visible">True</property>
947
 
                          <property name="stock">gtk-redo</property>
948
 
                          <property name="icon_size">4</property>
949
 
                          <property name="xalign">0.5</property>
950
 
                          <property name="yalign">0.5</property>
951
 
                          <property name="xpad">0</property>
952
 
                          <property name="ypad">0</property>
953
 
                        </widget>
954
 
                        <packing>
955
 
                          <property name="padding">0</property>
956
 
                          <property name="expand">False</property>
957
 
                          <property name="fill">False</property>
958
 
                        </packing>
959
 
                      </child>
960
 
 
961
 
                      <child>
962
 
                        <widget class="GtkLabel" id="label11">
963
 
                          <property name="visible">True</property>
964
 
                          <property name="label" translatable="yes">_Commit</property>
965
 
                          <property name="use_underline">True</property>
966
 
                          <property name="use_markup">False</property>
967
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
968
 
                          <property name="wrap">False</property>
969
 
                          <property name="selectable">False</property>
970
 
                          <property name="xalign">0.5</property>
971
 
                          <property name="yalign">0.5</property>
972
 
                          <property name="xpad">0</property>
973
 
                          <property name="ypad">0</property>
974
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
975
 
                          <property name="width_chars">-1</property>
976
 
                          <property name="single_line_mode">False</property>
977
 
                          <property name="angle">0</property>
978
 
                        </widget>
979
 
                        <packing>
980
 
                          <property name="padding">0</property>
981
 
                          <property name="expand">False</property>
982
 
                          <property name="fill">False</property>
983
 
                        </packing>
984
 
                      </child>
985
 
                    </widget>
986
 
                  </child>
987
 
                </widget>
988
 
              </child>
989
 
            </widget>
990
 
          </child>
991
 
        </widget>
992
 
        <packing>
993
 
          <property name="padding">0</property>
994
 
          <property name="expand">False</property>
995
 
          <property name="fill">False</property>
996
 
        </packing>
997
 
      </child>
998
1087
    </widget>
999
1088
  </child>
1000
1089
</widget>
1001
1090
 
1002
 
<widget class="GtkWindow" id="window_branch">
 
1091
<widget class="GtkDialog" id="window_branch">
1003
1092
  <property name="width_request">350</property>
1004
1093
  <property name="title" translatable="yes">Olive - Branch</property>
1005
1094
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1015
1104
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1016
1105
  <property name="focus_on_map">True</property>
1017
1106
  <property name="urgency_hint">False</property>
 
1107
  <property name="has_separator">True</property>
1018
1108
 
1019
 
  <child>
 
1109
  <child internal-child="vbox">
1020
1110
    <widget class="GtkVBox" id="vbox_branch">
1021
 
      <property name="border_width">5</property>
1022
1111
      <property name="visible">True</property>
1023
1112
      <property name="homogeneous">False</property>
1024
1113
      <property name="spacing">3</property>
1025
1114
 
1026
 
      <child>
1027
 
        <widget class="GtkTable" id="table_branch">
1028
 
          <property name="visible">True</property>
1029
 
          <property name="n_rows">3</property>
1030
 
          <property name="n_columns">2</property>
1031
 
          <property name="homogeneous">False</property>
1032
 
          <property name="row_spacing">3</property>
1033
 
          <property name="column_spacing">3</property>
1034
 
 
1035
 
          <child>
1036
 
            <widget class="GtkLabel" id="label_branch_location">
1037
 
              <property name="visible">True</property>
1038
 
              <property name="label" translatable="yes">Branch location:</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</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="left_attach">0</property>
1055
 
              <property name="right_attach">1</property>
1056
 
              <property name="top_attach">0</property>
1057
 
              <property name="bottom_attach">1</property>
1058
 
              <property name="x_options">fill</property>
1059
 
              <property name="y_options"></property>
1060
 
            </packing>
1061
 
          </child>
1062
 
 
1063
 
          <child>
1064
 
            <widget class="GtkLabel" id="label_branch_destination">
1065
 
              <property name="visible">True</property>
1066
 
              <property name="label" translatable="yes">Destination:</property>
1067
 
              <property name="use_underline">False</property>
1068
 
              <property name="use_markup">False</property>
1069
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1070
 
              <property name="wrap">False</property>
1071
 
              <property name="selectable">False</property>
1072
 
              <property name="xalign">0</property>
1073
 
              <property name="yalign">0.5</property>
1074
 
              <property name="xpad">0</property>
1075
 
              <property name="ypad">0</property>
1076
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1077
 
              <property name="width_chars">-1</property>
1078
 
              <property name="single_line_mode">False</property>
1079
 
              <property name="angle">0</property>
1080
 
            </widget>
1081
 
            <packing>
1082
 
              <property name="left_attach">0</property>
1083
 
              <property name="right_attach">1</property>
1084
 
              <property name="top_attach">1</property>
1085
 
              <property name="bottom_attach">2</property>
1086
 
              <property name="x_options">fill</property>
1087
 
              <property name="y_options"></property>
1088
 
            </packing>
1089
 
          </child>
1090
 
 
1091
 
          <child>
1092
 
            <widget class="GtkFileChooserButton" id="filechooserbutton_branch">
1093
 
              <property name="visible">True</property>
1094
 
              <property name="title" translatable="yes">Please select a folder</property>
1095
 
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
1096
 
              <property name="local_only">True</property>
1097
 
              <property name="show_hidden">False</property>
1098
 
              <property name="do_overwrite_confirmation">False</property>
1099
 
              <property name="width_chars">-1</property>
1100
 
            </widget>
1101
 
            <packing>
1102
 
              <property name="left_attach">1</property>
1103
 
              <property name="right_attach">2</property>
1104
 
              <property name="top_attach">1</property>
1105
 
              <property name="bottom_attach">2</property>
1106
 
              <property name="y_options">fill</property>
1107
 
            </packing>
1108
 
          </child>
1109
 
 
1110
 
          <child>
1111
 
            <widget class="GtkEntry" id="entry_branch_location">
1112
 
              <property name="visible">True</property>
1113
 
              <property name="can_focus">True</property>
1114
 
              <property name="editable">True</property>
1115
 
              <property name="visibility">True</property>
1116
 
              <property name="max_length">0</property>
1117
 
              <property name="text" translatable="yes"></property>
1118
 
              <property name="has_frame">True</property>
1119
 
              <property name="invisible_char">●</property>
1120
 
              <property name="activates_default">False</property>
1121
 
            </widget>
1122
 
            <packing>
1123
 
              <property name="left_attach">1</property>
1124
 
              <property name="right_attach">2</property>
1125
 
              <property name="top_attach">0</property>
1126
 
              <property name="bottom_attach">1</property>
1127
 
              <property name="y_options"></property>
1128
 
            </packing>
1129
 
          </child>
1130
 
 
1131
 
          <child>
1132
 
            <widget class="GtkLabel" id="label_branch_revno">
1133
 
              <property name="visible">True</property>
1134
 
              <property name="label" translatable="yes">Revision number:</property>
1135
 
              <property name="use_underline">False</property>
1136
 
              <property name="use_markup">False</property>
1137
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
1138
 
              <property name="wrap">False</property>
1139
 
              <property name="selectable">False</property>
1140
 
              <property name="xalign">0</property>
1141
 
              <property name="yalign">0.5</property>
1142
 
              <property name="xpad">0</property>
1143
 
              <property name="ypad">0</property>
1144
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1145
 
              <property name="width_chars">-1</property>
1146
 
              <property name="single_line_mode">False</property>
1147
 
              <property name="angle">0</property>
1148
 
            </widget>
1149
 
            <packing>
1150
 
              <property name="left_attach">0</property>
1151
 
              <property name="right_attach">1</property>
1152
 
              <property name="top_attach">2</property>
1153
 
              <property name="bottom_attach">3</property>
1154
 
              <property name="x_options">fill</property>
1155
 
              <property name="y_options"></property>
1156
 
            </packing>
1157
 
          </child>
1158
 
 
1159
 
          <child>
1160
 
            <widget class="GtkSpinButton" id="spinbutton_branch_revno">
1161
 
              <property name="visible">True</property>
1162
 
              <property name="can_focus">True</property>
1163
 
              <property name="climb_rate">1</property>
1164
 
              <property name="digits">0</property>
1165
 
              <property name="numeric">False</property>
1166
 
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
1167
 
              <property name="snap_to_ticks">False</property>
1168
 
              <property name="wrap">False</property>
1169
 
              <property name="adjustment">0 0 100000 1 10 10</property>
1170
 
            </widget>
1171
 
            <packing>
1172
 
              <property name="left_attach">1</property>
1173
 
              <property name="right_attach">2</property>
1174
 
              <property name="top_attach">2</property>
1175
 
              <property name="bottom_attach">3</property>
1176
 
              <property name="y_options"></property>
1177
 
            </packing>
1178
 
          </child>
1179
 
        </widget>
1180
 
        <packing>
1181
 
          <property name="padding">0</property>
1182
 
          <property name="expand">True</property>
1183
 
          <property name="fill">True</property>
1184
 
        </packing>
1185
 
      </child>
1186
 
 
1187
 
      <child>
 
1115
      <child internal-child="action_area">
1188
1116
        <widget class="GtkHButtonBox" id="hbuttonbox_branch">
1189
1117
          <property name="visible">True</property>
1190
1118
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1191
 
          <property name="spacing">3</property>
1192
1119
 
1193
1120
          <child>
1194
1121
            <widget class="GtkButton" id="button_branch_cancel">
1199
1126
              <property name="use_stock">True</property>
1200
1127
              <property name="relief">GTK_RELIEF_NORMAL</property>
1201
1128
              <property name="focus_on_click">True</property>
 
1129
              <property name="response_id">0</property>
1202
1130
              <signal name="clicked" handler="on_button_branch_cancel_clicked" last_modification_time="Mon, 17 Jul 2006 16:26:15 GMT"/>
1203
1131
            </widget>
1204
1132
          </child>
1211
1139
              <property name="can_focus">True</property>
1212
1140
              <property name="relief">GTK_RELIEF_NORMAL</property>
1213
1141
              <property name="focus_on_click">True</property>
 
1142
              <property name="response_id">0</property>
1214
1143
              <signal name="clicked" handler="on_button_branch_branch_clicked" last_modification_time="Mon, 17 Jul 2006 16:25:30 GMT"/>
1215
1144
 
1216
1145
              <child>
1283
1212
          <property name="padding">0</property>
1284
1213
          <property name="expand">False</property>
1285
1214
          <property name="fill">False</property>
 
1215
          <property name="pack_type">GTK_PACK_END</property>
 
1216
        </packing>
 
1217
      </child>
 
1218
 
 
1219
      <child>
 
1220
        <widget class="GtkTable" id="table_branch">
 
1221
          <property name="visible">True</property>
 
1222
          <property name="n_rows">3</property>
 
1223
          <property name="n_columns">2</property>
 
1224
          <property name="homogeneous">False</property>
 
1225
          <property name="row_spacing">3</property>
 
1226
          <property name="column_spacing">3</property>
 
1227
 
 
1228
          <child>
 
1229
            <widget class="GtkLabel" id="label_branch_location">
 
1230
              <property name="visible">True</property>
 
1231
              <property name="label" translatable="yes">Branch location:</property>
 
1232
              <property name="use_underline">False</property>
 
1233
              <property name="use_markup">False</property>
 
1234
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1235
              <property name="wrap">False</property>
 
1236
              <property name="selectable">False</property>
 
1237
              <property name="xalign">0</property>
 
1238
              <property name="yalign">0.5</property>
 
1239
              <property name="xpad">0</property>
 
1240
              <property name="ypad">0</property>
 
1241
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1242
              <property name="width_chars">-1</property>
 
1243
              <property name="single_line_mode">False</property>
 
1244
              <property name="angle">0</property>
 
1245
            </widget>
 
1246
            <packing>
 
1247
              <property name="left_attach">0</property>
 
1248
              <property name="right_attach">1</property>
 
1249
              <property name="top_attach">0</property>
 
1250
              <property name="bottom_attach">1</property>
 
1251
              <property name="x_options">fill</property>
 
1252
              <property name="y_options"></property>
 
1253
            </packing>
 
1254
          </child>
 
1255
 
 
1256
          <child>
 
1257
            <widget class="GtkLabel" id="label_branch_destination">
 
1258
              <property name="visible">True</property>
 
1259
              <property name="label" translatable="yes">Destination:</property>
 
1260
              <property name="use_underline">False</property>
 
1261
              <property name="use_markup">False</property>
 
1262
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1263
              <property name="wrap">False</property>
 
1264
              <property name="selectable">False</property>
 
1265
              <property name="xalign">0</property>
 
1266
              <property name="yalign">0.5</property>
 
1267
              <property name="xpad">0</property>
 
1268
              <property name="ypad">0</property>
 
1269
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1270
              <property name="width_chars">-1</property>
 
1271
              <property name="single_line_mode">False</property>
 
1272
              <property name="angle">0</property>
 
1273
            </widget>
 
1274
            <packing>
 
1275
              <property name="left_attach">0</property>
 
1276
              <property name="right_attach">1</property>
 
1277
              <property name="top_attach">1</property>
 
1278
              <property name="bottom_attach">2</property>
 
1279
              <property name="x_options">fill</property>
 
1280
              <property name="y_options"></property>
 
1281
            </packing>
 
1282
          </child>
 
1283
 
 
1284
          <child>
 
1285
            <widget class="GtkFileChooserButton" id="filechooserbutton_branch">
 
1286
              <property name="visible">True</property>
 
1287
              <property name="title" translatable="yes">Please select a folder</property>
 
1288
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 
1289
              <property name="local_only">True</property>
 
1290
              <property name="show_hidden">False</property>
 
1291
              <property name="do_overwrite_confirmation">False</property>
 
1292
              <property name="width_chars">-1</property>
 
1293
            </widget>
 
1294
            <packing>
 
1295
              <property name="left_attach">1</property>
 
1296
              <property name="right_attach">2</property>
 
1297
              <property name="top_attach">1</property>
 
1298
              <property name="bottom_attach">2</property>
 
1299
              <property name="y_options">fill</property>
 
1300
            </packing>
 
1301
          </child>
 
1302
 
 
1303
          <child>
 
1304
            <widget class="GtkEntry" id="entry_branch_location">
 
1305
              <property name="visible">True</property>
 
1306
              <property name="can_focus">True</property>
 
1307
              <property name="editable">True</property>
 
1308
              <property name="visibility">True</property>
 
1309
              <property name="max_length">0</property>
 
1310
              <property name="text" translatable="yes"></property>
 
1311
              <property name="has_frame">True</property>
 
1312
              <property name="invisible_char">●</property>
 
1313
              <property name="activates_default">False</property>
 
1314
            </widget>
 
1315
            <packing>
 
1316
              <property name="left_attach">1</property>
 
1317
              <property name="right_attach">2</property>
 
1318
              <property name="top_attach">0</property>
 
1319
              <property name="bottom_attach">1</property>
 
1320
              <property name="y_options"></property>
 
1321
            </packing>
 
1322
          </child>
 
1323
 
 
1324
          <child>
 
1325
            <widget class="GtkLabel" id="label_branch_revno">
 
1326
              <property name="visible">True</property>
 
1327
              <property name="label" translatable="yes">Revision number:</property>
 
1328
              <property name="use_underline">False</property>
 
1329
              <property name="use_markup">False</property>
 
1330
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1331
              <property name="wrap">False</property>
 
1332
              <property name="selectable">False</property>
 
1333
              <property name="xalign">0</property>
 
1334
              <property name="yalign">0.5</property>
 
1335
              <property name="xpad">0</property>
 
1336
              <property name="ypad">0</property>
 
1337
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1338
              <property name="width_chars">-1</property>
 
1339
              <property name="single_line_mode">False</property>
 
1340
              <property name="angle">0</property>
 
1341
            </widget>
 
1342
            <packing>
 
1343
              <property name="left_attach">0</property>
 
1344
              <property name="right_attach">1</property>
 
1345
              <property name="top_attach">2</property>
 
1346
              <property name="bottom_attach">3</property>
 
1347
              <property name="x_options">fill</property>
 
1348
              <property name="y_options"></property>
 
1349
            </packing>
 
1350
          </child>
 
1351
 
 
1352
          <child>
 
1353
            <widget class="GtkSpinButton" id="spinbutton_branch_revno">
 
1354
              <property name="visible">True</property>
 
1355
              <property name="can_focus">True</property>
 
1356
              <property name="climb_rate">1</property>
 
1357
              <property name="digits">0</property>
 
1358
              <property name="numeric">False</property>
 
1359
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 
1360
              <property name="snap_to_ticks">False</property>
 
1361
              <property name="wrap">False</property>
 
1362
              <property name="adjustment">0 0 100000 1 10 10</property>
 
1363
            </widget>
 
1364
            <packing>
 
1365
              <property name="left_attach">1</property>
 
1366
              <property name="right_attach">2</property>
 
1367
              <property name="top_attach">2</property>
 
1368
              <property name="bottom_attach">3</property>
 
1369
              <property name="y_options"></property>
 
1370
            </packing>
 
1371
          </child>
 
1372
        </widget>
 
1373
        <packing>
 
1374
          <property name="padding">0</property>
 
1375
          <property name="expand">True</property>
 
1376
          <property name="fill">True</property>
1286
1377
        </packing>
1287
1378
      </child>
1288
1379
    </widget>
1302
1393
  <property name="logo">oliveicon2.png</property>
1303
1394
</widget>
1304
1395
 
1305
 
<widget class="GtkWindow" id="window_add">
 
1396
<widget class="GtkDialog" id="window_add">
1306
1397
  <property name="visible">True</property>
1307
1398
  <property name="title" translatable="yes">Olive - Add file(s)</property>
1308
1399
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1318
1409
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1319
1410
  <property name="focus_on_map">True</property>
1320
1411
  <property name="urgency_hint">False</property>
 
1412
  <property name="has_separator">True</property>
1321
1413
 
1322
 
  <child>
 
1414
  <child internal-child="vbox">
1323
1415
    <widget class="GtkVBox" id="vbox_add">
1324
 
      <property name="border_width">5</property>
1325
1416
      <property name="visible">True</property>
1326
1417
      <property name="homogeneous">False</property>
1327
1418
      <property name="spacing">3</property>
1328
1419
 
1329
 
      <child>
1330
 
        <widget class="GtkLabel" id="label_add_question">
1331
 
          <property name="visible">True</property>
1332
 
          <property name="label" translatable="yes">Which file(s) do you want to add?</property>
1333
 
          <property name="use_underline">False</property>
1334
 
          <property name="use_markup">False</property>
1335
 
          <property name="justify">GTK_JUSTIFY_LEFT</property>
1336
 
          <property name="wrap">False</property>
1337
 
          <property name="selectable">False</property>
1338
 
          <property name="xalign">0.5</property>
1339
 
          <property name="yalign">0.5</property>
1340
 
          <property name="xpad">0</property>
1341
 
          <property name="ypad">0</property>
1342
 
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1343
 
          <property name="width_chars">-1</property>
1344
 
          <property name="single_line_mode">False</property>
1345
 
          <property name="angle">0</property>
1346
 
        </widget>
1347
 
        <packing>
1348
 
          <property name="padding">0</property>
1349
 
          <property name="expand">False</property>
1350
 
          <property name="fill">False</property>
1351
 
        </packing>
1352
 
      </child>
1353
 
 
1354
 
      <child>
1355
 
        <widget class="GtkRadioButton" id="radiobutton_add_selected">
1356
 
          <property name="visible">True</property>
1357
 
          <property name="can_focus">True</property>
1358
 
          <property name="label" translatable="yes">Selected only</property>
1359
 
          <property name="use_underline">True</property>
1360
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1361
 
          <property name="focus_on_click">True</property>
1362
 
          <property name="active">False</property>
1363
 
          <property name="inconsistent">False</property>
1364
 
          <property name="draw_indicator">True</property>
1365
 
        </widget>
1366
 
        <packing>
1367
 
          <property name="padding">0</property>
1368
 
          <property name="expand">False</property>
1369
 
          <property name="fill">False</property>
1370
 
        </packing>
1371
 
      </child>
1372
 
 
1373
 
      <child>
1374
 
        <widget class="GtkRadioButton" id="radiobutton_add_unknown">
1375
 
          <property name="visible">True</property>
1376
 
          <property name="can_focus">True</property>
1377
 
          <property name="label" translatable="yes">All unknowns recursively</property>
1378
 
          <property name="use_underline">True</property>
1379
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1380
 
          <property name="focus_on_click">True</property>
1381
 
          <property name="active">False</property>
1382
 
          <property name="inconsistent">False</property>
1383
 
          <property name="draw_indicator">True</property>
1384
 
          <property name="group">radiobutton_add_selected</property>
1385
 
        </widget>
1386
 
        <packing>
1387
 
          <property name="padding">0</property>
1388
 
          <property name="expand">False</property>
1389
 
          <property name="fill">False</property>
1390
 
        </packing>
1391
 
      </child>
1392
 
 
1393
 
      <child>
 
1420
      <child internal-child="action_area">
1394
1421
        <widget class="GtkHButtonBox" id="hbuttonbox_add">
1395
1422
          <property name="visible">True</property>
1396
1423
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1397
 
          <property name="spacing">3</property>
1398
1424
 
1399
1425
          <child>
1400
1426
            <widget class="GtkButton" id="button_add_cancel">
1405
1431
              <property name="use_stock">True</property>
1406
1432
              <property name="relief">GTK_RELIEF_NORMAL</property>
1407
1433
              <property name="focus_on_click">True</property>
 
1434
              <property name="response_id">0</property>
1408
1435
              <signal name="clicked" handler="on_button_add_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 11:37:02 GMT"/>
1409
1436
            </widget>
1410
1437
          </child>
1417
1444
              <property name="can_focus">True</property>
1418
1445
              <property name="relief">GTK_RELIEF_NORMAL</property>
1419
1446
              <property name="focus_on_click">True</property>
 
1447
              <property name="response_id">0</property>
1420
1448
              <signal name="clicked" handler="on_button_add_add_clicked" last_modification_time="Fri, 21 Jul 2006 11:37:11 GMT"/>
1421
1449
 
1422
1450
              <child>
1489
1517
          <property name="padding">0</property>
1490
1518
          <property name="expand">True</property>
1491
1519
          <property name="fill">True</property>
 
1520
          <property name="pack_type">GTK_PACK_END</property>
 
1521
        </packing>
 
1522
      </child>
 
1523
 
 
1524
      <child>
 
1525
        <widget class="GtkLabel" id="label_add_question">
 
1526
          <property name="visible">True</property>
 
1527
          <property name="label" translatable="yes">Which file(s) do you want to add?</property>
 
1528
          <property name="use_underline">False</property>
 
1529
          <property name="use_markup">False</property>
 
1530
          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1531
          <property name="wrap">False</property>
 
1532
          <property name="selectable">False</property>
 
1533
          <property name="xalign">0.5</property>
 
1534
          <property name="yalign">0.5</property>
 
1535
          <property name="xpad">0</property>
 
1536
          <property name="ypad">0</property>
 
1537
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1538
          <property name="width_chars">-1</property>
 
1539
          <property name="single_line_mode">False</property>
 
1540
          <property name="angle">0</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_add_selected">
 
1551
          <property name="visible">True</property>
 
1552
          <property name="can_focus">True</property>
 
1553
          <property name="label" translatable="yes">Selected only</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
        </widget>
 
1561
        <packing>
 
1562
          <property name="padding">0</property>
 
1563
          <property name="expand">False</property>
 
1564
          <property name="fill">False</property>
 
1565
        </packing>
 
1566
      </child>
 
1567
 
 
1568
      <child>
 
1569
        <widget class="GtkRadioButton" id="radiobutton_add_unknown">
 
1570
          <property name="visible">True</property>
 
1571
          <property name="can_focus">True</property>
 
1572
          <property name="label" translatable="yes">All unknowns recursively</property>
 
1573
          <property name="use_underline">True</property>
 
1574
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1575
          <property name="focus_on_click">True</property>
 
1576
          <property name="active">False</property>
 
1577
          <property name="inconsistent">False</property>
 
1578
          <property name="draw_indicator">True</property>
 
1579
          <property name="group">radiobutton_add_selected</property>
 
1580
        </widget>
 
1581
        <packing>
 
1582
          <property name="padding">0</property>
 
1583
          <property name="expand">False</property>
 
1584
          <property name="fill">False</property>
1492
1585
        </packing>
1493
1586
      </child>
1494
1587
    </widget>
1495
1588
  </child>
1496
1589
</widget>
1497
1590
 
1498
 
<widget class="GtkWindow" id="window_remove">
 
1591
<widget class="GtkDialog" id="window_remove">
1499
1592
  <property name="visible">True</property>
1500
1593
  <property name="title" translatable="yes">Olive - Remove file(s)</property>
1501
1594
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1511
1604
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1512
1605
  <property name="focus_on_map">True</property>
1513
1606
  <property name="urgency_hint">False</property>
 
1607
  <property name="has_separator">True</property>
1514
1608
 
1515
 
  <child>
 
1609
  <child internal-child="vbox">
1516
1610
    <widget class="GtkVBox" id="vbox_remove">
1517
 
      <property name="border_width">5</property>
1518
1611
      <property name="visible">True</property>
1519
1612
      <property name="homogeneous">False</property>
1520
1613
      <property name="spacing">3</property>
1521
1614
 
1522
 
      <child>
1523
 
        <widget class="GtkLabel" id="label_remove_question">
1524
 
          <property name="visible">True</property>
1525
 
          <property name="label" translatable="yes">Which file(s) do you want to remove?</property>
1526
 
          <property name="use_underline">False</property>
1527
 
          <property name="use_markup">False</property>
1528
 
          <property name="justify">GTK_JUSTIFY_LEFT</property>
1529
 
          <property name="wrap">False</property>
1530
 
          <property name="selectable">False</property>
1531
 
          <property name="xalign">0.5</property>
1532
 
          <property name="yalign">0.5</property>
1533
 
          <property name="xpad">0</property>
1534
 
          <property name="ypad">0</property>
1535
 
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1536
 
          <property name="width_chars">-1</property>
1537
 
          <property name="single_line_mode">False</property>
1538
 
          <property name="angle">0</property>
1539
 
        </widget>
1540
 
        <packing>
1541
 
          <property name="padding">0</property>
1542
 
          <property name="expand">False</property>
1543
 
          <property name="fill">False</property>
1544
 
        </packing>
1545
 
      </child>
1546
 
 
1547
 
      <child>
1548
 
        <widget class="GtkRadioButton" id="radiobutton_remove_selected">
1549
 
          <property name="visible">True</property>
1550
 
          <property name="can_focus">True</property>
1551
 
          <property name="label" translatable="yes">Selected only</property>
1552
 
          <property name="use_underline">True</property>
1553
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1554
 
          <property name="focus_on_click">True</property>
1555
 
          <property name="active">False</property>
1556
 
          <property name="inconsistent">False</property>
1557
 
          <property name="draw_indicator">True</property>
1558
 
        </widget>
1559
 
        <packing>
1560
 
          <property name="padding">0</property>
1561
 
          <property name="expand">False</property>
1562
 
          <property name="fill">False</property>
1563
 
        </packing>
1564
 
      </child>
1565
 
 
1566
 
      <child>
1567
 
        <widget class="GtkRadioButton" id="radiobutton_remove_new">
1568
 
          <property name="visible">True</property>
1569
 
          <property name="can_focus">True</property>
1570
 
          <property name="label" translatable="yes">All files with status 'added'</property>
1571
 
          <property name="use_underline">True</property>
1572
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
1573
 
          <property name="focus_on_click">True</property>
1574
 
          <property name="active">False</property>
1575
 
          <property name="inconsistent">False</property>
1576
 
          <property name="draw_indicator">True</property>
1577
 
          <property name="group">radiobutton_remove_selected</property>
1578
 
        </widget>
1579
 
        <packing>
1580
 
          <property name="padding">0</property>
1581
 
          <property name="expand">False</property>
1582
 
          <property name="fill">False</property>
1583
 
        </packing>
1584
 
      </child>
1585
 
 
1586
 
      <child>
 
1615
      <child internal-child="action_area">
1587
1616
        <widget class="GtkHButtonBox" id="hbuttonbox_remove">
1588
1617
          <property name="visible">True</property>
1589
1618
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1590
 
          <property name="spacing">3</property>
1591
1619
 
1592
1620
          <child>
1593
1621
            <widget class="GtkButton" id="button_remove_cancel">
1598
1626
              <property name="use_stock">True</property>
1599
1627
              <property name="relief">GTK_RELIEF_NORMAL</property>
1600
1628
              <property name="focus_on_click">True</property>
 
1629
              <property name="response_id">0</property>
1601
1630
              <signal name="clicked" handler="on_button_remove_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 14:22:58 GMT"/>
1602
1631
            </widget>
1603
1632
          </child>
1610
1639
              <property name="can_focus">True</property>
1611
1640
              <property name="relief">GTK_RELIEF_NORMAL</property>
1612
1641
              <property name="focus_on_click">True</property>
 
1642
              <property name="response_id">0</property>
1613
1643
              <signal name="clicked" handler="on_button_remove_remove_clicked" last_modification_time="Fri, 21 Jul 2006 14:22:51 GMT"/>
1614
1644
 
1615
1645
              <child>
1682
1712
          <property name="padding">0</property>
1683
1713
          <property name="expand">True</property>
1684
1714
          <property name="fill">True</property>
 
1715
          <property name="pack_type">GTK_PACK_END</property>
 
1716
        </packing>
 
1717
      </child>
 
1718
 
 
1719
      <child>
 
1720
        <widget class="GtkLabel" id="label_remove_question">
 
1721
          <property name="visible">True</property>
 
1722
          <property name="label" translatable="yes">Which file(s) do you want to remove?</property>
 
1723
          <property name="use_underline">False</property>
 
1724
          <property name="use_markup">False</property>
 
1725
          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1726
          <property name="wrap">False</property>
 
1727
          <property name="selectable">False</property>
 
1728
          <property name="xalign">0.5</property>
 
1729
          <property name="yalign">0.5</property>
 
1730
          <property name="xpad">0</property>
 
1731
          <property name="ypad">0</property>
 
1732
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1733
          <property name="width_chars">-1</property>
 
1734
          <property name="single_line_mode">False</property>
 
1735
          <property name="angle">0</property>
 
1736
        </widget>
 
1737
        <packing>
 
1738
          <property name="padding">0</property>
 
1739
          <property name="expand">False</property>
 
1740
          <property name="fill">False</property>
 
1741
        </packing>
 
1742
      </child>
 
1743
 
 
1744
      <child>
 
1745
        <widget class="GtkRadioButton" id="radiobutton_remove_selected">
 
1746
          <property name="visible">True</property>
 
1747
          <property name="can_focus">True</property>
 
1748
          <property name="label" translatable="yes">Selected only</property>
 
1749
          <property name="use_underline">True</property>
 
1750
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1751
          <property name="focus_on_click">True</property>
 
1752
          <property name="active">False</property>
 
1753
          <property name="inconsistent">False</property>
 
1754
          <property name="draw_indicator">True</property>
 
1755
        </widget>
 
1756
        <packing>
 
1757
          <property name="padding">0</property>
 
1758
          <property name="expand">False</property>
 
1759
          <property name="fill">False</property>
 
1760
        </packing>
 
1761
      </child>
 
1762
 
 
1763
      <child>
 
1764
        <widget class="GtkRadioButton" id="radiobutton_remove_new">
 
1765
          <property name="visible">True</property>
 
1766
          <property name="can_focus">True</property>
 
1767
          <property name="label" translatable="yes">All files with status 'added'</property>
 
1768
          <property name="use_underline">True</property>
 
1769
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
1770
          <property name="focus_on_click">True</property>
 
1771
          <property name="active">False</property>
 
1772
          <property name="inconsistent">False</property>
 
1773
          <property name="draw_indicator">True</property>
 
1774
          <property name="group">radiobutton_remove_selected</property>
 
1775
        </widget>
 
1776
        <packing>
 
1777
          <property name="padding">0</property>
 
1778
          <property name="expand">False</property>
 
1779
          <property name="fill">False</property>
1685
1780
        </packing>
1686
1781
      </child>
1687
1782
    </widget>
1688
1783
  </child>
1689
1784
</widget>
1690
1785
 
1691
 
<widget class="GtkWindow" id="window_push">
 
1786
<widget class="GtkDialog" id="window_push">
1692
1787
  <property name="width_request">320</property>
1693
1788
  <property name="title" translatable="yes">Olive - Push</property>
1694
1789
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
1704
1799
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
1705
1800
  <property name="focus_on_map">True</property>
1706
1801
  <property name="urgency_hint">False</property>
 
1802
  <property name="has_separator">True</property>
1707
1803
 
1708
 
  <child>
 
1804
  <child internal-child="vbox">
1709
1805
    <widget class="GtkVBox" id="vbox_push">
1710
 
      <property name="border_width">5</property>
1711
1806
      <property name="visible">True</property>
1712
1807
      <property name="homogeneous">False</property>
1713
1808
      <property name="spacing">3</property>
1714
1809
 
 
1810
      <child internal-child="action_area">
 
1811
        <widget class="GtkHButtonBox" id="hbuttonbox_push">
 
1812
          <property name="visible">True</property>
 
1813
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
1814
 
 
1815
          <child>
 
1816
            <widget class="GtkButton" id="button_push_test">
 
1817
              <property name="visible">True</property>
 
1818
              <property name="can_default">True</property>
 
1819
              <property name="can_focus">True</property>
 
1820
              <property name="label" translatable="yes">_Test</property>
 
1821
              <property name="use_underline">True</property>
 
1822
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1823
              <property name="focus_on_click">True</property>
 
1824
              <property name="response_id">0</property>
 
1825
              <signal name="clicked" handler="on_button_push_test_clicked" last_modification_time="Sun, 20 Aug 2006 20:01:01 GMT"/>
 
1826
            </widget>
 
1827
          </child>
 
1828
 
 
1829
          <child>
 
1830
            <widget class="GtkButton" id="button_push_cancel">
 
1831
              <property name="visible">True</property>
 
1832
              <property name="can_default">True</property>
 
1833
              <property name="can_focus">True</property>
 
1834
              <property name="label">gtk-cancel</property>
 
1835
              <property name="use_stock">True</property>
 
1836
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1837
              <property name="focus_on_click">True</property>
 
1838
              <property name="response_id">0</property>
 
1839
              <signal name="clicked" handler="on_button_push_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 16:38:55 GMT"/>
 
1840
            </widget>
 
1841
          </child>
 
1842
 
 
1843
          <child>
 
1844
            <widget class="GtkButton" id="button_push_push">
 
1845
              <property name="visible">True</property>
 
1846
              <property name="can_default">True</property>
 
1847
              <property name="has_default">True</property>
 
1848
              <property name="can_focus">True</property>
 
1849
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1850
              <property name="focus_on_click">True</property>
 
1851
              <property name="response_id">0</property>
 
1852
              <signal name="clicked" handler="on_button_push_push_clicked" last_modification_time="Fri, 21 Jul 2006 16:39:01 GMT"/>
 
1853
 
 
1854
              <child>
 
1855
                <widget class="GtkAlignment" id="alignment6">
 
1856
                  <property name="visible">True</property>
 
1857
                  <property name="xalign">0.5</property>
 
1858
                  <property name="yalign">0.5</property>
 
1859
                  <property name="xscale">0</property>
 
1860
                  <property name="yscale">0</property>
 
1861
                  <property name="top_padding">0</property>
 
1862
                  <property name="bottom_padding">0</property>
 
1863
                  <property name="left_padding">0</property>
 
1864
                  <property name="right_padding">0</property>
 
1865
 
 
1866
                  <child>
 
1867
                    <widget class="GtkHBox" id="hbox8">
 
1868
                      <property name="visible">True</property>
 
1869
                      <property name="homogeneous">False</property>
 
1870
                      <property name="spacing">2</property>
 
1871
 
 
1872
                      <child>
 
1873
                        <widget class="GtkImage" id="image50">
 
1874
                          <property name="visible">True</property>
 
1875
                          <property name="stock">gtk-goto-top</property>
 
1876
                          <property name="icon_size">4</property>
 
1877
                          <property name="xalign">0.5</property>
 
1878
                          <property name="yalign">0.5</property>
 
1879
                          <property name="xpad">0</property>
 
1880
                          <property name="ypad">0</property>
 
1881
                        </widget>
 
1882
                        <packing>
 
1883
                          <property name="padding">0</property>
 
1884
                          <property name="expand">False</property>
 
1885
                          <property name="fill">False</property>
 
1886
                        </packing>
 
1887
                      </child>
 
1888
 
 
1889
                      <child>
 
1890
                        <widget class="GtkLabel" id="label12">
 
1891
                          <property name="visible">True</property>
 
1892
                          <property name="label" translatable="yes">_Push</property>
 
1893
                          <property name="use_underline">True</property>
 
1894
                          <property name="use_markup">False</property>
 
1895
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1896
                          <property name="wrap">False</property>
 
1897
                          <property name="selectable">False</property>
 
1898
                          <property name="xalign">0.5</property>
 
1899
                          <property name="yalign">0.5</property>
 
1900
                          <property name="xpad">0</property>
 
1901
                          <property name="ypad">0</property>
 
1902
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1903
                          <property name="width_chars">-1</property>
 
1904
                          <property name="single_line_mode">False</property>
 
1905
                          <property name="angle">0</property>
 
1906
                        </widget>
 
1907
                        <packing>
 
1908
                          <property name="padding">0</property>
 
1909
                          <property name="expand">False</property>
 
1910
                          <property name="fill">False</property>
 
1911
                        </packing>
 
1912
                      </child>
 
1913
                    </widget>
 
1914
                  </child>
 
1915
                </widget>
 
1916
              </child>
 
1917
            </widget>
 
1918
          </child>
 
1919
        </widget>
 
1920
        <packing>
 
1921
          <property name="padding">0</property>
 
1922
          <property name="expand">False</property>
 
1923
          <property name="fill">False</property>
 
1924
          <property name="pack_type">GTK_PACK_END</property>
 
1925
        </packing>
 
1926
      </child>
 
1927
 
1715
1928
      <child>
1716
1929
        <widget class="GtkRadioButton" id="radiobutton_push_stored">
1717
1930
          <property name="visible">True</property>
1904
2117
          <property name="fill">False</property>
1905
2118
        </packing>
1906
2119
      </child>
1907
 
 
1908
 
      <child>
1909
 
        <widget class="GtkHButtonBox" id="hbuttonbox_push">
1910
 
          <property name="visible">True</property>
1911
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
1912
 
          <property name="spacing">3</property>
1913
 
 
1914
 
          <child>
1915
 
            <widget class="GtkButton" id="button_push_test">
1916
 
              <property name="visible">True</property>
1917
 
              <property name="can_default">True</property>
1918
 
              <property name="can_focus">True</property>
1919
 
              <property name="label" translatable="yes">_Test</property>
1920
 
              <property name="use_underline">True</property>
1921
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1922
 
              <property name="focus_on_click">True</property>
1923
 
              <signal name="clicked" handler="on_button_push_test_clicked" last_modification_time="Sun, 20 Aug 2006 20:01:01 GMT"/>
1924
 
            </widget>
1925
 
          </child>
1926
 
 
1927
 
          <child>
1928
 
            <widget class="GtkButton" id="button_push_cancel">
1929
 
              <property name="visible">True</property>
1930
 
              <property name="can_default">True</property>
1931
 
              <property name="can_focus">True</property>
1932
 
              <property name="label">gtk-cancel</property>
1933
 
              <property name="use_stock">True</property>
1934
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1935
 
              <property name="focus_on_click">True</property>
1936
 
              <signal name="clicked" handler="on_button_push_cancel_clicked" last_modification_time="Fri, 21 Jul 2006 16:38:55 GMT"/>
1937
 
            </widget>
1938
 
          </child>
1939
 
 
1940
 
          <child>
1941
 
            <widget class="GtkButton" id="button_push_push">
1942
 
              <property name="visible">True</property>
1943
 
              <property name="can_default">True</property>
1944
 
              <property name="has_default">True</property>
1945
 
              <property name="can_focus">True</property>
1946
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1947
 
              <property name="focus_on_click">True</property>
1948
 
              <signal name="clicked" handler="on_button_push_push_clicked" last_modification_time="Fri, 21 Jul 2006 16:39:01 GMT"/>
1949
 
 
1950
 
              <child>
1951
 
                <widget class="GtkAlignment" id="alignment6">
1952
 
                  <property name="visible">True</property>
1953
 
                  <property name="xalign">0.5</property>
1954
 
                  <property name="yalign">0.5</property>
1955
 
                  <property name="xscale">0</property>
1956
 
                  <property name="yscale">0</property>
1957
 
                  <property name="top_padding">0</property>
1958
 
                  <property name="bottom_padding">0</property>
1959
 
                  <property name="left_padding">0</property>
1960
 
                  <property name="right_padding">0</property>
1961
 
 
1962
 
                  <child>
1963
 
                    <widget class="GtkHBox" id="hbox8">
1964
 
                      <property name="visible">True</property>
1965
 
                      <property name="homogeneous">False</property>
1966
 
                      <property name="spacing">2</property>
1967
 
 
1968
 
                      <child>
1969
 
                        <widget class="GtkImage" id="image50">
1970
 
                          <property name="visible">True</property>
1971
 
                          <property name="stock">gtk-goto-top</property>
1972
 
                          <property name="icon_size">4</property>
1973
 
                          <property name="xalign">0.5</property>
1974
 
                          <property name="yalign">0.5</property>
1975
 
                          <property name="xpad">0</property>
1976
 
                          <property name="ypad">0</property>
1977
 
                        </widget>
1978
 
                        <packing>
1979
 
                          <property name="padding">0</property>
1980
 
                          <property name="expand">False</property>
1981
 
                          <property name="fill">False</property>
1982
 
                        </packing>
1983
 
                      </child>
1984
 
 
1985
 
                      <child>
1986
 
                        <widget class="GtkLabel" id="label12">
1987
 
                          <property name="visible">True</property>
1988
 
                          <property name="label" translatable="yes">_Push</property>
1989
 
                          <property name="use_underline">True</property>
1990
 
                          <property name="use_markup">False</property>
1991
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
1992
 
                          <property name="wrap">False</property>
1993
 
                          <property name="selectable">False</property>
1994
 
                          <property name="xalign">0.5</property>
1995
 
                          <property name="yalign">0.5</property>
1996
 
                          <property name="xpad">0</property>
1997
 
                          <property name="ypad">0</property>
1998
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1999
 
                          <property name="width_chars">-1</property>
2000
 
                          <property name="single_line_mode">False</property>
2001
 
                          <property name="angle">0</property>
2002
 
                        </widget>
2003
 
                        <packing>
2004
 
                          <property name="padding">0</property>
2005
 
                          <property name="expand">False</property>
2006
 
                          <property name="fill">False</property>
2007
 
                        </packing>
2008
 
                      </child>
2009
 
                    </widget>
2010
 
                  </child>
2011
 
                </widget>
2012
 
              </child>
2013
 
            </widget>
2014
 
          </child>
2015
 
        </widget>
2016
 
        <packing>
2017
 
          <property name="padding">0</property>
2018
 
          <property name="expand">False</property>
2019
 
          <property name="fill">False</property>
2020
 
        </packing>
2021
 
      </child>
2022
2120
    </widget>
2023
2121
  </child>
2024
2122
</widget>
2025
2123
 
2026
 
<widget class="GtkWindow" id="window_checkout">
 
2124
<widget class="GtkDialog" id="window_checkout">
2027
2125
  <property name="width_request">350</property>
2028
2126
  <property name="title" translatable="yes">Olive - Checkout</property>
2029
2127
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2039
2137
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2040
2138
  <property name="focus_on_map">True</property>
2041
2139
  <property name="urgency_hint">False</property>
 
2140
  <property name="has_separator">True</property>
2042
2141
 
2043
 
  <child>
 
2142
  <child internal-child="vbox">
2044
2143
    <widget class="GtkVBox" id="vbox_checkout">
2045
 
      <property name="border_width">5</property>
2046
2144
      <property name="visible">True</property>
2047
2145
      <property name="homogeneous">False</property>
2048
2146
      <property name="spacing">3</property>
2049
2147
 
 
2148
      <child internal-child="action_area">
 
2149
        <widget class="GtkHButtonBox" id="hbuttonbox_checkout">
 
2150
          <property name="visible">True</property>
 
2151
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
2152
 
 
2153
          <child>
 
2154
            <widget class="GtkButton" id="button_checkout_cancel">
 
2155
              <property name="visible">True</property>
 
2156
              <property name="can_default">True</property>
 
2157
              <property name="can_focus">True</property>
 
2158
              <property name="label">gtk-cancel</property>
 
2159
              <property name="use_stock">True</property>
 
2160
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
2161
              <property name="focus_on_click">True</property>
 
2162
              <property name="response_id">0</property>
 
2163
              <signal name="clicked" handler="on_button_checkout_cancel_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:19 GMT"/>
 
2164
            </widget>
 
2165
          </child>
 
2166
 
 
2167
          <child>
 
2168
            <widget class="GtkButton" id="button_checkout_checkout">
 
2169
              <property name="visible">True</property>
 
2170
              <property name="can_default">True</property>
 
2171
              <property name="has_default">True</property>
 
2172
              <property name="can_focus">True</property>
 
2173
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
2174
              <property name="focus_on_click">True</property>
 
2175
              <property name="response_id">0</property>
 
2176
              <signal name="clicked" handler="on_button_checkout_checkout_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:11 GMT"/>
 
2177
 
 
2178
              <child>
 
2179
                <widget class="GtkAlignment" id="alignment7">
 
2180
                  <property name="visible">True</property>
 
2181
                  <property name="xalign">0.5</property>
 
2182
                  <property name="yalign">0.5</property>
 
2183
                  <property name="xscale">0</property>
 
2184
                  <property name="yscale">0</property>
 
2185
                  <property name="top_padding">0</property>
 
2186
                  <property name="bottom_padding">0</property>
 
2187
                  <property name="left_padding">0</property>
 
2188
                  <property name="right_padding">0</property>
 
2189
 
 
2190
                  <child>
 
2191
                    <widget class="GtkHBox" id="hbox9">
 
2192
                      <property name="visible">True</property>
 
2193
                      <property name="homogeneous">False</property>
 
2194
                      <property name="spacing">2</property>
 
2195
 
 
2196
                      <child>
 
2197
                        <widget class="GtkImage" id="image51">
 
2198
                          <property name="visible">True</property>
 
2199
                          <property name="stock">gtk-apply</property>
 
2200
                          <property name="icon_size">4</property>
 
2201
                          <property name="xalign">0.5</property>
 
2202
                          <property name="yalign">0.5</property>
 
2203
                          <property name="xpad">0</property>
 
2204
                          <property name="ypad">0</property>
 
2205
                        </widget>
 
2206
                        <packing>
 
2207
                          <property name="padding">0</property>
 
2208
                          <property name="expand">False</property>
 
2209
                          <property name="fill">False</property>
 
2210
                        </packing>
 
2211
                      </child>
 
2212
 
 
2213
                      <child>
 
2214
                        <widget class="GtkLabel" id="label16">
 
2215
                          <property name="visible">True</property>
 
2216
                          <property name="label" translatable="yes">C_heckout</property>
 
2217
                          <property name="use_underline">True</property>
 
2218
                          <property name="use_markup">False</property>
 
2219
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
2220
                          <property name="wrap">False</property>
 
2221
                          <property name="selectable">False</property>
 
2222
                          <property name="xalign">0.5</property>
 
2223
                          <property name="yalign">0.5</property>
 
2224
                          <property name="xpad">0</property>
 
2225
                          <property name="ypad">0</property>
 
2226
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
2227
                          <property name="width_chars">-1</property>
 
2228
                          <property name="single_line_mode">False</property>
 
2229
                          <property name="angle">0</property>
 
2230
                        </widget>
 
2231
                        <packing>
 
2232
                          <property name="padding">0</property>
 
2233
                          <property name="expand">False</property>
 
2234
                          <property name="fill">False</property>
 
2235
                        </packing>
 
2236
                      </child>
 
2237
                    </widget>
 
2238
                  </child>
 
2239
                </widget>
 
2240
              </child>
 
2241
            </widget>
 
2242
          </child>
 
2243
        </widget>
 
2244
        <packing>
 
2245
          <property name="padding">0</property>
 
2246
          <property name="expand">False</property>
 
2247
          <property name="fill">False</property>
 
2248
          <property name="pack_type">GTK_PACK_END</property>
 
2249
        </packing>
 
2250
      </child>
 
2251
 
2050
2252
      <child>
2051
2253
        <widget class="GtkTable" id="table_checkout">
2052
2254
          <property name="visible">True</property>
2229
2431
          <property name="fill">True</property>
2230
2432
        </packing>
2231
2433
      </child>
2232
 
 
2233
 
      <child>
2234
 
        <widget class="GtkHButtonBox" id="hbuttonbox_checkout">
2235
 
          <property name="visible">True</property>
2236
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2237
 
          <property name="spacing">3</property>
2238
 
 
2239
 
          <child>
2240
 
            <widget class="GtkButton" id="button_checkout_cancel">
2241
 
              <property name="visible">True</property>
2242
 
              <property name="can_default">True</property>
2243
 
              <property name="can_focus">True</property>
2244
 
              <property name="label">gtk-cancel</property>
2245
 
              <property name="use_stock">True</property>
2246
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2247
 
              <property name="focus_on_click">True</property>
2248
 
              <signal name="clicked" handler="on_button_checkout_cancel_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:19 GMT"/>
2249
 
            </widget>
2250
 
          </child>
2251
 
 
2252
 
          <child>
2253
 
            <widget class="GtkButton" id="button_checkout_checkout">
2254
 
              <property name="visible">True</property>
2255
 
              <property name="can_default">True</property>
2256
 
              <property name="has_default">True</property>
2257
 
              <property name="can_focus">True</property>
2258
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2259
 
              <property name="focus_on_click">True</property>
2260
 
              <signal name="clicked" handler="on_button_checkout_checkout_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:11 GMT"/>
2261
 
 
2262
 
              <child>
2263
 
                <widget class="GtkAlignment" id="alignment7">
2264
 
                  <property name="visible">True</property>
2265
 
                  <property name="xalign">0.5</property>
2266
 
                  <property name="yalign">0.5</property>
2267
 
                  <property name="xscale">0</property>
2268
 
                  <property name="yscale">0</property>
2269
 
                  <property name="top_padding">0</property>
2270
 
                  <property name="bottom_padding">0</property>
2271
 
                  <property name="left_padding">0</property>
2272
 
                  <property name="right_padding">0</property>
2273
 
 
2274
 
                  <child>
2275
 
                    <widget class="GtkHBox" id="hbox9">
2276
 
                      <property name="visible">True</property>
2277
 
                      <property name="homogeneous">False</property>
2278
 
                      <property name="spacing">2</property>
2279
 
 
2280
 
                      <child>
2281
 
                        <widget class="GtkImage" id="image51">
2282
 
                          <property name="visible">True</property>
2283
 
                          <property name="stock">gtk-apply</property>
2284
 
                          <property name="icon_size">4</property>
2285
 
                          <property name="xalign">0.5</property>
2286
 
                          <property name="yalign">0.5</property>
2287
 
                          <property name="xpad">0</property>
2288
 
                          <property name="ypad">0</property>
2289
 
                        </widget>
2290
 
                        <packing>
2291
 
                          <property name="padding">0</property>
2292
 
                          <property name="expand">False</property>
2293
 
                          <property name="fill">False</property>
2294
 
                        </packing>
2295
 
                      </child>
2296
 
 
2297
 
                      <child>
2298
 
                        <widget class="GtkLabel" id="label16">
2299
 
                          <property name="visible">True</property>
2300
 
                          <property name="label" translatable="yes">C_heckout</property>
2301
 
                          <property name="use_underline">True</property>
2302
 
                          <property name="use_markup">False</property>
2303
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
2304
 
                          <property name="wrap">False</property>
2305
 
                          <property name="selectable">False</property>
2306
 
                          <property name="xalign">0.5</property>
2307
 
                          <property name="yalign">0.5</property>
2308
 
                          <property name="xpad">0</property>
2309
 
                          <property name="ypad">0</property>
2310
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2311
 
                          <property name="width_chars">-1</property>
2312
 
                          <property name="single_line_mode">False</property>
2313
 
                          <property name="angle">0</property>
2314
 
                        </widget>
2315
 
                        <packing>
2316
 
                          <property name="padding">0</property>
2317
 
                          <property name="expand">False</property>
2318
 
                          <property name="fill">False</property>
2319
 
                        </packing>
2320
 
                      </child>
2321
 
                    </widget>
2322
 
                  </child>
2323
 
                </widget>
2324
 
              </child>
2325
 
            </widget>
2326
 
          </child>
2327
 
        </widget>
2328
 
        <packing>
2329
 
          <property name="padding">0</property>
2330
 
          <property name="expand">False</property>
2331
 
          <property name="fill">False</property>
2332
 
        </packing>
2333
 
      </child>
2334
 
    </widget>
2335
 
  </child>
2336
 
</widget>
2337
 
 
2338
 
<widget class="GtkWindow" id="window_diff">
2339
 
  <property name="width_request">600</property>
2340
 
  <property name="height_request">400</property>
2341
 
  <property name="title" translatable="yes">Olive - Diff</property>
2342
 
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2343
 
  <property name="window_position">GTK_WIN_POS_NONE</property>
2344
 
  <property name="modal">False</property>
2345
 
  <property name="resizable">True</property>
2346
 
  <property name="destroy_with_parent">False</property>
2347
 
  <property name="icon">oliveicon2.png</property>
2348
 
  <property name="decorated">True</property>
2349
 
  <property name="skip_taskbar_hint">False</property>
2350
 
  <property name="skip_pager_hint">False</property>
2351
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
2352
 
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2353
 
  <property name="focus_on_map">True</property>
2354
 
  <property name="urgency_hint">False</property>
2355
 
 
2356
 
  <child>
2357
 
    <widget class="GtkVBox" id="vbox_diff">
2358
 
      <property name="border_width">5</property>
2359
 
      <property name="visible">True</property>
2360
 
      <property name="homogeneous">False</property>
2361
 
      <property name="spacing">3</property>
2362
 
 
2363
 
      <child>
2364
 
        <widget class="GtkHPaned" id="hpaned_diff">
2365
 
          <property name="visible">True</property>
2366
 
          <property name="can_focus">True</property>
2367
 
          <property name="position">200</property>
2368
 
 
2369
 
          <child>
2370
 
            <widget class="GtkScrolledWindow" id="scrolledwindow_diff_files">
2371
 
              <property name="visible">True</property>
2372
 
              <property name="can_focus">True</property>
2373
 
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2374
 
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2375
 
              <property name="shadow_type">GTK_SHADOW_IN</property>
2376
 
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
2377
 
 
2378
 
              <child>
2379
 
                <widget class="GtkTreeView" id="treeview_diff_files">
2380
 
                  <property name="visible">True</property>
2381
 
                  <property name="can_focus">True</property>
2382
 
                  <property name="headers_visible">False</property>
2383
 
                  <property name="rules_hint">False</property>
2384
 
                  <property name="reorderable">False</property>
2385
 
                  <property name="enable_search">True</property>
2386
 
                  <property name="fixed_height_mode">False</property>
2387
 
                  <property name="hover_selection">False</property>
2388
 
                  <property name="hover_expand">False</property>
2389
 
                  <signal name="cursor_changed" handler="on_treeview_diff_files_cursor_changed" last_modification_time="Thu, 03 Aug 2006 09:02:37 GMT"/>
2390
 
                </widget>
2391
 
              </child>
2392
 
            </widget>
2393
 
            <packing>
2394
 
              <property name="shrink">True</property>
2395
 
              <property name="resize">False</property>
2396
 
            </packing>
2397
 
          </child>
2398
 
 
2399
 
          <child>
2400
 
            <widget class="GtkScrolledWindow" id="scrolledwindow_diff_diff">
2401
 
              <property name="visible">True</property>
2402
 
              <property name="can_focus">True</property>
2403
 
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2404
 
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
2405
 
              <property name="shadow_type">GTK_SHADOW_IN</property>
2406
 
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
2407
 
 
2408
 
              <child>
2409
 
                <placeholder/>
2410
 
              </child>
2411
 
            </widget>
2412
 
            <packing>
2413
 
              <property name="shrink">True</property>
2414
 
              <property name="resize">True</property>
2415
 
            </packing>
2416
 
          </child>
2417
 
        </widget>
2418
 
        <packing>
2419
 
          <property name="padding">0</property>
2420
 
          <property name="expand">True</property>
2421
 
          <property name="fill">True</property>
2422
 
        </packing>
2423
 
      </child>
2424
 
 
2425
 
      <child>
2426
 
        <widget class="GtkHButtonBox" id="hbuttonbox_diff">
2427
 
          <property name="visible">True</property>
2428
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2429
 
          <property name="spacing">0</property>
2430
 
 
2431
 
          <child>
2432
 
            <widget class="GtkButton" id="button_diff_close">
2433
 
              <property name="visible">True</property>
2434
 
              <property name="can_default">True</property>
2435
 
              <property name="has_default">True</property>
2436
 
              <property name="can_focus">True</property>
2437
 
              <property name="label">gtk-close</property>
2438
 
              <property name="use_stock">True</property>
2439
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2440
 
              <property name="focus_on_click">True</property>
2441
 
              <signal name="clicked" handler="on_button_diff_close_clicked" last_modification_time="Wed, 02 Aug 2006 22:55:53 GMT"/>
2442
 
            </widget>
2443
 
          </child>
2444
 
        </widget>
2445
 
        <packing>
2446
 
          <property name="padding">0</property>
2447
 
          <property name="expand">False</property>
2448
 
          <property name="fill">True</property>
2449
 
        </packing>
2450
 
      </child>
2451
 
    </widget>
2452
 
  </child>
2453
 
</widget>
2454
 
 
2455
 
<widget class="GtkWindow" id="window_status">
 
2434
    </widget>
 
2435
  </child>
 
2436
</widget>
 
2437
 
 
2438
<widget class="GtkDialog" id="window_status">
2456
2439
  <property name="width_request">400</property>
2457
2440
  <property name="height_request">300</property>
2458
2441
  <property name="title" translatable="yes">Olive - Status</property>
2465
2448
  <property name="decorated">True</property>
2466
2449
  <property name="skip_taskbar_hint">False</property>
2467
2450
  <property name="skip_pager_hint">False</property>
2468
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
 
2451
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2469
2452
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2470
2453
  <property name="focus_on_map">True</property>
2471
2454
  <property name="urgency_hint">False</property>
 
2455
  <property name="has_separator">True</property>
2472
2456
 
2473
 
  <child>
 
2457
  <child internal-child="vbox">
2474
2458
    <widget class="GtkVBox" id="vbox_status">
2475
 
      <property name="border_width">5</property>
2476
2459
      <property name="visible">True</property>
2477
2460
      <property name="homogeneous">False</property>
2478
2461
      <property name="spacing">3</property>
2479
2462
 
 
2463
      <child internal-child="action_area">
 
2464
        <widget class="GtkHButtonBox" id="hbuttonbox_status">
 
2465
          <property name="visible">True</property>
 
2466
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
2467
 
 
2468
          <child>
 
2469
            <widget class="GtkButton" id="button_status_close">
 
2470
              <property name="visible">True</property>
 
2471
              <property name="can_default">True</property>
 
2472
              <property name="has_default">True</property>
 
2473
              <property name="can_focus">True</property>
 
2474
              <property name="label">gtk-close</property>
 
2475
              <property name="use_stock">True</property>
 
2476
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
2477
              <property name="focus_on_click">True</property>
 
2478
              <property name="response_id">0</property>
 
2479
              <signal name="clicked" handler="on_button_status_close_clicked" last_modification_time="Thu, 03 Aug 2006 13:45:17 GMT"/>
 
2480
            </widget>
 
2481
          </child>
 
2482
        </widget>
 
2483
        <packing>
 
2484
          <property name="padding">0</property>
 
2485
          <property name="expand">False</property>
 
2486
          <property name="fill">True</property>
 
2487
          <property name="pack_type">GTK_PACK_END</property>
 
2488
        </packing>
 
2489
      </child>
 
2490
 
2480
2491
      <child>
2481
2492
        <widget class="GtkScrolledWindow" id="scrolledwindow_status">
2482
2493
          <property name="visible">True</property>
2506
2517
          <property name="fill">True</property>
2507
2518
        </packing>
2508
2519
      </child>
2509
 
 
2510
 
      <child>
2511
 
        <widget class="GtkHButtonBox" id="hbuttonbox_status">
2512
 
          <property name="visible">True</property>
2513
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2514
 
          <property name="spacing">0</property>
2515
 
 
2516
 
          <child>
2517
 
            <widget class="GtkButton" id="button_status_close">
2518
 
              <property name="visible">True</property>
2519
 
              <property name="can_default">True</property>
2520
 
              <property name="has_default">True</property>
2521
 
              <property name="can_focus">True</property>
2522
 
              <property name="label">gtk-close</property>
2523
 
              <property name="use_stock">True</property>
2524
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
2525
 
              <property name="focus_on_click">True</property>
2526
 
              <signal name="clicked" handler="on_button_status_close_clicked" last_modification_time="Thu, 03 Aug 2006 13:45:17 GMT"/>
2527
 
            </widget>
2528
 
          </child>
2529
 
        </widget>
2530
 
        <packing>
2531
 
          <property name="padding">0</property>
2532
 
          <property name="expand">False</property>
2533
 
          <property name="fill">True</property>
2534
 
        </packing>
2535
 
      </child>
2536
2520
    </widget>
2537
2521
  </child>
2538
2522
</widget>
2539
2523
 
2540
 
<widget class="GtkWindow" id="window_mkdir">
 
2524
<widget class="GtkDialog" id="window_mkdir">
2541
2525
  <property name="visible">True</property>
2542
2526
  <property name="title" translatable="yes">Olive - Make directory</property>
2543
2527
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2553
2537
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2554
2538
  <property name="focus_on_map">True</property>
2555
2539
  <property name="urgency_hint">False</property>
 
2540
  <property name="has_separator">True</property>
2556
2541
 
2557
 
  <child>
 
2542
  <child internal-child="vbox">
2558
2543
    <widget class="GtkVBox" id="vbox_mkdir">
2559
 
      <property name="border_width">5</property>
2560
2544
      <property name="visible">True</property>
2561
2545
      <property name="homogeneous">False</property>
2562
2546
      <property name="spacing">3</property>
2563
2547
 
2564
 
      <child>
2565
 
        <widget class="GtkEntry" id="entry_mkdir">
2566
 
          <property name="visible">True</property>
2567
 
          <property name="can_focus">True</property>
2568
 
          <property name="has_focus">True</property>
2569
 
          <property name="editable">True</property>
2570
 
          <property name="visibility">True</property>
2571
 
          <property name="max_length">0</property>
2572
 
          <property name="text" translatable="yes"></property>
2573
 
          <property name="has_frame">True</property>
2574
 
          <property name="invisible_char">●</property>
2575
 
          <property name="activates_default">False</property>
2576
 
        </widget>
2577
 
        <packing>
2578
 
          <property name="padding">0</property>
2579
 
          <property name="expand">False</property>
2580
 
          <property name="fill">False</property>
2581
 
        </packing>
2582
 
      </child>
2583
 
 
2584
 
      <child>
2585
 
        <widget class="GtkCheckButton" id="checkbutton_mkdir_versioned">
2586
 
          <property name="visible">True</property>
2587
 
          <property name="can_focus">True</property>
2588
 
          <property name="label" translatable="yes">_Versioned directory</property>
2589
 
          <property name="use_underline">True</property>
2590
 
          <property name="relief">GTK_RELIEF_NORMAL</property>
2591
 
          <property name="focus_on_click">True</property>
2592
 
          <property name="active">True</property>
2593
 
          <property name="inconsistent">False</property>
2594
 
          <property name="draw_indicator">True</property>
2595
 
        </widget>
2596
 
        <packing>
2597
 
          <property name="padding">0</property>
2598
 
          <property name="expand">False</property>
2599
 
          <property name="fill">False</property>
2600
 
        </packing>
2601
 
      </child>
2602
 
 
2603
 
      <child>
 
2548
      <child internal-child="action_area">
2604
2549
        <widget class="GtkHButtonBox" id="hbuttonbox_mkdir">
2605
2550
          <property name="visible">True</property>
2606
2551
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2607
 
          <property name="spacing">3</property>
2608
2552
 
2609
2553
          <child>
2610
2554
            <widget class="GtkButton" id="button_mkdir_cancel">
2615
2559
              <property name="use_stock">True</property>
2616
2560
              <property name="relief">GTK_RELIEF_NORMAL</property>
2617
2561
              <property name="focus_on_click">True</property>
 
2562
              <property name="response_id">0</property>
2618
2563
              <signal name="clicked" handler="on_button_mkdir_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 12:33:49 GMT"/>
2619
2564
            </widget>
2620
2565
          </child>
2627
2572
              <property name="can_focus">True</property>
2628
2573
              <property name="relief">GTK_RELIEF_NORMAL</property>
2629
2574
              <property name="focus_on_click">True</property>
 
2575
              <property name="response_id">0</property>
2630
2576
              <signal name="clicked" handler="on_button_mkdir_mkdir_clicked" last_modification_time="Wed, 09 Aug 2006 12:33:54 GMT"/>
2631
2577
 
2632
2578
              <child>
2699
2645
          <property name="padding">0</property>
2700
2646
          <property name="expand">False</property>
2701
2647
          <property name="fill">False</property>
 
2648
          <property name="pack_type">GTK_PACK_END</property>
 
2649
        </packing>
 
2650
      </child>
 
2651
 
 
2652
      <child>
 
2653
        <widget class="GtkEntry" id="entry_mkdir">
 
2654
          <property name="visible">True</property>
 
2655
          <property name="can_focus">True</property>
 
2656
          <property name="has_focus">True</property>
 
2657
          <property name="editable">True</property>
 
2658
          <property name="visibility">True</property>
 
2659
          <property name="max_length">0</property>
 
2660
          <property name="text" translatable="yes"></property>
 
2661
          <property name="has_frame">True</property>
 
2662
          <property name="invisible_char">●</property>
 
2663
          <property name="activates_default">False</property>
 
2664
        </widget>
 
2665
        <packing>
 
2666
          <property name="padding">0</property>
 
2667
          <property name="expand">False</property>
 
2668
          <property name="fill">False</property>
 
2669
        </packing>
 
2670
      </child>
 
2671
 
 
2672
      <child>
 
2673
        <widget class="GtkCheckButton" id="checkbutton_mkdir_versioned">
 
2674
          <property name="visible">True</property>
 
2675
          <property name="can_focus">True</property>
 
2676
          <property name="label" translatable="yes">_Versioned directory</property>
 
2677
          <property name="use_underline">True</property>
 
2678
          <property name="relief">GTK_RELIEF_NORMAL</property>
 
2679
          <property name="focus_on_click">True</property>
 
2680
          <property name="active">True</property>
 
2681
          <property name="inconsistent">False</property>
 
2682
          <property name="draw_indicator">True</property>
 
2683
        </widget>
 
2684
        <packing>
 
2685
          <property name="padding">0</property>
 
2686
          <property name="expand">False</property>
 
2687
          <property name="fill">False</property>
2702
2688
        </packing>
2703
2689
      </child>
2704
2690
    </widget>
2705
2691
  </child>
2706
2692
</widget>
2707
2693
 
2708
 
<widget class="GtkWindow" id="window_move">
 
2694
<widget class="GtkDialog" id="window_move">
2709
2695
  <property name="width_request">250</property>
2710
2696
  <property name="title" translatable="yes">Olive - Move</property>
2711
2697
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2721
2707
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2722
2708
  <property name="focus_on_map">True</property>
2723
2709
  <property name="urgency_hint">False</property>
 
2710
  <property name="has_separator">True</property>
2724
2711
 
2725
 
  <child>
 
2712
  <child internal-child="vbox">
2726
2713
    <widget class="GtkVBox" id="vbox_move">
2727
 
      <property name="border_width">5</property>
2728
2714
      <property name="visible">True</property>
2729
2715
      <property name="homogeneous">False</property>
2730
2716
      <property name="spacing">3</property>
2731
2717
 
2732
 
      <child>
2733
 
        <widget class="GtkHBox" id="hbox_move">
2734
 
          <property name="visible">True</property>
2735
 
          <property name="homogeneous">False</property>
2736
 
          <property name="spacing">5</property>
2737
 
 
2738
 
          <child>
2739
 
            <widget class="GtkLabel" id="label_move">
2740
 
              <property name="visible">True</property>
2741
 
              <property name="label" translatable="yes">Move to</property>
2742
 
              <property name="use_underline">False</property>
2743
 
              <property name="use_markup">False</property>
2744
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2745
 
              <property name="wrap">False</property>
2746
 
              <property name="selectable">False</property>
2747
 
              <property name="xalign">0.5</property>
2748
 
              <property name="yalign">0.5</property>
2749
 
              <property name="xpad">0</property>
2750
 
              <property name="ypad">0</property>
2751
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2752
 
              <property name="width_chars">-1</property>
2753
 
              <property name="single_line_mode">False</property>
2754
 
              <property name="angle">0</property>
2755
 
            </widget>
2756
 
            <packing>
2757
 
              <property name="padding">0</property>
2758
 
              <property name="expand">False</property>
2759
 
              <property name="fill">False</property>
2760
 
            </packing>
2761
 
          </child>
2762
 
 
2763
 
          <child>
2764
 
            <widget class="GtkFileChooserButton" id="filechooserbutton_move">
2765
 
              <property name="visible">True</property>
2766
 
              <property name="title" translatable="yes">Select a directory</property>
2767
 
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
2768
 
              <property name="local_only">True</property>
2769
 
              <property name="show_hidden">False</property>
2770
 
              <property name="do_overwrite_confirmation">False</property>
2771
 
              <property name="width_chars">-1</property>
2772
 
            </widget>
2773
 
            <packing>
2774
 
              <property name="padding">0</property>
2775
 
              <property name="expand">True</property>
2776
 
              <property name="fill">True</property>
2777
 
            </packing>
2778
 
          </child>
2779
 
        </widget>
2780
 
        <packing>
2781
 
          <property name="padding">0</property>
2782
 
          <property name="expand">True</property>
2783
 
          <property name="fill">True</property>
2784
 
        </packing>
2785
 
      </child>
2786
 
 
2787
 
      <child>
 
2718
      <child internal-child="action_area">
2788
2719
        <widget class="GtkHButtonBox" id="hbuttonbox_move">
2789
2720
          <property name="visible">True</property>
2790
2721
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2791
 
          <property name="spacing">3</property>
2792
2722
 
2793
2723
          <child>
2794
2724
            <widget class="GtkButton" id="button_move_cancel">
2799
2729
              <property name="use_stock">True</property>
2800
2730
              <property name="relief">GTK_RELIEF_NORMAL</property>
2801
2731
              <property name="focus_on_click">True</property>
 
2732
              <property name="response_id">0</property>
2802
2733
              <signal name="clicked" handler="on_button_move_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:11 GMT"/>
2803
2734
            </widget>
2804
2735
          </child>
2811
2742
              <property name="can_focus">True</property>
2812
2743
              <property name="relief">GTK_RELIEF_NORMAL</property>
2813
2744
              <property name="focus_on_click">True</property>
 
2745
              <property name="response_id">0</property>
2814
2746
              <signal name="clicked" handler="on_button_move_move_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:24 GMT"/>
2815
2747
 
2816
2748
              <child>
2882
2814
        <packing>
2883
2815
          <property name="padding">0</property>
2884
2816
          <property name="expand">False</property>
2885
 
          <property name="fill">False</property>
 
2817
          <property name="fill">True</property>
 
2818
          <property name="pack_type">GTK_PACK_END</property>
 
2819
        </packing>
 
2820
      </child>
 
2821
 
 
2822
      <child>
 
2823
        <widget class="GtkHBox" id="hbox_move">
 
2824
          <property name="visible">True</property>
 
2825
          <property name="homogeneous">False</property>
 
2826
          <property name="spacing">5</property>
 
2827
 
 
2828
          <child>
 
2829
            <widget class="GtkLabel" id="label_move">
 
2830
              <property name="visible">True</property>
 
2831
              <property name="label" translatable="yes">Move to</property>
 
2832
              <property name="use_underline">False</property>
 
2833
              <property name="use_markup">False</property>
 
2834
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
2835
              <property name="wrap">False</property>
 
2836
              <property name="selectable">False</property>
 
2837
              <property name="xalign">0.5</property>
 
2838
              <property name="yalign">0.5</property>
 
2839
              <property name="xpad">0</property>
 
2840
              <property name="ypad">0</property>
 
2841
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
2842
              <property name="width_chars">-1</property>
 
2843
              <property name="single_line_mode">False</property>
 
2844
              <property name="angle">0</property>
 
2845
            </widget>
 
2846
            <packing>
 
2847
              <property name="padding">0</property>
 
2848
              <property name="expand">False</property>
 
2849
              <property name="fill">False</property>
 
2850
            </packing>
 
2851
          </child>
 
2852
 
 
2853
          <child>
 
2854
            <widget class="GtkFileChooserButton" id="filechooserbutton_move">
 
2855
              <property name="visible">True</property>
 
2856
              <property name="title" translatable="yes">Select a directory</property>
 
2857
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 
2858
              <property name="local_only">True</property>
 
2859
              <property name="show_hidden">False</property>
 
2860
              <property name="do_overwrite_confirmation">False</property>
 
2861
              <property name="width_chars">-1</property>
 
2862
            </widget>
 
2863
            <packing>
 
2864
              <property name="padding">0</property>
 
2865
              <property name="expand">True</property>
 
2866
              <property name="fill">True</property>
 
2867
            </packing>
 
2868
          </child>
 
2869
        </widget>
 
2870
        <packing>
 
2871
          <property name="padding">0</property>
 
2872
          <property name="expand">True</property>
 
2873
          <property name="fill">True</property>
2886
2874
        </packing>
2887
2875
      </child>
2888
2876
    </widget>
2889
2877
  </child>
2890
2878
</widget>
2891
2879
 
2892
 
<widget class="GtkWindow" id="window_rename">
 
2880
<widget class="GtkDialog" id="window_rename">
2893
2881
  <property name="title" translatable="yes">Olive - Rename</property>
2894
2882
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
2895
2883
  <property name="window_position">GTK_WIN_POS_NONE</property>
2904
2892
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2905
2893
  <property name="focus_on_map">True</property>
2906
2894
  <property name="urgency_hint">False</property>
 
2895
  <property name="has_separator">True</property>
2907
2896
 
2908
 
  <child>
 
2897
  <child internal-child="vbox">
2909
2898
    <widget class="GtkVBox" id="vbox_rename">
2910
 
      <property name="border_width">5</property>
2911
2899
      <property name="visible">True</property>
2912
2900
      <property name="homogeneous">False</property>
2913
2901
      <property name="spacing">3</property>
2914
2902
 
2915
 
      <child>
2916
 
        <widget class="GtkHBox" id="hbox_rename">
2917
 
          <property name="visible">True</property>
2918
 
          <property name="homogeneous">False</property>
2919
 
          <property name="spacing">5</property>
2920
 
 
2921
 
          <child>
2922
 
            <widget class="GtkLabel" id="label_rename">
2923
 
              <property name="visible">True</property>
2924
 
              <property name="label" translatable="yes">Rename to</property>
2925
 
              <property name="use_underline">False</property>
2926
 
              <property name="use_markup">False</property>
2927
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
2928
 
              <property name="wrap">False</property>
2929
 
              <property name="selectable">False</property>
2930
 
              <property name="xalign">0.5</property>
2931
 
              <property name="yalign">0.5</property>
2932
 
              <property name="xpad">0</property>
2933
 
              <property name="ypad">0</property>
2934
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2935
 
              <property name="width_chars">-1</property>
2936
 
              <property name="single_line_mode">False</property>
2937
 
              <property name="angle">0</property>
2938
 
            </widget>
2939
 
            <packing>
2940
 
              <property name="padding">0</property>
2941
 
              <property name="expand">False</property>
2942
 
              <property name="fill">False</property>
2943
 
            </packing>
2944
 
          </child>
2945
 
 
2946
 
          <child>
2947
 
            <widget class="GtkEntry" id="entry_rename">
2948
 
              <property name="visible">True</property>
2949
 
              <property name="can_focus">True</property>
2950
 
              <property name="has_focus">True</property>
2951
 
              <property name="editable">True</property>
2952
 
              <property name="visibility">True</property>
2953
 
              <property name="max_length">0</property>
2954
 
              <property name="text" translatable="yes"></property>
2955
 
              <property name="has_frame">True</property>
2956
 
              <property name="invisible_char">●</property>
2957
 
              <property name="activates_default">False</property>
2958
 
            </widget>
2959
 
            <packing>
2960
 
              <property name="padding">0</property>
2961
 
              <property name="expand">True</property>
2962
 
              <property name="fill">True</property>
2963
 
            </packing>
2964
 
          </child>
2965
 
        </widget>
2966
 
        <packing>
2967
 
          <property name="padding">0</property>
2968
 
          <property name="expand">True</property>
2969
 
          <property name="fill">True</property>
2970
 
        </packing>
2971
 
      </child>
2972
 
 
2973
 
      <child>
 
2903
      <child internal-child="action_area">
2974
2904
        <widget class="GtkHButtonBox" id="hbuttonbox_rename">
2975
2905
          <property name="visible">True</property>
2976
2906
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2977
 
          <property name="spacing">3</property>
2978
2907
 
2979
2908
          <child>
2980
2909
            <widget class="GtkButton" id="button_rename_cancel">
2985
2914
              <property name="use_stock">True</property>
2986
2915
              <property name="relief">GTK_RELIEF_NORMAL</property>
2987
2916
              <property name="focus_on_click">True</property>
 
2917
              <property name="response_id">0</property>
2988
2918
              <signal name="clicked" handler="on_button_rename_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 14:29:00 GMT"/>
2989
2919
            </widget>
2990
2920
          </child>
2997
2927
              <property name="can_focus">True</property>
2998
2928
              <property name="relief">GTK_RELIEF_NORMAL</property>
2999
2929
              <property name="focus_on_click">True</property>
 
2930
              <property name="response_id">0</property>
3000
2931
              <signal name="clicked" handler="on_button_rename_rename_clicked" last_modification_time="Wed, 09 Aug 2006 14:28:53 GMT"/>
3001
2932
 
3002
2933
              <child>
3068
2999
        <packing>
3069
3000
          <property name="padding">0</property>
3070
3001
          <property name="expand">False</property>
3071
 
          <property name="fill">False</property>
 
3002
          <property name="fill">True</property>
 
3003
          <property name="pack_type">GTK_PACK_END</property>
 
3004
        </packing>
 
3005
      </child>
 
3006
 
 
3007
      <child>
 
3008
        <widget class="GtkHBox" id="hbox_rename">
 
3009
          <property name="visible">True</property>
 
3010
          <property name="homogeneous">False</property>
 
3011
          <property name="spacing">5</property>
 
3012
 
 
3013
          <child>
 
3014
            <widget class="GtkLabel" id="label_rename">
 
3015
              <property name="visible">True</property>
 
3016
              <property name="label" translatable="yes">Rename to</property>
 
3017
              <property name="use_underline">False</property>
 
3018
              <property name="use_markup">False</property>
 
3019
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
3020
              <property name="wrap">False</property>
 
3021
              <property name="selectable">False</property>
 
3022
              <property name="xalign">0.5</property>
 
3023
              <property name="yalign">0.5</property>
 
3024
              <property name="xpad">0</property>
 
3025
              <property name="ypad">0</property>
 
3026
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
3027
              <property name="width_chars">-1</property>
 
3028
              <property name="single_line_mode">False</property>
 
3029
              <property name="angle">0</property>
 
3030
            </widget>
 
3031
            <packing>
 
3032
              <property name="padding">0</property>
 
3033
              <property name="expand">False</property>
 
3034
              <property name="fill">False</property>
 
3035
            </packing>
 
3036
          </child>
 
3037
 
 
3038
          <child>
 
3039
            <widget class="GtkEntry" id="entry_rename">
 
3040
              <property name="visible">True</property>
 
3041
              <property name="can_focus">True</property>
 
3042
              <property name="has_focus">True</property>
 
3043
              <property name="editable">True</property>
 
3044
              <property name="visibility">True</property>
 
3045
              <property name="max_length">0</property>
 
3046
              <property name="text" translatable="yes"></property>
 
3047
              <property name="has_frame">True</property>
 
3048
              <property name="invisible_char">●</property>
 
3049
              <property name="activates_default">False</property>
 
3050
            </widget>
 
3051
            <packing>
 
3052
              <property name="padding">0</property>
 
3053
              <property name="expand">True</property>
 
3054
              <property name="fill">True</property>
 
3055
            </packing>
 
3056
          </child>
 
3057
        </widget>
 
3058
        <packing>
 
3059
          <property name="padding">0</property>
 
3060
          <property name="expand">True</property>
 
3061
          <property name="fill">True</property>
3072
3062
        </packing>
3073
3063
      </child>
3074
3064
    </widget>
3075
3065
  </child>
3076
3066
</widget>
3077
3067
 
3078
 
<widget class="GtkWindow" id="window_info">
 
3068
<widget class="GtkDialog" id="window_info">
3079
3069
  <property name="title" translatable="yes">Olive - Information</property>
3080
3070
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
3081
3071
  <property name="window_position">GTK_WIN_POS_NONE</property>
3090
3080
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
3091
3081
  <property name="focus_on_map">True</property>
3092
3082
  <property name="urgency_hint">False</property>
 
3083
  <property name="has_separator">True</property>
3093
3084
 
3094
 
  <child>
 
3085
  <child internal-child="vbox">
3095
3086
    <widget class="GtkVBox" id="vbox_info">
3096
 
      <property name="border_width">5</property>
3097
3087
      <property name="visible">True</property>
3098
3088
      <property name="homogeneous">False</property>
3099
3089
      <property name="spacing">3</property>
3100
3090
 
 
3091
      <child internal-child="action_area">
 
3092
        <widget class="GtkHButtonBox" id="hbuttonbox_info">
 
3093
          <property name="visible">True</property>
 
3094
          <property name="can_default">True</property>
 
3095
          <property name="has_default">True</property>
 
3096
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
3097
 
 
3098
          <child>
 
3099
            <widget class="GtkButton" id="button_info_close">
 
3100
              <property name="visible">True</property>
 
3101
              <property name="can_default">True</property>
 
3102
              <property name="has_default">True</property>
 
3103
              <property name="can_focus">True</property>
 
3104
              <property name="label">gtk-close</property>
 
3105
              <property name="use_stock">True</property>
 
3106
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
3107
              <property name="focus_on_click">True</property>
 
3108
              <property name="response_id">0</property>
 
3109
              <signal name="clicked" handler="on_button_info_close_clicked" last_modification_time="Wed, 09 Aug 2006 20:00:44 GMT"/>
 
3110
            </widget>
 
3111
          </child>
 
3112
        </widget>
 
3113
        <packing>
 
3114
          <property name="padding">0</property>
 
3115
          <property name="expand">False</property>
 
3116
          <property name="fill">False</property>
 
3117
          <property name="pack_type">GTK_PACK_END</property>
 
3118
        </packing>
 
3119
      </child>
 
3120
 
3101
3121
      <child>
3102
3122
        <widget class="GtkExpander" id="expander_info_location">
3103
3123
          <property name="can_focus">True</property>
5342
5362
          <property name="fill">True</property>
5343
5363
        </packing>
5344
5364
      </child>
5345
 
 
5346
 
      <child>
5347
 
        <widget class="GtkHButtonBox" id="hbuttonbox_info">
5348
 
          <property name="visible">True</property>
5349
 
          <property name="can_default">True</property>
5350
 
          <property name="has_default">True</property>
5351
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
5352
 
          <property name="spacing">0</property>
5353
 
 
5354
 
          <child>
5355
 
            <widget class="GtkButton" id="button_info_close">
5356
 
              <property name="visible">True</property>
5357
 
              <property name="can_default">True</property>
5358
 
              <property name="has_default">True</property>
5359
 
              <property name="can_focus">True</property>
5360
 
              <property name="label">gtk-close</property>
5361
 
              <property name="use_stock">True</property>
5362
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5363
 
              <property name="focus_on_click">True</property>
5364
 
              <signal name="clicked" handler="on_button_info_close_clicked" last_modification_time="Wed, 09 Aug 2006 20:00:44 GMT"/>
5365
 
            </widget>
5366
 
          </child>
5367
 
        </widget>
5368
 
        <packing>
5369
 
          <property name="padding">0</property>
5370
 
          <property name="expand">False</property>
5371
 
          <property name="fill">False</property>
5372
 
        </packing>
5373
 
      </child>
5374
5365
    </widget>
5375
5366
  </child>
5376
5367
</widget>
5377
5368
 
5378
 
<widget class="GtkWindow" id="window_bookmark">
 
5369
<widget class="GtkDialog" id="window_bookmark">
5379
5370
  <property name="visible">True</property>
5380
5371
  <property name="title" translatable="yes">Edit bookmark - Olive</property>
5381
5372
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
5391
5382
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5392
5383
  <property name="focus_on_map">True</property>
5393
5384
  <property name="urgency_hint">False</property>
 
5385
  <property name="has_separator">True</property>
5394
5386
 
5395
 
  <child>
 
5387
  <child internal-child="vbox">
5396
5388
    <widget class="GtkVBox" id="vbox_bookmark">
5397
 
      <property name="border_width">5</property>
5398
5389
      <property name="visible">True</property>
5399
5390
      <property name="homogeneous">False</property>
5400
5391
      <property name="spacing">3</property>
5401
5392
 
 
5393
      <child internal-child="action_area">
 
5394
        <widget class="GtkHButtonBox" id="hbuttonbox_bookmark">
 
5395
          <property name="visible">True</property>
 
5396
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
5397
 
 
5398
          <child>
 
5399
            <widget class="GtkButton" id="button_bookmark_cancel">
 
5400
              <property name="visible">True</property>
 
5401
              <property name="can_default">True</property>
 
5402
              <property name="can_focus">True</property>
 
5403
              <property name="label">gtk-cancel</property>
 
5404
              <property name="use_stock">True</property>
 
5405
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5406
              <property name="focus_on_click">True</property>
 
5407
              <property name="response_id">0</property>
 
5408
              <signal name="clicked" handler="on_button_bookmark_cancel_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:23 GMT"/>
 
5409
            </widget>
 
5410
          </child>
 
5411
 
 
5412
          <child>
 
5413
            <widget class="GtkButton" id="button_bookmark_save">
 
5414
              <property name="visible">True</property>
 
5415
              <property name="can_default">True</property>
 
5416
              <property name="has_default">True</property>
 
5417
              <property name="can_focus">True</property>
 
5418
              <property name="label">gtk-save</property>
 
5419
              <property name="use_stock">True</property>
 
5420
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5421
              <property name="focus_on_click">True</property>
 
5422
              <property name="response_id">0</property>
 
5423
              <signal name="clicked" handler="on_button_bookmark_save_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:19 GMT"/>
 
5424
            </widget>
 
5425
          </child>
 
5426
        </widget>
 
5427
        <packing>
 
5428
          <property name="padding">0</property>
 
5429
          <property name="expand">False</property>
 
5430
          <property name="fill">False</property>
 
5431
          <property name="pack_type">GTK_PACK_END</property>
 
5432
        </packing>
 
5433
      </child>
 
5434
 
5402
5435
      <child>
5403
5436
        <widget class="GtkTable" id="table_bookmark">
5404
5437
          <property name="visible">True</property>
5513
5546
          <property name="fill">False</property>
5514
5547
        </packing>
5515
5548
      </child>
5516
 
 
5517
 
      <child>
5518
 
        <widget class="GtkHButtonBox" id="hbuttonbox_bookmark">
 
5549
    </widget>
 
5550
  </child>
 
5551
</widget>
 
5552
 
 
5553
<widget class="GtkDialog" id="window_merge">
 
5554
  <property name="visible">True</property>
 
5555
  <property name="title" translatable="yes">Merge - Olive</property>
 
5556
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
 
5557
  <property name="window_position">GTK_WIN_POS_NONE</property>
 
5558
  <property name="modal">False</property>
 
5559
  <property name="resizable">True</property>
 
5560
  <property name="destroy_with_parent">False</property>
 
5561
  <property name="icon">oliveicon2.png</property>
 
5562
  <property name="decorated">True</property>
 
5563
  <property name="skip_taskbar_hint">False</property>
 
5564
  <property name="skip_pager_hint">False</property>
 
5565
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
 
5566
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
5567
  <property name="focus_on_map">True</property>
 
5568
  <property name="urgency_hint">False</property>
 
5569
  <property name="has_separator">True</property>
 
5570
 
 
5571
  <child internal-child="vbox">
 
5572
    <widget class="GtkVBox" id="vbox_merge">
 
5573
      <property name="visible">True</property>
 
5574
      <property name="homogeneous">False</property>
 
5575
      <property name="spacing">3</property>
 
5576
 
 
5577
      <child internal-child="action_area">
 
5578
        <widget class="GtkHButtonBox" id="hbuttonbox_merge">
5519
5579
          <property name="visible">True</property>
5520
5580
          <property name="layout_style">GTK_BUTTONBOX_END</property>
5521
 
          <property name="spacing">3</property>
5522
5581
 
5523
5582
          <child>
5524
 
            <widget class="GtkButton" id="button_bookmark_cancel">
 
5583
            <widget class="GtkButton" id="button_merge_cancel">
5525
5584
              <property name="visible">True</property>
5526
5585
              <property name="can_default">True</property>
5527
5586
              <property name="can_focus">True</property>
5529
5588
              <property name="use_stock">True</property>
5530
5589
              <property name="relief">GTK_RELIEF_NORMAL</property>
5531
5590
              <property name="focus_on_click">True</property>
5532
 
              <signal name="clicked" handler="on_button_bookmark_cancel_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:23 GMT"/>
 
5591
              <property name="response_id">0</property>
 
5592
              <signal name="clicked" handler="on_button_merge_cancel_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:13 GMT"/>
5533
5593
            </widget>
5534
5594
          </child>
5535
5595
 
5536
5596
          <child>
5537
 
            <widget class="GtkButton" id="button_bookmark_save">
 
5597
            <widget class="GtkButton" id="button_merge_merge">
5538
5598
              <property name="visible">True</property>
5539
5599
              <property name="can_default">True</property>
5540
5600
              <property name="has_default">True</property>
5541
5601
              <property name="can_focus">True</property>
5542
 
              <property name="label">gtk-save</property>
5543
 
              <property name="use_stock">True</property>
5544
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5545
 
              <property name="focus_on_click">True</property>
5546
 
              <signal name="clicked" handler="on_button_bookmark_save_clicked" last_modification_time="Sun, 20 Aug 2006 15:11:19 GMT"/>
5547
 
            </widget>
 
5602
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5603
              <property name="focus_on_click">True</property>
 
5604
              <property name="response_id">0</property>
 
5605
              <signal name="clicked" handler="on_button_merge_merge_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:07 GMT"/>
 
5606
 
 
5607
              <child>
 
5608
                <widget class="GtkAlignment" id="alignment19">
 
5609
                  <property name="visible">True</property>
 
5610
                  <property name="xalign">0.5</property>
 
5611
                  <property name="yalign">0.5</property>
 
5612
                  <property name="xscale">0</property>
 
5613
                  <property name="yscale">0</property>
 
5614
                  <property name="top_padding">0</property>
 
5615
                  <property name="bottom_padding">0</property>
 
5616
                  <property name="left_padding">0</property>
 
5617
                  <property name="right_padding">0</property>
 
5618
 
 
5619
                  <child>
 
5620
                    <widget class="GtkHBox" id="hbox14">
 
5621
                      <property name="visible">True</property>
 
5622
                      <property name="homogeneous">False</property>
 
5623
                      <property name="spacing">2</property>
 
5624
 
 
5625
                      <child>
 
5626
                        <widget class="GtkImage" id="image239">
 
5627
                          <property name="visible">True</property>
 
5628
                          <property name="stock">gtk-apply</property>
 
5629
                          <property name="icon_size">4</property>
 
5630
                          <property name="xalign">0.5</property>
 
5631
                          <property name="yalign">0.5</property>
 
5632
                          <property name="xpad">0</property>
 
5633
                          <property name="ypad">0</property>
 
5634
                        </widget>
 
5635
                        <packing>
 
5636
                          <property name="padding">0</property>
 
5637
                          <property name="expand">False</property>
 
5638
                          <property name="fill">False</property>
 
5639
                        </packing>
 
5640
                      </child>
 
5641
 
 
5642
                      <child>
 
5643
                        <widget class="GtkLabel" id="label21">
 
5644
                          <property name="visible">True</property>
 
5645
                          <property name="label" translatable="yes">_Merge</property>
 
5646
                          <property name="use_underline">True</property>
 
5647
                          <property name="use_markup">False</property>
 
5648
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
5649
                          <property name="wrap">False</property>
 
5650
                          <property name="selectable">False</property>
 
5651
                          <property name="xalign">0.5</property>
 
5652
                          <property name="yalign">0.5</property>
 
5653
                          <property name="xpad">0</property>
 
5654
                          <property name="ypad">0</property>
 
5655
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
5656
                          <property name="width_chars">-1</property>
 
5657
                          <property name="single_line_mode">False</property>
 
5658
                          <property name="angle">0</property>
 
5659
                        </widget>
 
5660
                        <packing>
 
5661
                          <property name="padding">0</property>
 
5662
                          <property name="expand">False</property>
 
5663
                          <property name="fill">False</property>
 
5664
                        </packing>
 
5665
                      </child>
 
5666
                    </widget>
 
5667
                  </child>
 
5668
                </widget>
 
5669
              </child>
 
5670
            </widget>
 
5671
          </child>
 
5672
        </widget>
 
5673
        <packing>
 
5674
          <property name="padding">0</property>
 
5675
          <property name="expand">False</property>
 
5676
          <property name="fill">False</property>
 
5677
          <property name="pack_type">GTK_PACK_END</property>
 
5678
        </packing>
 
5679
      </child>
 
5680
 
 
5681
      <child>
 
5682
        <widget class="GtkHBox" id="hbox_merge">
 
5683
          <property name="visible">True</property>
 
5684
          <property name="homogeneous">False</property>
 
5685
          <property name="spacing">3</property>
 
5686
 
 
5687
          <child>
 
5688
            <widget class="GtkLabel" id="label_merge">
 
5689
              <property name="visible">True</property>
 
5690
              <property name="label" translatable="yes">Merge from:</property>
 
5691
              <property name="use_underline">False</property>
 
5692
              <property name="use_markup">False</property>
 
5693
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
5694
              <property name="wrap">False</property>
 
5695
              <property name="selectable">False</property>
 
5696
              <property name="xalign">0.5</property>
 
5697
              <property name="yalign">0.5</property>
 
5698
              <property name="xpad">0</property>
 
5699
              <property name="ypad">0</property>
 
5700
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
5701
              <property name="width_chars">-1</property>
 
5702
              <property name="single_line_mode">False</property>
 
5703
              <property name="angle">0</property>
 
5704
            </widget>
 
5705
            <packing>
 
5706
              <property name="padding">0</property>
 
5707
              <property name="expand">False</property>
 
5708
              <property name="fill">False</property>
 
5709
            </packing>
 
5710
          </child>
 
5711
 
 
5712
          <child>
 
5713
            <widget class="GtkEntry" id="entry_merge">
 
5714
              <property name="visible">True</property>
 
5715
              <property name="can_focus">True</property>
 
5716
              <property name="editable">True</property>
 
5717
              <property name="visibility">True</property>
 
5718
              <property name="max_length">0</property>
 
5719
              <property name="text" translatable="yes"></property>
 
5720
              <property name="has_frame">True</property>
 
5721
              <property name="invisible_char">●</property>
 
5722
              <property name="activates_default">False</property>
 
5723
            </widget>
 
5724
            <packing>
 
5725
              <property name="padding">0</property>
 
5726
              <property name="expand">True</property>
 
5727
              <property name="fill">True</property>
 
5728
            </packing>
 
5729
          </child>
 
5730
 
 
5731
          <child>
 
5732
            <widget class="GtkButton" id="button_merge_open">
 
5733
              <property name="visible">True</property>
 
5734
              <property name="can_focus">True</property>
 
5735
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5736
              <property name="focus_on_click">True</property>
 
5737
              <signal name="clicked" handler="on_button_merge_open_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:20 GMT"/>
 
5738
 
 
5739
              <child>
 
5740
                <widget class="GtkImage" id="image240">
 
5741
                  <property name="visible">True</property>
 
5742
                  <property name="stock">gtk-open</property>
 
5743
                  <property name="icon_size">4</property>
 
5744
                  <property name="xalign">0.5</property>
 
5745
                  <property name="yalign">0.5</property>
 
5746
                  <property name="xpad">0</property>
 
5747
                  <property name="ypad">0</property>
 
5748
                </widget>
 
5749
              </child>
 
5750
            </widget>
 
5751
            <packing>
 
5752
              <property name="padding">0</property>
 
5753
              <property name="expand">False</property>
 
5754
              <property name="fill">False</property>
 
5755
            </packing>
5548
5756
          </child>
5549
5757
        </widget>
5550
5758
        <packing>