/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: Gary van der Merwe
  • Date: 2007-08-24 20:00:17 UTC
  • mfrom: (267 trunk)
  • mto: (256.2.37 gtk)
  • mto: This revision was merged to the branch mainline in revision 289.
  • Revision ID: garyvdm@gmail.com-20070824200017-7ki4fkmlq5l5sjex
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
129
129
                      </widget>
130
130
                    </child>
131
131
                    <child>
 
132
                      <widget class="GtkCheckMenuItem" id="menuitem_view_show_ignored_files">
 
133
                        <property name="visible">True</property>
 
134
                        <property name="label" translatable="yes">Show _ignored files</property>
 
135
                        <property name="use_underline">True</property>
 
136
                        <signal name="activate" handler="on_menuitem_view_show_ignored_files_activate"/>
 
137
                      </widget>
 
138
                    </child>
 
139
                    <child>
132
140
                      <widget class="GtkSeparatorMenuItem" id="separator_view1">
133
141
                        <property name="visible">True</property>
134
142
                      </widget>
210
218
                      </widget>
211
219
                    </child>
212
220
                    <child>
 
221
                      <widget class="GtkMenuItem" id="menuitem_branch_update">
 
222
                        <property name="visible">True</property>
 
223
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
224
                        <property name="label" translatable="yes">Update</property>
 
225
                        <property name="use_underline">True</property>
 
226
                        <signal name="activate" handler="on_menuitem_branch_update_activate"/>
 
227
                      </widget>
 
228
                    </child>
 
229
                    <child>
213
230
                      <widget class="GtkSeparatorMenuItem" id="separator_branch2">
214
231
                        <property name="visible">True</property>
215
232
                      </widget>
452
469
                <property name="expand">False</property>
453
470
              </packing>
454
471
            </child>
 
472
            <child>
 
473
              <widget class="GtkToolButton" id="toolbutton_update">
 
474
                <property name="visible">True</property>
 
475
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
476
                <property name="label" translatable="yes">Update</property>
 
477
                <property name="icon">icons/pull.png</property>
 
478
                <signal name="clicked" handler="on_toolbutton_update_clicked"/>
 
479
              </widget>
 
480
              <packing>
 
481
                <property name="expand">False</property>
 
482
              </packing>
 
483
            </child>
455
484
          </widget>
456
485
          <packing>
457
486
            <property name="expand">False</property>
482
511
              </widget>
483
512
              <packing>
484
513
                <property name="resize">False</property>
 
514
                <property name="shrink">True</property>
485
515
              </packing>
486
516
            </child>
487
517
            <child>
500
530
                        <property name="receives_default">True</property>
501
531
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
502
532
                        <property name="relief">GTK_RELIEF_NONE</property>
 
533
                        <property name="response_id">0</property>
503
534
                        <signal name="clicked" handler="on_button_location_up_clicked"/>
504
535
                        <child>
505
536
                          <widget class="GtkImage" id="image_location_up">
548
579
                        <property name="label" translatable="yes">gtk-jump-to</property>
549
580
                        <property name="relief">GTK_RELIEF_NONE</property>
550
581
                        <property name="use_stock">True</property>
 
582
                        <property name="response_id">0</property>
551
583
                        <signal name="clicked" handler="on_button_location_jump_clicked"/>
552
584
                      </widget>
553
585
                      <packing>
574
606
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
575
607
                        <property name="label" translatable="yes">H_istory Mode</property>
576
608
                        <property name="use_underline">True</property>
 
609
                        <property name="response_id">0</property>
577
610
                        <property name="draw_indicator">True</property>
578
611
                        <signal name="toggled" handler="on_checkbutton_history_toggled"/>
579
612
                      </widget>
605
638
                        <property name="can_focus">True</property>
606
639
                        <property name="receives_default">True</property>
607
640
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 
641
                        <property name="response_id">0</property>
608
642
                        <signal name="clicked" handler="on_button_history_browse_clicked"/>
609
643
                        <child>
610
644
                          <widget class="GtkImage" id="image_history_browse">
647
681
                  </packing>
648
682
                </child>
649
683
              </widget>
 
684
              <packing>
 
685
                <property name="resize">True</property>
 
686
                <property name="shrink">True</property>
 
687
              </packing>
650
688
            </child>
651
689
          </widget>
652
690
          <packing>
716
754
            <property name="can_focus">True</property>
717
755
            <property name="label" translatable="yes">Selected only</property>
718
756
            <property name="use_underline">True</property>
 
757
            <property name="response_id">0</property>
719
758
            <property name="draw_indicator">True</property>
720
759
          </widget>
721
760
          <packing>
730
769
            <property name="can_focus">True</property>
731
770
            <property name="label" translatable="yes">All unknowns recursively</property>
732
771
            <property name="use_underline">True</property>
 
772
            <property name="response_id">0</property>
733
773
            <property name="draw_indicator">True</property>
734
774
            <property name="group">radiobutton_add_selected</property>
735
775
          </widget>
750
790
                <property name="can_default">True</property>
751
791
                <property name="label">gtk-cancel</property>
752
792
                <property name="use_stock">True</property>
 
793
                <property name="response_id">0</property>
753
794
                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
754
795
              </widget>
755
796
            </child>
759
800
                <property name="can_focus">True</property>
760
801
                <property name="can_default">True</property>
761
802
                <property name="has_default">True</property>
 
803
                <property name="response_id">0</property>
762
804
                <signal name="clicked" handler="on_button_add_add_clicked"/>
763
805
                <child>
764
806
                  <widget class="GtkAlignment" id="alignment3">
836
878
            <property name="can_focus">True</property>
837
879
            <property name="label" translatable="yes">Selected only</property>
838
880
            <property name="use_underline">True</property>
 
881
            <property name="response_id">0</property>
839
882
            <property name="draw_indicator">True</property>
840
883
          </widget>
841
884
          <packing>
850
893
            <property name="can_focus">True</property>
851
894
            <property name="label" translatable="yes">All files with status 'added'</property>
852
895
            <property name="use_underline">True</property>
 
896
            <property name="response_id">0</property>
853
897
            <property name="draw_indicator">True</property>
854
898
            <property name="group">radiobutton_remove_selected</property>
855
899
          </widget>
870
914
                <property name="can_default">True</property>
871
915
                <property name="label">gtk-cancel</property>
872
916
                <property name="use_stock">True</property>
 
917
                <property name="response_id">0</property>
873
918
                <signal name="clicked" handler="on_button_remove_cancel_clicked"/>
874
919
              </widget>
875
920
            </child>
879
924
                <property name="can_focus">True</property>
880
925
                <property name="can_default">True</property>
881
926
                <property name="has_default">True</property>
 
927
                <property name="response_id">0</property>
882
928
                <signal name="clicked" handler="on_button_remove_remove_clicked"/>
883
929
                <child>
884
930
                  <widget class="GtkAlignment" id="alignment4">
956
1002
            <property name="can_focus">True</property>
957
1003
            <property name="label" translatable="yes">_Versioned directory</property>
958
1004
            <property name="use_underline">True</property>
 
1005
            <property name="response_id">0</property>
959
1006
            <property name="active">True</property>
960
1007
            <property name="draw_indicator">True</property>
961
1008
          </widget>
976
1023
                <property name="can_default">True</property>
977
1024
                <property name="label">gtk-cancel</property>
978
1025
                <property name="use_stock">True</property>
 
1026
                <property name="response_id">0</property>
979
1027
                <signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
980
1028
              </widget>
981
1029
            </child>
985
1033
                <property name="can_focus">True</property>
986
1034
                <property name="can_default">True</property>
987
1035
                <property name="has_default">True</property>
 
1036
                <property name="response_id">0</property>
988
1037
                <signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
989
1038
                <child>
990
1039
                  <widget class="GtkAlignment" id="alignment8">
1085
1134
                <property name="can_default">True</property>
1086
1135
                <property name="label">gtk-cancel</property>
1087
1136
                <property name="use_stock">True</property>
 
1137
                <property name="response_id">0</property>
1088
1138
                <signal name="clicked" handler="on_button_move_cancel_clicked"/>
1089
1139
              </widget>
1090
1140
            </child>
1094
1144
                <property name="can_focus">True</property>
1095
1145
                <property name="can_default">True</property>
1096
1146
                <property name="has_default">True</property>
 
1147
                <property name="response_id">0</property>
1097
1148
                <signal name="clicked" handler="on_button_move_move_clicked"/>
1098
1149
                <child>
1099
1150
                  <widget class="GtkAlignment" id="alignment9">
1192
1243
                <property name="can_default">True</property>
1193
1244
                <property name="label">gtk-cancel</property>
1194
1245
                <property name="use_stock">True</property>
 
1246
                <property name="response_id">0</property>
1195
1247
                <signal name="clicked" handler="on_button_rename_cancel_clicked"/>
1196
1248
              </widget>
1197
1249
            </child>
1201
1253
                <property name="can_focus">True</property>
1202
1254
                <property name="can_default">True</property>
1203
1255
                <property name="has_default">True</property>
 
1256
                <property name="response_id">0</property>
1204
1257
                <signal name="clicked" handler="on_button_rename_rename_clicked"/>
1205
1258
                <child>
1206
1259
                  <widget class="GtkAlignment" id="alignment10">
2338
2391
                <property name="has_default">True</property>
2339
2392
                <property name="label">gtk-close</property>
2340
2393
                <property name="use_stock">True</property>
 
2394
                <property name="response_id">0</property>
2341
2395
                <signal name="clicked" handler="on_button_info_close_clicked"/>
2342
2396
              </widget>
2343
2397
            </child>
2387
2441
              <widget class="GtkButton" id="button_merge_open">
2388
2442
                <property name="visible">True</property>
2389
2443
                <property name="can_focus">True</property>
 
2444
                <property name="response_id">0</property>
2390
2445
                <signal name="clicked" handler="on_button_merge_open_clicked"/>
2391
2446
                <child>
2392
2447
                  <widget class="GtkImage" id="image240">
2419
2474
                <property name="can_default">True</property>
2420
2475
                <property name="label">gtk-cancel</property>
2421
2476
                <property name="use_stock">True</property>
 
2477
                <property name="response_id">0</property>
2422
2478
                <signal name="clicked" handler="on_button_merge_cancel_clicked"/>
2423
2479
              </widget>
2424
2480
            </child>
2428
2484
                <property name="can_focus">True</property>
2429
2485
                <property name="can_default">True</property>
2430
2486
                <property name="has_default">True</property>
 
2487
                <property name="response_id">0</property>
2431
2488
                <signal name="clicked" handler="on_button_merge_merge_clicked"/>
2432
2489
                <child>
2433
2490
                  <widget class="GtkAlignment" id="alignment19">