/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: Mateusz Korniak
  • Date: 2007-07-21 13:16:33 UTC
  • mto: This revision was merged to the branch mainline in revision 248.
  • Revision ID: matkor@laptop-hp-20070721131633-t40kxs20j1q2fvvc
Context menu "Remove and delete added"
Acts like "Remove" but also deletes file locally.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
6
6
    <property name="width_request">700</property>
7
7
    <property name="height_request">400</property>
8
8
    <property name="title" translatable="yes">Olive - Bazaar GUI</property>
9
 
    <property name="icon">icons/oliveicon2.png</property>
 
9
    <property name="icon">oliveicon2.png</property>
10
10
    <signal name="destroy" handler="on_window_main_destroy"/>
11
11
    <signal name="delete_event" handler="on_window_main_delete_event"/>
12
12
    <child>
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>
140
132
                      <widget class="GtkSeparatorMenuItem" id="separator_view1">
141
133
                        <property name="visible">True</property>
142
134
                      </widget>
198
190
                        <child internal-child="image">
199
191
                          <widget class="GtkImage" id="image243">
200
192
                            <property name="visible">True</property>
201
 
                            <property name="pixbuf">icons/pull16.png</property>
 
193
                            <property name="pixbuf">pull16.png</property>
202
194
                          </widget>
203
195
                        </child>
204
196
                      </widget>
212
204
                        <child internal-child="image">
213
205
                          <widget class="GtkImage" id="image244">
214
206
                            <property name="visible">True</property>
215
 
                            <property name="pixbuf">icons/push16.png</property>
 
207
                            <property name="pixbuf">push16.png</property>
216
208
                          </widget>
217
209
                        </child>
218
210
                      </widget>
219
211
                    </child>
220
212
                    <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>
230
213
                      <widget class="GtkSeparatorMenuItem" id="separator_branch2">
231
214
                        <property name="visible">True</property>
232
215
                      </widget>
256
239
                        <child internal-child="image">
257
240
                          <widget class="GtkImage" id="image245">
258
241
                            <property name="visible">True</property>
259
 
                            <property name="pixbuf">icons/commit16.png</property>
 
242
                            <property name="pixbuf">commit16.png</property>
260
243
                          </widget>
261
244
                        </child>
262
245
                      </widget>
318
301
                        <child internal-child="image">
319
302
                          <widget class="GtkImage" id="image246">
320
303
                            <property name="visible">True</property>
321
 
                            <property name="pixbuf">icons/diff16.png</property>
 
304
                            <property name="pixbuf">diff16.png</property>
322
305
                          </widget>
323
306
                        </child>
324
307
                      </widget>
332
315
                        <child internal-child="image">
333
316
                          <widget class="GtkImage" id="image247">
334
317
                            <property name="visible">True</property>
335
 
                            <property name="pixbuf">icons/log16.png</property>
 
318
                            <property name="pixbuf">log16.png</property>
336
319
                          </widget>
337
320
                        </child>
338
321
                      </widget>
384
367
                <property name="visible">True</property>
385
368
                <property name="label">Refresh</property>
386
369
                <property name="use_underline">True</property>
387
 
                <property name="icon">icons/refresh.png</property>
 
370
                <property name="icon">refresh.png</property>
388
371
                <signal name="clicked" handler="on_toolbutton_refresh_clicked"/>
389
372
              </widget>
390
373
              <packing>
396
379
                <property name="visible">True</property>
397
380
                <property name="label">Diff</property>
398
381
                <property name="use_underline">True</property>
399
 
                <property name="icon">icons/diff.png</property>
 
382
                <property name="icon">diff.png</property>
400
383
                <signal name="clicked" handler="on_toolbutton_diff_clicked"/>
401
384
              </widget>
402
385
              <packing>
408
391
                <property name="visible">True</property>
409
392
                <property name="label">Log</property>
410
393
                <property name="use_underline">True</property>
411
 
                <property name="icon">icons/log.png</property>
 
394
                <property name="icon">log.png</property>
412
395
                <signal name="clicked" handler="on_toolbutton_log_clicked"/>
413
396
              </widget>
414
397
              <packing>
429
412
                <property name="visible">True</property>
430
413
                <property name="label">Commit</property>
431
414
                <property name="use_underline">True</property>
432
 
                <property name="icon">icons/commit.png</property>
 
415
                <property name="icon">commit.png</property>
433
416
                <signal name="clicked" handler="on_toolbutton_commit_clicked"/>
434
417
              </widget>
435
418
              <packing>
450
433
                <property name="visible">True</property>
451
434
                <property name="label">Pull</property>
452
435
                <property name="use_underline">True</property>
453
 
                <property name="icon">icons/pull.png</property>
 
436
                <property name="icon">pull.png</property>
454
437
                <signal name="clicked" handler="on_toolbutton_pull_clicked"/>
455
438
              </widget>
456
439
              <packing>
462
445
                <property name="visible">True</property>
463
446
                <property name="label">Push</property>
464
447
                <property name="use_underline">True</property>
465
 
                <property name="icon">icons/push.png</property>
 
448
                <property name="icon">push.png</property>
466
449
                <signal name="clicked" handler="on_toolbutton_push_clicked"/>
467
450
              </widget>
468
451
              <packing>
469
452
                <property name="expand">False</property>
470
453
              </packing>
471
454
            </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>
484
455
          </widget>
485
456
          <packing>
486
457
            <property name="expand">False</property>
511
482
              </widget>
512
483
              <packing>
513
484
                <property name="resize">False</property>
514
 
                <property name="shrink">True</property>
515
485
              </packing>
516
486
            </child>
517
487
            <child>
530
500
                        <property name="receives_default">True</property>
531
501
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
532
502
                        <property name="relief">GTK_RELIEF_NONE</property>
533
 
                        <property name="response_id">0</property>
534
503
                        <signal name="clicked" handler="on_button_location_up_clicked"/>
535
504
                        <child>
536
505
                          <widget class="GtkImage" id="image_location_up">
579
548
                        <property name="label" translatable="yes">gtk-jump-to</property>
580
549
                        <property name="relief">GTK_RELIEF_NONE</property>
581
550
                        <property name="use_stock">True</property>
582
 
                        <property name="response_id">0</property>
583
551
                        <signal name="clicked" handler="on_button_location_jump_clicked"/>
584
552
                      </widget>
585
553
                      <packing>
606
574
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
607
575
                        <property name="label" translatable="yes">H_istory Mode</property>
608
576
                        <property name="use_underline">True</property>
609
 
                        <property name="response_id">0</property>
610
577
                        <property name="draw_indicator">True</property>
611
578
                        <signal name="toggled" handler="on_checkbutton_history_toggled"/>
612
579
                      </widget>
638
605
                        <property name="can_focus">True</property>
639
606
                        <property name="receives_default">True</property>
640
607
                        <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>
642
608
                        <signal name="clicked" handler="on_button_history_browse_clicked"/>
643
609
                        <child>
644
610
                          <widget class="GtkImage" id="image_history_browse">
681
647
                  </packing>
682
648
                </child>
683
649
              </widget>
684
 
              <packing>
685
 
                <property name="resize">True</property>
686
 
                <property name="shrink">True</property>
687
 
              </packing>
688
650
            </child>
689
651
          </widget>
690
652
          <packing>
713
675
    <property name="website_label" translatable="yes">https://launchpad.net/products/olive</property>
714
676
    <property name="authors">Szilveszter Farkas (Phanatic) &lt;szilveszter.farkas@gmail.com&gt;</property>
715
677
    <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
716
 
    <property name="logo">icons/oliveicon2.png</property>
 
678
    <property name="logo">oliveicon2.png</property>
717
679
    <child internal-child="vbox">
718
680
      <widget class="GtkVBox" id="dialog-vbox1">
719
681
        <child internal-child="action_area">
731
693
    <property name="visible">True</property>
732
694
    <property name="title" translatable="yes">Olive - Add file(s)</property>
733
695
    <property name="resizable">False</property>
734
 
    <property name="icon">icons/oliveicon2.png</property>
 
696
    <property name="icon">oliveicon2.png</property>
735
697
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
736
698
    <child internal-child="vbox">
737
699
      <widget class="GtkVBox" id="vbox_add">
754
716
            <property name="can_focus">True</property>
755
717
            <property name="label" translatable="yes">Selected only</property>
756
718
            <property name="use_underline">True</property>
757
 
            <property name="response_id">0</property>
758
719
            <property name="draw_indicator">True</property>
759
720
          </widget>
760
721
          <packing>
769
730
            <property name="can_focus">True</property>
770
731
            <property name="label" translatable="yes">All unknowns recursively</property>
771
732
            <property name="use_underline">True</property>
772
 
            <property name="response_id">0</property>
773
733
            <property name="draw_indicator">True</property>
774
734
            <property name="group">radiobutton_add_selected</property>
775
735
          </widget>
790
750
                <property name="can_default">True</property>
791
751
                <property name="label">gtk-cancel</property>
792
752
                <property name="use_stock">True</property>
793
 
                <property name="response_id">0</property>
794
753
                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
795
754
              </widget>
796
755
            </child>
800
759
                <property name="can_focus">True</property>
801
760
                <property name="can_default">True</property>
802
761
                <property name="has_default">True</property>
803
 
                <property name="response_id">0</property>
804
762
                <signal name="clicked" handler="on_button_add_add_clicked"/>
805
763
                <child>
806
764
                  <widget class="GtkAlignment" id="alignment3">
855
813
    <property name="visible">True</property>
856
814
    <property name="title" translatable="yes">Olive - Remove file(s)</property>
857
815
    <property name="resizable">False</property>
858
 
    <property name="icon">icons/oliveicon2.png</property>
 
816
    <property name="icon">oliveicon2.png</property>
859
817
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
860
818
    <child internal-child="vbox">
861
819
      <widget class="GtkVBox" id="vbox_remove">
878
836
            <property name="can_focus">True</property>
879
837
            <property name="label" translatable="yes">Selected only</property>
880
838
            <property name="use_underline">True</property>
881
 
            <property name="response_id">0</property>
882
839
            <property name="draw_indicator">True</property>
883
840
          </widget>
884
841
          <packing>
893
850
            <property name="can_focus">True</property>
894
851
            <property name="label" translatable="yes">All files with status 'added'</property>
895
852
            <property name="use_underline">True</property>
896
 
            <property name="response_id">0</property>
897
853
            <property name="draw_indicator">True</property>
898
854
            <property name="group">radiobutton_remove_selected</property>
899
855
          </widget>
914
870
                <property name="can_default">True</property>
915
871
                <property name="label">gtk-cancel</property>
916
872
                <property name="use_stock">True</property>
917
 
                <property name="response_id">0</property>
918
873
                <signal name="clicked" handler="on_button_remove_cancel_clicked"/>
919
874
              </widget>
920
875
            </child>
924
879
                <property name="can_focus">True</property>
925
880
                <property name="can_default">True</property>
926
881
                <property name="has_default">True</property>
927
 
                <property name="response_id">0</property>
928
882
                <signal name="clicked" handler="on_button_remove_remove_clicked"/>
929
883
                <child>
930
884
                  <widget class="GtkAlignment" id="alignment4">
978
932
  <widget class="GtkDialog" id="window_mkdir">
979
933
    <property name="visible">True</property>
980
934
    <property name="title" translatable="yes">Olive - Make directory</property>
981
 
    <property name="icon">icons/oliveicon2.png</property>
 
935
    <property name="icon">oliveicon2.png</property>
982
936
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
983
937
    <child internal-child="vbox">
984
938
      <widget class="GtkVBox" id="vbox_mkdir">
1002
956
            <property name="can_focus">True</property>
1003
957
            <property name="label" translatable="yes">_Versioned directory</property>
1004
958
            <property name="use_underline">True</property>
1005
 
            <property name="response_id">0</property>
1006
959
            <property name="active">True</property>
1007
960
            <property name="draw_indicator">True</property>
1008
961
          </widget>
1023
976
                <property name="can_default">True</property>
1024
977
                <property name="label">gtk-cancel</property>
1025
978
                <property name="use_stock">True</property>
1026
 
                <property name="response_id">0</property>
1027
979
                <signal name="clicked" handler="on_button_mkdir_cancel_clicked"/>
1028
980
              </widget>
1029
981
            </child>
1033
985
                <property name="can_focus">True</property>
1034
986
                <property name="can_default">True</property>
1035
987
                <property name="has_default">True</property>
1036
 
                <property name="response_id">0</property>
1037
988
                <signal name="clicked" handler="on_button_mkdir_mkdir_clicked"/>
1038
989
                <child>
1039
990
                  <widget class="GtkAlignment" id="alignment8">
1088
1039
  <widget class="GtkDialog" id="window_move">
1089
1040
    <property name="width_request">250</property>
1090
1041
    <property name="title" translatable="yes">Olive - Move</property>
1091
 
    <property name="icon">icons/oliveicon2.png</property>
 
1042
    <property name="icon">oliveicon2.png</property>
1092
1043
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1093
1044
    <child internal-child="vbox">
1094
1045
      <widget class="GtkVBox" id="vbox_move">
1134
1085
                <property name="can_default">True</property>
1135
1086
                <property name="label">gtk-cancel</property>
1136
1087
                <property name="use_stock">True</property>
1137
 
                <property name="response_id">0</property>
1138
1088
                <signal name="clicked" handler="on_button_move_cancel_clicked"/>
1139
1089
              </widget>
1140
1090
            </child>
1144
1094
                <property name="can_focus">True</property>
1145
1095
                <property name="can_default">True</property>
1146
1096
                <property name="has_default">True</property>
1147
 
                <property name="response_id">0</property>
1148
1097
                <signal name="clicked" handler="on_button_move_move_clicked"/>
1149
1098
                <child>
1150
1099
                  <widget class="GtkAlignment" id="alignment9">
1197
1146
  </widget>
1198
1147
  <widget class="GtkDialog" id="window_rename">
1199
1148
    <property name="title" translatable="yes">Olive - Rename</property>
1200
 
    <property name="icon">icons/oliveicon2.png</property>
 
1149
    <property name="icon">oliveicon2.png</property>
1201
1150
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
1202
1151
    <child internal-child="vbox">
1203
1152
      <widget class="GtkVBox" id="vbox_rename">
1243
1192
                <property name="can_default">True</property>
1244
1193
                <property name="label">gtk-cancel</property>
1245
1194
                <property name="use_stock">True</property>
1246
 
                <property name="response_id">0</property>
1247
1195
                <signal name="clicked" handler="on_button_rename_cancel_clicked"/>
1248
1196
              </widget>
1249
1197
            </child>
1253
1201
                <property name="can_focus">True</property>
1254
1202
                <property name="can_default">True</property>
1255
1203
                <property name="has_default">True</property>
1256
 
                <property name="response_id">0</property>
1257
1204
                <signal name="clicked" handler="on_button_rename_rename_clicked"/>
1258
1205
                <child>
1259
1206
                  <widget class="GtkAlignment" id="alignment10">
1306
1253
  </widget>
1307
1254
  <widget class="GtkDialog" id="window_info">
1308
1255
    <property name="title" translatable="yes">Olive - Information</property>
1309
 
    <property name="icon">icons/oliveicon2.png</property>
 
1256
    <property name="icon">oliveicon2.png</property>
1310
1257
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
1311
1258
    <child internal-child="vbox">
1312
1259
      <widget class="GtkVBox" id="vbox_info">
2391
2338
                <property name="has_default">True</property>
2392
2339
                <property name="label">gtk-close</property>
2393
2340
                <property name="use_stock">True</property>
2394
 
                <property name="response_id">0</property>
2395
2341
                <signal name="clicked" handler="on_button_info_close_clicked"/>
2396
2342
              </widget>
2397
2343
            </child>
2408
2354
  <widget class="GtkDialog" id="window_merge">
2409
2355
    <property name="visible">True</property>
2410
2356
    <property name="title" translatable="yes">Merge - Olive</property>
2411
 
    <property name="icon">icons/oliveicon2.png</property>
 
2357
    <property name="icon">oliveicon2.png</property>
2412
2358
    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2413
2359
    <child internal-child="vbox">
2414
2360
      <widget class="GtkVBox" id="vbox_merge">
2441
2387
              <widget class="GtkButton" id="button_merge_open">
2442
2388
                <property name="visible">True</property>
2443
2389
                <property name="can_focus">True</property>
2444
 
                <property name="response_id">0</property>
2445
2390
                <signal name="clicked" handler="on_button_merge_open_clicked"/>
2446
2391
                <child>
2447
2392
                  <widget class="GtkImage" id="image240">
2474
2419
                <property name="can_default">True</property>
2475
2420
                <property name="label">gtk-cancel</property>
2476
2421
                <property name="use_stock">True</property>
2477
 
                <property name="response_id">0</property>
2478
2422
                <signal name="clicked" handler="on_button_merge_cancel_clicked"/>
2479
2423
              </widget>
2480
2424
            </child>
2484
2428
                <property name="can_focus">True</property>
2485
2429
                <property name="can_default">True</property>
2486
2430
                <property name="has_default">True</property>
2487
 
                <property name="response_id">0</property>
2488
2431
                <signal name="clicked" handler="on_button_merge_merge_clicked"/>
2489
2432
                <child>
2490
2433
                  <widget class="GtkAlignment" id="alignment19">