From c27aa7723ee9516e45c967625d483efde6ca8f85 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 3 Sep 2015 15:57:04 +0800 Subject: [PATCH] Options GUI layout cleanups: Speed Page Move uTP options to it's own section --- src/gui/options.ui | 815 +++++++++++++++++++++------------------------ 1 file changed, 386 insertions(+), 429 deletions(-) diff --git a/src/gui/options.ui b/src/gui/options.ui index 6810b357e..64b24e3c8 100644 --- a/src/gui/options.ui +++ b/src/gui/options.ui @@ -10,12 +10,6 @@ 591 - - - 0 - 0 - - Options @@ -25,22 +19,10 @@ Qt::Horizontal + + false + - - - 0 - 0 - - - - - 116 - 0 - - - - QFrame::StyledPanel - false @@ -50,9 +32,6 @@ 32 - - QListView::LeftToRight - true @@ -71,12 +50,6 @@ QListView::IconMode - - false - - - false - 0 @@ -164,6 +137,15 @@ + + 0 + + + 0 + + + 0 + @@ -180,8 +162,8 @@ 0 0 - 474 - 646 + 480 + 672 @@ -519,6 +501,15 @@ + + 0 + + + 0 + + + 0 + @@ -1026,6 +1017,15 @@ + + 0 + + + 0 + + + 0 + @@ -1036,8 +1036,8 @@ 0 0 - 450 - 632 + 480 + 658 @@ -1386,12 +1386,12 @@ - - Use proxy only for torrents - RSS feeds, search engine, software updates or anything else other than torrent transfers and related operations (such as peer exchanges) will use a direct connection + + Use proxy only for torrents + false @@ -1540,13 +1540,22 @@ - - - - + + + 0 + + + 0 + + + 0 + + + 0 + @@ -1557,266 +1566,107 @@ 0 0 - 376 - 431 + 502 + 538 - + - + Global Rate Limits - - - - - + + + + + false + + 1 + + + 1000000 + + + 100 + + + + + + + Upload: + + + + + + + KiB/s + + + + + + + false + + + 1 + + + 1000000 + + + 100 + + + + + + + KiB/s + + + + + :/icons/slow_off.png - - - - - - Upload: - - - - - - - false - - - - - - 1 - - - 1000000 - - - 100 - - - - - - - KiB/s - - - - - - - Download: - - - - - - - false - - - - - - 1 - - - 1000000 - - - 100 - - - - - - - KiB/s - - - - + + + + Download: + + - - + + Qt::Horizontal - 200 + 40 20 - - - - Options - - - - - - Enable bandwidth management (uTP) - - - true - - - - - - - Apply rate limit to uTP connections - - - - - - - Apply rate limit to transport overhead - - - - - - - Apply rate limit to peers on LAN - - - - - - - + - Alternative Global Rate Limits + Alternative Rate Limits - - - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/icons/slow.png - - - false - - - - - - - - - 1 - - - 1000000 - - - 10 - - - - - - - KiB/s - - - - - - - false - - - 1 - - - 1000000 - - - 10 - - - - - - - KiB/s - - - - - - - Upload: - - - true - - - - - - - Download: - - - - - - - - - Qt::Horizontal - - - - 222 - 59 - - - - - - - + + Schedule the use of alternative rate limits @@ -1827,130 +1677,236 @@ false - - - - - 5 + + + + + From: - - - - from - - - - - - - true - - - hh:mm - - - false - - - - - - - - - - to - - - Qt::AlignCenter - - - - - - - true - - - hh:mm - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + - - - - 5 + + + + true + + + hh:mm + + + + + + + + + + To: + + + + + + + true + + + hh:mm + + + false + + + + + + + + + + When: + + + + + + + + 0 + 0 + - - - When: - - + + Every day + - - - - Every day - - - - - Week days - - - - - Week ends - - - + + Weekdays + - - - Qt::Horizontal - - - - 40 - 20 - - - + + Weekends + - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + :/icons/slow.png + + + + + + + Upload: + + + + + + + Download: + + + + + + + false + + + 1 + + + 1000000 + + + 10 + + + + + + + false + + + 1 + + + 1000000 + + + 10 + + + + + + + KiB/s + + + + + + + KiB/s + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Rate Limits Settings + + + + + + Apply rate limit to peers on LAN + + + + + + + Apply rate limit to transport overhead + + + + + + + Enable µTP protocol + + + + + + + Apply rate limit to µTP protocol + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -1975,6 +1931,15 @@ + + 0 + + + 0 + + + 0 + @@ -2329,6 +2294,15 @@ + + 0 + + + 0 + + + 0 + @@ -2704,8 +2678,17 @@ - + + + 0 + + + 0 + + + 0 + @@ -2720,7 +2703,20 @@ 28 - + + + 0 + + + 0 + + + 0 + + + 0 + + @@ -2730,34 +2726,11 @@ - - - - - Qt::Horizontal - - - - 208 - 20 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - false - - - - + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + @@ -2893,22 +2866,6 @@ - - checkuTP - toggled(bool) - checkLimituTPConnections - setEnabled(bool) - - - 421 - 147 - - - 711 - 172 - - - checkMaxUploads toggled(bool)