/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-10-09 21:21:47 UTC
  • Revision ID: Szilveszter.Farkas@gmail.com-20061009212147-8893be90e5b46f3e
Began to implement Merge dialog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
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>
233
233
                      <signal name="activate" handler="on_menuitem_branch_pull_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
234
234
 
235
235
                      <child internal-child="image">
236
 
                        <widget class="GtkImage" id="image234">
 
236
                        <widget class="GtkImage" id="image243">
237
237
                          <property name="visible">True</property>
238
238
                          <property name="pixbuf">pull16.png</property>
239
239
                          <property name="xalign">0.5</property>
253
253
                      <signal name="activate" handler="on_menuitem_branch_push_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
254
254
 
255
255
                      <child internal-child="image">
256
 
                        <widget class="GtkImage" id="image235">
 
256
                        <widget class="GtkImage" id="image244">
257
257
                          <property name="visible">True</property>
258
258
                          <property name="pixbuf">push16.png</property>
259
259
                          <property name="xalign">0.5</property>
272
272
                  </child>
273
273
 
274
274
                  <child>
 
275
                    <widget class="GtkMenuItem" id="menuitem_branch_merge">
 
276
                      <property name="visible">True</property>
 
277
                      <property name="label" translatable="yes">_Merge...</property>
 
278
                      <property name="use_underline">True</property>
 
279
                      <signal name="activate" handler="on_menuitem_branch_merge_activate" last_modification_time="Mon, 09 Oct 2006 18:24:06 GMT"/>
 
280
                    </widget>
 
281
                  </child>
 
282
 
 
283
                  <child>
275
284
                    <widget class="GtkImageMenuItem" id="menuitem_branch_commit">
276
285
                      <property name="visible">True</property>
277
286
                      <property name="label" translatable="yes">_Commit...</property>
279
288
                      <signal name="activate" handler="on_menuitem_branch_commit_activate" last_modification_time="Mon, 17 Jul 2006 08:53:37 GMT"/>
280
289
 
281
290
                      <child internal-child="image">
282
 
                        <widget class="GtkImage" id="image236">
 
291
                        <widget class="GtkImage" id="image245">
283
292
                          <property name="visible">True</property>
284
293
                          <property name="pixbuf">commit16.png</property>
285
294
                          <property name="xalign">0.5</property>
309
318
                  <child>
310
319
                    <widget class="GtkMenuItem" id="menuitem_branch_missing_revisions">
311
320
                      <property name="visible">True</property>
312
 
                      <property name="label" translatable="yes">_Missing revisions</property>
 
321
                      <property name="label" translatable="yes">Missing _revisions</property>
313
322
                      <property name="use_underline">True</property>
314
323
                      <signal name="activate" handler="on_menuitem_branch_missing_revisions_activate" last_modification_time="Sat, 02 Sep 2006 14:01:29 GMT"/>
315
324
                    </widget>
336
345
                      <signal name="activate" handler="on_menuitem_stats_diff_activate" last_modification_time="Thu, 03 Aug 2006 11:35:30 GMT"/>
337
346
 
338
347
                      <child internal-child="image">
339
 
                        <widget class="GtkImage" id="image237">
 
348
                        <widget class="GtkImage" id="image246">
340
349
                          <property name="visible">True</property>
341
350
                          <property name="pixbuf">diff16.png</property>
342
351
                          <property name="xalign">0.5</property>
356
365
                      <signal name="activate" handler="on_menuitem_stats_log_activate" last_modification_time="Thu, 03 Aug 2006 11:35:43 GMT"/>
357
366
 
358
367
                      <child internal-child="image">
359
 
                        <widget class="GtkImage" id="image238">
 
368
                        <widget class="GtkImage" id="image247">
360
369
                          <property name="visible">True</property>
361
370
                          <property name="pixbuf">log16.png</property>
362
371
                          <property name="xalign">0.5</property>
2632
2641
        <widget class="GtkHButtonBox" id="hbuttonbox_move">
2633
2642
          <property name="visible">True</property>
2634
2643
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2635
 
          <property name="spacing">3</property>
2636
2644
 
2637
2645
          <child>
2638
2646
            <widget class="GtkButton" id="button_move_cancel">
2643
2651
              <property name="use_stock">True</property>
2644
2652
              <property name="relief">GTK_RELIEF_NORMAL</property>
2645
2653
              <property name="focus_on_click">True</property>
 
2654
              <property name="response_id">0</property>
2646
2655
              <signal name="clicked" handler="on_button_move_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:11 GMT"/>
2647
2656
            </widget>
2648
2657
          </child>
2655
2664
              <property name="can_focus">True</property>
2656
2665
              <property name="relief">GTK_RELIEF_NORMAL</property>
2657
2666
              <property name="focus_on_click">True</property>
 
2667
              <property name="response_id">0</property>
2658
2668
              <signal name="clicked" handler="on_button_move_move_clicked" last_modification_time="Wed, 09 Aug 2006 13:35:24 GMT"/>
2659
2669
 
2660
2670
              <child>
2816
2826
        <widget class="GtkHButtonBox" id="hbuttonbox_rename">
2817
2827
          <property name="visible">True</property>
2818
2828
          <property name="layout_style">GTK_BUTTONBOX_END</property>
2819
 
          <property name="spacing">3</property>
2820
2829
 
2821
2830
          <child>
2822
2831
            <widget class="GtkButton" id="button_rename_cancel">
2827
2836
              <property name="use_stock">True</property>
2828
2837
              <property name="relief">GTK_RELIEF_NORMAL</property>
2829
2838
              <property name="focus_on_click">True</property>
 
2839
              <property name="response_id">0</property>
2830
2840
              <signal name="clicked" handler="on_button_rename_cancel_clicked" last_modification_time="Wed, 09 Aug 2006 14:29:00 GMT"/>
2831
2841
            </widget>
2832
2842
          </child>
2839
2849
              <property name="can_focus">True</property>
2840
2850
              <property name="relief">GTK_RELIEF_NORMAL</property>
2841
2851
              <property name="focus_on_click">True</property>
 
2852
              <property name="response_id">0</property>
2842
2853
              <signal name="clicked" handler="on_button_rename_rename_clicked" last_modification_time="Wed, 09 Aug 2006 14:28:53 GMT"/>
2843
2854
 
2844
2855
              <child>
5469
5480
  <property name="modal">False</property>
5470
5481
  <property name="resizable">True</property>
5471
5482
  <property name="destroy_with_parent">False</property>
 
5483
  <property name="icon">oliveicon2.png</property>
5472
5484
  <property name="decorated">True</property>
5473
5485
  <property name="skip_taskbar_hint">False</property>
5474
5486
  <property name="skip_pager_hint">False</property>
5476
5488
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
5477
5489
  <property name="focus_on_map">True</property>
5478
5490
  <property name="urgency_hint">False</property>
 
5491
  <property name="has_separator">True</property>
5479
5492
 
5480
5493
  <child internal-child="vbox">
5481
5494
    <widget class="GtkVBox" id="vbox_merge">
5482
 
      <property name="border_width">5</property>
5483
5495
      <property name="visible">True</property>
5484
5496
      <property name="homogeneous">False</property>
5485
5497
      <property name="spacing">3</property>
5486
5498
 
 
5499
      <child internal-child="action_area">
 
5500
        <widget class="GtkHButtonBox" id="hbuttonbox_merge">
 
5501
          <property name="visible">True</property>
 
5502
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
5503
 
 
5504
          <child>
 
5505
            <widget class="GtkButton" id="button_merge_cancel">
 
5506
              <property name="visible">True</property>
 
5507
              <property name="can_default">True</property>
 
5508
              <property name="can_focus">True</property>
 
5509
              <property name="label">gtk-cancel</property>
 
5510
              <property name="use_stock">True</property>
 
5511
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5512
              <property name="focus_on_click">True</property>
 
5513
              <property name="response_id">0</property>
 
5514
              <signal name="clicked" handler="on_button_merge_cancel_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:13 GMT"/>
 
5515
            </widget>
 
5516
          </child>
 
5517
          
 
5518
          <child>
 
5519
            <widget class="GtkButton" id="button_merge_merge">
 
5520
              <property name="visible">True</property>
 
5521
              <property name="can_default">True</property>
 
5522
              <property name="has_default">True</property>
 
5523
              <property name="can_focus">True</property>
 
5524
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
5525
              <property name="focus_on_click">True</property>
 
5526
              <property name="response_id">0</property>
 
5527
              <signal name="clicked" handler="on_button_merge_merge_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:07 GMT"/>
 
5528
 
 
5529
              <child>
 
5530
                <widget class="GtkAlignment" id="alignment19">
 
5531
                  <property name="visible">True</property>
 
5532
                  <property name="xalign">0.5</property>
 
5533
                  <property name="yalign">0.5</property>
 
5534
                  <property name="xscale">0</property>
 
5535
                  <property name="yscale">0</property>
 
5536
                  <property name="top_padding">0</property>
 
5537
                  <property name="bottom_padding">0</property>
 
5538
                  <property name="left_padding">0</property>
 
5539
                  <property name="right_padding">0</property>
 
5540
 
 
5541
                  <child>
 
5542
                    <widget class="GtkHBox" id="hbox14">
 
5543
                      <property name="visible">True</property>
 
5544
                      <property name="homogeneous">False</property>
 
5545
                      <property name="spacing">2</property>
 
5546
 
 
5547
                      <child>
 
5548
                        <widget class="GtkImage" id="image239">
 
5549
                          <property name="visible">True</property>
 
5550
                          <property name="stock">gtk-apply</property>
 
5551
                          <property name="icon_size">4</property>
 
5552
                          <property name="xalign">0.5</property>
 
5553
                          <property name="yalign">0.5</property>
 
5554
                          <property name="xpad">0</property>
 
5555
                          <property name="ypad">0</property>
 
5556
                        </widget>
 
5557
                        <packing>
 
5558
                          <property name="padding">0</property>
 
5559
                          <property name="expand">False</property>
 
5560
                          <property name="fill">False</property>
 
5561
                        </packing>
 
5562
                      </child>
 
5563
 
 
5564
                      <child>
 
5565
                        <widget class="GtkLabel" id="label21">
 
5566
                          <property name="visible">True</property>
 
5567
                          <property name="label" translatable="yes">_Merge</property>
 
5568
                          <property name="use_underline">True</property>
 
5569
                          <property name="use_markup">False</property>
 
5570
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
5571
                          <property name="wrap">False</property>
 
5572
                          <property name="selectable">False</property>
 
5573
                          <property name="xalign">0.5</property>
 
5574
                          <property name="yalign">0.5</property>
 
5575
                          <property name="xpad">0</property>
 
5576
                          <property name="ypad">0</property>
 
5577
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
5578
                          <property name="width_chars">-1</property>
 
5579
                          <property name="single_line_mode">False</property>
 
5580
                          <property name="angle">0</property>
 
5581
                        </widget>
 
5582
                        <packing>
 
5583
                          <property name="padding">0</property>
 
5584
                          <property name="expand">False</property>
 
5585
                          <property name="fill">False</property>
 
5586
                        </packing>
 
5587
                      </child>
 
5588
                    </widget>
 
5589
                  </child>
 
5590
                </widget>
 
5591
              </child>
 
5592
            </widget>
 
5593
          </child>        
 
5594
        </widget>
 
5595
        <packing>
 
5596
          <property name="padding">0</property>
 
5597
          <property name="expand">False</property>
 
5598
          <property name="fill">False</property>
 
5599
          <property name="pack_type">GTK_PACK_END</property>
 
5600
        </packing>
 
5601
      </child>
 
5602
 
5487
5603
      <child>
5488
5604
        <widget class="GtkHBox" id="hbox_merge">
5489
5605
          <property name="visible">True</property>
5567
5683
          <property name="fill">False</property>
5568
5684
        </packing>
5569
5685
      </child>
5570
 
 
5571
 
      <child internal-child="action_area">
5572
 
        <widget class="GtkHButtonBox" id="hbuttonbox_merge">
5573
 
          <property name="visible">True</property>
5574
 
          <property name="layout_style">GTK_BUTTONBOX_END</property>
5575
 
          <property name="spacing">3</property>
5576
 
 
5577
 
          <child>
5578
 
            <widget class="GtkButton" id="button_merge_merge">
5579
 
              <property name="visible">True</property>
5580
 
              <property name="can_default">True</property>
5581
 
              <property name="has_default">True</property>
5582
 
              <property name="can_focus">True</property>
5583
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5584
 
              <property name="focus_on_click">True</property>
5585
 
              <signal name="clicked" handler="on_button_merge_merge_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:07 GMT"/>
5586
 
 
5587
 
              <child>
5588
 
                <widget class="GtkAlignment" id="alignment19">
5589
 
                  <property name="visible">True</property>
5590
 
                  <property name="xalign">0.5</property>
5591
 
                  <property name="yalign">0.5</property>
5592
 
                  <property name="xscale">0</property>
5593
 
                  <property name="yscale">0</property>
5594
 
                  <property name="top_padding">0</property>
5595
 
                  <property name="bottom_padding">0</property>
5596
 
                  <property name="left_padding">0</property>
5597
 
                  <property name="right_padding">0</property>
5598
 
 
5599
 
                  <child>
5600
 
                    <widget class="GtkHBox" id="hbox14">
5601
 
                      <property name="visible">True</property>
5602
 
                      <property name="homogeneous">False</property>
5603
 
                      <property name="spacing">2</property>
5604
 
 
5605
 
                      <child>
5606
 
                        <widget class="GtkImage" id="image239">
5607
 
                          <property name="visible">True</property>
5608
 
                          <property name="stock">gtk-apply</property>
5609
 
                          <property name="icon_size">4</property>
5610
 
                          <property name="xalign">0.5</property>
5611
 
                          <property name="yalign">0.5</property>
5612
 
                          <property name="xpad">0</property>
5613
 
                          <property name="ypad">0</property>
5614
 
                        </widget>
5615
 
                        <packing>
5616
 
                          <property name="padding">0</property>
5617
 
                          <property name="expand">False</property>
5618
 
                          <property name="fill">False</property>
5619
 
                        </packing>
5620
 
                      </child>
5621
 
 
5622
 
                      <child>
5623
 
                        <widget class="GtkLabel" id="label21">
5624
 
                          <property name="visible">True</property>
5625
 
                          <property name="label" translatable="yes">_Merge</property>
5626
 
                          <property name="use_underline">True</property>
5627
 
                          <property name="use_markup">False</property>
5628
 
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
5629
 
                          <property name="wrap">False</property>
5630
 
                          <property name="selectable">False</property>
5631
 
                          <property name="xalign">0.5</property>
5632
 
                          <property name="yalign">0.5</property>
5633
 
                          <property name="xpad">0</property>
5634
 
                          <property name="ypad">0</property>
5635
 
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
5636
 
                          <property name="width_chars">-1</property>
5637
 
                          <property name="single_line_mode">False</property>
5638
 
                          <property name="angle">0</property>
5639
 
                        </widget>
5640
 
                        <packing>
5641
 
                          <property name="padding">0</property>
5642
 
                          <property name="expand">False</property>
5643
 
                          <property name="fill">False</property>
5644
 
                        </packing>
5645
 
                      </child>
5646
 
                    </widget>
5647
 
                  </child>
5648
 
                </widget>
5649
 
              </child>
5650
 
            </widget>
5651
 
          </child>
5652
 
 
5653
 
          <child>
5654
 
            <widget class="GtkButton" id="button_merge_cancel">
5655
 
              <property name="visible">True</property>
5656
 
              <property name="can_default">True</property>
5657
 
              <property name="can_focus">True</property>
5658
 
              <property name="label">gtk-cancel</property>
5659
 
              <property name="use_stock">True</property>
5660
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
5661
 
              <property name="focus_on_click">True</property>
5662
 
              <signal name="clicked" handler="on_button_merge_cancel_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:13 GMT"/>
5663
 
            </widget>
5664
 
          </child>
5665
 
        </widget>
5666
 
        <packing>
5667
 
          <property name="padding">0</property>
5668
 
          <property name="expand">False</property>
5669
 
          <property name="fill">False</property>
5670
 
        </packing>
5671
 
      </child>
5672
5686
    </widget>
5673
5687
  </child>
5674
5688
</widget>