/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-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
                      </widget>
59
59
                    </child>
60
60
                    <child>
61
 
                      <widget class="GtkMenuItem" id="menuitem_file_bookmark">
62
 
                        <property name="visible">True</property>
63
 
                        <property name="label" translatable="yes">_Bookmark current directory</property>
64
 
                        <property name="use_underline">True</property>
65
 
                        <signal name="activate" handler="on_menuitem_file_bookmark_activate"/>
66
 
                      </widget>
67
 
                    </child>
68
 
                    <child>
69
61
                      <widget class="GtkMenuItem" id="menuitem_file_make_directory">
70
62
                        <property name="visible">True</property>
71
63
                        <property name="label" translatable="yes">Make _directory...</property>
137
129
                      </widget>
138
130
                    </child>
139
131
                    <child>
140
 
                      <widget class="GtkCheckMenuItem" id="menuitem_view_show_ignored_files">
141
 
                        <property name="visible">True</property>
142
 
                        <property name="label" translatable="yes">Show _ignored files</property>
143
 
                        <property name="use_underline">True</property>
144
 
                        <signal name="activate" handler="on_menuitem_view_show_ignored_files_activate"/>
145
 
                      </widget>
146
 
                    </child>
147
 
                    <child>
148
132
                      <widget class="GtkSeparatorMenuItem" id="separator_view1">
149
133
                        <property name="visible">True</property>
150
134
                      </widget>
206
190
                        <child internal-child="image">
207
191
                          <widget class="GtkImage" id="image243">
208
192
                            <property name="visible">True</property>
209
 
                            <property name="pixbuf">icons/pull16.png</property>
 
193
                            <property name="pixbuf">pull16.png</property>
210
194
                          </widget>
211
195
                        </child>
212
196
                      </widget>
220
204
                        <child internal-child="image">
221
205
                          <widget class="GtkImage" id="image244">
222
206
                            <property name="visible">True</property>
223
 
                            <property name="pixbuf">icons/push16.png</property>
 
207
                            <property name="pixbuf">push16.png</property>
224
208
                          </widget>
225
209
                        </child>
226
210
                      </widget>
227
211
                    </child>
228
212
                    <child>
229
 
                      <widget class="GtkMenuItem" id="menuitem_branch_update">
230
 
                        <property name="visible">True</property>
231
 
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
232
 
                        <property name="label" translatable="yes">Update</property>
233
 
                        <property name="use_underline">True</property>
234
 
                        <signal name="activate" handler="on_menuitem_branch_update_activate"/>
235
 
                      </widget>
236
 
                    </child>
237
 
                    <child>
238
213
                      <widget class="GtkSeparatorMenuItem" id="separator_branch2">
239
214
                        <property name="visible">True</property>
240
215
                      </widget>
264
239
                        <child internal-child="image">
265
240
                          <widget class="GtkImage" id="image245">
266
241
                            <property name="visible">True</property>
267
 
                            <property name="pixbuf">icons/commit16.png</property>
 
242
                            <property name="pixbuf">commit16.png</property>
268
243
                          </widget>
269
244
                        </child>
270
245
                      </widget>
326
301
                        <child internal-child="image">
327
302
                          <widget class="GtkImage" id="image246">
328
303
                            <property name="visible">True</property>
329
 
                            <property name="pixbuf">icons/diff16.png</property>
 
304
                            <property name="pixbuf">diff16.png</property>
330
305
                          </widget>
331
306
                        </child>
332
307
                      </widget>
340
315
                        <child internal-child="image">
341
316
                          <widget class="GtkImage" id="image247">
342
317
                            <property name="visible">True</property>
343
 
                            <property name="pixbuf">icons/log16.png</property>
 
318
                            <property name="pixbuf">log16.png</property>
344
319
                          </widget>
345
320
                        </child>
346
321
                      </widget>
386
361
        <child>
387
362
          <widget class="GtkToolbar" id="toolbar">
388
363
            <property name="visible">True</property>
 
364
            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
389
365
            <child>
390
366
              <widget class="GtkToolButton" id="toolbutton_refresh">
391
367
                <property name="visible">True</property>
434
410
            <child>
435
411
              <widget class="GtkToolButton" id="toolbutton_commit">
436
412
                <property name="visible">True</property>
437
 
                <property name="is_important">True</property>
438
413
                <property name="label">Commit</property>
439
414
                <property name="use_underline">True</property>
440
415
                <property name="icon">icons/commit.png</property>
456
431
            <child>
457
432
              <widget class="GtkToolButton" id="toolbutton_pull">
458
433
                <property name="visible">True</property>
459
 
                <property name="is_important">True</property>
460
434
                <property name="label">Pull</property>
461
435
                <property name="use_underline">True</property>
462
436
                <property name="icon">icons/pull.png</property>
469
443
            <child>
470
444
              <widget class="GtkToolButton" id="toolbutton_push">
471
445
                <property name="visible">True</property>
472
 
                <property name="is_important">True</property>
473
446
                <property name="label">Push</property>
474
447
                <property name="use_underline">True</property>
475
448
                <property name="icon">icons/push.png</property>
479
452
                <property name="expand">False</property>
480
453
              </packing>
481
454
            </child>
482
 
            <child>
483
 
              <widget class="GtkToolButton" id="toolbutton_update">
484
 
                <property name="visible">True</property>
485
 
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
486
 
                <property name="label" translatable="yes">Update</property>
487
 
                <property name="icon">icons/pull.png</property>
488
 
                <signal name="clicked" handler="on_toolbutton_update_clicked"/>
489
 
              </widget>
490
 
              <packing>
491
 
                <property name="expand">False</property>
492
 
              </packing>
493
 
            </child>
494
455
          </widget>
495
456
          <packing>
496
457
            <property name="expand">False</property>
515
476
                    <property name="can_focus">True</property>
516
477
                    <property name="headers_visible">False</property>
517
478
                    <signal name="button_press_event" handler="on_treeview_left_button_press_event"/>
518
 
                    <signal name="button_release_event" handler="on_treeview_left_button_release_event"/>
519
479
                    <signal name="row_activated" handler="on_treeview_left_row_activated"/>
520
480
                  </widget>
521
481
                </child>
522
482
              </widget>
523
483
              <packing>
524
484
                <property name="resize">False</property>
525
 
                <property name="shrink">True</property>
526
485
              </packing>
527
486
            </child>
528
487
            <child>
541
500
                        <property name="receives_default">True</property>
542
501
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
543
502
                        <property name="relief">GTK_RELIEF_NONE</property>
544
 
                        <property name="response_id">0</property>
545
503
                        <signal name="clicked" handler="on_button_location_up_clicked"/>
546
504
                        <child>
547
505
                          <widget class="GtkImage" id="image_location_up">
590
548
                        <property name="label" translatable="yes">gtk-jump-to</property>
591
549
                        <property name="relief">GTK_RELIEF_NONE</property>
592
550
                        <property name="use_stock">True</property>
593
 
                        <property name="response_id">0</property>
594
551
                        <signal name="clicked" handler="on_button_location_jump_clicked"/>
595
552
                      </widget>
596
553
                      <packing>
617
574
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
618
575
                        <property name="label" translatable="yes">H_istory Mode</property>
619
576
                        <property name="use_underline">True</property>
620
 
                        <property name="response_id">0</property>
621
577
                        <property name="draw_indicator">True</property>
622
578
                        <signal name="toggled" handler="on_checkbutton_history_toggled"/>
623
579
                      </widget>
649
605
                        <property name="can_focus">True</property>
650
606
                        <property name="receives_default">True</property>
651
607
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
652
 
                        <property name="response_id">0</property>
653
608
                        <signal name="clicked" handler="on_button_history_browse_clicked"/>
654
609
                        <child>
655
610
                          <widget class="GtkImage" id="image_history_browse">
692
647
                  </packing>
693
648
                </child>
694
649
              </widget>
695
 
              <packing>
696
 
                <property name="resize">True</property>
697
 
                <property name="shrink">True</property>
698
 
              </packing>
699
650
            </child>
700
651
          </widget>
701
652
          <packing>
765
716
            <property name="can_focus">True</property>
766
717
            <property name="label" translatable="yes">Selected only</property>
767
718
            <property name="use_underline">True</property>
768
 
            <property name="response_id">0</property>
769
719
            <property name="draw_indicator">True</property>
770
720
          </widget>
771
721
          <packing>
780
730
            <property name="can_focus">True</property>
781
731
            <property name="label" translatable="yes">All unknowns recursively</property>
782
732
            <property name="use_underline">True</property>
783
 
            <property name="response_id">0</property>
784
733
            <property name="draw_indicator">True</property>
785
734
            <property name="group">radiobutton_add_selected</property>
786
735
          </widget>
801
750
                <property name="can_default">True</property>
802
751
                <property name="label">gtk-cancel</property>
803
752
                <property name="use_stock">True</property>
804
 
                <property name="response_id">0</property>
805
753
                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
806
754
              </widget>
807
755
            </child>
811
759
                <property name="can_focus">True</property>
812
760
                <property name="can_default">True</property>
813
761
                <property name="has_default">True</property>
814
 
                <property name="response_id">0</property>
815
762
                <signal name="clicked" handler="on_button_add_add_clicked"/>
816
763
                <child>
817
764
                  <widget class="GtkAlignment" id="alignment3">
889
836
            <property name="can_focus">True</property>
890
837
            <property name="label" translatable="yes">Selected only</property>
891
838
            <property name="use_underline">True</property>
892
 
            <property name="response_id">0</property>
893
839
            <property name="draw_indicator">True</property>
894
840
          </widget>
895
841
          <packing>
904
850
            <property name="can_focus">True</property>
905
851
            <property name="label" translatable="yes">All files with status 'added'</property>
906
852
            <property name="use_underline">True</property>
907
 
            <property name="response_id">0</property>
908
853
            <property name="draw_indicator">True</property>
909
854
            <property name="group">radiobutton_remove_selected</property>
910
855
          </widget>
925
870
                <property name="can_default">True</property>
926
871
                <property name="label">gtk-cancel</property>
927
872
                <property name="use_stock">True</property>
928
 
                <property name="response_id">0</property>
929
873
                <signal name="clicked" handler="on_button_remove_cancel_clicked"/>
930
874
              </widget>
931
875
            </child>
935
879
                <property name="can_focus">True</property>
936
880
                <property name="can_default">True</property>
937
881
                <property name="has_default">True</property>
938
 
                <property name="response_id">0</property>
939
882
                <signal name="clicked" handler="on_button_remove_remove_clicked"/>
940
883
                <child>
941
884
                  <widget class="GtkAlignment" id="alignment4">
1013
956
            <property name="can_focus">True</property>
1014
957
            <property name="label" translatable="yes">_Versioned directory</property>
1015
958
            <property name="use_underline">True</property>
1016
 
            <property name="response_id">0</property>
1017
959
            <property name="active">True</property>
1018
960
            <property name="draw_indicator">True</property>
1019
961
          </widget>
1034
976
                <property name="can_default">True</property>
1035
977
                <property name="label">gtk-cancel</property>
1036
978
                <property name="use_stock">True</property>
1037
 
                <property name="response_id">0</property>
1038
979
                <signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
1039
980
              </widget>
1040
981
            </child>
1044
985
                <property name="can_focus">True</property>
1045
986
                <property name="can_default">True</property>
1046
987
                <property name="has_default">True</property>
1047
 
                <property name="response_id">0</property>
1048
988
                <signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
1049
989
                <child>
1050
990
                  <widget class="GtkAlignment" id="alignment8">
1145
1085
                <property name="can_default">True</property>
1146
1086
                <property name="label">gtk-cancel</property>
1147
1087
                <property name="use_stock">True</property>
1148
 
                <property name="response_id">0</property>
1149
1088
                <signal name="clicked" handler="on_button_move_cancel_clicked"/>
1150
1089
              </widget>
1151
1090
            </child>
1155
1094
                <property name="can_focus">True</property>
1156
1095
                <property name="can_default">True</property>
1157
1096
                <property name="has_default">True</property>
1158
 
                <property name="response_id">0</property>
1159
1097
                <signal name="clicked" handler="on_button_move_move_clicked"/>
1160
1098
                <child>
1161
1099
                  <widget class="GtkAlignment" id="alignment9">
1254
1192
                <property name="can_default">True</property>
1255
1193
                <property name="label">gtk-cancel</property>
1256
1194
                <property name="use_stock">True</property>
1257
 
                <property name="response_id">0</property>
1258
1195
                <signal name="clicked" handler="on_button_rename_cancel_clicked"/>
1259
1196
              </widget>
1260
1197
            </child>
1264
1201
                <property name="can_focus">True</property>
1265
1202
                <property name="can_default">True</property>
1266
1203
                <property name="has_default">True</property>
1267
 
                <property name="response_id">0</property>
1268
1204
                <signal name="clicked" handler="on_button_rename_rename_clicked"/>
1269
1205
                <child>
1270
1206
                  <widget class="GtkAlignment" id="alignment10">
2402
2338
                <property name="has_default">True</property>
2403
2339
                <property name="label">gtk-close</property>
2404
2340
                <property name="use_stock">True</property>
2405
 
                <property name="response_id">0</property>
2406
2341
                <signal name="clicked" handler="on_button_info_close_clicked"/>
2407
2342
              </widget>
2408
2343
            </child>
2452
2387
              <widget class="GtkButton" id="button_merge_open">
2453
2388
                <property name="visible">True</property>
2454
2389
                <property name="can_focus">True</property>
2455
 
                <property name="response_id">0</property>
2456
2390
                <signal name="clicked" handler="on_button_merge_open_clicked"/>
2457
2391
                <child>
2458
2392
                  <widget class="GtkImage" id="image240">
2485
2419
                <property name="can_default">True</property>
2486
2420
                <property name="label">gtk-cancel</property>
2487
2421
                <property name="use_stock">True</property>
2488
 
                <property name="response_id">0</property>
2489
2422
                <signal name="clicked" handler="on_button_merge_cancel_clicked"/>
2490
2423
              </widget>
2491
2424
            </child>
2495
2428
                <property name="can_focus">True</property>
2496
2429
                <property name="can_default">True</property>
2497
2430
                <property name="has_default">True</property>
2498
 
                <property name="response_id">0</property>
2499
2431
                <signal name="clicked" handler="on_button_merge_merge_clicked"/>
2500
2432
                <child>
2501
2433
                  <widget class="GtkAlignment" id="alignment19">