/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to olive.glade

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
58
58
                      </widget>
59
59
                    </child>
60
60
                    <child>
 
61
                      <widget class="GtkMenuItem" id="menuitem_file_bookmark">
 
62
                        <property name="visible">True</property>
 
63
                        <property name="label" translatable="yes">_Bookmark current directory</property>
 
64
                        <property name="use_underline">True</property>
 
65
                        <signal name="activate" handler="on_menuitem_file_bookmark_activate"/>
 
66
                      </widget>
 
67
                    </child>
 
68
                    <child>
61
69
                      <widget class="GtkMenuItem" id="menuitem_file_make_directory">
62
70
                        <property name="visible">True</property>
63
71
                        <property name="label" translatable="yes">Make _directory...</property>
218
226
                      </widget>
219
227
                    </child>
220
228
                    <child>
 
229
                      <widget class="GtkMenuItem" id="menuitem_branch_update">
 
230
                        <property name="visible">True</property>
 
231
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
232
                        <property name="label" translatable="yes">Update</property>
 
233
                        <property name="use_underline">True</property>
 
234
                        <signal name="activate" handler="on_menuitem_branch_update_activate"/>
 
235
                      </widget>
 
236
                    </child>
 
237
                    <child>
221
238
                      <widget class="GtkSeparatorMenuItem" id="separator_branch2">
222
239
                        <property name="visible">True</property>
223
240
                      </widget>
369
386
        <child>
370
387
          <widget class="GtkToolbar" id="toolbar">
371
388
            <property name="visible">True</property>
372
 
            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
373
389
            <child>
374
390
              <widget class="GtkToolButton" id="toolbutton_refresh">
375
391
                <property name="visible">True</property>
418
434
            <child>
419
435
              <widget class="GtkToolButton" id="toolbutton_commit">
420
436
                <property name="visible">True</property>
 
437
                <property name="is_important">True</property>
421
438
                <property name="label">Commit</property>
422
439
                <property name="use_underline">True</property>
423
440
                <property name="icon">icons/commit.png</property>
439
456
            <child>
440
457
              <widget class="GtkToolButton" id="toolbutton_pull">
441
458
                <property name="visible">True</property>
 
459
                <property name="is_important">True</property>
442
460
                <property name="label">Pull</property>
443
461
                <property name="use_underline">True</property>
444
462
                <property name="icon">icons/pull.png</property>
451
469
            <child>
452
470
              <widget class="GtkToolButton" id="toolbutton_push">
453
471
                <property name="visible">True</property>
 
472
                <property name="is_important">True</property>
454
473
                <property name="label">Push</property>
455
474
                <property name="use_underline">True</property>
456
475
                <property name="icon">icons/push.png</property>
460
479
                <property name="expand">False</property>
461
480
              </packing>
462
481
            </child>
 
482
            <child>
 
483
              <widget class="GtkToolButton" id="toolbutton_update">
 
484
                <property name="visible">True</property>
 
485
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
486
                <property name="label" translatable="yes">Update</property>
 
487
                <property name="icon">icons/pull.png</property>
 
488
                <signal name="clicked" handler="on_toolbutton_update_clicked"/>
 
489
              </widget>
 
490
              <packing>
 
491
                <property name="expand">False</property>
 
492
              </packing>
 
493
            </child>
463
494
          </widget>
464
495
          <packing>
465
496
            <property name="expand">False</property>
484
515
                    <property name="can_focus">True</property>
485
516
                    <property name="headers_visible">False</property>
486
517
                    <signal name="button_press_event" handler="on_treeview_left_button_press_event"/>
 
518
                    <signal name="button_release_event" handler="on_treeview_left_button_release_event"/>
487
519
                    <signal name="row_activated" handler="on_treeview_left_row_activated"/>
488
520
                  </widget>
489
521
                </child>
490
522
              </widget>
491
523
              <packing>
492
524
                <property name="resize">False</property>
 
525
                <property name="shrink">True</property>
493
526
              </packing>
494
527
            </child>
495
528
            <child>
508
541
                        <property name="receives_default">True</property>
509
542
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
510
543
                        <property name="relief">GTK_RELIEF_NONE</property>
 
544
                        <property name="response_id">0</property>
511
545
                        <signal name="clicked" handler="on_button_location_up_clicked"/>
512
546
                        <child>
513
547
                          <widget class="GtkImage" id="image_location_up">
556
590
                        <property name="label" translatable="yes">gtk-jump-to</property>
557
591
                        <property name="relief">GTK_RELIEF_NONE</property>
558
592
                        <property name="use_stock">True</property>
 
593
                        <property name="response_id">0</property>
559
594
                        <signal name="clicked" handler="on_button_location_jump_clicked"/>
560
595
                      </widget>
561
596
                      <packing>
582
617
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
583
618
                        <property name="label" translatable="yes">H_istory Mode</property>
584
619
                        <property name="use_underline">True</property>
 
620
                        <property name="response_id">0</property>
585
621
                        <property name="draw_indicator">True</property>
586
622
                        <signal name="toggled" handler="on_checkbutton_history_toggled"/>
587
623
                      </widget>
613
649
                        <property name="can_focus">True</property>
614
650
                        <property name="receives_default">True</property>
615
651
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
652
                        <property name="response_id">0</property>
616
653
                        <signal name="clicked" handler="on_button_history_browse_clicked"/>
617
654
                        <child>
618
655
                          <widget class="GtkImage" id="image_history_browse">
655
692
                  </packing>
656
693
                </child>
657
694
              </widget>
 
695
              <packing>
 
696
                <property name="resize">True</property>
 
697
                <property name="shrink">True</property>
 
698
              </packing>
658
699
            </child>
659
700
          </widget>
660
701
          <packing>
724
765
            <property name="can_focus">True</property>
725
766
            <property name="label" translatable="yes">Selected only</property>
726
767
            <property name="use_underline">True</property>
 
768
            <property name="response_id">0</property>
727
769
            <property name="draw_indicator">True</property>
728
770
          </widget>
729
771
          <packing>
738
780
            <property name="can_focus">True</property>
739
781
            <property name="label" translatable="yes">All unknowns recursively</property>
740
782
            <property name="use_underline">True</property>
 
783
            <property name="response_id">0</property>
741
784
            <property name="draw_indicator">True</property>
742
785
            <property name="group">radiobutton_add_selected</property>
743
786
          </widget>
758
801
                <property name="can_default">True</property>
759
802
                <property name="label">gtk-cancel</property>
760
803
                <property name="use_stock">True</property>
 
804
                <property name="response_id">0</property>
761
805
                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
762
806
              </widget>
763
807
            </child>
767
811
                <property name="can_focus">True</property>
768
812
                <property name="can_default">True</property>
769
813
                <property name="has_default">True</property>
 
814
                <property name="response_id">0</property>
770
815
                <signal name="clicked" handler="on_button_add_add_clicked"/>
771
816
                <child>
772
817
                  <widget class="GtkAlignment" id="alignment3">
844
889
            <property name="can_focus">True</property>
845
890
            <property name="label" translatable="yes">Selected only</property>
846
891
            <property name="use_underline">True</property>
 
892
            <property name="response_id">0</property>
847
893
            <property name="draw_indicator">True</property>
848
894
          </widget>
849
895
          <packing>
858
904
            <property name="can_focus">True</property>
859
905
            <property name="label" translatable="yes">All files with status 'added'</property>
860
906
            <property name="use_underline">True</property>
 
907
            <property name="response_id">0</property>
861
908
            <property name="draw_indicator">True</property>
862
909
            <property name="group">radiobutton_remove_selected</property>
863
910
          </widget>
878
925
                <property name="can_default">True</property>
879
926
                <property name="label">gtk-cancel</property>
880
927
                <property name="use_stock">True</property>
 
928
                <property name="response_id">0</property>
881
929
                <signal name="clicked" handler="on_button_remove_cancel_clicked"/>
882
930
              </widget>
883
931
            </child>
887
935
                <property name="can_focus">True</property>
888
936
                <property name="can_default">True</property>
889
937
                <property name="has_default">True</property>
 
938
                <property name="response_id">0</property>
890
939
                <signal name="clicked" handler="on_button_remove_remove_clicked"/>
891
940
                <child>
892
941
                  <widget class="GtkAlignment" id="alignment4">
964
1013
            <property name="can_focus">True</property>
965
1014
            <property name="label" translatable="yes">_Versioned directory</property>
966
1015
            <property name="use_underline">True</property>
 
1016
            <property name="response_id">0</property>
967
1017
            <property name="active">True</property>
968
1018
            <property name="draw_indicator">True</property>
969
1019
          </widget>
984
1034
                <property name="can_default">True</property>
985
1035
                <property name="label">gtk-cancel</property>
986
1036
                <property name="use_stock">True</property>
 
1037
                <property name="response_id">0</property>
987
1038
                <signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
988
1039
              </widget>
989
1040
            </child>
993
1044
                <property name="can_focus">True</property>
994
1045
                <property name="can_default">True</property>
995
1046
                <property name="has_default">True</property>
 
1047
                <property name="response_id">0</property>
996
1048
                <signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
997
1049
                <child>
998
1050
                  <widget class="GtkAlignment" id="alignment8">
1093
1145
                <property name="can_default">True</property>
1094
1146
                <property name="label">gtk-cancel</property>
1095
1147
                <property name="use_stock">True</property>
 
1148
                <property name="response_id">0</property>
1096
1149
                <signal name="clicked" handler="on_button_move_cancel_clicked"/>
1097
1150
              </widget>
1098
1151
            </child>
1102
1155
                <property name="can_focus">True</property>
1103
1156
                <property name="can_default">True</property>
1104
1157
                <property name="has_default">True</property>
 
1158
                <property name="response_id">0</property>
1105
1159
                <signal name="clicked" handler="on_button_move_move_clicked"/>
1106
1160
                <child>
1107
1161
                  <widget class="GtkAlignment" id="alignment9">
1200
1254
                <property name="can_default">True</property>
1201
1255
                <property name="label">gtk-cancel</property>
1202
1256
                <property name="use_stock">True</property>
 
1257
                <property name="response_id">0</property>
1203
1258
                <signal name="clicked" handler="on_button_rename_cancel_clicked"/>
1204
1259
              </widget>
1205
1260
            </child>
1209
1264
                <property name="can_focus">True</property>
1210
1265
                <property name="can_default">True</property>
1211
1266
                <property name="has_default">True</property>
 
1267
                <property name="response_id">0</property>
1212
1268
                <signal name="clicked" handler="on_button_rename_rename_clicked"/>
1213
1269
                <child>
1214
1270
                  <widget class="GtkAlignment" id="alignment10">
2346
2402
                <property name="has_default">True</property>
2347
2403
                <property name="label">gtk-close</property>
2348
2404
                <property name="use_stock">True</property>
 
2405
                <property name="response_id">0</property>
2349
2406
                <signal name="clicked" handler="on_button_info_close_clicked"/>
2350
2407
              </widget>
2351
2408
            </child>
2395
2452
              <widget class="GtkButton" id="button_merge_open">
2396
2453
                <property name="visible">True</property>
2397
2454
                <property name="can_focus">True</property>
 
2455
                <property name="response_id">0</property>
2398
2456
                <signal name="clicked" handler="on_button_merge_open_clicked"/>
2399
2457
                <child>
2400
2458
                  <widget class="GtkImage" id="image240">
2427
2485
                <property name="can_default">True</property>
2428
2486
                <property name="label">gtk-cancel</property>
2429
2487
                <property name="use_stock">True</property>
 
2488
                <property name="response_id">0</property>
2430
2489
                <signal name="clicked" handler="on_button_merge_cancel_clicked"/>
2431
2490
              </widget>
2432
2491
            </child>
2436
2495
                <property name="can_focus">True</property>
2437
2496
                <property name="can_default">True</property>
2438
2497
                <property name="has_default">True</property>
 
2498
                <property name="response_id">0</property>
2439
2499
                <signal name="clicked" handler="on_button_merge_merge_clicked"/>
2440
2500
                <child>
2441
2501
                  <widget class="GtkAlignment" id="alignment19">