codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTKUI: Fix layout issues with new path chooser in options tab

This commit is contained in:
Calum Lind 2013-05-18 17:48:52 +01:00
parent e5f7042d00
commit 957f04912f
2 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
deluge/ui/gtkui/glade/main_window.tabs.ui
View File

@ -804,30 +804,6 @@
<property name="n_columns">4</property> <property name="n_columns">4</property>
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">2</property> <property name="row_spacing">2</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkLabel" id="summary_comments"> <object class="GtkLabel" id="summary_comments">
<property name="visible">True</property> <property name="visible">True</property>
@ -841,7 +817,7 @@
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">5</property> <property name="top_attach">5</property>
<property name="bottom_attach">6</property> <property name="bottom_attach">6</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -859,7 +835,7 @@
<property name="top_attach">5</property> <property name="top_attach">5</property>
<property name="bottom_attach">6</property> <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -874,7 +850,7 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="bottom_attach">5</property> <property name="bottom_attach">5</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -892,7 +868,7 @@
<property name="top_attach">4</property> <property name="top_attach">4</property>
<property name="bottom_attach">5</property> <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -909,7 +885,7 @@
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -926,7 +902,7 @@
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -942,7 +918,7 @@
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">7</property> <property name="top_attach">7</property>
<property name="bottom_attach">8</property> <property name="bottom_attach">8</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -960,7 +936,7 @@
<property name="top_attach">7</property> <property name="top_attach">7</property>
<property name="bottom_attach">8</property> <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -985,7 +961,7 @@
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1000,7 +976,7 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1024,7 +1000,7 @@
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1048,7 +1024,7 @@
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1065,7 +1041,7 @@
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1083,7 +1059,7 @@
<property name="top_attach">6</property> <property name="top_attach">6</property>
<property name="bottom_attach">7</property> <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1098,7 +1074,7 @@
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">6</property> <property name="top_attach">6</property>
<property name="bottom_attach">7</property> <property name="bottom_attach">7</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1113,7 +1089,7 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1131,7 +1107,7 @@
<property name="top_attach">8</property> <property name="top_attach">8</property>
<property name="bottom_attach">9</property> <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1149,7 +1125,7 @@
<property name="top_attach">9</property> <property name="top_attach">9</property>
<property name="bottom_attach">10</property> <property name="bottom_attach">10</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1165,7 +1141,7 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">8</property> <property name="top_attach">8</property>
<property name="bottom_attach">9</property> <property name="bottom_attach">9</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1181,9 +1157,33 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">9</property> <property name="top_attach">9</property>
<property name="bottom_attach">10</property> <property name="bottom_attach">10</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1375,12 +1375,6 @@
<property name="n_columns">3</property> <property name="n_columns">3</property>
<property name="column_spacing">5</property> <property name="column_spacing">5</property>
<property name="row_spacing">2</property> <property name="row_spacing">2</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkSpinButton" id="spin_max_connections"> <object class="GtkSpinButton" id="spin_max_connections">
<property name="visible">True</property> <property name="visible">True</property>
@ -1401,8 +1395,8 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1426,8 +1420,8 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1450,8 +1444,8 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1465,7 +1459,7 @@
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1479,7 +1473,7 @@
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1491,7 +1485,7 @@
</object> </object>
<packing> <packing>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1503,8 +1497,8 @@
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="right_attach">3</property> <property name="right_attach">3</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1518,8 +1512,8 @@
<property name="right_attach">3</property> <property name="right_attach">3</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1533,7 +1527,7 @@
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1556,10 +1550,16 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">3</property> <property name="top_attach">3</property>
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1576,7 +1576,7 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
@ -1599,6 +1599,7 @@
<child> <child>
<object class="GtkCheckButton" id="chk_auto_managed"> <object class="GtkCheckButton" id="chk_auto_managed">
<property name="label" translatable="yes">Auto Managed</property> <property name="label" translatable="yes">Auto Managed</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1623,6 +1624,7 @@
<child> <child>
<object class="GtkCheckButton" id="chk_stop_at_ratio"> <object class="GtkCheckButton" id="chk_stop_at_ratio">
<property name="label" translatable="yes">Stop seed at ratio:</property> <property name="label" translatable="yes">Stop seed at ratio:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1671,6 +1673,7 @@
<child> <child>
<object class="GtkCheckButton" id="chk_remove_at_ratio"> <object class="GtkCheckButton" id="chk_remove_at_ratio">
<property name="label" translatable="yes">Remove at ratio</property> <property name="label" translatable="yes">Remove at ratio</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1710,7 +1713,7 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
@ -1743,6 +1746,7 @@
<child> <child>
<object class="GtkCheckButton" id="chk_private"> <object class="GtkCheckButton" id="chk_private">
<property name="label" translatable="yes">Private</property> <property name="label" translatable="yes">Private</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -1751,12 +1755,13 @@
<signal name="toggled" handler="on_chk_toggled" swapped="no"/> <signal name="toggled" handler="on_chk_toggled" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="chk_shared"> <object class="GtkCheckButton" id="chk_shared">
<property name="label" translatable="yes">Shared</property> <property name="label" translatable="yes">Shared</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1766,12 +1771,13 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="chk_prioritize_first_last"> <object class="GtkCheckButton" id="chk_prioritize_first_last">
<property name="label" translatable="yes">Prioritize First/Last</property> <property name="label" translatable="yes">Prioritize First/Last</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1782,12 +1788,13 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">1</property> <property name="top_attach">1</property>
<property name="bottom_attach">2</property> <property name="bottom_attach">2</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="chk_sequential_download"> <object class="GtkCheckButton" id="chk_sequential_download">
<property name="label" translatable="yes">Sequential Download</property> <property name="label" translatable="yes">Sequential Download</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -1798,7 +1805,7 @@
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="top_attach">2</property> <property name="top_attach">2</property>
<property name="bottom_attach">3</property> <property name="bottom_attach">3</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
</object> </object>
@ -1818,64 +1825,6 @@
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property> <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<property name="right_padding">5</property>
<child>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
<child>
<object class="GtkCheckButton" id="chk_move_completed">
<property name="label" translatable="yes">Move completed:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_move_completed_toggled" swapped="no"/>
</object>
<packing>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_move_completed_path_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"/>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child> <child>
<object class="GtkFrame" id="frame5"> <object class="GtkFrame" id="frame5">
<property name="visible">True</property> <property name="visible">True</property>
@ -1894,6 +1843,7 @@
<child> <child>
<object class="GtkButton" id="button_apply"> <object class="GtkButton" id="button_apply">
<property name="label">gtk-apply</property> <property name="label">gtk-apply</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -1909,6 +1859,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="button_edit_trackers1"> <object class="GtkButton" id="button_edit_trackers1">
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
@ -1953,9 +1904,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -1974,15 +1922,66 @@
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
<property name="right_attach">2</property> <property name="right_attach">2</property>
<property name="x_options"/> <property name="x_options"></property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="left_padding">14</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_move_completed">
<property name="label" translatable="yes">Move completed:</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_move_completed_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox_move_completed_path_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>
<property name="right_attach">3</property> <property name="right_attach">3</property>
<property name="y_options"/> <property name="y_options"></property>
</packing> </packing>
</child> </child>
</object> </object>

1
deluge/ui/gtkui/options_tab.py
View File

@ -67,6 +67,7 @@ class OptionsTab(Tab):
self.move_completed_hbox = builder.get_object("hbox_move_completed_path_chooser") self.move_completed_hbox = builder.get_object("hbox_move_completed_path_chooser")
self.move_completed_path_chooser = PathChooser("move_completed_paths_list") self.move_completed_path_chooser = PathChooser("move_completed_paths_list")
self.move_completed_path_chooser.set_sensitive(self.chk_move_completed.get_active())
self.move_completed_hbox.add(self.move_completed_path_chooser) self.move_completed_hbox.add(self.move_completed_path_chooser)
self.move_completed_hbox.show_all() self.move_completed_hbox.show_all()