/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

merge with main branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
670
670
</widget>
671
671
 
672
672
<widget class="GtkDialog" id="window_commit">
673
 
  <property name="width_request">400</property>
674
 
  <property name="height_request">400</property>
 
673
  <property name="width_request">500</property>
 
674
  <property name="height_request">500</property>
675
675
  <property name="title" translatable="yes">Olive - Commit</property>
676
676
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
677
677
  <property name="window_position">GTK_WIN_POS_NONE</property>
802
802
        <widget class="GtkVPaned" id="vpaned_commit">
803
803
          <property name="visible">True</property>
804
804
          <property name="can_focus">True</property>
805
 
          <property name="position">120</property>
 
805
          <property name="position">250</property>
806
806
 
807
807
          <child>
808
808
            <widget class="GtkVBox" id="vbox_commit_select">
864
864
                  <property name="fill">True</property>
865
865
                </packing>
866
866
              </child>
 
867
 
 
868
              <child>
 
869
                <widget class="GtkLabel" id="label_commit_pending">
 
870
                  <property name="visible">True</property>
 
871
                  <property name="label" translatable="yes">Pending merges:</property>
 
872
                  <property name="use_underline">False</property>
 
873
                  <property name="use_markup">False</property>
 
874
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
 
875
                  <property name="wrap">False</property>
 
876
                  <property name="selectable">False</property>
 
877
                  <property name="xalign">0</property>
 
878
                  <property name="yalign">0.5</property>
 
879
                  <property name="xpad">0</property>
 
880
                  <property name="ypad">0</property>
 
881
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
882
                  <property name="width_chars">-1</property>
 
883
                  <property name="single_line_mode">False</property>
 
884
                  <property name="angle">0</property>
 
885
                </widget>
 
886
                <packing>
 
887
                  <property name="padding">0</property>
 
888
                  <property name="expand">False</property>
 
889
                  <property name="fill">False</property>
 
890
                </packing>
 
891
              </child>
 
892
 
 
893
              <child>
 
894
                <widget class="GtkScrolledWindow" id="scrolledwindow_commit_pending">
 
895
                  <property name="visible">True</property>
 
896
                  <property name="can_focus">True</property>
 
897
                  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
898
                  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 
899
                  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
900
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
901
 
 
902
                  <child>
 
903
                    <widget class="GtkTreeView" id="treeview_commit_pending">
 
904
                      <property name="visible">True</property>
 
905
                      <property name="can_focus">True</property>
 
906
                      <property name="headers_visible">True</property>
 
907
                      <property name="rules_hint">False</property>
 
908
                      <property name="reorderable">False</property>
 
909
                      <property name="enable_search">True</property>
 
910
                      <property name="fixed_height_mode">False</property>
 
911
                      <property name="hover_selection">False</property>
 
912
                      <property name="hover_expand">False</property>
 
913
                    </widget>
 
914
                  </child>
 
915
                </widget>
 
916
                <packing>
 
917
                  <property name="padding">0</property>
 
918
                  <property name="expand">True</property>
 
919
                  <property name="fill">True</property>
 
920
                </packing>
 
921
              </child>
867
922
            </widget>
868
923
            <packing>
869
924
              <property name="shrink">True</property>
5514
5569
              <signal name="clicked" handler="on_button_merge_cancel_clicked" last_modification_time="Mon, 09 Oct 2006 13:35:13 GMT"/>
5515
5570
            </widget>
5516
5571
          </child>
5517
 
          
 
5572
 
5518
5573
          <child>
5519
5574
            <widget class="GtkButton" id="button_merge_merge">
5520
5575
              <property name="visible">True</property>
5590
5645
                </widget>
5591
5646
              </child>
5592
5647
            </widget>
5593
 
          </child>        
 
5648
          </child>
5594
5649
        </widget>
5595
5650
        <packing>
5596
5651
          <property name="padding">0</property>