/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-17 20:24:24 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-20060717202424-0f2d6bb723296b35
2006-07-17  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * olive.glade: signals added + Branch dialog modifications
    * olive/frontend/gtk/branch.py: began to implement branching functionality
    * olive/frontend/gtk/*: fixes tabs and spaces

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
6
6
<widget class="GtkWindow" id="window_main">
7
7
  <property name="width_request">700</property>
8
8
  <property name="height_request">400</property>
9
 
  <property name="visible">True</property>
10
9
  <property name="title" translatable="yes">Olive - Bazaar-NG GUI</property>
11
10
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
12
11
  <property name="window_position">GTK_WIN_POS_NONE</property>
461
460
</widget>
462
461
 
463
462
<widget class="GtkWindow" id="window_commit">
464
 
  <property name="visible">True</property>
465
463
  <property name="title" translatable="yes">Olive - Commit</property>
466
464
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
467
465
  <property name="window_position">GTK_WIN_POS_NONE</property>
647
645
</widget>
648
646
 
649
647
<widget class="GtkWindow" id="window_branch">
650
 
  <property name="visible">True</property>
651
648
  <property name="title" translatable="yes">Olive - Branch</property>
652
649
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
653
650
  <property name="window_position">GTK_WIN_POS_NONE</property>
657
654
  <property name="decorated">True</property>
658
655
  <property name="skip_taskbar_hint">False</property>
659
656
  <property name="skip_pager_hint">False</property>
660
 
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
 
657
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
661
658
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
662
659
  <property name="focus_on_map">True</property>
663
660
  <property name="urgency_hint">False</property>
672
669
      <child>
673
670
        <widget class="GtkTable" id="table_branch">
674
671
          <property name="visible">True</property>
675
 
          <property name="n_rows">5</property>
 
672
          <property name="n_rows">6</property>
676
673
          <property name="n_columns">2</property>
677
674
          <property name="homogeneous">False</property>
678
675
          <property name="row_spacing">3</property>
775
772
          </child>
776
773
 
777
774
          <child>
778
 
            <widget class="GtkLabel" id="label_branch_revno">
 
775
            <widget class="GtkCheckButton" id="checkbutton_branch_lightweight">
779
776
              <property name="visible">True</property>
780
 
              <property name="label" translatable="yes">Revision number:</property>
781
 
              <property name="use_underline">False</property>
782
 
              <property name="use_markup">False</property>
783
 
              <property name="justify">GTK_JUSTIFY_LEFT</property>
784
 
              <property name="wrap">False</property>
785
 
              <property name="selectable">False</property>
786
 
              <property name="xalign">0</property>
787
 
              <property name="yalign">0.5</property>
788
 
              <property name="xpad">0</property>
789
 
              <property name="ypad">0</property>
790
 
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
791
 
              <property name="width_chars">-1</property>
792
 
              <property name="single_line_mode">False</property>
793
 
              <property name="angle">0</property>
 
777
              <property name="can_focus">True</property>
 
778
              <property name="label" translatable="yes">Lightweight checkout</property>
 
779
              <property name="use_underline">True</property>
 
780
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
781
              <property name="focus_on_click">True</property>
 
782
              <property name="active">False</property>
 
783
              <property name="inconsistent">False</property>
 
784
              <property name="draw_indicator">True</property>
794
785
            </widget>
795
786
            <packing>
796
 
              <property name="left_attach">0</property>
797
 
              <property name="right_attach">1</property>
798
 
              <property name="top_attach">2</property>
799
 
              <property name="bottom_attach">3</property>
 
787
              <property name="left_attach">1</property>
 
788
              <property name="right_attach">2</property>
 
789
              <property name="top_attach">5</property>
 
790
              <property name="bottom_attach">6</property>
800
791
              <property name="x_options">fill</property>
801
792
              <property name="y_options"></property>
802
793
            </packing>
803
794
          </child>
804
795
 
805
796
          <child>
806
 
            <widget class="GtkEntry" id="entry_branch_revno">
807
 
              <property name="visible">True</property>
808
 
              <property name="can_focus">True</property>
809
 
              <property name="editable">True</property>
810
 
              <property name="visibility">True</property>
811
 
              <property name="max_length">0</property>
812
 
              <property name="text" translatable="yes"></property>
813
 
              <property name="has_frame">True</property>
814
 
              <property name="invisible_char">●</property>
815
 
              <property name="activates_default">False</property>
816
 
            </widget>
817
 
            <packing>
818
 
              <property name="left_attach">1</property>
819
 
              <property name="right_attach">2</property>
820
 
              <property name="top_attach">2</property>
821
 
              <property name="bottom_attach">3</property>
822
 
              <property name="y_options"></property>
823
 
            </packing>
824
 
          </child>
825
 
 
826
 
          <child>
827
797
            <widget class="GtkCheckButton" id="checkbutton_branch_checkout">
828
798
              <property name="visible">True</property>
829
799
              <property name="can_focus">True</property>
838
808
            <packing>
839
809
              <property name="left_attach">1</property>
840
810
              <property name="right_attach">2</property>
841
 
              <property name="top_attach">3</property>
842
 
              <property name="bottom_attach">4</property>
843
 
              <property name="x_options">fill</property>
844
 
              <property name="y_options"></property>
845
 
            </packing>
846
 
          </child>
847
 
 
848
 
          <child>
849
 
            <widget class="GtkCheckButton" id="checkbutton_branch_lightweight">
850
 
              <property name="visible">True</property>
851
 
              <property name="can_focus">True</property>
852
 
              <property name="label" translatable="yes">Lightweight checkout</property>
853
 
              <property name="use_underline">True</property>
854
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
855
 
              <property name="focus_on_click">True</property>
856
 
              <property name="active">False</property>
857
 
              <property name="inconsistent">False</property>
858
 
              <property name="draw_indicator">True</property>
859
 
            </widget>
860
 
            <packing>
861
 
              <property name="left_attach">1</property>
862
 
              <property name="right_attach">2</property>
863
811
              <property name="top_attach">4</property>
864
812
              <property name="bottom_attach">5</property>
865
813
              <property name="x_options">fill</property>
866
814
              <property name="y_options"></property>
867
815
            </packing>
868
816
          </child>
 
817
 
 
818
          <child>
 
819
            <widget class="GtkLabel" id="label_branch_revno">
 
820
              <property name="visible">True</property>
 
821
              <property name="label" translatable="yes">Revision number:</property>
 
822
              <property name="use_underline">False</property>
 
823
              <property name="use_markup">False</property>
 
824
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
825
              <property name="wrap">False</property>
 
826
              <property name="selectable">False</property>
 
827
              <property name="xalign">0</property>
 
828
              <property name="yalign">0.5</property>
 
829
              <property name="xpad">0</property>
 
830
              <property name="ypad">0</property>
 
831
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
832
              <property name="width_chars">-1</property>
 
833
              <property name="single_line_mode">False</property>
 
834
              <property name="angle">0</property>
 
835
            </widget>
 
836
            <packing>
 
837
              <property name="left_attach">0</property>
 
838
              <property name="right_attach">1</property>
 
839
              <property name="top_attach">3</property>
 
840
              <property name="bottom_attach">4</property>
 
841
              <property name="x_options">fill</property>
 
842
              <property name="y_options"></property>
 
843
            </packing>
 
844
          </child>
 
845
 
 
846
          <child>
 
847
            <widget class="GtkLabel" id="label_branch_localnick">
 
848
              <property name="visible">True</property>
 
849
              <property name="label" translatable="yes">Local nick:</property>
 
850
              <property name="use_underline">False</property>
 
851
              <property name="use_markup">False</property>
 
852
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
853
              <property name="wrap">False</property>
 
854
              <property name="selectable">False</property>
 
855
              <property name="xalign">0</property>
 
856
              <property name="yalign">0.5</property>
 
857
              <property name="xpad">0</property>
 
858
              <property name="ypad">0</property>
 
859
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
860
              <property name="width_chars">-1</property>
 
861
              <property name="single_line_mode">False</property>
 
862
              <property name="angle">0</property>
 
863
            </widget>
 
864
            <packing>
 
865
              <property name="left_attach">0</property>
 
866
              <property name="right_attach">1</property>
 
867
              <property name="top_attach">2</property>
 
868
              <property name="bottom_attach">3</property>
 
869
              <property name="x_options">fill</property>
 
870
              <property name="y_options"></property>
 
871
            </packing>
 
872
          </child>
 
873
 
 
874
          <child>
 
875
            <widget class="GtkEntry" id="entry_branch_localnick">
 
876
              <property name="visible">True</property>
 
877
              <property name="can_focus">True</property>
 
878
              <property name="editable">True</property>
 
879
              <property name="visibility">True</property>
 
880
              <property name="max_length">0</property>
 
881
              <property name="text" translatable="yes"></property>
 
882
              <property name="has_frame">True</property>
 
883
              <property name="invisible_char">●</property>
 
884
              <property name="activates_default">False</property>
 
885
            </widget>
 
886
            <packing>
 
887
              <property name="left_attach">1</property>
 
888
              <property name="right_attach">2</property>
 
889
              <property name="top_attach">2</property>
 
890
              <property name="bottom_attach">3</property>
 
891
              <property name="y_options"></property>
 
892
            </packing>
 
893
          </child>
 
894
 
 
895
          <child>
 
896
            <widget class="GtkSpinButton" id="spinbutton_branch_revno">
 
897
              <property name="visible">True</property>
 
898
              <property name="can_focus">True</property>
 
899
              <property name="climb_rate">1</property>
 
900
              <property name="digits">0</property>
 
901
              <property name="numeric">False</property>
 
902
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 
903
              <property name="snap_to_ticks">False</property>
 
904
              <property name="wrap">False</property>
 
905
              <property name="adjustment">0 0 100000 1 10 10</property>
 
906
            </widget>
 
907
            <packing>
 
908
              <property name="left_attach">1</property>
 
909
              <property name="right_attach">2</property>
 
910
              <property name="top_attach">3</property>
 
911
              <property name="bottom_attach">4</property>
 
912
              <property name="y_options"></property>
 
913
            </packing>
 
914
          </child>
869
915
        </widget>
870
916
        <packing>
871
917
          <property name="padding">0</property>
887
933
              <property name="can_focus">True</property>
888
934
              <property name="relief">GTK_RELIEF_NORMAL</property>
889
935
              <property name="focus_on_click">True</property>
 
936
              <signal name="clicked" handler="on_button_branch_branch_clicked" last_modification_time="Mon, 17 Jul 2006 16:25:30 GMT"/>
890
937
 
891
938
              <child>
892
939
                <widget class="GtkAlignment" id="alignment2">
926
973
                      <child>
927
974
                        <widget class="GtkLabel" id="label6">
928
975
                          <property name="visible">True</property>
929
 
                          <property name="label" translatable="yes">Branch</property>
 
976
                          <property name="label" translatable="yes">_Branch</property>
930
977
                          <property name="use_underline">True</property>
931
978
                          <property name="use_markup">False</property>
932
979
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
963
1010
              <property name="use_stock">True</property>
964
1011
              <property name="relief">GTK_RELIEF_NORMAL</property>
965
1012
              <property name="focus_on_click">True</property>
 
1013
              <signal name="clicked" handler="on_button_branch_cancel_clicked" last_modification_time="Mon, 17 Jul 2006 16:26:15 GMT"/>
966
1014
            </widget>
967
1015
          </child>
968
1016
        </widget>