Updating branch refs/heads/aria2-xml-rpc
to c69a3e28e7d8f1a58cacca5e1cd1919fc6fc2863 (commit)
from f0797ba68bc8749d6550e33f02381a029be27ad2 (commit)
commit c69a3e28e7d8f1a58cacca5e1cd1919fc6fc2863
Author: Mike Massonnet <[email protected]>
Date: Fri Feb 12 11:42:11 2010 +0100
Add "Save .torrent/.metalink on disk" option
The value of follow-torrent/metalink can be false/true/mem, false
doesn't do anything, true saves the metadata file on disk and mem keeps
it in memory. On true/mem the download of the metadata will proceed.
src/eatsettings.rb | 16 ++++++++++----
src/manager.ui | 4 +-
src/settings.ui | 55 +++++++++++++++++++++++++++++++--------------------
3 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/eatsettings.rb b/src/eatsettings.rb
index 1e38d93..1f79897 100644
--- a/src/eatsettings.rb
+++ b/src/eatsettings.rb
@@ -151,11 +151,12 @@ class Eat::SettingsDialog
@bittorrent[:require_encryption] = builder["require-encryption"]
@advanced = Hash.new
@advanced[:vbox] = builder["advanced-vbox"]
- @advanced[:certificates] = builder["certificates"]
@advanced[:split] = builder["split"]
@advanced[:locations] = builder["locations"]
@advanced[:listen_port] = builder["listen-port"]
@advanced[:enable_upnp] = builder["enable-upnp"]
+ @advanced[:certificates] = builder["certificates"]
+ @advanced[:save_ondisk] = builder["save-ondisk"]
# Setup parent window
@dialog.set_transient_for(parent_window)
@@ -179,11 +180,12 @@ class Eat::SettingsDialog
@bittorrent[:enable_dht].active = @settings.aria2["enable-dht"]
@bittorrent[:enable_pex].active =
@settings.aria2["enable-peer-exchange"]
@bittorrent[:require_encryption].active =
@settings.aria2["bt-require-crypto"]
- @advanced[:certificates].active =
@settings.aria2["check-certificate"]
@advanced[:split].value = @settings.aria2["split"]
@advanced[:locations].text =
@settings.aria2["metalink-location"]
@advanced[:listen_port].value =
@settings.aria2["listen-port"].to_i
@advanced[:enable_upnp].active = @settings["enable-upnp"]
+ @advanced[:certificates].active =
@settings.aria2["check-certificate"]
+ @advanced[:save_ondisk].active =
@settings.aria2["follow-torrent"] == true
# Setup advanced configuration treeview
@treestore = TreeStore.new(String, String, TrueClass)
@@ -252,10 +254,11 @@ class Eat::SettingsDialog
@treeiter["enable-dht"].set_value(1,
@bittorrent[:enable_dht].active?.to_s)
@treeiter["enable-peer-exchange"].set_value(1,
@bittorrent[:enable_pex].active?.to_s)
@treeiter["bt-require-crypto"].set_value(1,
@bittorrent[:require_encryption].active?.to_s)
- @treeiter["check-certificate"].set_value(1,
@advanced[:certificates].active?.to_s)
@treeiter["split"].set_value(1,
@advanced[:split].value_as_int.to_s)
@treeiter["metalink-location"].set_value(1,
@advanced[:locations].text)
@treeiter["listen-port"].set_value(1,
@advanced[:listen_port].value_as_int.to_s)
+ @treeiter["check-certificate"].set_value(1,
@advanced[:certificates].active?.to_s)
+ @treeiter["follow-torrent"].set_value(1,
@advanced[:save_ondisk].active? ? "true" : "mem")
else
# Sync widget values with treestore
@basic_options[:max_concurrent_downloads].value =
@treeiter["max-concurrent-downloads"].get_value(1).to_i
@@ -267,10 +270,11 @@ class Eat::SettingsDialog
@bittorrent[:enable_dht].active =
@treeiter["enable-dht"].get_value(1) == "true"
@bittorrent[:enable_pex].active =
@treeiter["enable-peer-exchange"].get_value(1) == "true"
@bittorrent[:require_encryption].active =
@treeiter["bt-require-crypto"].get_value(1) == "true"
- @advanced[:certificates].active =
@treeiter["check-certificate"].get_value(1) == "true"
@advanced[:split].value =
@treeiter["split"].get_value(1).to_i
@advanced[:locations].text =
@treeiter["metalink-location"].get_value(1)
@advanced[:listen_port].value =
@treeiter["listen-port"].get_value(1).to_i
+ @advanced[:certificates].active =
@treeiter["check-certificate"].get_value(1) == "true"
+ @advanced[:save_ondisk].active =
@treeiter["follow-torrent"].get_value(1) == "true"
end
end
@@ -296,10 +300,12 @@ class Eat::SettingsDialog
@settings.aria2["enable-dht"] =
@bittorrent[:enable_dht].active?
@settings.aria2["enable-peer-exchange"] =
@bittorrent[:enable_pex].active?
@settings.aria2["bt-require-crypto"] =
@bittorrent[:require_encryption].active?
- @settings.aria2["check-certificate"] =
@advanced[:certificates].active?
@settings.aria2["split"] =
@advanced[:split].value_as_int
@settings.aria2["metalink-location"] =
@advanced[:locations].text
@settings.aria2["listen-port"] =
@advanced[:listen_port].value_as_int
+ @settings.aria2["check-certificate"] =
@advanced[:certificates].active?
+ @settings.aria2["follow-torrent"] =
@advanced[:save_ondisk].active? ? "true" : "mem"
+ @settings.aria2["follow-metalink"] =
@advanced[:save_ondisk].active? ? "true" : "mem"
end
@settings.save
diff --git a/src/manager.ui b/src/manager.ui
index 08fc56e..a98d9ef 100644
--- a/src/manager.ui
+++ b/src/manager.ui
@@ -1106,8 +1106,8 @@
</object>
<object class="GtkAdjustment" id="adjustment-file-seed-ratio">
<property name="upper">99</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
+ <property name="page_increment">0.1</property>
</object>
<object class="GtkAdjustment" id="adjustment-file-split">
<property name="lower">1</property>
diff --git a/src/settings.ui b/src/settings.ui
index af46495..2db54c9 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -7,7 +7,6 @@
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="default_width">375</property>
- <property name="default_height">405</property>
<property name="destroy_with_parent">True</property>
<property name="icon_name">preferences-other</property>
<property name="type_hint">normal</property>
@@ -58,8 +57,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
- <property
name="use_action_appearance">True</property>
<property
name="related_action">action-custom-server</property>
+ <property
name="use_action_appearance">True</property>
<property
name="use_underline">True</property>
<property
name="draw_indicator">True</property>
</object>
@@ -367,8 +366,8 @@
<child>
<object class="GtkFileChooserButton"
id="download-dir-button">
<property
name="visible">True</property>
- <property
name="action">select-folder</property>
<property
name="create_folders">False</property>
+ <property
name="action">select-folder</property>
<property
name="width_chars">14</property>
</object>
<packing>
@@ -702,21 +701,6 @@
<property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="certificates">
- <property name="label"
translatable="yes">Check HTTPS certificates</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="active">True</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox12">
<property name="visible">True</property>
<property name="tooltip_text"
translatable="yes">Number of connections to open for one file to download (only
for HTTP(s)/FTP)</property>
@@ -749,7 +733,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -785,9 +769,36 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="certificates">
+ <property name="label"
translatable="yes">Check HTTPS certificates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="save-ondisk">
+ <property name="label"
translatable="yes">Save .torrent/.metalink files on disk</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>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -860,7 +871,7 @@
</child>
<child>
<object class="GtkCheckButton"
id="enable-upnp">
- <property name="label"
translatable="yes">Negociate automatic port redirection with UPnP</property>
+ <property name="label"
translatable="yes">Automatic port redirection with UPnP</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -1120,8 +1131,8 @@
<object class="GtkAdjustment" id="adjustment-seed-ratio">
<property name="value">1</property>
<property name="upper">99</property>
- <property name="step_increment">0.10000000000000001</property>
- <property name="page_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
+ <property name="page_increment">0.1</property>
</object>
<object class="GtkAdjustment" id="adjustment-max-peers">
<property name="value">55</property>
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
