mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-28 13:28:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix values for unsetting speed limits.

Browse source
This commit is contained in:
sledgehammer999 2016-10-30 03:36:47 +03:00
parent 6053390bf5
commit db4b30ad48
4 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/mainwindow.cpp
View file

@ -817,7 +817,7 @@ void MainWindow::on_actionSetGlobalUploadLimit_triggered()
{
qDebug() << Q_FUNC_INFO;
BitTorrent::Session *const session = BitTorrent::Session::instance();
bool ok;
bool ok = false;
const long newLimit = SpeedLimitDialog::askSpeedLimit(
&ok, tr("Global Upload Speed Limit"), session->uploadSpeedLimit());
if (ok) {
@ -830,7 +830,7 @@ void MainWindow::on_actionSetGlobalDownloadLimit_triggered()
{
qDebug() << Q_FUNC_INFO;
BitTorrent::Session *const session = BitTorrent::Session::instance();
bool ok;
bool ok = false;
const long newLimit = SpeedLimitDialog::askSpeedLimit(
&ok, tr("Global Download Speed Limit"), session->downloadSpeedLimit());
if (ok) {

4
src/gui/optionsdlg.cpp
View file

@ -1056,7 +1056,7 @@ bool OptionsDialog::isUPnPEnabled() const
// [download,upload]
QPair<int, int> OptionsDialog::getGlobalBandwidthLimits() const
{
int DL = -1, UP = -1;
int DL = 0, UP = 0;
if (m_ui->checkDownloadLimit->isChecked())
DL = m_ui->spinDownloadLimit->value();
if (m_ui->checkUploadLimit->isChecked())
@ -1068,7 +1068,7 @@ QPair<int, int> OptionsDialog::getGlobalBandwidthLimits() const
// [download,upload]
QPair<int, int> OptionsDialog::getAltGlobalBandwidthLimits() const
{
int DL = -1, UP = -1;
int DL = 0, UP = 0;
if (m_ui->checkDownloadLimitAlt->isChecked())
DL = m_ui->spinDownloadLimitAlt->value();
if (m_ui->checkUploadLimitAlt->isChecked())

4
src/gui/speedlimitdlg.cpp
View file

@ -56,7 +56,7 @@ long SpeedLimitDialog::askSpeedLimit(bool *ok, QString title, long default_value
*ok = true;
int val = dlg.getSpeedLimit();
if (val <= 0)
return -1;
return 0;
return val * 1024;
}
else {
@ -112,4 +112,4 @@ void SpeedLimitDialog::setupDialog(long max_slider, long val) const
bandwidthSlider->setMaximum(max_slider);
bandwidthSlider->setValue(val);
updateSpinValue(val);
}
}

28
src/gui/statusbar.cpp
View file

@ -205,13 +205,13 @@ void StatusBar::updateSpeedLabels(const BitTorrent::SessionStatus &sessionStatus
{
QString speedLbl = Utils::Misc::friendlyUnit(sessionStatus.payloadDownloadRate(), true);
int speedLimit = BitTorrent::Session::instance()->downloadSpeedLimit();
if (speedLimit >= 0)
if (speedLimit)
speedLbl += " [" + Utils::Misc::friendlyUnit(speedLimit, true) + "]";
speedLbl += " (" + Utils::Misc::friendlyUnit(sessionStatus.totalPayloadDownload()) + ")";
m_dlSpeedLbl->setText(speedLbl);
speedLimit = BitTorrent::Session::instance()->uploadSpeedLimit();
speedLbl = Utils::Misc::friendlyUnit(sessionStatus.payloadUploadRate(), true);
if (speedLimit >= 0)
if (speedLimit)
speedLbl += " [" + Utils::Misc::friendlyUnit(speedLimit, true) + "]";
speedLbl += " (" + Utils::Misc::friendlyUnit(sessionStatus.totalPayloadUpload()) + ")";
m_upSpeedLbl->setText(speedLbl);
@ -252,17 +252,11 @@ void StatusBar::capDownloadSpeed()
{
BitTorrent::Session *const session = BitTorrent::Session::instance();
bool ok = false;
long newLimit = SpeedLimitDialog::askSpeedLimit(
const long newLimit = SpeedLimitDialog::askSpeedLimit(
&ok, tr("Global Download Speed Limit"), session->downloadSpeedLimit());
if (ok) {
if (newLimit <= 0) {
qDebug("Setting global download rate limit to Unlimited");
session->setDownloadSpeedLimit(-1);
}
else {
qDebug("Setting global download rate limit to %.1fKb/s", newLimit / 1024.);
session->setDownloadSpeedLimit(newLimit);
}
qDebug("Setting global download rate limit to %.1fKb/s", newLimit / 1024.);
session->setDownloadSpeedLimit(newLimit);
refreshStatusBar();
}
}
@ -271,17 +265,11 @@ void StatusBar::capUploadSpeed()
{
BitTorrent::Session *const session = BitTorrent::Session::instance();
bool ok = false;
long newLimit = SpeedLimitDialog::askSpeedLimit(
const long newLimit = SpeedLimitDialog::askSpeedLimit(
&ok, tr("Global Upload Speed Limit"), session->uploadSpeedLimit());
if (ok) {
if (newLimit <= 0) {
qDebug("Setting global upload rate limit to Unlimited");
session->setUploadSpeedLimit(-1);
}
else {
qDebug("Setting global upload rate limit to %.1fKb/s", newLimit / 1024.);
session->setUploadSpeedLimit(newLimit);
}
qDebug("Setting global upload rate limit to %.1fKb/s", newLimit / 1024.);
session->setUploadSpeedLimit(newLimit);
refreshStatusBar();
}
}