From c167fb8448a5578a6b41763e5645eb59bc61e672 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 19 Aug 2022 18:36:11 +0200 Subject: [PATCH] using actual limits for max TR/s in the GUI --- libretroshare | 2 +- retroshare-gui/src/gui/settings/TransferPage.cpp | 6 ++++++ retroshare-gui/src/gui/settings/TransferPage.ui | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libretroshare b/libretroshare index 86745109f..8f3a30705 160000 --- a/libretroshare +++ b/libretroshare @@ -1 +1 @@ -Subproject commit 86745109f35dddbf9de9ff84537a1c97fa1d30b3 +Subproject commit 8f3a3070519322a66b0e83ecb2035e0ac7e67e58 diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp index 3575a5479..c0cf3608f 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.cpp +++ b/retroshare-gui/src/gui/settings/TransferPage.cpp @@ -40,6 +40,12 @@ TransferPage::TransferPage(QWidget * parent, Qt::WindowFlags flags) /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); + int max_tr_low,max_tr_high; + rsTurtle->getMaxTRForwardRateLimits(max_tr_low,max_tr_high); + + ui._max_tr_up_per_sec_SB->setMinimum(max_tr_low); + ui._max_tr_up_per_sec_SB->setMaximum(max_tr_high); + QObject::connect(ui._queueSize_SB,SIGNAL(valueChanged(int)),this,SLOT(updateQueueSize(int))) ; QObject::connect(ui._max_up_SB,SIGNAL(valueChanged(int)),this,SLOT(updateMaxUploadSlots(int))) ; QObject::connect(ui._defaultStrategy_CB,SIGNAL(activated(int)),this,SLOT(updateDefaultStrategy(int))) ; diff --git a/retroshare-gui/src/gui/settings/TransferPage.ui b/retroshare-gui/src/gui/settings/TransferPage.ui index 282c5ff51..7370f4706 100644 --- a/retroshare-gui/src/gui/settings/TransferPage.ui +++ b/retroshare-gui/src/gui/settings/TransferPage.ui @@ -7,7 +7,7 @@ 0 0 701 - 527 + 632 @@ -289,7 +289,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory in the shared files dialog to be:</span></p>