/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-07-24 14:32:01 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060724143201-d0df92c78dd2c610
2006-07-24  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive.glade: improvements to the Commit dialog
    * olive/frontend/gtk/commit.py: merged Jelmer Vernooij's integration branch
      and some code from bzr-gtk (select files to commit)
    * TODO: added some wishlist stuff

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
431
431
            <widget class="GtkScrolledWindow" id="scrolledwindow_left">
432
432
              <property name="visible">True</property>
433
433
              <property name="can_focus">True</property>
434
 
              <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
435
 
              <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
 
434
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
435
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
436
436
              <property name="shadow_type">GTK_SHADOW_NONE</property>
437
437
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
438
438
 
460
460
            <widget class="GtkScrolledWindow" id="scrolledwindow_right">
461
461
              <property name="visible">True</property>
462
462
              <property name="can_focus">True</property>
463
 
              <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
464
 
              <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
 
463
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
464
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
465
465
              <property name="shadow_type">GTK_SHADOW_NONE</property>
466
466
              <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
467
467
 
533
533
      <property name="spacing">3</property>
534
534
 
535
535
      <child>
536
 
        <widget class="GtkLabel" id="label_commit">
537
 
          <property name="visible">True</property>
538
 
          <property name="label" translatable="yes">Please specify a commit message:</property>
539
 
          <property name="use_underline">False</property>
540
 
          <property name="use_markup">False</property>
541
 
          <property name="justify">GTK_JUSTIFY_LEFT</property>
542
 
          <property name="wrap">False</property>
543
 
          <property name="selectable">False</property>
544
 
          <property name="xalign">0</property>
545
 
          <property name="yalign">0.5</property>
546
 
          <property name="xpad">0</property>
547
 
          <property name="ypad">0</property>
548
 
          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
549
 
          <property name="width_chars">-1</property>
550
 
          <property name="single_line_mode">False</property>
551
 
          <property name="angle">0</property>
552
 
        </widget>
553
 
        <packing>
554
 
          <property name="padding">0</property>
555
 
          <property name="expand">False</property>
556
 
          <property name="fill">False</property>
557
 
        </packing>
558
 
      </child>
559
 
 
560
 
      <child>
561
 
        <widget class="GtkScrolledWindow" id="scrolledwindow_commit">
 
536
        <widget class="GtkVPaned" id="vpaned_commit">
562
537
          <property name="visible">True</property>
563
538
          <property name="can_focus">True</property>
564
 
          <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
565
 
          <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
566
 
          <property name="shadow_type">GTK_SHADOW_NONE</property>
567
 
          <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
568
 
 
569
 
          <child>
570
 
            <widget class="GtkTextView" id="textview_commit">
571
 
              <property name="visible">True</property>
572
 
              <property name="can_focus">True</property>
573
 
              <property name="editable">True</property>
574
 
              <property name="overwrite">False</property>
575
 
              <property name="accepts_tab">True</property>
576
 
              <property name="justification">GTK_JUSTIFY_LEFT</property>
577
 
              <property name="wrap_mode">GTK_WRAP_NONE</property>
578
 
              <property name="cursor_visible">True</property>
579
 
              <property name="pixels_above_lines">0</property>
580
 
              <property name="pixels_below_lines">0</property>
581
 
              <property name="pixels_inside_wrap">0</property>
582
 
              <property name="left_margin">0</property>
583
 
              <property name="right_margin">0</property>
584
 
              <property name="indent">0</property>
585
 
              <property name="text" translatable="yes"></property>
586
 
            </widget>
 
539
          <property name="position">120</property>
 
540
 
 
541
          <child>
 
542
            <widget class="GtkVBox" id="vbox_commit_select">
 
543
              <property name="visible">True</property>
 
544
              <property name="homogeneous">False</property>
 
545
              <property name="spacing">0</property>
 
546
 
 
547
              <child>
 
548
                <widget class="GtkLabel" id="label_commit_select">
 
549
                  <property name="visible">True</property>
 
550
                  <property name="label" translatable="yes">Please select the file(s) to commit:</property>
 
551
                  <property name="use_underline">False</property>
 
552
                  <property name="use_markup">False</property>
 
553
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
 
554
                  <property name="wrap">False</property>
 
555
                  <property name="selectable">False</property>
 
556
                  <property name="xalign">0</property>
 
557
                  <property name="yalign">0.5</property>
 
558
                  <property name="xpad">0</property>
 
559
                  <property name="ypad">0</property>
 
560
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
561
                  <property name="width_chars">-1</property>
 
562
                  <property name="single_line_mode">False</property>
 
563
                  <property name="angle">0</property>
 
564
                </widget>
 
565
                <packing>
 
566
                  <property name="padding">0</property>
 
567
                  <property name="expand">False</property>
 
568
                  <property name="fill">False</property>
 
569
                </packing>
 
570
              </child>
 
571
 
 
572
              <child>
 
573
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_select">
 
574
                  <property name="visible">True</property>
 
575
                  <property name="can_focus">True</property>
 
576
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
577
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
578
                  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
579
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
580
 
 
581
                  <child>
 
582
                    <widget class="GtkTreeView" id="treeview_commit_select">
 
583
                      <property name="visible">True</property>
 
584
                      <property name="can_focus">True</property>
 
585
                      <property name="headers_visible">True</property>
 
586
                      <property name="rules_hint">False</property>
 
587
                      <property name="reorderable">False</property>
 
588
                      <property name="enable_search">True</property>
 
589
                      <property name="fixed_height_mode">False</property>
 
590
                      <property name="hover_selection">False</property>
 
591
                      <property name="hover_expand">False</property>
 
592
                    </widget>
 
593
                  </child>
 
594
                </widget>
 
595
                <packing>
 
596
                  <property name="padding">0</property>
 
597
                  <property name="expand">True</property>
 
598
                  <property name="fill">True</property>
 
599
                </packing>
 
600
              </child>
 
601
            </widget>
 
602
            <packing>
 
603
              <property name="shrink">True</property>
 
604
              <property name="resize">False</property>
 
605
            </packing>
 
606
          </child>
 
607
 
 
608
          <child>
 
609
            <widget class="GtkVBox" id="vbox_commit_message">
 
610
              <property name="visible">True</property>
 
611
              <property name="homogeneous">False</property>
 
612
              <property name="spacing">0</property>
 
613
 
 
614
              <child>
 
615
                <widget class="GtkLabel" id="label_commit_message">
 
616
                  <property name="visible">True</property>
 
617
                  <property name="label" translatable="yes">Please specify a commit message:</property>
 
618
                  <property name="use_underline">False</property>
 
619
                  <property name="use_markup">False</property>
 
620
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
 
621
                  <property name="wrap">False</property>
 
622
                  <property name="selectable">False</property>
 
623
                  <property name="xalign">0</property>
 
624
                  <property name="yalign">0.5</property>
 
625
                  <property name="xpad">0</property>
 
626
                  <property name="ypad">0</property>
 
627
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
628
                  <property name="width_chars">-1</property>
 
629
                  <property name="single_line_mode">False</property>
 
630
                  <property name="angle">0</property>
 
631
                </widget>
 
632
                <packing>
 
633
                  <property name="padding">0</property>
 
634
                  <property name="expand">False</property>
 
635
                  <property name="fill">False</property>
 
636
                </packing>
 
637
              </child>
 
638
 
 
639
              <child>
 
640
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_message">
 
641
                  <property name="visible">True</property>
 
642
                  <property name="can_focus">True</property>
 
643
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
644
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
645
                  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
646
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
647
 
 
648
                  <child>
 
649
                    <widget class="GtkTextView" id="textview_commit">
 
650
                      <property name="visible">True</property>
 
651
                      <property name="can_focus">True</property>
 
652
                      <property name="editable">True</property>
 
653
                      <property name="overwrite">False</property>
 
654
                      <property name="accepts_tab">True</property>
 
655
                      <property name="justification">GTK_JUSTIFY_LEFT</property>
 
656
                      <property name="wrap_mode">GTK_WRAP_NONE</property>
 
657
                      <property name="cursor_visible">True</property>
 
658
                      <property name="pixels_above_lines">0</property>
 
659
                      <property name="pixels_below_lines">0</property>
 
660
                      <property name="pixels_inside_wrap">0</property>
 
661
                      <property name="left_margin">0</property>
 
662
                      <property name="right_margin">0</property>
 
663
                      <property name="indent">0</property>
 
664
                      <property name="text" translatable="yes"></property>
 
665
                    </widget>
 
666
                  </child>
 
667
                </widget>
 
668
                <packing>
 
669
                  <property name="padding">0</property>
 
670
                  <property name="expand">True</property>
 
671
                  <property name="fill">True</property>
 
672
                </packing>
 
673
              </child>
 
674
            </widget>
 
675
            <packing>
 
676
              <property name="shrink">True</property>
 
677
              <property name="resize">True</property>
 
678
            </packing>
587
679
          </child>
588
680
        </widget>
589
681
        <packing>
747
839
        <packing>
748
840
          <property name="padding">0</property>
749
841
          <property name="expand">False</property>
750
 
          <property name="fill">True</property>
 
842
          <property name="fill">False</property>
751
843
        </packing>
752
844
      </child>
753
845
    </widget>