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

[GTKUI] Move 'Add Dialog' prefs to Download tab 

Also includes more tweaks to layout for consistency and creating space.
This commit is contained in:
Calum Lind 2014-08-22 21:43:38 +01:00
parent 5c82c144cf
commit 48f79dbfca
2 changed files with 184 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

359
deluge/ui/gtkui/glade/preferences_dialog.ui
View File

@ -35,17 +35,17 @@
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<object class="GtkAdjustment" id="adjustment_spin_daemon_port">
<property name="upper">65535</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment_spin_downloading"> <object class="GtkAdjustment" id="adjustment_spin_downloading">
<property name="lower">-1</property> <property name="lower">-1</property>
<property name="upper">9999</property> <property name="upper">9999</property>
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<object class="GtkAdjustment" id="adjustment_spin_daemon_port">
<property name="upper">65535</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment_spin_i2p_port"> <object class="GtkAdjustment" id="adjustment_spin_i2p_port">
<property name="upper">65535</property> <property name="upper">65535</property>
<property name="step_increment">1</property> <property name="step_increment">1</property>
@ -373,7 +373,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="top_padding">2</property> <property name="top_padding">2</property>
<property name="left_padding">15</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkHBox" id="hbox_app_mode"> <object class="GtkHBox" id="hbox_app_mode">
<property name="visible">True</property> <property name="visible">True</property>
@ -431,7 +431,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">3</property> <property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -447,7 +447,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">2</property> <property name="top_padding">2</property>
<property name="bottom_padding">2</property> <property name="bottom_padding">2</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkVBox" id="vbox27"> <object class="GtkVBox" id="vbox27">
<property name="visible">True</property> <property name="visible">True</property>
@ -763,86 +763,10 @@ and daemon (does not apply in Standalone mode).</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">3</property> <property name="padding">5</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame" id="frame18">
<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="alignment14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">2</property>
<property name="bottom_padding">2</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_show_dialog">
<property name="label" translatable="yes">Always show</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_toggle" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_focus_dialog">
<property name="label" translatable="yes">Bring the dialog to focus</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>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Add Torrents Dialog</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkFrame" id="frame13"> <object class="GtkFrame" id="frame13">
<property name="visible">True</property> <property name="visible">True</property>
@ -855,7 +779,7 @@ and daemon (does not apply in Standalone mode).</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">2</property> <property name="top_padding">2</property>
<property name="bottom_padding">2</property> <property name="bottom_padding">2</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkVBox" id="vbox17"> <object class="GtkVBox" id="vbox17">
<property name="visible">True</property> <property name="visible">True</property>
@ -1071,7 +995,66 @@ and daemon (does not apply in Standalone mode).</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">3</property> <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame19">
<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="alignment35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">2</property>
<property name="left_padding">10</property>
<child>
<object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkAlignment" id="alignment36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_show_new_releases">
<property name="label" translatable="yes">Notify about new releases</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>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Updates</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
@ -1085,9 +1068,10 @@ and daemon (does not apply in Standalone mode).</property>
<object class="GtkAlignment" id="alignment2"> <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="top_padding">2</property>
<property name="left_padding">10</property>
<child> <child>
<object class="GtkHBox" id="hbox8"> <object class="GtkVBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
@ -1107,21 +1091,27 @@ and daemon (does not apply in Standalone mode).</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="combobox_language"> <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="model">liststore8</property> <property name="left_padding">20</property>
<property name="active">0</property>
<child> <child>
<object class="GtkCellRendererText" id="cellrenderertext8"/> <object class="GtkComboBox" id="combobox_language">
<attributes> <property name="can_focus">False</property>
<attribute name="text">1</attribute> <property name="model">liststore8</property>
</attributes> <property name="active">0</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext8"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -1445,6 +1435,82 @@ used sparingly.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame" id="frame18">
<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="alignment14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">2</property>
<property name="bottom_padding">2</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_show_dialog">
<property name="label" translatable="yes">Always show</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_toggle" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_focus_dialog">
<property name="label" translatable="yes">Bring the dialog to focus</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>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Add Torrents Dialog</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -2103,7 +2169,6 @@ used sparingly.</property>
<object class="GtkVBox" id="queue_prefs_box2"> <object class="GtkVBox" id="queue_prefs_box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkFrame" id="frame10"> <object class="GtkFrame" id="frame10">
<property name="visible">True</property> <property name="visible">True</property>
@ -2153,6 +2218,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -2333,6 +2399,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -2557,6 +2624,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
@ -2608,7 +2676,7 @@ used sparingly.</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="xscale">0</property> <property name="xscale">0</property>
<property name="top_padding">1</property> <property name="top_padding">5</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkEntry" id="entry_interface"> <object class="GtkEntry" id="entry_interface">
@ -2630,7 +2698,6 @@ used sparingly.</property>
<object class="GtkLabel" id="label110"> <object class="GtkLabel" id="label110">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="ypad">2</property>
<property name="label" translatable="yes">Incoming Address</property> <property name="label" translatable="yes">Incoming Address</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -2641,7 +2708,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">2</property> <property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -2655,8 +2722,8 @@ used sparingly.</property>
<object class="GtkAlignment" id="alignment1"> <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">1</property> <property name="top_padding">5</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkVBox" id="vbox3"> <object class="GtkVBox" id="vbox3">
<property name="visible">True</property> <property name="visible">True</property>
@ -2758,7 +2825,6 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -2766,7 +2832,6 @@ used sparingly.</property>
<object class="GtkHBox" id="hbox3"> <object class="GtkHBox" id="hbox3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">10</property>
<child> <child>
<object class="GtkHBox" id="hbox4"> <object class="GtkHBox" id="hbox4">
<property name="visible">True</property> <property name="visible">True</property>
@ -2832,6 +2897,7 @@ used sparingly.</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="left_padding">10</property>
<child> <child>
<object class="GtkImage" id="port_img"> <object class="GtkImage" id="port_img">
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -2861,7 +2927,6 @@ used sparingly.</property>
<object class="GtkLabel" id="label4"> <object class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="ypad">2</property>
<property name="label" translatable="yes">Incoming Ports</property> <property name="label" translatable="yes">Incoming Ports</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -2872,7 +2937,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="padding">2</property> <property name="padding">5</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -2886,8 +2951,8 @@ used sparingly.</property>
<object class="GtkAlignment" id="alignment34"> <object class="GtkAlignment" id="alignment34">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">1</property> <property name="top_padding">5</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkHBox" id="hbox14"> <object class="GtkHBox" id="hbox14">
<property name="visible">True</property> <property name="visible">True</property>
@ -2988,7 +3053,6 @@ used sparingly.</property>
<object class="GtkLabel" id="label79"> <object class="GtkLabel" id="label79">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="ypad">2</property>
<property name="label" translatable="yes">Outgoing Ports</property> <property name="label" translatable="yes">Outgoing Ports</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
@ -2999,7 +3063,7 @@ used sparingly.</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">2</property> <property name="padding">5</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
@ -3013,7 +3077,7 @@ used sparingly.</property>
<object class="GtkAlignment" id="alignment4"> <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkHBox" id="hbox6"> <object class="GtkHBox" id="hbox6">
<property name="visible">True</property> <property name="visible">True</property>
@ -3177,7 +3241,7 @@ used sparingly.</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">2</property> <property name="top_padding">2</property>
<property name="bottom_padding">2</property> <property name="bottom_padding">2</property>
<property name="left_padding">12</property> <property name="left_padding">10</property>
<child> <child>
<object class="GtkTable" id="table8"> <object class="GtkTable" id="table8">
<property name="visible">True</property> <property name="visible">True</property>
@ -3625,6 +3689,7 @@ the proxy instead of using the local DNS service</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -4341,66 +4406,6 @@ the proxy instead of using the local DNS service</property>
<object class="GtkVBox" id="vbox16"> <object class="GtkVBox" id="vbox16">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame19">
<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="alignment35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">2</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkAlignment" id="alignment36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="chk_show_new_releases">
<property name="label" translatable="yes">Be alerted about new releases</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="tooltip_text" translatable="yes">Deluge will check our servers and will tell you if a newer version has been released</property>
<property name="draw_indicator">True</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label43">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Updates</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkFrame" id="frame20"> <object class="GtkFrame" id="frame20">
<property name="visible">True</property> <property name="visible">True</property>
@ -4473,7 +4478,7 @@ the proxy instead of using the local DNS service</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property> <property name="padding">5</property>
<property name="position">1</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -4559,7 +4564,7 @@ the proxy instead of using the local DNS service</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">5</property> <property name="padding">5</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -4623,7 +4628,7 @@ the proxy instead of using the local DNS service</property>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">3</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>

4
deluge/ui/gtkui/preferences.py
View File

@ -246,7 +246,7 @@ class Preferences(component.Component):
if self.gtkui_config["language"] is None: if self.gtkui_config["language"] is None:
self.language_checkbox.set_active(True) self.language_checkbox.set_active(True)
self.language_combo.set_sensitive(False) self.language_combo.set_visible(False)
elif index != -1: elif index != -1:
self.language_combo.set_active(index) self.language_combo.set_active(index)
@ -1242,7 +1242,7 @@ class Preferences(component.Component):
colors_widget.set_visible(widget.get_active()) colors_widget.set_visible(widget.get_active())
def _on_checkbutton_language_toggled(self, widget): def _on_checkbutton_language_toggled(self, widget):
self.language_combo.set_sensitive(not self.language_checkbox.get_active()) self.language_combo.set_visible(not self.language_checkbox.get_active())
def _on_completed_color_set(self, widget): def _on_completed_color_set(self, widget):
self.__set_color("completed") self.__set_color("completed")