diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index d7457ccd7..4fe37998a 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 @@ -105,108 +105,25 @@ 4 2 - - True - 0 - Download to: - - - GTK_FILL - - - - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - + True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - Select A Folder - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - 1 - - - - - 1 - 2 - - - - - True - True - Move completed to: - 0 - True - - - - 1 - 2 - GTK_FILL - - - - - True - True - Copy of .torrent files to: - 0 - True - - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Auto add .torrents from: - 0 - True - - - - 3 - 4 - GTK_FILL - - - - - True - - - True 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - Select A Folder - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 @@ -218,8 +135,8 @@ 1 2 - 1 - 2 + 3 + 4 @@ -259,25 +176,23 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Select A Folder - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 @@ -289,8 +204,93 @@ 1 2 + 1 + 2 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Auto add .torrents from: + 0 + True + + + 3 4 + GTK_FILL + + + + + True + True + Copy of .torrent files to: + 0 + True + + + + 2 + 3 + GTK_FILL + + + + + True + True + Move completed to: + 0 + True + + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Select A Folder + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 1 + + + + + 1 + 2 + + + + + True + 0 + Download to: + + + GTK_FILL @@ -874,53 +874,17 @@ - + True True - Distributed hash table may improve the amount of active connections. - DHT - True - 0 - True - - - 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 - Local Service Discovery finds local peers on your network. - LSD - 0 - True - - - 1 - 2 - GTK_FILL - - - - - True - True - Peer Exchange - Peer Exchange + Universal Plug and Play + UPnP True 0 True True - 2 - 3 GTK_FILL @@ -942,17 +906,53 @@ - + True True - Universal Plug and Play - UPnP + Peer Exchange + Peer Exchange True 0 True True + 2 + 3 + GTK_FILL + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Local Service Discovery finds local peers on your network. + LSD + 0 + True + + + 1 + 2 + GTK_FILL + + + + + True + True + Distributed hash table may improve the amount of active connections. + DHT + True + 0 + True + + + 1 + 2 + 1 + 2 GTK_FILL @@ -1215,40 +1215,127 @@ Disabled 2 15 - + True True - The maximum upload slots for all torrents. Set -1 for unlimited. 1 - -1 -1 9000 1 10 0 - 1 - True + -1 -1 9999 1 10 0 True 1 2 + 5 + 6 + GTK_FILL + + + + + True + True + 1 + -1 -1 9999 1 10 0 + True + + + 1 + 2 + 4 + 5 + GTK_FILL + + + + + True + 0 + Maximum Connection Attempts per Second: + + + 5 + 6 + GTK_FILL + + + + + True + 0 + Maximum Half-Open Connections: + + + 4 + 5 + GTK_FILL + + + + + True + The maximum upload speed for all torrents. Set -1 for unlimited. + 0 + Maximum Upload Speed (KiB/s): + + + 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 Slots: + + 1 2 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 0 1 - 1 + True True + GTK_UPDATE_IF_VALID 1 2 - 3 - 4 + GTK_FILL + + + + + True + The maximum download speed for all torrents. Set -1 for unlimited. + 0 + Maximum Download Speed (KiB/s): + + + 2 + 3 GTK_FILL @@ -1273,127 +1360,40 @@ Disabled - - True - The maximum download speed for all torrents. Set -1 for unlimited. - 0 - Maximum Download Speed (KiB/s): - - - 2 - 3 - GTK_FILL - - - - + True True - The maximum number of connections allowed. Set -1 for unlimited. - 4 + The maximum upload speed for all torrents. Set -1 for unlimited. 1 -1 -1 9000 1 10 0 1 - True + 1 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: - - - 1 - 2 - 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): - - 3 4 GTK_FILL - - True - 0 - Maximum Half-Open Connections: - - - 4 - 5 - GTK_FILL - - - - - True - 0 - Maximum Connection Attempts per Second: - - - 5 - 6 - GTK_FILL - - - - + True True + The maximum upload slots for all torrents. Set -1 for unlimited. 1 - -1 -1 9999 1 10 0 + -1 -1 9000 1 10 0 + 1 + True True 1 2 - 4 - 5 - GTK_FILL - - - - - True - True - 1 - -1 -1 9999 1 10 0 - True - - - 1 - 2 - 5 - 6 + 1 + 2 GTK_FILL @@ -1481,18 +1481,85 @@ Disabled 2 15 - + True True - The maximum number of connections per torrent. Set -1 for unlimited. + The maximum upload slots per torrent. Set -1 for unlimited. 1 -1 -1 9000 1 10 0 - 1 + 1 + True True 1 2 + 1 + 2 + GTK_FILL + + + + + True + True + The maximum number of connections per torrent. Set -1 for unlimited. + 1 + -1 -1 9000 1 10 0 + True + True + + + 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 + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Upload Slots: + + + 1 + 2 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Download Speed (KiB/s): + + + 2 + 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Maximum Upload Speed (KiB/s): + + 3 4 GTK_FILL @@ -1517,87 +1584,20 @@ Disabled - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Upload Speed (KiB/s): - - - 3 - 4 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Download Speed (KiB/s): - - - 2 - 3 - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Maximum Upload Slots: - - - 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 True The maximum number of connections per torrent. Set -1 for unlimited. 1 -1 -1 9000 1 10 0 - True + 1 True 1 2 - GTK_FILL - - - - - True - True - The maximum upload slots per torrent. Set -1 for unlimited. - 1 - -1 -1 9000 1 10 0 - 1 - True - True - - - 1 - 2 - 1 - 2 + 3 + 4 GTK_FILL @@ -1729,6 +1729,54 @@ Disabled 2 + + + True + 0 + GTK_SHADOW_NONE + + + True + 2 + 2 + 12 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Show the Add Torrents dialog when adding files from an external source + Show session speed in titlebar + 0 + True + + + + + + + + + True + <b>Main Window</b> + True + + + label_item + + + + + False + False + 5 + 3 + + True @@ -1795,7 +1843,7 @@ Disabled False False 5 - 3 + 4 @@ -1943,7 +1991,7 @@ Disabled False 5 - 4 + 5 @@ -2497,15 +2545,59 @@ Disabled 2 10 - + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 0 -1 9999 1 10 0 + True + True + + + 1 + 2 + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 1 + 0 -1 9999 1 10 0 + True + True + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Total active seeding: + + + 2 + 3 + GTK_FILL + + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Total active downloading: + Total active: - 1 - 2 GTK_FILL @@ -2528,62 +2620,18 @@ Disabled - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Total active: + Total active downloading: + 1 + 2 GTK_FILL - - - True - 0 - Total active seeding: - - - 2 - 3 - GTK_FILL - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 0 -1 9999 1 10 0 - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 - 0 -1 9999 1 10 0 - True - True - - - 1 - 2 - - - @@ -2644,18 +2692,51 @@ Disabled 2 10 - + + True + 0 + Share Ratio Limit: + + + GTK_FILL + + + + + True + 0 + Seed Time Ratio: + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Seed Time (m): + + + 2 + 3 + GTK_FILL + + + + True True 6 1 - 6 -1 100 1 10 0 + 1.5 -1 100 0.10000000000000001 10 0 + 2 1 2 - 2 - 3 @@ -2677,52 +2758,19 @@ Disabled - + True True 6 1 - 1.5 -1 100 0.10000000000000001 10 0 - 2 + 6 -1 100 1 10 0 1 2 - - - - - - True - 0 - Seed Time (m): - - 2 3 - GTK_FILL - - - - - True - 0 - Seed Time Ratio: - - - 1 - 2 - GTK_FILL - - - - - True - 0 - Share Ratio Limit: - - - GTK_FILL + @@ -2901,48 +2949,47 @@ Disabled 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Username: + Password: - 1 - 2 + 2 + 3 GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth + False 1 2 + 2 + 3 GTK_FILL - + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2950,8 +2997,19 @@ HTTP W/ Auth 1 2 - 1 - 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 GTK_FILL @@ -2979,19 +3037,7 @@ HTTP W/ Auth - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2999,47 +3045,49 @@ HTTP W/ Auth 1 2 - 3 - 4 - - - - - True - 0 - Host: - - - 3 - 4 + 1 + 2 GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth 1 2 - 2 - 3 GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Password: + Type: - 2 - 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 GTK_FILL @@ -3077,48 +3125,47 @@ HTTP W/ Auth 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Username: + Password: - 1 - 2 + 2 + 3 GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth + False 1 2 + 2 + 3 GTK_FILL - + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3126,8 +3173,19 @@ HTTP W/ Auth 1 2 - 1 - 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 GTK_FILL @@ -3155,19 +3213,7 @@ HTTP W/ Auth - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3175,47 +3221,49 @@ HTTP W/ Auth 1 2 - 3 - 4 - - - - - True - 0 - Host: - - - 3 - 4 + 1 + 2 GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth 1 2 - 2 - 3 GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Password: + Type: - 2 - 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 GTK_FILL @@ -3256,48 +3304,47 @@ HTTP W/ Auth 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Username: + Password: - 1 - 2 + 2 + 3 GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth + False 1 2 + 2 + 3 GTK_FILL - + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3305,8 +3352,19 @@ HTTP W/ Auth 1 2 - 1 - 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 GTK_FILL @@ -3334,19 +3392,7 @@ HTTP W/ Auth - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3354,47 +3400,49 @@ HTTP W/ Auth 1 2 - 3 - 4 - - - - - True - 0 - Host: - - - 3 - 4 + 1 + 2 GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth 1 2 - 2 - 3 GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Password: + Type: - 2 - 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 GTK_FILL @@ -3435,48 +3483,47 @@ HTTP W/ Auth 2 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Username: + Password: - 1 - 2 + 2 + 3 GTK_FILL - + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 - Type: - - - GTK_FILL - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - None -Socksv4 -Socksv5 -Socksv5 W/ Auth -HTTP -HTTP W/ Auth + False 1 2 + 2 + 3 GTK_FILL - + + True + 0 + Host: + + + 3 + 4 + GTK_FILL + + + + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3484,8 +3531,19 @@ HTTP W/ Auth 1 2 - 1 - 2 + 3 + 4 + + + + + True + 0 + Port: + + + 4 + 5 GTK_FILL @@ -3513,19 +3571,7 @@ HTTP W/ Auth - - True - 0 - Port: - - - 4 - 5 - GTK_FILL - - - - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3533,47 +3579,49 @@ HTTP W/ Auth 1 2 - 3 - 4 - - - - - True - 0 - Host: - - - 3 - 4 + 1 + 2 GTK_FILL - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False + None +Socksv4 +Socksv5 +Socksv5 W/ Auth +HTTP +HTTP W/ Auth 1 2 - 2 - 3 GTK_FILL - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Password: + Type: - 2 - 3 + GTK_FILL + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Username: + + + 1 + 2 GTK_FILL @@ -3678,27 +3726,18 @@ HTTP W/ Auth 2 5 - - True - - - 1 - 2 - 2 - 3 - - - - + True True - Blinking tray icon + Only OGG and WAV files are supported + Sound: True 0 True - 2 + 2 + 3 GTK_FILL @@ -3719,19 +3758,28 @@ HTTP W/ Auth - + True True - Only OGG and WAV files are supported - Sound: + Blinking tray icon True 0 True + 2 + GTK_FILL + + + + + True + + + 1 + 2 2 3 - GTK_FILL @@ -3772,115 +3820,14 @@ HTTP W/ Auth 2 5 - - True - True - Enable - 0 - True - - - 2 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - + True 0 - Address: + Security: - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - True - 0 - Server: - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - True - 0 - Username: - - - 3 - 4 - GTK_FILL - - - - - True - True - False - - - 1 - 2 - 4 - 5 - - - - - True - 0 - Password: - - - 4 - 5 + 5 + 6 GTK_FILL @@ -3942,17 +3889,118 @@ HTTP W/ Auth - + True 0 - Security: + Password: - 5 - 6 + 4 + 5 GTK_FILL + + + True + True + False + + + 1 + 2 + 4 + 5 + + + + + True + 0 + Username: + + + 3 + 4 + GTK_FILL + + + + + True + True + + + 1 + 2 + 3 + 4 + + + + + True + 0 + Server: + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + True + True + + + 1 + 2 + 2 + 3 + + + + + True + 0 + Address: + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + True + True + Enable + 0 + True + + + 2 + GTK_FILL + GTK_FILL + + @@ -4088,78 +4136,39 @@ HTTP W/ Auth 2 5 - + True 0 1 2 - 2 - 3 + 4 + 5 - + True 0 1 2 - 3 - 4 - - - - - - True - 0 - Author Email: - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - 0 - Homepage: - - - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - 0 - Author: - - - GTK_FILL - - - - - - True - 0 - Version: - - 1 2 - GTK_FILL + + + + + + True + 0 + + + 1 + 2 @@ -4178,39 +4187,78 @@ HTTP W/ Auth - + True 0 + Version: - 1 - 2 - - - - - - True - 0 - - - 1 - 2 1 2 + GTK_FILL - + + True + 0 + Author: + + + GTK_FILL + + + + + + True + 0 + Homepage: + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + 0 + Author Email: + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + True 0 1 2 - 4 - 5 + 3 + 4 + + + + + + True + 0 + + + 1 + 2 + 2 + 3 diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 186ed0852..67fdd486f 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -107,7 +107,8 @@ DEFAULT_PREFS = { "show_statusbar": True, "sidebar_show_zero": False, "sidebar_show_trackers": False, - "sidebar_position": 170 + "sidebar_position": 170, + "show_rate_in_title": False } class GtkUI: diff --git a/deluge/ui/gtkui/mainwindow.py b/deluge/ui/gtkui/mainwindow.py index 935024af7..037ff7c24 100644 --- a/deluge/ui/gtkui/mainwindow.py +++ b/deluge/ui/gtkui/mainwindow.py @@ -72,6 +72,8 @@ class MainWindow(component.Component): self.vpaned.connect("notify::position", self.on_vpaned_position_event) self.window.connect("expose-event", self.on_expose_event) + self.config.register_set_function("show_rate_in_title", self._on_set_show_rate_in_title) + if not(self.config["start_in_tray"] and \ self.config["enable_system_tray"]) and not \ self.window.get_property("visible"): @@ -196,13 +198,20 @@ class MainWindow(component.Component): def on_expose_event(self, widget, event): component.get("SystemTray").blink(False) + def stop(self): + self.window.set_title("Deluge") + def update(self): - self.send_status_request() + # Update the window title + def _on_get_session_status(status): + download_rate = deluge.common.fspeed(status["download_rate"]) + upload_rate = deluge.common.fspeed(status["upload_rate"]) + self.window.set_title("Deluge - %s %s %s %s" % (_("Down:"), download_rate, _("Up:"), upload_rate)) + if self.config["show_rate_in_title"]: + client.get_session_status(_on_get_session_status, ["download_rate", "upload_rate"]) - def send_status_request(self): - client.get_session_status(self._on_get_session_status, ["download_rate", "upload_rate"]) - - def _on_get_session_status(self, status): - self.download_rate = deluge.common.fsize(status["download_rate"]) - self.upload_rate = deluge.common.fsize(status["upload_rate"]) - self.window.set_title("Deluge - %s %s/s|%s %s/s" % (_("Down:"), self.download_rate, _("Up:"), self.upload_rate)) + def _on_set_show_rate_in_title(self, key, value): + if value: + self.update() + else: + self.window.set_title("Deluge") diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index fe68a7170..6210a9c1b 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -422,6 +422,8 @@ class Preferences(component.Component): self.gtkui_config["lock_tray"]) self.glade.get_widget("chk_classic_mode").set_active( self.gtkui_config["classic_mode"]) + self.glade.get_widget("chk_show_rate_in_title").set_active( + self.gtkui_config["show_rate_in_title"]) ## Other tab ## self.glade.get_widget("chk_show_new_releases").set_active( @@ -606,6 +608,8 @@ class Preferences(component.Component): new_gtkui_config["tray_password"] = passhex new_gtkui_config["classic_mode"] = \ self.glade.get_widget("chk_classic_mode").get_active() + new_gtkui_config["show_rate_in_title"] = \ + self.glade.get_widget("chk_show_rate_in_title").get_active() ## Notification tab ## new_gtkui_config["ntf_tray_blink"] = \