From 74a459274c59c4730410a9f316bce28f5f9bff33 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 24 Oct 2018 14:38:02 +0100 Subject: [PATCH] [GTK3] Cleanup widget placement and spacing --- deluge/ui/gtk3/glade/add_torrent_dialog.ui | 8 +- deluge/ui/gtk3/glade/edit_trackers.ui | 1 - deluge/ui/gtk3/glade/main_window.tabs.ui | 25 +- deluge/ui/gtk3/glade/preferences_dialog.ui | 398 ++++++++++----------- deluge/ui/gtk3/glade/queuedtorrents.ui | 1 - 5 files changed, 222 insertions(+), 211 deletions(-) diff --git a/deluge/ui/gtk3/glade/add_torrent_dialog.ui b/deluge/ui/gtk3/glade/add_torrent_dialog.ui index 0944eb3e6..4d3680344 100644 --- a/deluge/ui/gtk3/glade/add_torrent_dialog.ui +++ b/deluge/ui/gtk3/glade/add_torrent_dialog.ui @@ -107,6 +107,7 @@ True True in + 50 71 @@ -325,7 +326,7 @@ False - True + False @@ -340,16 +341,17 @@ True False - + True False + vertical True False 5 - + False 5 diff --git a/deluge/ui/gtk3/glade/edit_trackers.ui b/deluge/ui/gtk3/glade/edit_trackers.ui index afad60022..9b77a9b34 100644 --- a/deluge/ui/gtk3/glade/edit_trackers.ui +++ b/deluge/ui/gtk3/glade/edit_trackers.ui @@ -90,7 +90,6 @@ True False Edit Trackers - 0.05000000074505806 diff --git a/deluge/ui/gtk3/glade/main_window.tabs.ui b/deluge/ui/gtk3/glade/main_window.tabs.ui index 233cc6b2d..30bd395bd 100644 --- a/deluge/ui/gtk3/glade/main_window.tabs.ui +++ b/deluge/ui/gtk3/glade/main_window.tabs.ui @@ -490,6 +490,7 @@ True False + 1 _Status True @@ -525,6 +526,7 @@ True False + start True word-char True @@ -539,6 +541,7 @@ True False + start True @@ -550,6 +553,7 @@ True False + start True @@ -561,6 +565,7 @@ True False + start 4 @@ -572,6 +577,7 @@ 100 True False + start 4 @@ -597,6 +603,7 @@ True False + start 4 @@ -607,6 +614,7 @@ True False + start True True 40 @@ -620,6 +628,7 @@ True False + start True char True @@ -634,6 +643,7 @@ True False + start char True end @@ -647,6 +657,7 @@ True False + start char True end @@ -795,11 +806,12 @@ True False - 2 + vertical 2 - 3 + 2 + 3 @@ -859,6 +871,7 @@ True False + 1 _Details True @@ -889,6 +902,7 @@ True False + 1 Fi_les True @@ -919,6 +933,7 @@ True False + 1 _Peers True @@ -1262,7 +1277,6 @@ True True • - 6 False False spin_max_connections_adjustment @@ -1278,7 +1292,6 @@ True True • - 6 False False spin_max_upload_adjustment @@ -1295,7 +1308,6 @@ True True • - 6 False False spin_max_download_adjustment @@ -1354,7 +1366,6 @@ True True • - 6 False False spin_max_upload_slots_adjustment @@ -1442,6 +1453,7 @@ True False + 1 _Options True @@ -1652,6 +1664,7 @@ True False + 1 _Trackers True diff --git a/deluge/ui/gtk3/glade/preferences_dialog.ui b/deluge/ui/gtk3/glade/preferences_dialog.ui index 81c2dc9ce..e1bbc7484 100644 --- a/deluge/ui/gtk3/glade/preferences_dialog.ui +++ b/deluge/ui/gtk3/glade/preferences_dialog.ui @@ -368,7 +368,7 @@ True False - 2 + 3 10 @@ -1499,7 +1499,6 @@ used sparingly. True False - 10 vertical @@ -1529,7 +1528,6 @@ used sparingly. True True - 4 False False adjustment_spin_max_conn_per_sec @@ -1544,7 +1542,6 @@ used sparingly. True True - 4 False False adjustment_spin_max_half_open_conn @@ -1610,8 +1607,6 @@ used sparingly. True True The maximum number of connections allowed. Set -1 for unlimited. - 4 - 4 False False adjustment_spin_max_conn_global @@ -1643,7 +1638,6 @@ used sparingly. True True The maximum download speed for all torrents. Set -1 for unlimited. - 6 False False adjustment_spin_max_download @@ -1661,7 +1655,6 @@ used sparingly. True True The maximum upload speed for all torrents. Set -1 for unlimited. - 6 False False adjustment_spin_max_upload @@ -1679,7 +1672,6 @@ used sparingly. True True The maximum upload slots for all torrents. Set -1 for unlimited. - 4 False False adjustment_spin_max_upload_slots_global @@ -1743,7 +1735,7 @@ used sparingly. - True + False True 0 @@ -1840,8 +1832,6 @@ used sparingly. True True The maximum upload slots per torrent. Set -1 for unlimited. - 4 - 4 False False adjustment_spin_max_upload_slots_per_torrent @@ -1859,8 +1849,6 @@ used sparingly. True True The maximum number of connections per torrent. Set -1 for unlimited. - 4 - 4 False False adjustment_spin_max_conn_per_torrent @@ -1925,7 +1913,6 @@ used sparingly. True True The maximum number download speed per torrent. Set -1 for unlimited. - 6 False False adjustment_spin_max_download_per_torrent @@ -1942,7 +1929,6 @@ used sparingly. True True The maximum upload speed per torrent. Set -1 for unlimited. - 5 False False adjustment_spin_max_upload_per_torrent @@ -2316,19 +2302,17 @@ used sparingly. - + True True • - 6 False False - adjustment_share_ratio_limit - 2 + adjustment_spin_seed_time_limit 1 - 0 + 2 @@ -2336,7 +2320,6 @@ used sparingly. True True • - 6 False False adjustment_time_ratio_limit @@ -2348,18 +2331,18 @@ used sparingly. - + True True • - 6 False False - adjustment_spin_seed_time_limit + adjustment_share_ratio_limit + 2 1 - 2 + 0 @@ -2834,17 +2817,22 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False 5 - 10 + 12 - + True False - 5 + vertical - + + Random True - False - From: + True + False + Uses random ports in range 49152 to 65525 + 0 + True + False @@ -2853,71 +2841,78 @@ The network interface name or IP address for outgoing BitTorrent connections. (L - - True - False - True - 5 - False - False - adjustment_spin_outgoing_port_min - 1 - True - True - - - False - True - 5 - 1 - - - - + True False - To: - - - False - False - 2 - - - - - True - False - True - 5 - False - False - adjustment_spin_outgoing_port_max - 1 - True - True + + + True + False + From: + + + False + False + 0 + + + + + True + False + True + 5 + False + False + adjustment_spin_outgoing_port_min + 1 + True + True + + + False + True + 5 + 1 + + + + + True + False + To: + + + False + False + 2 + + + + + True + False + True + 5 + False + False + adjustment_spin_outgoing_port_max + 1 + True + True + + + False + True + 5 + 3 + + False True - 5 - 3 - - - - - Random - True - True - False - Uses random ports in range 49152 to 65525 - True - - - - False - False - 4 + 1 @@ -2963,6 +2958,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False 6 + 5 True @@ -3003,7 +2999,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 8 Outgoing: @@ -3015,7 +3010,6 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 8 Incoming: @@ -3038,11 +3032,11 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False + 5 True False - 8 Level: @@ -3111,7 +3105,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False - 2 + 4 2 10 @@ -3201,6 +3195,7 @@ The network interface name or IP address for outgoing BitTorrent connections. (L True False + 5 True @@ -3215,12 +3210,11 @@ The network interface name or IP address for outgoing BitTorrent connections. (L - 25 True True 4 • - 4 + 1 0x00 True False @@ -3683,7 +3677,6 @@ the proxy instead of using the local DNS service True True ● - 6 False False adjustment_cache_size @@ -3701,7 +3694,6 @@ the proxy instead of using the local DNS service True 5 ● - 6 False False adjustment_cache_expiry @@ -4163,11 +4155,13 @@ the proxy instead of using the local DNS service False 2 12 + 40 True False vertical + 2 True @@ -4175,6 +4169,7 @@ the proxy instead of using the local DNS service 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 @@ -4184,20 +4179,13 @@ the proxy instead of using the local DNS service - + + Yes, please send anonymous statistics True - False - 10 - - - Yes, please send anonymous statistics - True - True - False - start - True - - + True + False + start + True False @@ -4240,49 +4228,15 @@ the proxy instead of using the local DNS service 2 12 - + True False - vertical + 5 - + True False - - - True - False - 5 - - - True - False - Location: - - - False - False - 0 - - - - - True - True - If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country. - ● - True - False - False - - - True - True - 1 - - - - + Location: False @@ -4290,6 +4244,22 @@ the proxy instead of using the local DNS service 0 + + + True + True + If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country. + ● + True + False + False + + + False + True + 1 + + @@ -4313,61 +4283,80 @@ the proxy instead of using the local DNS service - + True False - 12 + 0 + none - + True False - start + 2 + 12 - + True - True - True - + False + start - + True - False - 2 + True + True + - + True False - image-missing + 2 + + + True + False + image-missing + + + True + True + 0 + + + + + True + False + Associate with Deluge + + + True + True + 1 + + - - True - True - 0 - - - - - True - False - Associate Magnet links with Deluge - - - True - True - 1 - + + False + False + 0 + - - False - False - 0 - + + + True + False + Magnet Links + + + + + False @@ -4575,29 +4564,16 @@ the proxy instead of using the local DNS service True False 12 + 20 True False - - - True - True - - - - - - True - True - 0 - - + vertical True False - vertical 5 True start @@ -4653,6 +4629,28 @@ the proxy instead of using the local DNS service False True 4 + 0 + + + + + True + True + in + 150 + + + True + True + + + + + + + + False + True 1 diff --git a/deluge/ui/gtk3/glade/queuedtorrents.ui b/deluge/ui/gtk3/glade/queuedtorrents.ui index 333d45ab2..528ef64e2 100644 --- a/deluge/ui/gtk3/glade/queuedtorrents.ui +++ b/deluge/ui/gtk3/glade/queuedtorrents.ui @@ -96,7 +96,6 @@ True False Add Queued Torrents - 0.05000000074505806