/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-31 18:17:48 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-20060731181748-02e1970a99f30150
2006-07-31  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * Back from holiday.
    * olive.glade: separated branch and checkout dialogs (Fixed: #54019)
    * olive/frontend/gtk/checkout.py: file added respectively
    * olive/frontend/gtk/branch.py: removed checkout options
    * olive/frontend/gtk/handler.py: modified handler names + added checkout
    * olive/frontend/gtk/push.py: window gets properly resized (Fixed: #54676)

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive.glade
51
51
                      <signal name="activate" handler="on_menuitem_add_files_activate" last_modification_time="Fri, 21 Jul 2006 11:38:39 GMT"/>
52
52
 
53
53
                      <child internal-child="image">
54
 
                        <widget class="GtkImage" id="image44">
 
54
                        <widget class="GtkImage" id="image56">
55
55
                          <property name="visible">True</property>
56
56
                          <property name="stock">gtk-add</property>
57
57
                          <property name="icon_size">1</property>
72
72
                      <signal name="activate" handler="on_menuitem_remove_file_activate" last_modification_time="Fri, 21 Jul 2006 13:54:07 GMT"/>
73
73
 
74
74
                      <child internal-child="image">
75
 
                        <widget class="GtkImage" id="image45">
 
75
                        <widget class="GtkImage" id="image57">
76
76
                          <property name="visible">True</property>
77
77
                          <property name="stock">gtk-remove</property>
78
78
                          <property name="icon_size">1</property>
162
162
                  </child>
163
163
 
164
164
                  <child>
165
 
                    <widget class="GtkMenuItem" id="menuitem_branch_branch">
166
 
                      <property name="visible">True</property>
167
 
                      <property name="label" translatable="yes">_Branch...</property>
168
 
                      <property name="use_underline">True</property>
169
 
                      <signal name="activate" handler="on_menuitem_branch_branch_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
 
165
                    <widget class="GtkMenuItem" id="menuitem_branch_get">
 
166
                      <property name="visible">True</property>
 
167
                      <property name="label" translatable="yes">_Get...</property>
 
168
                      <property name="use_underline">True</property>
 
169
                      <signal name="activate" handler="on_menuitem_branch_get_activate" last_modification_time="Mon, 31 Jul 2006 17:01:12 GMT"/>
 
170
                    </widget>
 
171
                  </child>
 
172
 
 
173
                  <child>
 
174
                    <widget class="GtkMenuItem" id="menuitem_branch_checkout">
 
175
                      <property name="visible">True</property>
 
176
                      <property name="label" translatable="yes">C_heckout...</property>
 
177
                      <property name="use_underline">True</property>
 
178
                      <signal name="activate" handler="on_menuitem_branch_checkout_activate" last_modification_time="Mon, 31 Jul 2006 17:01:12 GMT"/>
170
179
                    </widget>
171
180
                  </child>
172
181
 
184
193
                      <signal name="activate" handler="on_menuitem_branch_pull_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
185
194
 
186
195
                      <child internal-child="image">
187
 
                        <widget class="GtkImage" id="image46">
 
196
                        <widget class="GtkImage" id="image58">
188
197
                          <property name="visible">True</property>
189
198
                          <property name="stock">gtk-goto-bottom</property>
190
199
                          <property name="icon_size">1</property>
205
214
                      <signal name="activate" handler="on_menuitem_branch_push_activate" last_modification_time="Mon, 17 Jul 2006 08:52:48 GMT"/>
206
215
 
207
216
                      <child internal-child="image">
208
 
                        <widget class="GtkImage" id="image47">
 
217
                        <widget class="GtkImage" id="image59">
209
218
                          <property name="visible">True</property>
210
219
                          <property name="stock">gtk-goto-top</property>
211
220
                          <property name="icon_size">1</property>
232
241
                      <signal name="activate" handler="on_menuitem_branch_commit_activate" last_modification_time="Mon, 17 Jul 2006 08:53:37 GMT"/>
233
242
 
234
243
                      <child internal-child="image">
235
 
                        <widget class="GtkImage" id="image48">
 
244
                        <widget class="GtkImage" id="image60">
236
245
                          <property name="visible">True</property>
237
246
                          <property name="stock">gtk-redo</property>
238
247
                          <property name="icon_size">1</property>
872
881
      <child>
873
882
        <widget class="GtkTable" id="table_branch">
874
883
          <property name="visible">True</property>
875
 
          <property name="n_rows">5</property>
 
884
          <property name="n_rows">3</property>
876
885
          <property name="n_columns">2</property>
877
886
          <property name="homogeneous">False</property>
878
887
          <property name="row_spacing">3</property>
1022
1031
              <property name="y_options"></property>
1023
1032
            </packing>
1024
1033
          </child>
1025
 
 
1026
 
          <child>
1027
 
            <widget class="GtkCheckButton" id="checkbutton_branch_checkout">
1028
 
              <property name="visible">True</property>
1029
 
              <property name="can_focus">True</property>
1030
 
              <property name="label" translatable="yes">Checkout</property>
1031
 
              <property name="use_underline">True</property>
1032
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1033
 
              <property name="focus_on_click">True</property>
1034
 
              <property name="active">False</property>
1035
 
              <property name="inconsistent">False</property>
1036
 
              <property name="draw_indicator">True</property>
1037
 
            </widget>
1038
 
            <packing>
1039
 
              <property name="left_attach">1</property>
1040
 
              <property name="right_attach">2</property>
1041
 
              <property name="top_attach">3</property>
1042
 
              <property name="bottom_attach">4</property>
1043
 
              <property name="x_options">fill</property>
1044
 
              <property name="y_options"></property>
1045
 
            </packing>
1046
 
          </child>
1047
 
 
1048
 
          <child>
1049
 
            <widget class="GtkCheckButton" id="checkbutton_branch_lightweight">
1050
 
              <property name="visible">True</property>
1051
 
              <property name="can_focus">True</property>
1052
 
              <property name="label" translatable="yes">Lightweight checkout</property>
1053
 
              <property name="use_underline">True</property>
1054
 
              <property name="relief">GTK_RELIEF_NORMAL</property>
1055
 
              <property name="focus_on_click">True</property>
1056
 
              <property name="active">False</property>
1057
 
              <property name="inconsistent">False</property>
1058
 
              <property name="draw_indicator">True</property>
1059
 
            </widget>
1060
 
            <packing>
1061
 
              <property name="left_attach">1</property>
1062
 
              <property name="right_attach">2</property>
1063
 
              <property name="top_attach">4</property>
1064
 
              <property name="bottom_attach">5</property>
1065
 
              <property name="x_options">fill</property>
1066
 
              <property name="y_options"></property>
1067
 
            </packing>
1068
 
          </child>
1069
1034
        </widget>
1070
1035
        <packing>
1071
1036
          <property name="padding">0</property>
1813
1778
  </child>
1814
1779
</widget>
1815
1780
 
 
1781
<widget class="GtkWindow" id="window_checkout">
 
1782
  <property name="width_request">350</property>
 
1783
  <property name="title" translatable="yes">Olive - Checkout</property>
 
1784
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
 
1785
  <property name="window_position">GTK_WIN_POS_NONE</property>
 
1786
  <property name="modal">False</property>
 
1787
  <property name="resizable">True</property>
 
1788
  <property name="destroy_with_parent">False</property>
 
1789
  <property name="decorated">True</property>
 
1790
  <property name="skip_taskbar_hint">False</property>
 
1791
  <property name="skip_pager_hint">False</property>
 
1792
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
 
1793
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 
1794
  <property name="focus_on_map">True</property>
 
1795
  <property name="urgency_hint">False</property>
 
1796
 
 
1797
  <child>
 
1798
    <widget class="GtkVBox" id="vbox_checkout">
 
1799
      <property name="border_width">5</property>
 
1800
      <property name="visible">True</property>
 
1801
      <property name="homogeneous">False</property>
 
1802
      <property name="spacing">3</property>
 
1803
 
 
1804
      <child>
 
1805
        <widget class="GtkTable" id="table_checkout">
 
1806
          <property name="visible">True</property>
 
1807
          <property name="n_rows">4</property>
 
1808
          <property name="n_columns">2</property>
 
1809
          <property name="homogeneous">False</property>
 
1810
          <property name="row_spacing">3</property>
 
1811
          <property name="column_spacing">3</property>
 
1812
 
 
1813
          <child>
 
1814
            <widget class="GtkLabel" id="label_checkout_location">
 
1815
              <property name="visible">True</property>
 
1816
              <property name="label" translatable="yes">Branch location:</property>
 
1817
              <property name="use_underline">False</property>
 
1818
              <property name="use_markup">False</property>
 
1819
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1820
              <property name="wrap">False</property>
 
1821
              <property name="selectable">False</property>
 
1822
              <property name="xalign">0</property>
 
1823
              <property name="yalign">0.5</property>
 
1824
              <property name="xpad">0</property>
 
1825
              <property name="ypad">0</property>
 
1826
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1827
              <property name="width_chars">-1</property>
 
1828
              <property name="single_line_mode">False</property>
 
1829
              <property name="angle">0</property>
 
1830
            </widget>
 
1831
            <packing>
 
1832
              <property name="left_attach">0</property>
 
1833
              <property name="right_attach">1</property>
 
1834
              <property name="top_attach">0</property>
 
1835
              <property name="bottom_attach">1</property>
 
1836
              <property name="x_options">fill</property>
 
1837
              <property name="y_options"></property>
 
1838
            </packing>
 
1839
          </child>
 
1840
 
 
1841
          <child>
 
1842
            <widget class="GtkLabel" id="label_checkout_destination">
 
1843
              <property name="visible">True</property>
 
1844
              <property name="label" translatable="yes">Destination:</property>
 
1845
              <property name="use_underline">False</property>
 
1846
              <property name="use_markup">False</property>
 
1847
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1848
              <property name="wrap">False</property>
 
1849
              <property name="selectable">False</property>
 
1850
              <property name="xalign">0</property>
 
1851
              <property name="yalign">0.5</property>
 
1852
              <property name="xpad">0</property>
 
1853
              <property name="ypad">0</property>
 
1854
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1855
              <property name="width_chars">-1</property>
 
1856
              <property name="single_line_mode">False</property>
 
1857
              <property name="angle">0</property>
 
1858
            </widget>
 
1859
            <packing>
 
1860
              <property name="left_attach">0</property>
 
1861
              <property name="right_attach">1</property>
 
1862
              <property name="top_attach">1</property>
 
1863
              <property name="bottom_attach">2</property>
 
1864
              <property name="x_options">fill</property>
 
1865
              <property name="y_options"></property>
 
1866
            </packing>
 
1867
          </child>
 
1868
 
 
1869
          <child>
 
1870
            <widget class="GtkFileChooserButton" id="filechooserbutton_checkout">
 
1871
              <property name="visible">True</property>
 
1872
              <property name="title" translatable="yes">Please select a folder</property>
 
1873
              <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 
1874
              <property name="local_only">True</property>
 
1875
              <property name="show_hidden">False</property>
 
1876
              <property name="do_overwrite_confirmation">False</property>
 
1877
              <property name="width_chars">-1</property>
 
1878
            </widget>
 
1879
            <packing>
 
1880
              <property name="left_attach">1</property>
 
1881
              <property name="right_attach">2</property>
 
1882
              <property name="top_attach">1</property>
 
1883
              <property name="bottom_attach">2</property>
 
1884
              <property name="y_options">fill</property>
 
1885
            </packing>
 
1886
          </child>
 
1887
 
 
1888
          <child>
 
1889
            <widget class="GtkEntry" id="entry_checkout_location">
 
1890
              <property name="visible">True</property>
 
1891
              <property name="can_focus">True</property>
 
1892
              <property name="editable">True</property>
 
1893
              <property name="visibility">True</property>
 
1894
              <property name="max_length">0</property>
 
1895
              <property name="text" translatable="yes"></property>
 
1896
              <property name="has_frame">True</property>
 
1897
              <property name="invisible_char">●</property>
 
1898
              <property name="activates_default">False</property>
 
1899
            </widget>
 
1900
            <packing>
 
1901
              <property name="left_attach">1</property>
 
1902
              <property name="right_attach">2</property>
 
1903
              <property name="top_attach">0</property>
 
1904
              <property name="bottom_attach">1</property>
 
1905
              <property name="y_options"></property>
 
1906
            </packing>
 
1907
          </child>
 
1908
 
 
1909
          <child>
 
1910
            <widget class="GtkLabel" id="label_checkout_revno">
 
1911
              <property name="visible">True</property>
 
1912
              <property name="label" translatable="yes">Revision number:</property>
 
1913
              <property name="use_underline">False</property>
 
1914
              <property name="use_markup">False</property>
 
1915
              <property name="justify">GTK_JUSTIFY_LEFT</property>
 
1916
              <property name="wrap">False</property>
 
1917
              <property name="selectable">False</property>
 
1918
              <property name="xalign">0</property>
 
1919
              <property name="yalign">0.5</property>
 
1920
              <property name="xpad">0</property>
 
1921
              <property name="ypad">0</property>
 
1922
              <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
1923
              <property name="width_chars">-1</property>
 
1924
              <property name="single_line_mode">False</property>
 
1925
              <property name="angle">0</property>
 
1926
            </widget>
 
1927
            <packing>
 
1928
              <property name="left_attach">0</property>
 
1929
              <property name="right_attach">1</property>
 
1930
              <property name="top_attach">2</property>
 
1931
              <property name="bottom_attach">3</property>
 
1932
              <property name="x_options">fill</property>
 
1933
              <property name="y_options"></property>
 
1934
            </packing>
 
1935
          </child>
 
1936
 
 
1937
          <child>
 
1938
            <widget class="GtkSpinButton" id="spinbutton_checkout_revno">
 
1939
              <property name="visible">True</property>
 
1940
              <property name="can_focus">True</property>
 
1941
              <property name="climb_rate">1</property>
 
1942
              <property name="digits">0</property>
 
1943
              <property name="numeric">False</property>
 
1944
              <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 
1945
              <property name="snap_to_ticks">False</property>
 
1946
              <property name="wrap">False</property>
 
1947
              <property name="adjustment">0 0 100000 1 10 10</property>
 
1948
            </widget>
 
1949
            <packing>
 
1950
              <property name="left_attach">1</property>
 
1951
              <property name="right_attach">2</property>
 
1952
              <property name="top_attach">2</property>
 
1953
              <property name="bottom_attach">3</property>
 
1954
              <property name="y_options"></property>
 
1955
            </packing>
 
1956
          </child>
 
1957
 
 
1958
          <child>
 
1959
            <widget class="GtkCheckButton" id="checkbutton_checkout_lightweight">
 
1960
              <property name="visible">True</property>
 
1961
              <property name="can_focus">True</property>
 
1962
              <property name="label" translatable="yes">Lightweight checkout</property>
 
1963
              <property name="use_underline">True</property>
 
1964
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1965
              <property name="focus_on_click">True</property>
 
1966
              <property name="active">False</property>
 
1967
              <property name="inconsistent">False</property>
 
1968
              <property name="draw_indicator">True</property>
 
1969
            </widget>
 
1970
            <packing>
 
1971
              <property name="left_attach">1</property>
 
1972
              <property name="right_attach">2</property>
 
1973
              <property name="top_attach">3</property>
 
1974
              <property name="bottom_attach">4</property>
 
1975
              <property name="x_options">fill</property>
 
1976
              <property name="y_options"></property>
 
1977
            </packing>
 
1978
          </child>
 
1979
        </widget>
 
1980
        <packing>
 
1981
          <property name="padding">0</property>
 
1982
          <property name="expand">True</property>
 
1983
          <property name="fill">True</property>
 
1984
        </packing>
 
1985
      </child>
 
1986
 
 
1987
      <child>
 
1988
        <widget class="GtkHButtonBox" id="hbuttonbox_checkout">
 
1989
          <property name="visible">True</property>
 
1990
          <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
 
1991
          <property name="spacing">0</property>
 
1992
 
 
1993
          <child>
 
1994
            <widget class="GtkButton" id="button_checkout_checkout">
 
1995
              <property name="visible">True</property>
 
1996
              <property name="can_default">True</property>
 
1997
              <property name="can_focus">True</property>
 
1998
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
1999
              <property name="focus_on_click">True</property>
 
2000
              <signal name="clicked" handler="on_button_checkout_checkout_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:11 GMT"/>
 
2001
 
 
2002
              <child>
 
2003
                <widget class="GtkAlignment" id="alignment7">
 
2004
                  <property name="visible">True</property>
 
2005
                  <property name="xalign">0.5</property>
 
2006
                  <property name="yalign">0.5</property>
 
2007
                  <property name="xscale">0</property>
 
2008
                  <property name="yscale">0</property>
 
2009
                  <property name="top_padding">0</property>
 
2010
                  <property name="bottom_padding">0</property>
 
2011
                  <property name="left_padding">0</property>
 
2012
                  <property name="right_padding">0</property>
 
2013
 
 
2014
                  <child>
 
2015
                    <widget class="GtkHBox" id="hbox9">
 
2016
                      <property name="visible">True</property>
 
2017
                      <property name="homogeneous">False</property>
 
2018
                      <property name="spacing">2</property>
 
2019
 
 
2020
                      <child>
 
2021
                        <widget class="GtkImage" id="image51">
 
2022
                          <property name="visible">True</property>
 
2023
                          <property name="stock">gtk-apply</property>
 
2024
                          <property name="icon_size">4</property>
 
2025
                          <property name="xalign">0.5</property>
 
2026
                          <property name="yalign">0.5</property>
 
2027
                          <property name="xpad">0</property>
 
2028
                          <property name="ypad">0</property>
 
2029
                        </widget>
 
2030
                        <packing>
 
2031
                          <property name="padding">0</property>
 
2032
                          <property name="expand">False</property>
 
2033
                          <property name="fill">False</property>
 
2034
                        </packing>
 
2035
                      </child>
 
2036
 
 
2037
                      <child>
 
2038
                        <widget class="GtkLabel" id="label16">
 
2039
                          <property name="visible">True</property>
 
2040
                          <property name="label" translatable="yes">C_heckout</property>
 
2041
                          <property name="use_underline">True</property>
 
2042
                          <property name="use_markup">False</property>
 
2043
                          <property name="justify">GTK_JUSTIFY_LEFT</property>
 
2044
                          <property name="wrap">False</property>
 
2045
                          <property name="selectable">False</property>
 
2046
                          <property name="xalign">0.5</property>
 
2047
                          <property name="yalign">0.5</property>
 
2048
                          <property name="xpad">0</property>
 
2049
                          <property name="ypad">0</property>
 
2050
                          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 
2051
                          <property name="width_chars">-1</property>
 
2052
                          <property name="single_line_mode">False</property>
 
2053
                          <property name="angle">0</property>
 
2054
                        </widget>
 
2055
                        <packing>
 
2056
                          <property name="padding">0</property>
 
2057
                          <property name="expand">False</property>
 
2058
                          <property name="fill">False</property>
 
2059
                        </packing>
 
2060
                      </child>
 
2061
                    </widget>
 
2062
                  </child>
 
2063
                </widget>
 
2064
              </child>
 
2065
            </widget>
 
2066
          </child>
 
2067
 
 
2068
          <child>
 
2069
            <widget class="GtkButton" id="button_checkout_cancel">
 
2070
              <property name="visible">True</property>
 
2071
              <property name="can_default">True</property>
 
2072
              <property name="can_focus">True</property>
 
2073
              <property name="label">gtk-cancel</property>
 
2074
              <property name="use_stock">True</property>
 
2075
              <property name="relief">GTK_RELIEF_NORMAL</property>
 
2076
              <property name="focus_on_click">True</property>
 
2077
              <signal name="clicked" handler="on_button_checkout_cancel_clicked" last_modification_time="Mon, 31 Jul 2006 16:44:19 GMT"/>
 
2078
            </widget>
 
2079
          </child>
 
2080
        </widget>
 
2081
        <packing>
 
2082
          <property name="padding">0</property>
 
2083
          <property name="expand">False</property>
 
2084
          <property name="fill">False</property>
 
2085
        </packing>
 
2086
      </child>
 
2087
    </widget>
 
2088
  </child>
 
2089
</widget>
 
2090
 
1816
2091
</glade-interface>