From 7b91bf83cc4de948b2b7946b2a75a46e6c25f4ce Mon Sep 17 00:00:00 2001 From: Andrew Resch Date: Fri, 21 Sep 2007 04:24:26 +0000 Subject: [PATCH] Fix get_pe_settings() in bindings. More debug output for encryption settings. Fix preferences glade file so that encryption settings are in correct order. --- deluge/core/core.py | 9 +- .../ui/gtkui/glade/preferences_dialog.glade | 263 ++++++++++-------- libtorrent/bindings/python/src/session.cpp | 2 +- 3 files changed, 156 insertions(+), 118 deletions(-) diff --git a/deluge/core/core.py b/deluge/core/core.py index 3f0d9d862..0ae34d3d6 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -373,9 +373,16 @@ class Core(dbus.service.Object): pe_settings.out_enc_policy = \ lt.enc_policy(self.config["enc_out_policy"]) pe_settings.in_enc_policy = lt.enc_policy(self.config["enc_in_policy"]) - pe_settings.allow_enc_level = lt.enc_level(self.config["enc_level"]) + pe_settings.allowed_enc_level = lt.enc_level(self.config["enc_level"]) pe_settings.prefer_rc4 = self.config["enc_prefer_rc4"] self.session.set_pe_settings(pe_settings) + set = self.session.get_pe_settings() + log.debug("encryption settings:\n\t\t\tout_policy: %s\n\t\t\ + in_policy: %s\n\t\t\tlevel: %s\n\t\t\tprefer_rc4: %s", + set.out_enc_policy, + set.in_enc_policy, + set.allowed_enc_level, + set.prefer_rc4) def on_set_max_connections_global(self, key, value): log.debug("max_connections_global set to %s..", value) diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index 4c7aa0c8c..ba9bf74be 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -38,6 +38,7 @@ False + True @@ -106,6 +107,7 @@ True Ask where to save each download True + 0 True @@ -121,6 +123,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Store all downloads in: Store all downloads in: + 0 True True radio_ask_save @@ -193,6 +196,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Full allocation preallocates all of the space that is needed for the torrent and prevents disk fragmentation Use Full Allocation + 0 True True @@ -208,6 +212,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Compact allocation only allocates space as needed Use Compact Allocation + 0 True radio_full_allocation @@ -260,6 +265,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Enable selecting files for torrents before loading Enable selecting files for torrents before loading + 0 True @@ -273,6 +279,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Prioritize first and last pieces of files in torrent Prioritize first and last pieces of files in torrent + 0 True @@ -436,6 +443,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Test Active Port + 0 False @@ -460,6 +468,7 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Deluge will automatically choose a different port to use every time. Use Random Ports + 0 True @@ -553,6 +562,7 @@ Distributed hash table may improve the amount of active connections. Enable Mainline DHT True + 0 True @@ -599,6 +609,7 @@ Universal Plug and Play UPnP True + 0 True True @@ -614,6 +625,7 @@ NAT Port Mapping Protocol NAT-PMP True + 0 True True @@ -630,6 +642,7 @@ µTorrent Peer-Exchange µTorrent-PeX True + 0 True True @@ -691,9 +704,9 @@ True - Disabled + Forced Enabled -Forced +Disabled False @@ -715,9 +728,9 @@ Forced True - Disabled + Forced Enabled -Forced +Disabled False @@ -744,8 +757,8 @@ Forced True Handshake -Either -Full Stream +Full Stream +Either False @@ -764,6 +777,7 @@ Full Stream True Prefer to encrypt the entire stream True + 0 True @@ -868,40 +882,71 @@ Full Stream 2 15 - + True - True - The maximum upload slots for all torrents. Set -1 for unlimited. - 1 - -1 -1 9000 1 10 10 - 1 - True - True + The maximum upload speed for all torrents. Set -1 for unlimited. + 0 + Maximum Upload Speed (KiB/s): + + + 2 + 3 + GTK_FILL + + + + + True + The maximum number of connections allowed. Set -1 for unlimited. + 0 + Maximum Connections: + + + GTK_FILL + + + + + True + The maximum upload speed for all torrents. Set -1 for unlimited. + 0 + Maximum Upload Slots: - 1 - 2 3 4 GTK_FILL - + True True - The maximum upload speed for all torrents. Set -1 for unlimited. + The maximum number of connections allowed. Set -1 for unlimited. + 4 1 -1 -1 9000 1 10 10 1 - 1 + True True + GTK_UPDATE_IF_VALID 1 2 - 2 - 3 + GTK_FILL + + + + + True + The maximum download speed for all torrents. Set -1 for unlimited. + 0 + Maximum Download Speed (KiB/s): + + + 1 + 2 GTK_FILL @@ -926,74 +971,43 @@ Full Stream - + True - The maximum download speed for all torrents. Set -1 for unlimited. - 0 - Maximum Download Speed (KiB/s): + True + The maximum upload speed for all torrents. Set -1 for unlimited. + 1 + -1 -1 9000 1 10 10 + 1 + 1 + True - 1 - 2 + 1 + 2 + 2 + 3 GTK_FILL - + True True - The maximum number of connections allowed. Set -1 for unlimited. - 4 + The maximum upload slots for all torrents. Set -1 for unlimited. 1 -1 -1 9000 1 10 10 1 True True - GTK_UPDATE_IF_VALID 1 2 - GTK_FILL - - - - - True - The maximum upload speed for all torrents. Set -1 for unlimited. - 0 - Maximum Upload Slots: - - 3 4 GTK_FILL - - - True - The maximum number of connections allowed. Set -1 for unlimited. - 0 - Maximum Connections: - - - GTK_FILL - - - - - True - The maximum upload speed for all torrents. Set -1 for unlimited. - 0 - Maximum Upload Speed (KiB/s): - - - 2 - 3 - GTK_FILL - - @@ -1037,24 +1051,29 @@ Full Stream 2 15 - + True - True - The maximum upload slots per torrent. Set -1 for unlimited. - 1 - -1 -1 9000 1 10 10 - 1 - True - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Upload Slots: - 1 - 2 1 2 GTK_FILL + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Connections: + + + GTK_FILL + + True @@ -1072,24 +1091,19 @@ Full Stream - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Connections: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Upload Slots: + True + The maximum upload slots per torrent. Set -1 for unlimited. + 1 + -1 -1 9000 1 10 10 + 1 + True + True + 1 + 2 1 2 GTK_FILL @@ -1193,6 +1207,7 @@ Full Stream True Enable system tray icon True + 0 True @@ -1207,6 +1222,7 @@ Full Stream False Minimize to tray on close True + 0 True @@ -1225,6 +1241,7 @@ Full Stream False Start in tray True + 0 True @@ -1245,6 +1262,7 @@ Full Stream True Password protect system tray True + 0 True @@ -1337,31 +1355,15 @@ Full Stream 2 10 - + True + False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Open folder with: - True - True - - - - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Custom: - True - True - radio_open_folder_stock - + 1 + 2 1 2 GTK_FILL @@ -1391,20 +1393,38 @@ Thunar - + True - False True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Custom: + 0 + True + True + radio_open_folder_stock + - 1 - 2 1 2 GTK_FILL + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Open folder with: + 0 + True + True + + + + GTK_FILL + + @@ -1455,6 +1475,7 @@ Thunar GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Deluge will check our servers and will tell you if a newer version has been released Be alerted about new releases + 0 True @@ -1528,6 +1549,7 @@ Thunar True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Yes, please send anonymous statistics + 0 True @@ -1630,6 +1652,7 @@ Thunar False + True @@ -1644,6 +1667,7 @@ Thunar False + True @@ -1668,6 +1692,10 @@ Thunar + + True + True + @@ -1687,6 +1715,7 @@ Thunar GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-cancel True + 0 @@ -1698,6 +1727,7 @@ Thunar GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-apply True + 0 @@ -1712,6 +1742,7 @@ Thunar GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-ok True + 0 diff --git a/libtorrent/bindings/python/src/session.cpp b/libtorrent/bindings/python/src/session.cpp index cf939d693..851d604ad 100755 --- a/libtorrent/bindings/python/src/session.cpp +++ b/libtorrent/bindings/python/src/session.cpp @@ -211,7 +211,7 @@ void bind_session() ) .def("set_settings", allow_threads(&session::set_settings), session_set_settings_doc) .def("set_pe_settings", allow_threads(&session::set_pe_settings), session_set_pe_settings_doc) - .def_readonly("get_pe_settings", allow_threads(&session::get_pe_settings), session_get_pe_settings_doc) + .def("get_pe_settings", allow_threads(&session::get_pe_settings), return_value_policy()) .def( "set_severity_level", allow_threads(&session::set_severity_level) , session_set_severity_level_doc