diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui index 5dcbf5c..efdc34f 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.ui +++ b/deluge/ui/gtkui/glade/preferences_dialog.ui @@ -344,10 +344,10 @@ gtk-cancel - False True True True + False True @@ -360,10 +360,10 @@ gtk-apply - False True True True + False True @@ -376,10 +376,10 @@ gtk-ok - False True True True + False True @@ -489,10 +489,10 @@ Move completed to: - False True True False + False True @@ -505,10 +505,10 @@ Copy of .torrent files to: - False True True False + False True @@ -521,11 +521,11 @@ Delete copy of torrent file on remove - False True True False Delete the copy of the torrent file created when the torrent is removed + False True @@ -722,11 +722,11 @@ Use Full Allocation - False True True False Full allocation preallocates all of the space that is needed for the torrent and prevents disk fragmentation + False True True @@ -740,11 +740,11 @@ Use Compact Allocation - False True True False Compact allocation only allocates space as needed + False True radio_full_allocation @@ -795,11 +795,11 @@ Prioritize first and last pieces of torrent - False True True False Prioritize first and last pieces of files in torrent + False True @@ -811,7 +811,6 @@ Sequential download - False True True False @@ -821,6 +820,7 @@ sequence instead of rarest first. Enabling sequential download will affect the piece distribution negatively in the swarm. It should be used sparingly. + False True @@ -832,10 +832,10 @@ used sparingly. Add torrents in Paused state - False True True False + False True @@ -948,11 +948,11 @@ used sparingly. Use Random Ports - False True True False Deluge will automatically choose a different port to use every time. + False True @@ -1091,10 +1091,10 @@ used sparingly. Test Active Port - False True True True + False @@ -1169,10 +1169,10 @@ used sparingly. Use Random Ports - False True True False + False True @@ -1445,11 +1445,11 @@ used sparingly. UPnP - False True True False Universal Plug and Play + False True True True @@ -1461,11 +1461,11 @@ used sparingly. NAT-PMP - False True True False NAT Port Mapping Protocol + False True True True @@ -1479,11 +1479,11 @@ used sparingly. Peer Exchange - False True True False Peer Exchange + False True True True @@ -1497,11 +1497,11 @@ used sparingly. LSD - False True True False Local Service Discovery finds local peers on your network. + False True @@ -1513,11 +1513,11 @@ used sparingly. DHT - False True True False Distributed hash table may improve the amount of active connections. + False True True @@ -1703,10 +1703,10 @@ used sparingly. Encrypt entire stream - False True True False + False True True @@ -2065,10 +2065,10 @@ used sparingly. Ignore limits on local network - False True True False + False True True @@ -2088,11 +2088,11 @@ used sparingly. Rate limit IP overhead - False True True False If checked, the estimated TCP/IP overhead is drained from the rate limiters, to avoid exceeding the limits with the total traffic + False True True @@ -2386,11 +2386,11 @@ used sparingly. Enable - False True True False Classic Mode will hide most of the daemon functionality and will make Deluge appear to be a single application. Use this if you do not want to take advantage of running Deluge as a daemon. You need to restart Deluge for this setting to take effect. + False True @@ -2432,10 +2432,10 @@ used sparingly. Show session speed in titlebar - False True True False + False True @@ -2447,11 +2447,11 @@ used sparingly. Focus window when adding torrent - False True True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False True @@ -2461,6 +2461,35 @@ used sparingly. + + True + True + False + Besides being experimental, using the pieces bar +will increase the bandwidth used between client +and daemon(does not apply in classic mode). +Use at your own risk if you wish to help us debug +this new feature. + False + True + + + + True + False + Show a pieces bar in the torrent's +status tab (<b>EXPERIMENTAL!!!</b>) + True + + + + + True + True + 2 + + + True @@ -2489,10 +2518,10 @@ used sparingly. - False True True True + False 0 #000000000000 @@ -2518,10 +2547,10 @@ used sparingly. - False True True True + False 0 #000000000000 @@ -2549,10 +2578,10 @@ used sparingly. - False True True True + False 0 #000000000000 @@ -2580,10 +2609,10 @@ used sparingly. - False True True True + False 0 #000000000000 @@ -2599,12 +2628,12 @@ used sparingly. gtk-revert-to-saved - False True False True True Revert color to default + False True right @@ -2618,12 +2647,12 @@ used sparingly. gtk-revert-to-saved - False True False True True Revert color to default + False True right @@ -2639,12 +2668,12 @@ used sparingly. gtk-revert-to-saved - False True False True True Revert color to default + False True right @@ -2660,12 +2689,12 @@ used sparingly. gtk-revert-to-saved - False True False True True Revert color to default + False True right @@ -2696,35 +2725,6 @@ used sparingly. 2 - - - False - True - True - False - Besides being experimental, using the pieces bar -will increase the bandwidth used between client -and daemon(does not apply in classic mode). -Use at your own risk if you wish to help us debug -this new feature. - True - - - - True - False - Show a pieces bar in the torrent's -status tab (<b>EXPERIMENTAL!!!</b>) - True - - - - - True - True - 2 - - @@ -2765,10 +2765,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Always show - False True True False + False True @@ -2785,10 +2785,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Bring the dialog to focus - False True True False + False True @@ -2839,10 +2839,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Enable system tray icon - False True False False + False True True @@ -2861,11 +2861,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Minimize to tray on close - False True False False False + False True True @@ -2878,6 +2878,30 @@ status tab (<b>EXPERIMENTAL!!!</b>) + + True + False + 10 + + + Minimize to tray on minimize + True + False + True + False + False + True + True + + + + + True + True + 2 + + + True False @@ -2885,11 +2909,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Start in tray - False True False False False + False True True @@ -2898,7 +2922,7 @@ status tab (<b>EXPERIMENTAL!!!</b>) True True - 2 + 3 @@ -2909,11 +2933,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Enable Application Indicator - False True False False False + False True True @@ -2922,7 +2946,7 @@ status tab (<b>EXPERIMENTAL!!!</b>) True True - 3 + 4 @@ -2934,11 +2958,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Password protect system tray - False True False True False + False True True @@ -2948,7 +2972,7 @@ status tab (<b>EXPERIMENTAL!!!</b>) False True - 4 + 5 @@ -3001,7 +3025,7 @@ status tab (<b>EXPERIMENTAL!!!</b>) True True - 5 + 6 @@ -3110,11 +3134,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Be alerted about new releases - False True True False Deluge will check our servers and will tell you if a newer version has been released + False True @@ -3184,10 +3208,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Yes, please send anonymous statistics - False True True False + False True @@ -3314,10 +3338,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) start - False True True True + False @@ -3521,10 +3545,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Allow Remote Connections - False True True False + False True @@ -3561,10 +3585,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Periodically check the website for new releases - False True True False + False True @@ -3622,10 +3646,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) gtk-add - False True True True + False True @@ -3638,11 +3662,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) gtk-edit - False True False True True + False True @@ -3655,11 +3679,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) gtk-delete - False True False True True + False True @@ -3786,10 +3810,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Queue new torrents to top - False True True False + False True @@ -3949,10 +3973,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Do not count slow torrents - False True True False + False True @@ -3964,10 +3988,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Prefer Seeding over Downloading - False True True False + False True @@ -4131,10 +4155,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) Stop seeding when share ratio reaches: - False True True False + False True @@ -4179,11 +4203,11 @@ status tab (<b>EXPERIMENTAL!!!</b>) Remove torrent when share ratio reached - False True False True False + False True @@ -5659,10 +5683,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) gtk-refresh - False True True True + False True @@ -5989,10 +6013,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) center - False True True True + False @@ -6036,10 +6060,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) - False True True True + False @@ -6094,10 +6118,10 @@ status tab (<b>EXPERIMENTAL!!!</b>) False - False True True True + False diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 28b892d..04f5f72 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -99,6 +99,7 @@ def start(): "focus_add_dialog": True, "enable_system_tray": True, "close_to_tray": False, + "minimize_to_tray": False, "start_in_tray": False, "enable_appindicator": False, "lock_tray": False, diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index 2755a33..2f0788b 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -543,6 +543,8 @@ def _show(self): self.gtkui_config["enable_system_tray"]) self.builder.get_object("chk_min_on_close").set_active( self.gtkui_config["close_to_tray"]) + self.builder.get_object("chk_min_on_min").set_active( + self.gtkui_config["minimize_to_tray"]) self.builder.get_object("chk_start_in_tray").set_active( self.gtkui_config["start_in_tray"]) self.builder.get_object("chk_enable_appindicator").set_active( @@ -727,6 +729,8 @@ def set_config(self, hide=False): self.builder.get_object("chk_use_tray").get_active() new_gtkui_config["close_to_tray"] = \ self.builder.get_object("chk_min_on_close").get_active() + new_gtkui_config["minimize_to_tray"] = \ + self.builder.get_object("chk_min_on_min").get_active() new_gtkui_config["start_in_tray"] = \ self.builder.get_object("chk_start_in_tray").get_active() new_gtkui_config["enable_appindicator"] = \ @@ -915,6 +919,7 @@ def on_toggle(self, widget): "chk_random_outgoing_ports": {"spin_outgoing_port_min": False, "spin_outgoing_port_max": False}, "chk_use_tray": {"chk_min_on_close": True, + "chk_min_on_min": True, "chk_start_in_tray": True, "chk_enable_appindicator": True, "chk_lock_tray": True},