From 395c2c862adbba5c5da311a957c01665499e5af2 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 30 Dec 2009 16:21:04 +0000 Subject: [PATCH] - Use global maximum transfer rates as maximum values in per-torrent speed limit ing dialogs --- Changelog | 1 + src/Icons/qBittorrent.desktop | 2 +- src/Icons/skin/splash.png | Bin 80248 -> 80492 bytes src/speedlimitdlg.h | 11 ++++++++++- src/src.pro | 4 ++-- src/transferlistwidget.cpp | 5 +++-- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index a51cdb05c..277e16466 100644 --- a/Changelog +++ b/Changelog @@ -6,6 +6,7 @@ - BUGFIX: Fix communication between qBittorrent and Web UI (Qt 4.6) - BUGFIX: Use Wildcard matching instead of full regex in RSS feed downloader - BUGFIX: Fix code for listening on a random port whenever it failed to listen on the one defined + - BUGFIX: Use global maximum transfer rates as maximum values in per-torrent speed limiting dialogs - COSMETIC: Display a disconnected icon in status bar whenever qBittorrent failed to listen on the port defined * Wed Dec 23 2009 - Christophe Dumez - v2.0.3 diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop index 7fed3f9c3..10c38a7bc 100644 --- a/src/Icons/qBittorrent.desktop +++ b/src/Icons/qBittorrent.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;Network;P2P; -Comment=V2.0.3 +Comment=V2.0.4 Exec=qbittorrent %f GenericName=Bittorrent client GenericName[bg]=Торент клиент diff --git a/src/Icons/skin/splash.png b/src/Icons/skin/splash.png index 95ee74c338ac33022bf2d3871ece80bba2192d08..10fab53cd099912cc1c3c0df47369f264d9917e5 100644 GIT binary patch delta 13526 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 delta 13280 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 Gh>5e73yK9c^6QPHkzm{9D#c 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 diff --git a/src/speedlimitdlg.h b/src/speedlimitdlg.h index f988f5a68..0a9aca6d9 100644 --- a/src/speedlimitdlg.h +++ b/src/speedlimitdlg.h @@ -56,9 +56,10 @@ class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg { } // -2: if cancel - static long askSpeedLimit(bool *ok, QString title, long default_value) { + static long askSpeedLimit(bool *ok, QString title, long default_value, long max_value=1024000) { SpeedLimitDialog dlg; dlg.setWindowTitle(title); + dlg.setMaxValue(max_value/1024.); dlg.setDefaultValue(default_value/1024.); if(dlg.exec() == QDialog::Accepted) { *ok = true; @@ -90,8 +91,16 @@ class SpeedLimitDialog : public QDialog, private Ui_bandwidth_dlg { return -1; } + void setMaxValue(long val) const { + if(val > 0) { + bandwidthSlider->setMaximum(val); + spinBandwidth->setMaximum(val); + } + } + void setDefaultValue(long val) const { if(val < 0) val = 0; + if(val > bandwidthSlider->maximum()) val = bandwidthSlider->maximum(); bandwidthSlider->setValue(val); } }; diff --git a/src/src.pro b/src/src.pro index 61d7bf444..a79148aab 100644 --- a/src/src.pro +++ b/src/src.pro @@ -12,10 +12,10 @@ CONFIG += qt \ thread # Update this VERSION for each release -DEFINES += VERSION=\\\"v2.0.3\\\" +DEFINES += VERSION=\\\"v2.0.4\\\" DEFINES += VERSION_MAJOR=2 DEFINES += VERSION_MINOR=0 -DEFINES += VERSION_BUGFIX=3 +DEFINES += VERSION_BUGFIX=4 # !mac:QMAKE_LFLAGS += -Wl,--as-needed contains(DEBUG_MODE, 1) { diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp index 8fc1c521b..bf65f4fda 100644 --- a/src/transferlistwidget.cpp +++ b/src/transferlistwidget.cpp @@ -36,6 +36,7 @@ #include "speedlimitdlg.h" #include "options_imp.h" #include "GUI.h" +#include "preferences.h" #include "deletionconfirmationdlg.h" #include #include @@ -665,7 +666,7 @@ void TransferListWidget::setDlLimitSelectedTorrents() { int default_limit = -1; if(all_same_limit) default_limit = selected_torrents.first().download_limit(); - long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Torrent Download Speed Limiting"), default_limit); + long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Torrent Download Speed Limiting"), default_limit, Preferences::getGlobalDownloadLimit()*1024.); if(ok) { foreach(QTorrentHandle h, selected_torrents) { qDebug("Applying download speed limit of %ld Kb/s to torrent %s", (long)(new_limit/1024.), h.hash().toLocal8Bit().data()); @@ -701,7 +702,7 @@ void TransferListWidget::setUpLimitSelectedTorrents() { int default_limit = -1; if(all_same_limit) default_limit = selected_torrents.first().upload_limit(); - long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Torrent Upload Speed Limiting"), default_limit); + long new_limit = SpeedLimitDialog::askSpeedLimit(&ok, tr("Torrent Upload Speed Limiting"), default_limit, Preferences::getGlobalUploadLimit()*1024.); if(ok) { foreach(QTorrentHandle h, selected_torrents) { qDebug("Applying upload speed limit of %ld Kb/s to torrent %s", (long)(new_limit/1024.), h.hash().toLocal8Bit().data());