From eebb93d4eefb01b2c3468938c3dfd2583b3b33cd Mon Sep 17 00:00:00 2001 From: hugosenari Date: Fri, 17 Aug 2018 17:19:12 -0300 Subject: [PATCH] [GTK3] Cleanup Glade UI deprecated widgets and properties - VBox is Box(vertical); - HBox is Box; - HButtonBox is ButtonBox; - HSeparator is Separator; - VPaned is Paned(vertical); - Table is Grid; - use_action_appearance is purged; - yalign is purged; - xalign is purged; - xoptions are purged; - yoptions are purged; - add some align: start; --- .../gtk3/glade/add_torrent_dialog.infohash.ui | 16 +- deluge/ui/gtk3/glade/add_torrent_dialog.ui | 206 +- .../ui/gtk3/glade/add_torrent_dialog.url.ui | 12 +- deluge/ui/gtk3/glade/connect_peer_dialog.ui | 19 +- .../gtk3/glade/connection_manager.addhost.ui | 41 +- deluge/ui/gtk3/glade/connection_manager.ui | 28 +- .../glade/create_torrent_dialog.progress.ui | 6 +- .../create_torrent_dialog.remote_path.ui | 20 +- .../create_torrent_dialog.remote_save.ui | 20 +- deluge/ui/gtk3/glade/create_torrent_dialog.ui | 58 +- deluge/ui/gtk3/glade/edit_trackers.add.ui | 22 +- deluge/ui/gtk3/glade/edit_trackers.edit.ui | 20 +- deluge/ui/gtk3/glade/edit_trackers.ui | 19 +- deluge/ui/gtk3/glade/filtertree_menu.ui | 3 - .../ui/gtk3/glade/main_window.new_release.ui | 89 +- .../gtk3/glade/main_window.tabs.menu_file.ui | 19 +- .../gtk3/glade/main_window.tabs.menu_peer.ui | 5 +- deluge/ui/gtk3/glade/main_window.tabs.ui | 1833 +++++++---------- deluge/ui/gtk3/glade/main_window.ui | 1443 +++++++------ deluge/ui/gtk3/glade/move_storage_dialog.ui | 13 +- deluge/ui/gtk3/glade/other_dialog.ui | 15 +- deluge/ui/gtk3/glade/path_combo_chooser.ui | 253 +-- deluge/ui/gtk3/glade/preferences_dialog.ui | 781 +++---- deluge/ui/gtk3/glade/queuedtorrents.ui | 15 +- deluge/ui/gtk3/glade/remove_torrent_dialog.ui | 156 +- deluge/ui/gtk3/glade/torrent_menu.options.ui | 7 - deluge/ui/gtk3/glade/torrent_menu.queue.ui | 4 - deluge/ui/gtk3/glade/torrent_menu.ui | 10 - deluge/ui/gtk3/glade/tray_menu.ui | 8 - 29 files changed, 2264 insertions(+), 2877 deletions(-) diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui index a8e8ddcc8..2663b08a9 100644 --- a/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui +++ b/deluge/ui/gtk3/glade/add_torrent_dialog.infohash.ui @@ -17,6 +17,7 @@ True + vertical False 2 @@ -27,7 +28,6 @@ gtk-cancel - False True True True @@ -42,7 +42,6 @@ gtk-ok - False True True True @@ -65,12 +64,13 @@ - + True + vertical False 5 - + True False 5 @@ -109,7 +109,8 @@ - + + vertical True False @@ -120,7 +121,7 @@ - + True False 5 @@ -160,7 +161,7 @@ - + True False 5 @@ -169,7 +170,6 @@ True False Trackers: - 0 False diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.ui index 429a07abf..c1633736e 100644 --- a/deluge/ui/gtk3/glade/add_torrent_dialog.ui +++ b/deluge/ui/gtk3/glade/add_torrent_dialog.ui @@ -39,6 +39,7 @@ True False + vertical 2 @@ -48,7 +49,6 @@ gtk-cancel - False True True True @@ -64,7 +64,6 @@ gtk-add - False True True True @@ -86,9 +85,10 @@ - + True True + vertical True @@ -97,9 +97,10 @@ 5 5 - + True False + vertical 2 @@ -125,7 +126,7 @@ - + True False center @@ -136,7 +137,7 @@ True - + True False 4 @@ -182,7 +183,7 @@ True - + True False 4 @@ -228,7 +229,7 @@ True - + True False 4 @@ -274,7 +275,7 @@ True - + True False 4 @@ -417,7 +418,7 @@ - + True False @@ -452,10 +453,11 @@ - + True False 3 + vertical 3 @@ -471,7 +473,7 @@ 5 5 - + True False @@ -511,7 +513,7 @@ 5 5 - + True False @@ -564,7 +566,7 @@ - + True False 10 @@ -581,15 +583,17 @@ 7 12 - + True False + vertical Add In _Paused State True True False + start True True @@ -605,6 +609,7 @@ True True False + start True @@ -626,6 +631,7 @@ sequence instead of rarest first. Enabling sequential download will affect the piece distribution negatively in the swarm. It should be used sparingly. + start True @@ -641,6 +647,7 @@ used sparingly. True False Useful if adding a complete torrent for seeding. + start True @@ -673,6 +680,7 @@ used sparingly. True False Preallocate the disk space for the torrent files + start True @@ -708,91 +716,14 @@ used sparingly. 12 5 - + True False - 4 - 2 12 - - - True - True - 1 - False - False - adjustment1 - - - 1 - 2 - - - - - - - True - False - Maximum torrent download speed - Down Speed: - 0 - - - GTK_FILL - - - - - - True - False - Maximum torrent upload speed - Up Speed: - 0 - - - 1 - 2 - GTK_FILL - - - - - - True - False - Maximum torrent connections - Connections: - 0 - - - 2 - 3 - GTK_FILL - - - - - - True - False - Maximum torrent upload slots - Upload Slots: - 0 - - - 3 - 4 - GTK_FILL - - - True True - 1 False False adjustment2 @@ -800,47 +731,98 @@ used sparingly. 1 - 2 1 - 2 - - True True - 1 False False adjustment3 1 - 2 2 - 3 - - True True - 1 False False adjustment4 1 - 2 3 - 4 - - + + + + + True + True + False + False + adjustment1 + + + 1 + 0 + + + + + True + False + Maximum torrent download speed + start + Down Speed: + + + 0 + 0 + + + + + True + False + Maximum torrent upload speed + start + Up Speed: + + + 0 + 1 + + + + + True + False + Maximum torrent connections + start + Connections: + + + 0 + 2 + + + + + True + False + Maximum torrent upload slots + start + Upload Slots: + + + 0 + 3 @@ -872,7 +854,7 @@ used sparingly. - + True False 5 @@ -888,14 +870,13 @@ used sparingly. True - + True False True False - 1 gtk-apply @@ -909,7 +890,6 @@ used sparingly. True False Apply To All - 0 False @@ -941,7 +921,7 @@ used sparingly. True - + True False @@ -994,7 +974,7 @@ used sparingly. - + True False diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui index 8a68d87d7..55139d8eb 100644 --- a/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui +++ b/deluge/ui/gtk3/glade/add_torrent_dialog.url.ui @@ -17,6 +17,7 @@ True + vertical False 2 @@ -27,7 +28,6 @@ gtk-cancel - False True True True @@ -42,7 +42,6 @@ gtk-ok - False True True True @@ -65,12 +64,13 @@ - + True + vertical False 5 - + True False 5 @@ -109,7 +109,7 @@ - + True False @@ -120,7 +120,7 @@ - + True False 5 diff --git a/deluge/ui/gtk3/glade/connect_peer_dialog.ui b/deluge/ui/gtk3/glade/connect_peer_dialog.ui index f6fd99fb7..9321dc890 100644 --- a/deluge/ui/gtk3/glade/connect_peer_dialog.ui +++ b/deluge/ui/gtk3/glade/connect_peer_dialog.ui @@ -1,7 +1,7 @@ - + False 5 @@ -11,12 +11,10 @@ True True False - - - True + vertical False 2 @@ -27,7 +25,6 @@ gtk-cancel - False True True True @@ -42,7 +39,6 @@ gtk-ok - False True True True @@ -65,12 +61,13 @@ - + True + vertical False 2 - + True False 5 @@ -91,7 +88,6 @@ True False Add Peer - 0 @@ -110,7 +106,7 @@ - + True False @@ -129,8 +125,11 @@ 39 hostname:port True + True False False + True + True True diff --git a/deluge/ui/gtk3/glade/connection_manager.addhost.ui b/deluge/ui/gtk3/glade/connection_manager.addhost.ui index fc97e956f..1c7f130c7 100644 --- a/deluge/ui/gtk3/glade/connection_manager.addhost.ui +++ b/deluge/ui/gtk3/glade/connection_manager.addhost.ui @@ -23,6 +23,7 @@ True False + vertical 2 @@ -68,7 +69,7 @@ - + True False 5 @@ -76,6 +77,7 @@ True False + start Hostname: @@ -127,7 +129,6 @@ 5 • 5 - 1 1 False False @@ -149,11 +150,9 @@ - + True False - 2 - 2 True @@ -173,9 +172,7 @@ 1 - 2 1 - 2 @@ -196,29 +193,31 @@ 1 - 2 - - - - - True - False - Password: - - - 1 - 2 - GTK_FILL + 0 True False + start Username: - GTK_FILL + 0 + 0 + + + + + True + False + start + Password: + + + 0 + 1 diff --git a/deluge/ui/gtk3/glade/connection_manager.ui b/deluge/ui/gtk3/glade/connection_manager.ui index eb1acdffa..0eeaa8cd9 100644 --- a/deluge/ui/gtk3/glade/connection_manager.ui +++ b/deluge/ui/gtk3/glade/connection_manager.ui @@ -38,6 +38,7 @@ True False + vertical True @@ -46,7 +47,6 @@ _Close - False True True True @@ -62,7 +62,6 @@ C_onnect - False True True True @@ -90,9 +89,10 @@ 0 none - + True False + vertical True @@ -133,11 +133,11 @@ - + True False - + True False True @@ -145,7 +145,6 @@ gtk-add - False True True True @@ -161,7 +160,6 @@ gtk-edit - False True True True @@ -177,7 +175,6 @@ gtk-remove - False True True True @@ -193,7 +190,6 @@ gtk-refresh - False True True True @@ -215,18 +211,17 @@ - + True False - False True True True - + True False 2 @@ -314,16 +309,17 @@ 5 5 - + True False + vertical Auto-connect to selected Daemon - False True True False + start True @@ -336,10 +332,10 @@ Auto-start localhost daemon (if required) - False True True False + start True @@ -352,10 +348,10 @@ Hide this dialog - False True True False + start True diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui index 6757d7e1b..cc28a0d9e 100644 --- a/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui +++ b/deluge/ui/gtk3/glade/create_torrent_dialog.progress.ui @@ -1,19 +1,17 @@ - + False 5 Creating Torrent center-on-parent dialog - - - True + vertical False 2 diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui index 77e7a9638..cdca95bcb 100644 --- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui +++ b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_path.ui @@ -1,7 +1,7 @@ - + 462 False @@ -11,12 +11,10 @@ True dialog False - - - True + vertical False 2 @@ -27,7 +25,6 @@ gtk-cancel - False True True True @@ -42,7 +39,6 @@ gtk-ok - False True True True @@ -65,12 +61,13 @@ - + True + vertical False 5 - + True False 5 @@ -109,7 +106,7 @@ - + True False @@ -120,7 +117,7 @@ - + True False 5 @@ -143,8 +140,11 @@ • True True + True False False + True + True True diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui index 88a0dd8de..5586bb426 100644 --- a/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui +++ b/deluge/ui/gtk3/glade/create_torrent_dialog.remote_save.ui @@ -1,7 +1,7 @@ - + 462 False @@ -11,12 +11,10 @@ True dialog False - - - True + vertical False 2 @@ -27,7 +25,6 @@ gtk-cancel - False True True True @@ -42,7 +39,6 @@ gtk-ok - False True True True @@ -65,12 +61,13 @@ - + True + vertical False 5 - + True False 5 @@ -109,7 +106,7 @@ - + True False @@ -120,7 +117,7 @@ - + True False 5 @@ -143,8 +140,11 @@ • True True + True False False + True + True True diff --git a/deluge/ui/gtk3/glade/create_torrent_dialog.ui b/deluge/ui/gtk3/glade/create_torrent_dialog.ui index 93685b817..b3e11be7e 100644 --- a/deluge/ui/gtk3/glade/create_torrent_dialog.ui +++ b/deluge/ui/gtk3/glade/create_torrent_dialog.ui @@ -52,12 +52,13 @@ - + True False + vertical 5 - + True False 5 @@ -98,7 +99,7 @@ - + True False @@ -122,9 +123,10 @@ 12 12 - + True False + vertical 5 @@ -150,19 +152,18 @@ - + True False center - False True True True - + True False 5 @@ -202,13 +203,12 @@ - False True True True - + True False 5 @@ -248,13 +248,12 @@ - False True True True - + True False 5 @@ -333,12 +332,13 @@ 12 12 - + True False + vertical 5 - + True False 5 @@ -376,7 +376,7 @@ - + True False 5 @@ -417,7 +417,7 @@ - + True False 5 @@ -459,7 +459,7 @@ 12 12 - + True False 5 @@ -485,15 +485,15 @@ - + True False + vertical 1 center gtk-go-up - False True True True @@ -509,7 +509,6 @@ gtk-add - False True True True @@ -525,7 +524,6 @@ gtk-remove - False True True True @@ -541,7 +539,6 @@ gtk-go-down - False True True True @@ -569,7 +566,7 @@ - + True False 5 @@ -630,7 +627,7 @@ - + True False 5 @@ -673,12 +670,13 @@ 12 12 - + True False + vertical 5 - + True False @@ -721,10 +719,10 @@ Set Private Flag - False True True False + start True @@ -736,10 +734,10 @@ Add this torrent to the session - False True True False + start True @@ -756,7 +754,7 @@ - + True False 5 @@ -802,14 +800,13 @@ True False - + True False end gtk-cancel - False True True True @@ -825,7 +822,6 @@ gtk-save - False True True True diff --git a/deluge/ui/gtk3/glade/edit_trackers.add.ui b/deluge/ui/gtk3/glade/edit_trackers.add.ui index 584803a5b..7326db5cb 100644 --- a/deluge/ui/gtk3/glade/edit_trackers.add.ui +++ b/deluge/ui/gtk3/glade/edit_trackers.add.ui @@ -1,7 +1,7 @@ - + 400 200 @@ -11,12 +11,10 @@ center-on-parent True dialog - - - True + vertical False 2 @@ -27,7 +25,6 @@ gtk-cancel - False True True True @@ -43,7 +40,6 @@ gtk-ok - False True True True @@ -67,12 +63,13 @@ - + True + vertical False 5 - + True False 5 @@ -111,7 +108,8 @@ - + + True False @@ -122,7 +120,7 @@ - + True False 5 @@ -131,8 +129,6 @@ True False Trackers: - 0 - 0 False @@ -144,6 +140,8 @@ True True + automatic + automatic in diff --git a/deluge/ui/gtk3/glade/edit_trackers.edit.ui b/deluge/ui/gtk3/glade/edit_trackers.edit.ui index 4db60c766..baf874e8f 100644 --- a/deluge/ui/gtk3/glade/edit_trackers.edit.ui +++ b/deluge/ui/gtk3/glade/edit_trackers.edit.ui @@ -1,7 +1,7 @@ - + 400 False @@ -10,12 +10,10 @@ center-on-parent True dialog - - - True + vertical False 2 @@ -26,7 +24,6 @@ gtk-cancel - False True True True @@ -42,7 +39,6 @@ gtk-ok - False True True True @@ -66,12 +62,13 @@ - + True + vertical False 5 - + True False 5 @@ -110,7 +107,7 @@ - + True False @@ -121,7 +118,7 @@ - + True False 5 @@ -144,8 +141,11 @@ • True True + True False False + True + True True diff --git a/deluge/ui/gtk3/glade/edit_trackers.ui b/deluge/ui/gtk3/glade/edit_trackers.ui index 3600e50dc..a14b0d00f 100644 --- a/deluge/ui/gtk3/glade/edit_trackers.ui +++ b/deluge/ui/gtk3/glade/edit_trackers.ui @@ -19,6 +19,7 @@ True False + vertical 2 @@ -28,7 +29,6 @@ gtk-cancel - False True True True @@ -43,7 +43,6 @@ gtk-ok - False True True True @@ -64,12 +63,13 @@ - + True False + vertical 5 - + True False 10 @@ -89,7 +89,6 @@ True False - 10 Edit Trackers 0.05000000074505806 @@ -111,7 +110,7 @@ - + True False 5 @@ -137,15 +136,15 @@ - + True False + vertical 1 center gtk-go-up - False True True True @@ -161,7 +160,6 @@ gtk-add - False True True True @@ -177,7 +175,6 @@ gtk-edit - False True True True @@ -193,7 +190,6 @@ gtk-remove - False True True True @@ -209,7 +205,6 @@ gtk-go-down - False True True True diff --git a/deluge/ui/gtk3/glade/filtertree_menu.ui b/deluge/ui/gtk3/glade/filtertree_menu.ui index 6743e06e8..d2e9241f4 100644 --- a/deluge/ui/gtk3/glade/filtertree_menu.ui +++ b/deluge/ui/gtk3/glade/filtertree_menu.ui @@ -25,7 +25,6 @@ _Select All - False True False True @@ -37,7 +36,6 @@ _Pause All - False True False True @@ -49,7 +47,6 @@ Resu_me All - False True False Resume selected torrents. diff --git a/deluge/ui/gtk3/glade/main_window.new_release.ui b/deluge/ui/gtk3/glade/main_window.new_release.ui index 961acc723..da7ebd008 100644 --- a/deluge/ui/gtk3/glade/main_window.new_release.ui +++ b/deluge/ui/gtk3/glade/main_window.new_release.ui @@ -16,6 +16,7 @@ True False + vertical 2 @@ -25,7 +26,6 @@ gtk-close - False True True True @@ -40,7 +40,6 @@ _Goto Website - False True True True @@ -61,13 +60,14 @@ - + True False 10 + vertical 5 - + True False 5 @@ -107,7 +107,7 @@ - + True False @@ -123,13 +123,11 @@ False 5 - + True False - 3 - 2 - 10 2 + 10 True @@ -137,26 +135,22 @@ 1 - 2 2 - 3 - True False + start Available Version: - 0 + 0 2 - 3 - GTK_FILL @@ -166,36 +160,7 @@ 1 - 2 - - - - - - True - False - Current Version: - 0 - - - - - - GTK_FILL - - - - - False - Server Version - 0 - - - - - - 1 - 2 + 0 @@ -204,10 +169,36 @@ 1 - 2 1 - 2 - + + + + + False + start + Server Version + + + + + + 0 + 1 + + + + + True + False + start + Current Version: + + + + + + 0 + 0 @@ -227,10 +218,10 @@ Do not show this dialog in the future - False True True False + start True diff --git a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui index 4f81cd15f..64e6d8bbb 100644 --- a/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui +++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_file.ui @@ -1,36 +1,36 @@ - + True False gtk-zoom-fit - 1 + 1 True False gtk-no - 1 + 1 True False gtk-yes - 1 + 1 True False gtk-go-up - 1 + 1 True False gtk-go-down - 1 + 1 True @@ -38,7 +38,6 @@ gtk-open - False True False True @@ -49,7 +48,6 @@ _Show - False True False True @@ -66,7 +64,6 @@ _Expand All - False True False True @@ -84,7 +81,6 @@ _Ignore - False True False True @@ -96,7 +92,6 @@ _Low Priority - False True False True @@ -108,7 +103,6 @@ _Normal Priority - False True False True @@ -120,7 +114,6 @@ _High Priority - False True False True diff --git a/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui b/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui index e59e461cb..31968eaee 100644 --- a/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui +++ b/deluge/ui/gtk3/glade/main_window.tabs.menu_peer.ui @@ -1,12 +1,12 @@ - + True False gtk-add - 1 + 1 True @@ -14,7 +14,6 @@ _Add Peer - False True False Add a peer by its IP diff --git a/deluge/ui/gtk3/glade/main_window.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui index 344bfd6db..8aeb7db42 100644 --- a/deluge/ui/gtk3/glade/main_window.tabs.ui +++ b/deluge/ui/gtk3/glade/main_window.tabs.ui @@ -65,14 +65,16 @@ 10 10 - + True False + vertical 5 - + True False + vertical True @@ -97,46 +99,30 @@ - + True False - 5 - 8 - 10 5 - - - - - - + 10 True False 20 - 0 1 - 2 - 3 - 4 - GTK_FILL + 0 True False - 0 1 - 2 2 - 3 - GTK_FILL @@ -144,409 +130,20 @@ True False 15 - 0 1 - 2 1 - 2 - GTK_FILL - - - - - True - False - - - 2 - 3 - 5 - GTK_SHRINK - 2 - - - - - True - False - - - 5 - 6 - 5 - GTK_SHRINK - 2 - - - - - True - False - 5 - - - True - False - Downloaded: - 0 - - - - - - - - 2 - 3 - GTK_FILL - - - - - True - False - 5 - - - True - False - Down Speed: - 0 - - - - - - - - GTK_FILL - - - - - True - False - 5 - - - True - False - Up Speed: - 0 - - - - - - - - 1 - 2 - GTK_FILL - - - - - True - False - 5 - - - True - False - Seeds: - 0 - - - - - - - - 3 - 4 - GTK_FILL - - - - - True - False - 5 - - - True - False - Uploaded: - 0 - - - - - - - - 3 - 4 - GTK_FILL - - - - - True - False - Complete Seen: - 0 - - - - - - 6 - 7 - 4 - 5 - GTK_FILL - - - - - True - False - True - char - 0 - - - 7 - 8 - 4 - 5 - GTK_FILL - - - - - True - False - Last Transfer: - 0 - - - - - - 6 - 7 - 3 - 4 - GTK_FILL - - - - - True - False - True - char - 0 - - - 7 - 8 - 3 - 4 - GTK_FILL - - - - - True - False - Seeding Time: - 0 - - - - - - 6 - 7 - 2 - 3 - GTK_FILL - - - - - True - False - 0 - - - 7 - 8 - 2 - 3 - GTK_FILL - - - - - True - False - Active Time: - 0 - - - - - - 6 - 7 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - - - 7 - 8 - 1 - 2 - GTK_FILL - - - - - True - False - ETA Time: - 0 - - - - - - 6 - 7 - GTK_FILL - - - - - True - False - 0 - - - 7 - 8 - GTK_FILL - - - - - True - False - Peers: - 0 - - - - - - 3 - 4 - 1 - 2 - GTK_FILL - - - - - True - False - 10 - 0 - - - 4 - 5 - GTK_FILL - - - - - True - False - 10 - 0 - - - 4 - 5 - 1 - 2 - GTK_FILL - - - - - True - False - Seed Rank: - 0 - - - - - - 3 - 4 - 4 - 5 - GTK_FILL True False - 0 - - - 4 - 5 - 4 - 5 - GTK_FILL - - - - - True - False - Availability: - 0 - - - 3 - 4 - 3 - 4 - GTK_FILL + 4 @@ -555,32 +152,156 @@ False True word-char - 0 - 4 - 5 + 3 3 - 4 - GTK_FILL - + True False - Share Ratio: - 0 + + + 3 + 2 + + + + + True + False + 10 + + + 3 + 1 + + + + + True + False + + + 5 + 0 + + + + + True + False + + + 5 + 1 + + + + + True + False + + + 5 + 2 + + + + + True + False + True + char + + + 5 + 3 + + + + + True + False + True + char + + + 5 + 4 + + + + + True + False + start + Down Speed: - 3 - 4 + 0 + 0 + + + + + True + False + start + Up Speed: + + + + + + 0 + 1 + + + + + True + False + start + Downloaded: + + + + + + 0 2 - 3 - GTK_FILL + + + + + True + False + start + Uploaded: + + + + + + 0 + 3 + + + + + True + False + 10 + + + 3 + 0 @@ -588,28 +309,168 @@ True False 15 - 0 1 - 2 - GTK_FILL + 3 - + True False - 0 + start + Seeds: + + + + + + 2 + 0 + + + + + True + False + start + Peers: + + + + + + 2 + 1 + + + + + True + False + start + Share Ratio: + + + + + + 2 + 2 + + + + + True + False + start + Availability: + + + + + + 2 + 3 + + + + + True + False + start + Seed Rank: + + + + + + 2 + 4 + + + + + True + False + start + ETA Time: + + + 4 - 5 - 2 - 3 - GTK_FILL + 0 + + + True + False + start + Last Transfer: + + + + + + 4 + 3 + + + + + True + False + start + Active Time: + + + + + + 4 + 1 + + + + + True + False + start + Complete Seen: + + + + + + 4 + 4 + + + + + True + False + start + Seeding Time: + + + + + + 4 + 2 + + + + + + + + False @@ -650,20 +511,16 @@ True False - 0 - 0 5 2 10 15 - + True False - 7 - 5 - 10 5 + 10 True @@ -672,59 +529,10 @@ word-char True end - 0 1 - 5 - GTK_SHRINK | GTK_FILL - GTK_EXPAND - - - - - True - False - - - 2 - 3 - 2 - 5 - GTK_SHRINK - 5 - - - - - True - False - Name: - 0 - - - - - - GTK_FILL - - - - - - True - False - Total Size: - 0 - - - - - - 2 - 3 - GTK_FILL - + 0 @@ -732,32 +540,10 @@ True False True - 0 1 - 2 2 - 3 - GTK_FILL - - - - - - True - False - Total Files: - 0 - - - - - - 3 - 4 - GTK_FILL - @@ -765,67 +551,20 @@ True False True - 0 1 - 2 3 - 4 - GTK_FILL - - - - - - True - False - Completed: - 0 - - - - - - 3 - 4 - 3 - 4 - GTK_FILL - True False - 0 4 - 5 3 - 4 - - - - - - True - False - Added: - 0 - - - - - - 3 - 4 - 2 - 3 - GTK_FILL - @@ -833,64 +572,35 @@ 100 True False - 0 4 - 5 2 - 3 - True False + start Pieces: - 0 3 - 4 4 - 5 - GTK_FILL - True False - 0 4 - 5 4 - 5 - - - - - - True - False - Hash: - 0 - - - - - - 4 - 5 - GTK_FILL - @@ -900,32 +610,10 @@ True True 40 - 0 1 - 2 4 - 5 - GTK_FILL - - - - - - True - False - Download Folder: - 0 - - - - - - 1 - 2 - GTK_FILL - @@ -936,14 +624,10 @@ char True start - 0 1 - 5 1 - 2 - @@ -953,48 +637,10 @@ char True end - 0 1 - 5 6 - 7 - - - - - - True - False - Comments: - 0 - - - - - - 6 - 7 - GTK_FILL - - - - - - True - False - Created By: - 0 - - - - - - 5 - 6 - GTK_FILL - @@ -1004,16 +650,200 @@ char True end - 0 1 - 5 5 - 6 - + + + True + False + start + Name: + + + + + + 0 + 0 + + + + + True + False + start + Download Folder: + + + + + + 0 + 1 + + + + + True + False + start + Added: + + + + + + 3 + 2 + + + + + True + False + start + Total Size: + + + + + + 0 + 2 + + + + + True + False + start + Total Files: + + + + + + 0 + 3 + + + + + True + False + start + Hash: + + + + + + 0 + 4 + + + + + True + False + start + Created By: + + + + + + 0 + 5 + + + + + True + False + start + Comments: + + + + + + 0 + 6 + + + + + True + False + start + Completed: + + + + + + 3 + 3 + + + + + True + False + 2 + + + 2 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1116,266 +946,23 @@ 5 15 - + True False - 5 - + True False - - - 1 - 2 - - - - - - True - False - - - 3 - 4 - - - - - - True - False - 0 - none + 2 + 5 + 5 - + True False - 0 - 0 - 0 + vertical - - True - False - 5 - 4 - 3 - 4 - 2 - - - - - - - - - True - True - • - 6 - 1 - False - False - spin_max_connections_adjustment - True - - - 1 - 2 - 2 - 3 - - - - - - - True - True - • - 6 - 1 - False - False - spin_max_upload_adjustment - 1 - True - - - 1 - 2 - 1 - 2 - - - - - - - True - True - • - 6 - 1 - False - False - spin_max_download_adjustment - 1 - 1 - True - - - 1 - 2 - - - - - - - True - False - Connections: - 0 - - - 2 - 3 - GTK_FILL - - - - - - True - False - Upload Speed: - 0 - - - 1 - 2 - GTK_FILL - - - - - - True - False - Download Speed: - 0 - - - GTK_FILL - - - - - - True - False - K/s - start - - - - - - 2 - 3 - - - - - - - True - False - K/s - - - - - - 2 - 3 - 1 - 2 - - - - - - - True - False - Upload Slots: - 0 - - - 3 - 4 - GTK_FILL - - - - - - True - True - • - 6 - 1 - False - False - spin_max_upload_slots_adjustment - True - - - 1 - 2 - 3 - 4 - - - - - - - - - - - True - False - Bandwidth Limits - - - - - - - - - GTK_FILL - - - - - True - False - 0 - 10 - - - True - False - - + True False @@ -1383,7 +970,6 @@ True False Owner: - 0 @@ -1400,7 +986,6 @@ False char True - 0 False @@ -1422,6 +1007,7 @@ True True False + start True @@ -1437,6 +1023,7 @@ True True False + start True @@ -1452,6 +1039,7 @@ True True False + start True @@ -1486,6 +1074,7 @@ True True False + start True @@ -1496,7 +1085,7 @@ - + True False @@ -1513,27 +1102,28 @@ - 4 - 5 + 2 + 0 - + True False - 2 - 5 - 5 + 10 - + True False + 15 + vertical Auto Managed True True False + start True @@ -1549,6 +1139,7 @@ True True False + start True @@ -1595,6 +1186,7 @@ True True False + start True @@ -1607,7 +1199,7 @@ - + True False @@ -1622,8 +1214,6 @@ True False - 1 - 0.69999998807907104 _Apply @@ -1646,9 +1236,195 @@ - 2 - 3 - GTK_FILL + 1 + 0 + + + + + True + False + 0 + none + + + True + False + + + True + False + 5 + 2 + 4 + + + True + True + • + 6 + False + False + spin_max_connections_adjustment + True + + + 1 + 2 + + + + + True + True + • + 6 + False + False + spin_max_upload_adjustment + 1 + True + + + 1 + 1 + + + + + True + True + • + 6 + False + False + spin_max_download_adjustment + 1 + 1 + True + + + 1 + 0 + + + + + True + False + start + Upload Speed: + + + 0 + 1 + + + + + True + False + K/s + start + + + + + + 2 + 0 + + + + + True + False + K/s + + + + + + 2 + 1 + + + + + True + True + • + 6 + False + False + spin_max_upload_slots_adjustment + True + + + 1 + 3 + + + + + True + False + start + Download Speed: + + + 0 + 0 + + + + + True + False + start + Connections: + + + 0 + 2 + + + + + True + False + start + Upload Slots: + + + 0 + 3 + + + + + + + + + + + + + + + True + False + Bandwidth Limits + + + + + + + + 0 + 0 @@ -1692,28 +1468,24 @@ 10 15 - + True False - 6 - 2 - 10 5 + 10 True False + start Current Tracker: - 0 + 0 1 - 2 - GTK_FILL - @@ -1721,31 +1493,10 @@ True False True - 0 1 - 2 1 - 2 - - - - - - True - False - Next Announce: - 0 - - - - - - 3 - 4 - GTK_FILL - @@ -1753,32 +1504,10 @@ True False True - 0 1 - 2 3 - 4 - - - - - - True - False - Tracker Status: - 0 - 0 - - - - - - 2 - 3 - GTK_FILL - @@ -1788,30 +1517,106 @@ True char True - 0 1 - 2 2 - 3 - GTK_FILL + + + + + True + False + True + + + 1 + 0 + + + + + True + False + char + True + + + 1 + 4 + + + + + True + False + start + Total Trackers: + + + + + + 0 + 0 + + + + + True + False + start + Tracker Status: + + + + + + 0 + 2 + + + + + True + False + start + Next Announce: + + + + + + 0 + 3 + + + + + True + False + start + Private Torrent: + + + + + + 0 + 4 True False - 0 - 0 + start 5 True True True - 0 - 0 @@ -1825,74 +1630,12 @@ - 2 + 0 5 - 6 - GTK_FILL - - - True - False - Total Trackers: - 0 - - - - - - GTK_FILL - - - - - - True - False - True - 0 - - - 1 - 2 - GTK_FILL - - - - - True - False - Private Torrent: - 0 - - - - - - 4 - 5 - GTK_FILL - - - - - - True - False - char - True - 0 - - - 1 - 2 - 4 - 5 - GTK_FILL - - + diff --git a/deluge/ui/gtk3/glade/main_window.ui b/deluge/ui/gtk3/glade/main_window.ui index 3210cc60e..33731d905 100644 --- a/deluge/ui/gtk3/glade/main_window.ui +++ b/deluge/ui/gtk3/glade/main_window.ui @@ -1,739 +1,8 @@ - + - - False - Deluge - - - - - - - - - True - False - - - True - False - - - False - True - False - _File - True - - - False - - - _Add Torrent - False - True - False - False - True - False - - - - - - - _Create Torrent - False - True - False - True - False - - - - - - - False - - - - - Quit & _Shutdown Daemon - False - False - True - False - - - - - - - True - False - - - - - gtk-quit - False - True - False - True - True - accelgroup1 - - - - - - - - - - False - True - False - _Edit - True - - - True - False - - - gtk-preferences - False - True - False - True - True - accelgroup1 - - - - - - - _Connection Manager - False - True - False - True - False - - - - - - - - - - - False - False - _Torrent - True - - - - - False - True - False - _View - True - - - True - False - - - False - True - False - _Toolbar - True - True - - - - - - False - True - False - _Sidebar - True - True - - - - - - False - True - False - Status_bar - True - True - - - - - - True - False - - - - - False - True - False - T_abs - True - - - - - False - True - False - _Columns - True - - - - - False - True - False - False - _Find ... - True - - - - - - - False - True - False - True - S_idebar - True - - - True - False - True - - - False - True - False - Show _Zero Hits - True - True - - - - - - False - True - False - Show _Trackers - True - True - - - - - - False - True - False - Show _Owners - True - - - - - - - - - - - - - - False - True - False - _Help - True - - - False - - - _Homepage - False - True - False - True - False - - - - - - _FAQ - False - True - False - Frequently Asked Questions - True - False - - - - - - - _Community - False - True - False - True - False - - - - - - True - False - - - - - gtk-about - False - True - False - True - True - accelgroup1 - - - - - - - - - - False - True - 0 - - - - - True - False - - - False - True - False - False - True - Add torrent - Add Torrent - True - gtk-add - - - - False - True - - - - - False - True - False - False - True - Remove torrent - Remove Torrent - gtk-remove - - - - False - True - - - - - False - True - False - False - Filter torrents by name. -This will filter torrents for the current selection on the sidebar. - _Filter - True - gtk-find - - - - - False - True - - - - - True - False - - - False - False - - - - - False - True - False - False - True - Pause the selected torrents - Pause - True - gtk-media-pause - - - - False - True - - - - - False - True - False - False - True - Resume the selected torrents - Resume - gtk-media-play - - - - False - True - - - - - True - False - - - False - False - - - - - False - True - False - False - True - Queue Torrent Up - Queue Up - gtk-go-up - - - - False - True - - - - - False - True - False - False - True - Queue Torrent Down - Queue Down - gtk-go-down - - - - False - True - - - - - True - False - - - False - False - - - - - False - True - False - True - Preferences - Preferences - True - gtk-preferences - - - - False - True - - - - - False - True - False - True - Connection Manager - Connection Manager - gtk-network - - - - False - True - - - - - False - True - 1 - - - - - True - False - 2 - - - True - False - - - True - True - - - True - True - - - False - True - - - - - True - False - - - False - - - False - True - True - True - True - Close - none - - - - True - False - gtk-close - 2 - - - - - False - False - 0 - - - - - True - False - Filter: - - - False - False - 1 - 1 - - - - - 350 - True - True - True - Filter torrents by name. -This will filter torrents for the current selection on the sidebar. - • - True - False - gtk-clear - False - Clear the search - Clear the search - - - - - False - False - 1 - 2 - - - - - _Match Case - False - True - True - False - True - True - - - - True - True - 1 - 3 - - - - - False - True - 0 - - - - - True - True - out - - - True - True - True - False - - - - - - - - True - True - 1 - - - - - True - True - - - - - True - False - - - - - True - False - left - False - True - - - False - False - - - - - - - True - True - 2 - - - - - True - False - - - False - False - 3 - - - - - -1 999999 @@ -768,36 +37,734 @@ This will filter torrents for the current selection on the sidebar. True False gtk-add - 1 + 1 True False gtk-no - 1 + 1 True False gtk-yes - 1 + 1 True False gtk-go-up - 1 + 1 True False gtk-goto-top - 1 + 1 True False gtk-zoom-fit - 1 + 1 + + + False + Deluge + + + + + + True + vertical + False + + + True + False + + + True + False + _File + True + + + False + + + _Add Torrent + True + False + False + True + False + + + + + + + _Create Torrent + True + False + True + False + + + + + + + False + + + + + Quit & _Shutdown Daemon + False + True + False + + + + + + + True + False + + + + + gtk-quit + True + False + True + True + accelgroup1 + + + + + + + + + + True + False + _Edit + True + + + True + False + + + gtk-preferences + True + False + True + True + accelgroup1 + + + + + + + _Connection Manager + True + False + True + False + + + + + + + + + + + False + _Torrent + True + + + + + True + False + _View + True + + + True + False + + + True + False + _Toolbar + True + True + + + + + + True + False + _Sidebar + True + True + + + + + + True + False + Status_bar + True + True + + + + + + True + False + + + + + True + False + T_abs + True + + + + + True + False + _Columns + True + + + + + True + False + False + _Find ... + True + + + + + + + True + False + True + S_idebar + True + + + True + False + True + + + True + False + Show _Zero Hits + True + True + + + + + + True + False + Show _Trackers + True + True + + + + + + True + False + Show _Owners + True + + + + + + + + + + + + + + True + False + _Help + True + + + False + + + _Homepage + True + False + True + False + + + + + + _FAQ + True + False + Frequently Asked Questions + True + False + + + + + + + _Community + True + False + True + False + + + + + + True + False + + + + + gtk-about + True + False + True + True + accelgroup1 + + + + + + + + + + False + True + 0 + + + + + True + False + + + True + False + False + True + Add torrent + Add Torrent + True + gtk-add + + + + False + True + + + + + True + False + False + True + Remove torrent + Remove Torrent + gtk-remove + + + + False + True + + + + + True + False + False + Filter torrents by name. +This will filter torrents for the current selection on the sidebar. + _Filter + True + gtk-find + + + + + False + True + + + + + True + False + + + False + + + + + True + False + False + True + Pause the selected torrents + Pause + True + gtk-media-pause + + + + False + True + + + + + True + False + False + True + Resume the selected torrents + Resume + gtk-media-play + + + + False + True + + + + + True + False + + + False + + + + + True + False + False + True + Queue Torrent Up + Queue Up + gtk-go-up + + + + False + True + + + + + True + False + False + True + Queue Torrent Down + Queue Down + gtk-go-down + + + + False + True + + + + + True + False + + + False + + + + + True + False + True + Preferences + Preferences + True + gtk-preferences + + + + False + True + + + + + True + False + True + Connection Manager + Connection Manager + gtk-network + + + + False + True + + + + + False + True + 1 + + + + + True + False + 2 + + + True + vertical + False + + + True + True + + + True + True + + + False + True + + + + + True + vertical + False + + + + False + + + True + True + True + True + Close + none + + + + True + False + gtk-close + 2 + + + + + False + False + 0 + + + + + True + False + Filter: + + + False + False + 1 + 1 + + + + + 350 + True + True + True + Filter torrents by name. +This will filter torrents for the current selection on the sidebar. + • + True + True + False + gtk-clear + True + True + False + True + Clear the search + Clear the search + + + + + False + False + 1 + 2 + + + + + _Match Case + True + True + False + True + True + + + + True + True + 1 + 3 + + + + + False + True + 0 + + + + + True + True + automatic + automatic + out + + + True + True + True + False + + + + + True + True + 1 + + + + + True + True + + + + + True + False + + + + + True + False + left + False + True + + + + False + False + + + + + + + True + True + 2 + + + + + True + False + + + False + False + 3 + + + + diff --git a/deluge/ui/gtk3/glade/move_storage_dialog.ui b/deluge/ui/gtk3/glade/move_storage_dialog.ui index f0bf52cbf..55c42c513 100644 --- a/deluge/ui/gtk3/glade/move_storage_dialog.ui +++ b/deluge/ui/gtk3/glade/move_storage_dialog.ui @@ -17,6 +17,7 @@ True False + vertical 2 @@ -26,7 +27,6 @@ gtk-cancel - False True True True @@ -41,7 +41,6 @@ gtk-ok - False True True True @@ -64,12 +63,13 @@ - + True False + vertical 5 - + True False 5 @@ -108,7 +108,7 @@ - + True False @@ -119,7 +119,7 @@ - + True False 5 @@ -127,6 +127,7 @@ True False + start Destination: diff --git a/deluge/ui/gtk3/glade/other_dialog.ui b/deluge/ui/gtk3/glade/other_dialog.ui index 742880f83..74a7ecf26 100644 --- a/deluge/ui/gtk3/glade/other_dialog.ui +++ b/deluge/ui/gtk3/glade/other_dialog.ui @@ -26,6 +26,7 @@ True False + vertical 5 @@ -35,7 +36,6 @@ gtk-cancel - False True True True @@ -50,7 +50,6 @@ gtk-ok - False True True True @@ -73,7 +72,7 @@ - + True False 10 @@ -92,9 +91,9 @@ True False + start label True - 0 False @@ -110,7 +109,7 @@ - + False @@ -120,7 +119,7 @@ - + True False 5 @@ -142,7 +141,6 @@ True False - 1 True @@ -150,7 +148,6 @@ 6 True 6 - 1 False False adjustment1 @@ -167,8 +164,8 @@ True False + start label - 0 True diff --git a/deluge/ui/gtk3/glade/path_combo_chooser.ui b/deluge/ui/gtk3/glade/path_combo_chooser.ui index da558773d..26a2d7f55 100644 --- a/deluge/ui/gtk3/glade/path_combo_chooser.ui +++ b/deluge/ui/gtk3/glade/path_combo_chooser.ui @@ -2,7 +2,6 @@ - 100 1 @@ -35,6 +34,7 @@ True False + vertical 5 @@ -44,7 +44,6 @@ Close - False True True True @@ -78,15 +77,15 @@ 15 10 - + True False True False + start Max drop down rows - 0 True @@ -145,16 +144,17 @@ 12 5 - + True False + vertical Show path entry - False True True False + start True @@ -167,10 +167,10 @@ Show file chooser - False True True False + start True @@ -188,10 +188,10 @@ Show folder name - False True True False + start True @@ -239,59 +239,59 @@ 12 5 - + True False - 2 - 2 - 5 5 - - - + 5 Enable autocomplete - False True True False + start True - - - - Set new key - False - True - True - True - Press this key to set new key accelerators to trigger auto-complete - - - - 1 - 2 + 0 + 0 Show hidden files - False True True False - 0.55000001192092896 + start True + 0 1 - 2 + + + Set new key + True + True + True + Press this key to set new key accelerators to trigger auto-complete + + + + + 1 + 0 + + + + + @@ -328,67 +328,33 @@ 15 5 - + True False - 6 - 2 2 + 10 True False + start Autocomplete - 0 + + 0 + 0 + True False + start Save path - 0 + 0 1 - 2 - - - - - True - False - Edit path - 0 - - - 2 - 3 - - - - - True - False - Remove path - 0 - 0.51999998092651367 - - - 3 - 4 - - - - - True - False - Toggle hidden files - 0 - - - 4 - 5 @@ -396,24 +362,20 @@ True False Ctrl+S - 0 1 - 2 1 - 2 True False - 0 1 - 2 + 0 @@ -421,13 +383,10 @@ True False Ctrl+E - 0 1 - 2 2 - 3 @@ -435,13 +394,10 @@ True False Ctrl+R - 0 1 - 2 3 - 4 @@ -449,25 +405,10 @@ True False Ctrl+H - 0 1 - 2 4 - 5 - - - - - True - False - Default path - 0 - - - 5 - 6 @@ -475,13 +416,59 @@ True False Ctrl+D - 0 1 - 2 5 - 6 + + + + + True + False + start + Edit path + + + 0 + 2 + + + + + True + False + start + Remove path + + + 0 + 3 + + + + + True + False + start + 8 + Toggle hidden files + + + 0 + 4 + + + + + True + False + start + Default path + + + 0 + 5 @@ -534,7 +521,7 @@ - + True False 3 @@ -598,10 +585,14 @@ dialog select-folder False + + + True False + vertical 2 @@ -611,7 +602,6 @@ Cancel - False True True True @@ -625,7 +615,6 @@ Open - False True True True @@ -677,7 +666,7 @@ - + True False 3 @@ -733,20 +722,21 @@ - + True False + vertical - + True False + vertical 1 start Add - False True True True @@ -762,7 +752,6 @@ Edit - False True True True @@ -778,7 +767,6 @@ Remove - False True True True @@ -794,7 +782,6 @@ Up - False True True True @@ -810,7 +797,6 @@ Down - False True True True @@ -826,7 +812,6 @@ Default - False True False True @@ -842,7 +827,6 @@ - False True True True @@ -889,7 +873,7 @@ - + True False 3 @@ -912,22 +896,18 @@ - False True True True - 0.50999999046325684 - + True False True False - 0 - 1 gtk-open @@ -940,8 +920,6 @@ True False - 6 - 0 False @@ -963,12 +941,11 @@ True True • - False - False + - + @@ -980,7 +957,6 @@ - False True True False @@ -990,23 +966,12 @@ - + 15 True False + vertical True - - - True - False - up - - - True - False - 0 - - True @@ -1016,7 +981,7 @@ True False - 1 + 0 diff --git a/deluge/ui/gtk3/glade/preferences_dialog.ui b/deluge/ui/gtk3/glade/preferences_dialog.ui index 5b1cc5f8e..0698aad64 100644 --- a/deluge/ui/gtk3/glade/preferences_dialog.ui +++ b/deluge/ui/gtk3/glade/preferences_dialog.ui @@ -251,6 +251,7 @@ True False + vertical 2 @@ -311,7 +312,7 @@ - + True True @@ -352,9 +353,10 @@ queue none - + True False + vertical True @@ -365,11 +367,10 @@ True False - 0 2 10 - + True False @@ -441,15 +442,17 @@ 2 10 - + True False + vertical Show session speed in titlebar True True False + start True @@ -465,6 +468,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + start True @@ -487,6 +491,7 @@ and daemon (does not apply in Standalone mode). True False + start Show a pieces bar in Status tab True @@ -507,22 +512,21 @@ and daemon (does not apply in Standalone mode). False 25 - + True False - 4 - 3 - 5 1 + 5 True False + start Completed: - 1 - GTK_FILL + 0 + 0 @@ -530,27 +534,23 @@ and daemon (does not apply in Standalone mode). True True True - 0 - #000000000000 1 - 2 - + 0 True False + start Downloading: - 1 + 0 1 - 2 - GTK_FILL @@ -558,29 +558,23 @@ and daemon (does not apply in Standalone mode). True True True - 0 - #000000000000 1 - 2 1 - 2 - True False + start Waiting: - 1 + 0 2 - 3 - GTK_FILL @@ -588,29 +582,23 @@ and daemon (does not apply in Standalone mode). True True True - 0 - #000000000000 1 - 2 2 - 3 - True False + start Missing: - 1 + 0 3 - 4 - GTK_FILL @@ -618,16 +606,11 @@ and daemon (does not apply in Standalone mode). True True True - 0 - #000000000000 1 - 2 3 - 4 - @@ -644,8 +627,7 @@ and daemon (does not apply in Standalone mode). 2 - 3 - + 0 @@ -662,10 +644,7 @@ and daemon (does not apply in Standalone mode). 2 - 3 1 - 2 - @@ -682,10 +661,7 @@ and daemon (does not apply in Standalone mode). 2 - 3 2 - 3 - @@ -702,10 +678,7 @@ and daemon (does not apply in Standalone mode). 2 - 3 3 - 4 - @@ -762,15 +735,17 @@ and daemon (does not apply in Standalone mode). 2 10 - + True False + vertical Enable system tray icon True False False + start True True @@ -785,7 +760,7 @@ and daemon (does not apply in Standalone mode). False - + True False @@ -842,6 +817,7 @@ and daemon (does not apply in Standalone mode). False False False + start True True @@ -865,6 +841,7 @@ and daemon (does not apply in Standalone mode). False False False + start True True @@ -889,6 +866,7 @@ and daemon (does not apply in Standalone mode). False True False + start True True @@ -907,7 +885,7 @@ and daemon (does not apply in Standalone mode). False 20 - + True False 5 @@ -917,7 +895,6 @@ and daemon (does not apply in Standalone mode). False False Password: - 0 False @@ -987,9 +964,10 @@ and daemon (does not apply in Standalone mode). 2 10 - + True False + vertical True @@ -1000,6 +978,7 @@ and daemon (does not apply in Standalone mode). True True False + start True @@ -1045,15 +1024,17 @@ and daemon (does not apply in Standalone mode). 2 10 - + True False + vertical System Default True True False + start True @@ -1134,9 +1115,10 @@ and daemon (does not apply in Standalone mode). queue none - + True False + vertical True @@ -1151,23 +1133,22 @@ and daemon (does not apply in Standalone mode). 2 12 - + True False - 7 Move completed to: True True False + start True + 0 2 - 3 - GTK_FILL @@ -1176,13 +1157,13 @@ and daemon (does not apply in Standalone mode). True True False + start True + 0 4 - 5 - GTK_FILL @@ -1192,23 +1173,24 @@ and daemon (does not apply in Standalone mode). True False Delete the copy of the torrent file created when the torrent is removed + start True + 0 6 - 7 - 15 True False + start Download to: - 0 - GTK_FILL + 0 + 0 @@ -1217,7 +1199,7 @@ and daemon (does not apply in Standalone mode). False 15 - + True False 5 @@ -1228,8 +1210,8 @@ and daemon (does not apply in Standalone mode). + 0 1 - 2 @@ -1238,7 +1220,7 @@ and daemon (does not apply in Standalone mode). False 15 - + True False 5 @@ -1249,8 +1231,8 @@ and daemon (does not apply in Standalone mode). + 0 3 - 4 @@ -1259,7 +1241,7 @@ and daemon (does not apply in Standalone mode). False 15 - + True False 5 @@ -1270,8 +1252,8 @@ and daemon (does not apply in Standalone mode). + 0 5 - 6 @@ -1310,9 +1292,10 @@ and daemon (does not apply in Standalone mode). 2 12 - + True False + vertical Prioritize first and last pieces of torrent @@ -1320,6 +1303,7 @@ and daemon (does not apply in Standalone mode). True False Prioritize first and last pieces of files in torrent + start True @@ -1340,6 +1324,7 @@ sequence instead of rarest first. Enabling sequential download will affect the piece distribution negatively in the swarm. It should be used sparingly. + start True @@ -1354,6 +1339,7 @@ used sparingly. True True False + start True @@ -1369,6 +1355,7 @@ used sparingly. True False Pre-allocate the disk space for the torrent files + start True @@ -1413,15 +1400,17 @@ used sparingly. 2 12 - + True False + vertical Always show True True False + start True @@ -1441,6 +1430,7 @@ used sparingly. True True False + start True @@ -1504,9 +1494,11 @@ used sparingly. queue none - + True False + 10 + vertical True @@ -1521,32 +1513,21 @@ used sparingly. 2 12 - + True False + vertical 5 - + True False - 6 - 3 10 - - - - - - - - - True True 4 - 1 False False adjustment_spin_max_conn_per_sec @@ -1554,10 +1535,7 @@ used sparingly. 1 - 2 5 - 6 - GTK_FILL @@ -1565,7 +1543,6 @@ used sparingly. True True 4 - 1 False False adjustment_spin_max_half_open_conn @@ -1573,10 +1550,7 @@ used sparingly. 1 - 2 4 - 5 - GTK_FILL @@ -1584,39 +1558,22 @@ used sparingly. True False Connection Attempts per Second: - 0 + 0 5 - 6 - GTK_FILL True False + start Half-Open Connections: - 0 + 0 4 - 5 - GTK_FILL - - - - - True - False - The maximum upload speed for all torrents. Set -1 for unlimited. - Upload Speed: - 0 - - - 3 - 4 - GTK_FILL @@ -1624,11 +1581,12 @@ used sparingly. True False The maximum number of connections allowed. Set -1 for unlimited. + start Connections: - 0 - GTK_FILL + 0 + 0 @@ -1636,13 +1594,12 @@ used sparingly. True False The maximum upload slots for all torrents. Set -1 for unlimited. + start Upload Slots: - 0 + 0 1 - 2 - GTK_FILL @@ -1652,7 +1609,6 @@ used sparingly. The maximum number of connections allowed. Set -1 for unlimited. 4 4 - 1 False False adjustment_spin_max_conn_global @@ -1663,8 +1619,7 @@ used sparingly. 1 - 2 - GTK_FILL + 0 @@ -1672,13 +1627,12 @@ used sparingly. True False The maximum download speed for all torrents. Set -1 for unlimited. + start Download Speed: - 0 + 0 2 - 3 - GTK_FILL @@ -1687,7 +1641,6 @@ used sparingly. True The maximum download speed for all torrents. Set -1 for unlimited. 6 - 1 False False adjustment_spin_max_download @@ -1697,10 +1650,7 @@ used sparingly. 1 - 2 2 - 3 - GTK_FILL @@ -1709,7 +1659,6 @@ used sparingly. True The maximum upload speed for all torrents. Set -1 for unlimited. 6 - 1 False False adjustment_spin_max_upload @@ -1719,10 +1668,7 @@ used sparingly. 1 - 2 3 - 4 - GTK_FILL @@ -1731,7 +1677,6 @@ used sparingly. True The maximum upload slots for all torrents. Set -1 for unlimited. 4 - 1 False False adjustment_spin_max_upload_slots_global @@ -1741,44 +1686,55 @@ used sparingly. 1 - 2 1 - 2 - GTK_FILL True False + start KiB/s - 0 2 - 3 2 - 3 - GTK_FILL - True False + start KiB/s - 0 2 - 3 3 - 4 - GTK_FILL - + + + True + False + The maximum upload speed for all torrents. Set -1 for unlimited. + start + Upload Speed: + + + 0 + 3 + + + + + + + + + + + @@ -1800,6 +1756,7 @@ used sparingly. True True False + start True True @@ -1823,6 +1780,7 @@ used sparingly. True False If checked, the estimated TCP/IP overhead is drained from the rate limiters, to avoid exceeding the limits with the total traffic + start True True @@ -1870,15 +1828,10 @@ used sparingly. 2 12 - + True False - 4 - 3 10 - - - True @@ -1886,7 +1839,6 @@ used sparingly. The maximum upload slots per torrent. Set -1 for unlimited. 4 4 - 1 False False adjustment_spin_max_upload_slots_per_torrent @@ -1896,10 +1848,7 @@ used sparingly. 1 - 2 1 - 2 - GTK_FILL @@ -1909,7 +1858,6 @@ used sparingly. The maximum number of connections per torrent. Set -1 for unlimited. 4 4 - 1 False False adjustment_spin_max_conn_per_torrent @@ -1918,58 +1866,55 @@ used sparingly. 1 - 2 - GTK_FILL + 0 True False + start Connections: - 0 - GTK_FILL + 0 + 0 True False + start Upload Slots: - 0 + 0 1 - 2 - GTK_FILL True False + start Download Speed: - 0 + 0 2 - 3 - GTK_FILL True False + start Upload Speed: - 0 + 0 3 - 4 - GTK_FILL @@ -1978,7 +1923,6 @@ used sparingly. True The maximum number download speed per torrent. Set -1 for unlimited. 6 - 1 False False adjustment_spin_max_download_per_torrent @@ -1987,10 +1931,7 @@ used sparingly. 1 - 2 2 - 3 - GTK_FILL @@ -1999,7 +1940,6 @@ used sparingly. True The maximum upload speed per torrent. Set -1 for unlimited. 5 - 1 False False adjustment_spin_max_upload_per_torrent @@ -2008,47 +1948,40 @@ used sparingly. 1 - 2 3 - 4 - GTK_FILL True False + start KiB/s - 0 2 - 3 2 - 3 - GTK_FILL - True False + start + start KiB/s - 0 2 - 3 3 - 4 - GTK_FILL - + + + @@ -2107,9 +2040,10 @@ used sparingly. False 5 - + True False + vertical 5 @@ -2124,15 +2058,17 @@ used sparingly. 5 12 - + True False + vertical Queue to top True True False + start True @@ -2175,22 +2111,20 @@ used sparingly. 5 12 - + True False + vertical 5 - + True False - 3 - 2 10 True True - 1 False False adjustment_spin_active @@ -2199,15 +2133,13 @@ used sparingly. 1 - 2 - + 0 True True - 1 False False adjustment_spin_seeding @@ -2216,41 +2148,37 @@ used sparingly. 1 - 2 2 - 3 - True False + start Seeding: - 0 + 0 2 - 3 - GTK_FILL True False + start Total: - 0 - GTK_FILL + 0 + 0 True True - 1 False False adjustment_spin_downloading @@ -2259,23 +2187,19 @@ used sparingly. 1 - 2 1 - 2 - True False + start Downloading: - 0 + 0 1 - 2 - GTK_FILL @@ -2292,6 +2216,7 @@ used sparingly. True False Torrents not transfering any data do not count towards download/seeding active count. + start True @@ -2307,6 +2232,7 @@ used sparingly. True False Give preference to seeding torrents over downloading torrents. + start True @@ -2349,21 +2275,19 @@ used sparingly. 5 12 - + True False - 3 - 2 10 True False Share Ratio: - 0 - GTK_FILL + 0 + 0 @@ -2371,12 +2295,10 @@ used sparingly. True False Time Ratio: - 0 + 0 1 - 2 - GTK_FILL @@ -2384,12 +2306,10 @@ used sparingly. True False Time (m): - 0 + 0 2 - 3 - GTK_FILL @@ -2398,7 +2318,6 @@ used sparingly. True • 6 - 1 False False adjustment_share_ratio_limit @@ -2406,8 +2325,7 @@ used sparingly. 1 - 2 - + 0 @@ -2416,7 +2334,6 @@ used sparingly. True • 6 - 1 False False adjustment_time_ratio_limit @@ -2424,10 +2341,7 @@ used sparingly. 1 - 2 1 - 2 - @@ -2436,17 +2350,13 @@ used sparingly. True • 6 - 1 False False adjustment_spin_seed_time_limit 1 - 2 2 - 3 - @@ -2483,11 +2393,12 @@ used sparingly. 5 12 - + True False + vertical - + True False @@ -2511,7 +2422,6 @@ used sparingly. False True • - 1 False False adjustment_share_ratio @@ -2538,15 +2448,17 @@ used sparingly. False 10 - + True False + vertical Pause Torrent True True False + start True True @@ -2562,6 +2474,7 @@ used sparingly. True True False + start True radio_pause_ratio @@ -2635,9 +2548,10 @@ used sparingly. queue none - + True False + vertical True @@ -2648,8 +2562,7 @@ used sparingly. True False - 0 - 0 + start 5 12 @@ -2697,11 +2610,12 @@ used sparingly. 5 10 - + True False + vertical - + True False @@ -2710,7 +2624,6 @@ used sparingly. False True 5 - 1 False False adjustment_spin_incoming_port @@ -2750,11 +2663,11 @@ used sparingly. - + True False - + True False @@ -2763,7 +2676,6 @@ used sparingly. False Active Port: right - 0 False @@ -2778,7 +2690,6 @@ used sparingly. False 0 5 - 0 @@ -2816,7 +2727,6 @@ used sparingly. True False - 0 10 @@ -2871,8 +2781,7 @@ used sparingly. True False - 0 - 0 + start 5 12 @@ -2923,7 +2832,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 5 10 - + True False 5 @@ -2945,7 +2854,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L False True 5 - 1 False False adjustment_spin_outgoing_port_min @@ -2978,7 +2886,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L False True 5 - 1 False False adjustment_spin_outgoing_port_max @@ -3043,16 +2950,14 @@ The network interface name or IP address for outgoing BitTorrent connections. (L False 10 - + True False 5 - + True False - 2 - 2 True @@ -3068,10 +2973,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 1 - 2 - 5 @@ -3089,8 +2991,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 - 5 + 0 @@ -3098,11 +2999,10 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False Outgoing: - 1 + 0 1 - 2 @@ -3110,8 +3010,11 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False Incoming: - 1 + + 0 + 0 + @@ -3124,18 +3027,15 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 0 - + True False True False - 5 Level: - 0 True @@ -3178,7 +3078,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 2 Encryption @@ -3207,13 +3106,11 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 2 10 - + True False - 2 - 3 - 6 1 + 6 UPnP @@ -3226,7 +3123,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True - GTK_FILL + 0 + 0 @@ -3242,8 +3140,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 - GTK_FILL + 0 @@ -3259,7 +3156,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 2 - 3 + 0 @@ -3272,9 +3169,8 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True + 1 1 - 2 - GTK_FILL @@ -3288,22 +3184,18 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True - 1 - 2 + 0 1 - 2 - GTK_FILL - + True False True False - 3 Peer TOS Byte: @@ -3334,9 +3226,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 2 - 3 1 - 2 @@ -3347,7 +3237,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 2 Network Extras @@ -3393,9 +3282,10 @@ The network interface name or IP address for outgoing BitTorrent connections. (L queue none - + True False + vertical 5 @@ -3411,23 +3301,20 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 12 12 - + True False - 8 - 2 5 True False + start Password: - 0 + 0 2 - 3 - GTK_FILL @@ -3441,23 +3328,19 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 2 - 3 - GTK_FILL True False + start Hostname: - 0 + 0 3 - 4 - GTK_FILL @@ -3471,30 +3354,25 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 3 - 4 True False + start Port: - 1 + 0 4 - 5 - GTK_FILL True False - 0 - 0 True @@ -3508,10 +3386,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 4 - 5 - GTK_FILL @@ -3524,10 +3399,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L 1 - 2 1 - 2 - GTK_FILL @@ -3544,22 +3416,20 @@ The network interface name or IP address for outgoing BitTorrent connections. (L - 2 - GTK_FILL - + 1 + 0 True False + start Username: - 0 + 0 1 - 2 - GTK_FILL @@ -3574,10 +3444,8 @@ the proxy instead of using the local DNS service True - 2 + 0 5 - 6 - GTK_FILL @@ -3587,15 +3455,12 @@ the proxy instead of using the local DNS service True False Proxy peer and web seed connections. - 0.49000000953674316 True True - 2 + 0 6 - 7 - GTK_FILL @@ -3604,17 +3469,26 @@ the proxy instead of using the local DNS service True True False - 0.49000000953674316 True True - 2 + 0 7 - 8 - GTK_FILL + + + + + + + + + + + + @@ -3644,9 +3518,10 @@ the proxy instead of using the local DNS service 0 none - + True False + vertical True @@ -3660,6 +3535,7 @@ the proxy instead of using the local DNS service True True False + start True @@ -3684,6 +3560,7 @@ the proxy instead of using the local DNS service True False Attempt to hide client identity and only use proxy for incoming connections. + start True @@ -3745,9 +3622,10 @@ the proxy instead of using the local DNS service queue none - + True False + vertical True @@ -3761,21 +3639,20 @@ the proxy instead of using the local DNS service 5 12 - + True False - 2 - 2 5 True False + start Cache Size (16 KiB blocks): - 0 - GTK_FILL + 0 + 0 @@ -3784,13 +3661,12 @@ the proxy instead of using the local DNS service False True The number of seconds from the last cached write to a piece in the write cache, to when it's forcefully flushed to disk. Default is 60 seconds. + start Cache Expiry (seconds): - 0 + 0 1 - 2 - GTK_FILL @@ -3799,7 +3675,6 @@ the proxy instead of using the local DNS service True ● 6 - 1 False False adjustment_cache_size @@ -3808,8 +3683,7 @@ the proxy instead of using the local DNS service 1 - 2 - + 0 @@ -3819,17 +3693,13 @@ the proxy instead of using the local DNS service 5 ● 6 - 1 False False adjustment_cache_expiry 1 - 2 1 - 2 - @@ -3867,9 +3737,10 @@ the proxy instead of using the local DNS service 5 12 - + True False + vertical True @@ -3882,22 +3753,21 @@ the proxy instead of using the local DNS service False 12 - + True False - 3 - 2 5 True False The total number of 16 KiB blocks written to disk since this session was started. + start Blocks Written: - 0 - GTK_FILL + 0 + 0 @@ -3905,13 +3775,12 @@ the proxy instead of using the local DNS service True False The total number of write operations performed since this session was started. + start Writes: - 0 + 0 1 - 2 - GTK_FILL @@ -3919,53 +3788,42 @@ the proxy instead of using the local DNS service True False The ratio (blocks_written - writes) / blocks_written represents the number of saved write operations per total write operations, i.e. a kind of cache hit ratio for the write cache. + start Write Cache Hit Ratio: - 0 + 0 2 - 3 - GTK_FILL True False - 1 1 - 2 - + 0 True False - 1 1 - 2 1 - 2 - True False - 1 1 - 2 2 - 3 - @@ -4001,22 +3859,21 @@ the proxy instead of using the local DNS service False 12 - + True False - 4 - 2 5 True False The number of blocks that were requested from the bittorrent engine (from peers), that were served from disk or cache. + start Blocks Read: - 0 - GTK_FILL + 0 + 0 @@ -4024,13 +3881,12 @@ the proxy instead of using the local DNS service True False The number of blocks that were served from cache. + start Blocks Read Hit: - 0 + 0 1 - 2 - GTK_FILL @@ -4039,52 +3895,40 @@ the proxy instead of using the local DNS service False The cache hit ratio for the read cache. Read Cache Hit Ratio: - 0 + 0 3 - 4 - GTK_FILL True False - 1 1 - 2 - + 0 True False - 1 1 - 2 1 - 2 - True False - 1 1 - 2 3 - 4 - @@ -4093,13 +3937,12 @@ the proxy instead of using the local DNS service False True The total number of read operations performed since this session was started. + start Reads: - 0 + 0 2 - 3 - GTK_FILL @@ -4109,10 +3952,7 @@ the proxy instead of using the local DNS service 1 - 2 2 - 3 - @@ -4148,61 +3988,53 @@ the proxy instead of using the local DNS service False 12 - + True False - 2 - 2 5 True False The number of 16 KiB blocks currently in the disk cache. This includes both read and write cache. + start Cache Size: - 0 - GTK_FILL + 0 + 0 True False + start Read Cache Size: - 0 + 0 1 - 2 - GTK_FILL True False - 1 1 - 2 - + 0 True False - 1 1 - 2 1 - 2 - @@ -4227,7 +4059,7 @@ the proxy instead of using the local DNS service - + True False start @@ -4306,9 +4138,10 @@ the proxy instead of using the local DNS service queue none - + True False + vertical True @@ -4322,16 +4155,17 @@ the proxy instead of using the local DNS service 2 12 - + True False + vertical True False + start Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. True - 0 False @@ -4351,6 +4185,7 @@ the proxy instead of using the local DNS service True True False + start True @@ -4396,15 +4231,16 @@ the proxy instead of using the local DNS service 2 12 - + True False + vertical True False - + True False 5 @@ -4473,7 +4309,7 @@ the proxy instead of using the local DNS service False 12 - + True False start @@ -4484,7 +4320,7 @@ the proxy instead of using the local DNS service True - + True False 2 @@ -4553,9 +4389,10 @@ the proxy instead of using the local DNS service queue none - + True False + vertical True @@ -4569,11 +4406,12 @@ the proxy instead of using the local DNS service 2 12 - + True False + vertical - + True False 5 @@ -4593,7 +4431,6 @@ the proxy instead of using the local DNS service True True - 1 False False adjustment_spin_daemon_port @@ -4651,6 +4488,7 @@ the proxy instead of using the local DNS service True True False + start True @@ -4692,6 +4530,7 @@ the proxy instead of using the local DNS service True True False + start True @@ -4727,7 +4566,7 @@ the proxy instead of using the local DNS service False 12 - + True False @@ -4745,9 +4584,10 @@ the proxy instead of using the local DNS service - + True False + vertical 5 True start @@ -4814,10 +4654,7 @@ the proxy instead of using the local DNS service True False - 10 - 10 Accounts - 0 @@ -4853,13 +4690,15 @@ the proxy instead of using the local DNS service queue none - + True False + vertical - + True True + vertical True @@ -4903,147 +4742,123 @@ the proxy instead of using the local DNS service False 12 - + True False - 5 - 2 5 True False - 0 + start 1 - 2 4 - 5 - GTK_FILL True False - 0 + start 1 - 2 1 - 2 - GTK_FILL True False - 0 + start 1 - 2 - + 0 True False + start Details: - 0 - 0 + 0 4 - 5 - GTK_FILL - GTK_FILL True False + start Version: - 0 + 0 1 - 2 - GTK_FILL - GTK_FILL True False + start Author: - 0 - GTK_FILL - GTK_FILL + 0 + 0 True False + start Homepage: - 0 + 0 3 - 4 - GTK_FILL - GTK_FILL True False + start Author Email: - 0 + 0 2 - 3 - GTK_FILL - GTK_FILL True False - 0 + start 1 - 2 3 - 4 - GTK_FILL True False - 0 + start 1 - 2 2 - 3 - GTK_FILL @@ -5078,7 +4893,7 @@ the proxy instead of using the local DNS service - + True False center diff --git a/deluge/ui/gtk3/glade/queuedtorrents.ui b/deluge/ui/gtk3/glade/queuedtorrents.ui index 78d6209f1..d8b233027 100644 --- a/deluge/ui/gtk3/glade/queuedtorrents.ui +++ b/deluge/ui/gtk3/glade/queuedtorrents.ui @@ -18,6 +18,7 @@ True False + vertical 2 @@ -27,7 +28,6 @@ gtk-close - False True True True @@ -43,7 +43,6 @@ gtk-add - False True False True @@ -70,12 +69,13 @@ - + True False + vertical 5 - + True False 10 @@ -95,7 +95,6 @@ True False - 10 Add Queued Torrents 0.05000000074505806 @@ -139,14 +138,13 @@ - + True False start gtk-remove - False True True True @@ -162,7 +160,6 @@ gtk-clear - False True True True @@ -185,10 +182,10 @@ Automatically add torrents on connect - False True True False + start True diff --git a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui index 86057057e..e49b032f1 100644 --- a/deluge/ui/gtk3/glade/remove_torrent_dialog.ui +++ b/deluge/ui/gtk3/glade/remove_torrent_dialog.ui @@ -11,14 +11,83 @@ center-on-parent True dialog - - - True + vertical False 2 + + + True + False + + + True + False + gtk-dialog-warning + 6 + + + False + False + 0 + + + + + True + False + Remove the selected torrent(s)? + + + + + + + True + True + 1 + + + + + True + True + 0 + + + + + + + + True + False + end + end + + + + + + True + False + 2 + + + + + GTK_ORIENTATION_HORIZONTAL + True + False + + + False + True + 4 + + True @@ -27,7 +96,6 @@ gtk-cancel - False True True True @@ -43,7 +111,6 @@ gtk-ok - False True True True @@ -64,86 +131,12 @@ - - True - False - - - True - False - 0 - gtk-dialog-warning - 6 - - - False - False - 0 - - - - - True - False - Remove the selected torrent(s)? - 0 - - - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - 5 - end - 0.05000000074505806 - - - - - - True - False - 2 - - - - - - - - True - False - - - False - True - 4 - - - - + True False Include downloaded files - False True True False @@ -160,10 +153,7 @@ False - 4 - 2 (This is permanent!) - 0 diff --git a/deluge/ui/gtk3/glade/torrent_menu.options.ui b/deluge/ui/gtk3/glade/torrent_menu.options.ui index 0076b3920..abb9c3af1 100644 --- a/deluge/ui/gtk3/glade/torrent_menu.options.ui +++ b/deluge/ui/gtk3/glade/torrent_menu.options.ui @@ -30,7 +30,6 @@ _Download Speed Limit - False True False True @@ -41,7 +40,6 @@ _Upload Speed Limit - False True False True @@ -52,7 +50,6 @@ _Connection Limit - False True False True @@ -63,7 +60,6 @@ Upload _Slot Limit - False True False True @@ -73,7 +69,6 @@ - False True False Stop seed at _ratio @@ -82,7 +77,6 @@ - False True False _Auto Managed @@ -100,7 +94,6 @@ - False True False _Change Ownership diff --git a/deluge/ui/gtk3/glade/torrent_menu.queue.ui b/deluge/ui/gtk3/glade/torrent_menu.queue.ui index 3930d3eaf..5fb394fbf 100644 --- a/deluge/ui/gtk3/glade/torrent_menu.queue.ui +++ b/deluge/ui/gtk3/glade/torrent_menu.queue.ui @@ -8,7 +8,6 @@ gtk-goto-top - False True False True @@ -19,7 +18,6 @@ gtk-go-up - False True False True @@ -30,7 +28,6 @@ gtk-go-down - False True False True @@ -41,7 +38,6 @@ gtk-goto-bottom - False True False True diff --git a/deluge/ui/gtk3/glade/torrent_menu.ui b/deluge/ui/gtk3/glade/torrent_menu.ui index 2edb8997d..a0c0e1e8e 100644 --- a/deluge/ui/gtk3/glade/torrent_menu.ui +++ b/deluge/ui/gtk3/glade/torrent_menu.ui @@ -68,7 +68,6 @@ _Open Download Folder - False True False True @@ -86,7 +85,6 @@ _Pause - False True False True @@ -98,7 +96,6 @@ Resu_me - False True False Resume selected torrents. @@ -117,7 +114,6 @@ Opt_ions - False True False True @@ -134,7 +130,6 @@ _Queue - False True False True @@ -151,7 +146,6 @@ _Update Tracker - False True False True @@ -163,7 +157,6 @@ _Edit Trackers - False True False True @@ -181,7 +174,6 @@ _Remove Torrent - False True False True @@ -199,7 +191,6 @@ _Force Re-check - False True False True @@ -211,7 +202,6 @@ _Move Download Folder - False True False True diff --git a/deluge/ui/gtk3/glade/tray_menu.ui b/deluge/ui/gtk3/glade/tray_menu.ui index da1cabd76..1147b72df 100644 --- a/deluge/ui/gtk3/glade/tray_menu.ui +++ b/deluge/ui/gtk3/glade/tray_menu.ui @@ -42,7 +42,6 @@ False - False True False _Show Deluge @@ -59,7 +58,6 @@ _Add Torrent - False True False True @@ -77,7 +75,6 @@ _Pause Session - False True False True @@ -89,7 +86,6 @@ _Resume Session - False True False True @@ -107,7 +103,6 @@ _Download Speed Limit - False True False True @@ -119,7 +114,6 @@ _Upload Speed Limit - False True False True @@ -137,7 +131,6 @@ Quit & Shutdown Daemon - False True False True @@ -155,7 +148,6 @@ gtk-quit - False True False True