diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui index 3d20fac9e..daced7e8c 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.ui +++ b/deluge/ui/gtkui/glade/preferences_dialog.ui @@ -2168,260 +2168,261 @@ used sparingly. queue none - + True False + 5 - + True False - 0 - none + 5 - + True False - 5 - 12 + 0 + none - + True False + 5 + 12 - - Queue new torrents to top - False - True - True - False - True - - - True - True - 0 - - - - - - - - - True - False - General - - - - - - - - False - False - 5 - 0 - - - - - True - False - 0 - none - - - True - False - 5 - 12 - - - True - False - 5 - - + True False - 3 - 2 - 10 - + + Queue to top + False True True - 1 - False - False - True - True - adjustment_spin_active - True - True + False + True - 1 - 2 - - - - - - True - True - 1 - False - False - True - True - adjustment_spin_seeding - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - False - 0 - Total active seeding: - - - 2 - 3 - GTK_FILL - - - - - True - False - 0 - Total active: - - - GTK_FILL - - - - - True - True - 1 - False - False - True - True - adjustment_spin_downloading - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - False - 0 - Total active downloading: - - - 1 - 2 - GTK_FILL + True + True + 0 - - True - True - 0 - - - - - Do not count slow torrents - False - True - True - False - True - - - True - True - 1 - - - - - Prefer Seeding over Downloading - False - True - True - False - True - - - True - True - 2 - - - - - - True - False - Active Torrents - - - - - - - - False - False - 5 - 1 - - - - - True - False - 0 - none - - - True - False - 5 - 12 - - + + True False - 2 + New Torrents + + + + + + + + False + False + 0 + + + + + True + False + 0 + none + + + True + False + 5 + 12 + + + True + False + 5 + + + True + False + 3 + 2 + 10 + + + True + True + 1 + False + False + True + True + adjustment_spin_active + True + True + + + 1 + 2 + + + + + + True + True + 1 + False + False + True + True + adjustment_spin_seeding + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + False + 0 + Seeding: + + + 2 + 3 + GTK_FILL + + + + + True + False + 0 + Total: + + + GTK_FILL + + + + + True + True + 1 + False + False + True + True + adjustment_spin_downloading + True + True + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Downloading: + + + 1 + 2 + GTK_FILL + + + + + True + True + 0 + + + + + Ignore slow torrents + False + True + True + False + Torrents not transfering any data do not count towards download/seeding active count. + True + + + True + True + 1 + + + + + Prefer seeding torrents + False + True + True + False + Give preference to seeding torrents over downloading torrents. + True + + + True + True + 2 + + + + + + + + + True + False + Active Torrents + + + + + + + + False + False + 1 + + + + + True + False + 0 + none + + + True + False + 5 + 12 True @@ -2434,7 +2435,7 @@ used sparingly. True False 0 - Share Ratio Limit: + Share Ratio: GTK_FILL @@ -2445,7 +2446,7 @@ used sparingly. True False 0 - Seed Time Ratio: + Time Ratio: 1 @@ -2458,7 +2459,7 @@ used sparingly. True False 0 - Seed Time (m): + Time (m): 2 @@ -2470,6 +2471,7 @@ used sparingly. True True + • 6 1 False @@ -2489,6 +2491,7 @@ used sparingly. True True + • 6 1 False @@ -2510,6 +2513,7 @@ used sparingly. True True + • 6 1 False @@ -2527,108 +2531,165 @@ used sparingly. - - True - True - 0 - - - - - True - False - - - Stop seeding when share ratio reaches: - False - True - True - False - True - - - - - - True - True - 1 - - - - - True - False - 0 - 0 - 12 - - - True - False - True - • - 1 - False - False - True - True - adjustment_share_ratio - 2 - True - - - - - False - False - 2 - - - - - True - False - 10 - - - Remove torrent when share ratio reached - False - True - False - True - False - True - - - - - True - True - 3 - + + + True + False + Seeding Rotation + + + + + + + False + False + 2 + - - + + True False - Seeding - - - + 0 + none + + + True + False + 5 + 12 + + + True + False + + + True + False + + + Share Ratio: + False + True + True + False + True + + + + False + False + 0 + + + + + True + False + True + • + 1 + True + False + False + True + True + adjustment_share_ratio + 2 + True + + + False + False + 10 + 1 + + + + + True + True + 0 + + + + + True + False + 10 + + + True + False + + + Pause Torrent + False + True + True + False + True + True + + + True + True + 0 + + + + + Remove Torrent + False + True + True + False + True + radio_pause_ratio + + + False + False + 1 + + + + + + + True + True + 3 + 1 + + + + + + + + + True + False + Share Ratio Reached + + + + + + + False + False + 3 + - - False - False - 5 - 2 - diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 76c573ff5..4fe1b703e 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -388,9 +388,10 @@ class Preferences(component.Component): "spin_share_ratio_limit": ("value", "share_ratio_limit"), "spin_seed_time_ratio_limit": ("value", "seed_time_ratio_limit"), "spin_seed_time_limit": ("value", "seed_time_limit"), - "chk_seed_ratio": ("active", "stop_seed_at_ratio"), + "chk_share_ratio": ("active", "stop_seed_at_ratio"), "spin_share_ratio": ("value", "stop_seed_ratio"), - "chk_remove_ratio": ("active", "remove_seed_at_ratio"), + "radio_pause_ratio": ("active", "stop_seed_at_ratio"), + "radio_remove_ratio": ("active", "remove_seed_at_ratio"), "spin_cache_size": ("value", "cache_size"), "spin_cache_expiry": ("value", "cache_expiry"), "combo_proxy_type": ("active", lambda: self.core_config["proxy"]["type"]), @@ -696,9 +697,9 @@ class Preferences(component.Component): new_core_config["auto_manage_prefer_seeds"] = \ self.builder.get_object("chk_auto_manage_prefer_seeds").get_active() new_core_config["stop_seed_at_ratio"] = \ - self.builder.get_object("chk_seed_ratio").get_active() + self.builder.get_object("chk_share_ratio").get_active() new_core_config["remove_seed_at_ratio"] = \ - self.builder.get_object("chk_remove_ratio").get_active() + self.builder.get_object("radio_remove_ratio").get_active() new_core_config["stop_seed_ratio"] = \ self.builder.get_object("spin_share_ratio").get_value() new_core_config["share_ratio_limit"] = \ @@ -858,8 +859,9 @@ class Preferences(component.Component): "chk_move_completed": {"move_completed_path_chooser": True}, "chk_copy_torrent_file": {"torrentfiles_location_path_chooser": True, "chk_del_copy_torrent_file": True}, - "chk_seed_ratio": {"spin_share_ratio": True, - "chk_remove_ratio": True} + "chk_share_ratio": {"spin_share_ratio": True, + "radio_pause_ratio": True, + "radio_remove_ratio": True} } def update_dependent_widgets(name, value):