Browse Source

FEATURE: User can choose to include the protocol overhead in transfer limits

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
245a8e0a3a
  1. 1
      Changelog
  2. 15
      src/advancedsettings.h
  3. 2
      src/bittorrent.cpp
  4. 10
      src/preferences.h

1
Changelog

@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
- FEATURE: Torrent files can be exported to a given directory
- FEATURE: Outgoing ports range can be customized (for QoS)
- FEATURE: User can choose to apply transfer limits on LAN too
- FEATURE: User can choose to include the protocol overhead in transfer limits
* Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0
- FEATURE: Graphical User Interface can be disabled at compilation time (headless running)

15
src/advancedsettings.h

@ -8,15 +8,15 @@ @@ -8,15 +8,15 @@
#include "preferences.h"
enum AdvSettingsCols {PROPERTY, VALUE};
enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN };
#define ROW_COUNT 4
enum AdvSettingsRows {DISK_CACHE, OUTGOING_PORT_MIN, OUTGOING_PORT_MAX, IGNORE_LIMIT_LAN, COUNT_OVERHEAD };
#define ROW_COUNT 5
class AdvancedSettings: public QTableWidget {
Q_OBJECT
private:
QSpinBox *spin_cache, *outgoing_ports_min, *outgoing_ports_max;
QCheckBox *cb_ignore_limits_lan;
QCheckBox *cb_ignore_limits_lan, *cb_count_overhead;
public:
AdvancedSettings(QWidget *parent=0): QTableWidget(parent) {
@ -38,6 +38,7 @@ public: @@ -38,6 +38,7 @@ public:
delete outgoing_ports_min;
delete outgoing_ports_max;
delete cb_ignore_limits_lan;
delete cb_count_overhead;
}
public slots:
@ -49,6 +50,8 @@ public: @@ -49,6 +50,8 @@ public:
Preferences::setOutgoingPortsMax(outgoing_ports_max->value());
// Ignore limits on LAN
Preferences::ignoreLimitsOnLAN(cb_ignore_limits_lan->isChecked());
// Include protocol overhead in transfer limits
Preferences::includeOverheadInLimits(cb_count_overhead->isChecked());
}
protected slots:
@ -83,6 +86,12 @@ protected slots: @@ -83,6 +86,12 @@ protected slots:
connect(cb_ignore_limits_lan, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
cb_ignore_limits_lan->setChecked(Preferences::ignoreLimitsOnLAN());
setCellWidget(IGNORE_LIMIT_LAN, VALUE, cb_ignore_limits_lan);
// Consider protocol overhead in transfer limits
setItem(COUNT_OVERHEAD, PROPERTY, new QTableWidgetItem(tr("Include TCP/IP overhead in transfer limits")));
cb_count_overhead = new QCheckBox();
connect(cb_count_overhead, SIGNAL(toggled(bool)), this, SLOT(emitSettingsChanged()));
cb_count_overhead->setChecked(Preferences::includeOverheadInLimits());
setCellWidget(COUNT_OVERHEAD, VALUE, cb_count_overhead);
}
void emitSettingsChanged() {

2
src/bittorrent.cpp

@ -432,6 +432,8 @@ void Bittorrent::configureSession() { @@ -432,6 +432,8 @@ void Bittorrent::configureSession() {
setSessionSettings(sessionSettings);
// Ignore limits on LAN
sessionSettings.ignore_limits_on_local_network = Preferences::ignoreLimitsOnLAN();
// Include overhead in transfer limits
sessionSettings.rate_limit_ip_overhead = Preferences::includeOverheadInLimits();
// Bittorrent
// * Max connections limit
setMaxConnections(Preferences::getMaxConnecs());

10
src/preferences.h

@ -868,6 +868,16 @@ public: @@ -868,6 +868,16 @@ public:
settings.setValue(QString::fromUtf8("Preferences/Advanced/IgnoreLimitsLAN"), ignore);
}
static bool includeOverheadInLimits() {
QSettings settings("qBittorrent", "qBittorrent");
return settings.value(QString::fromUtf8("Preferences/Advanced/IncludeOverhead"), false).toBool();
}
static void includeOverheadInLimits(bool include) {
QSettings settings("qBittorrent", "qBittorrent");
settings.setValue(QString::fromUtf8("Preferences/Advanced/IncludeOverhead"), include);
}
};
#endif // PREFERENCES_H

Loading…
Cancel
Save