diff --git a/src/options_imp.cpp b/src/options_imp.cpp index a0353e257..c5a3bd21b 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -164,15 +164,12 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ // Connection tab connect(checkUploadLimit, SIGNAL(toggled(bool)), this, SLOT(enableUploadLimit(bool))); connect(checkDownloadLimit, SIGNAL(toggled(bool)), this, SLOT(enableDownloadLimit(bool))); - connect(check_schedule, SIGNAL(toggled(bool)), this, SLOT(enableSchedulerFields(bool))); // Bittorrent tab connect(checkMaxConnecs, SIGNAL(toggled(bool)), this, SLOT(enableMaxConnecsLimit(bool))); connect(checkMaxConnecsPerTorrent, SIGNAL(toggled(bool)), this, SLOT(enableMaxConnecsLimitPerTorrent(bool))); connect(checkMaxUploadsPerTorrent, SIGNAL(toggled(bool)), this, SLOT(enableMaxUploadsLimitPerTorrent(bool))); connect(checkRatioLimit, SIGNAL(toggled(bool)), this, SLOT(enableShareRatio(bool))); connect(checkRatioRemove, SIGNAL(toggled(bool)), this, SLOT(enableDeleteRatio(bool))); - connect(checkDHT, SIGNAL(toggled(bool)), this, SLOT(enableDHTSettings(bool))); - connect(checkDifferentDHTPort, SIGNAL(toggled(bool)), this, SLOT(enableDHTPortSettings(bool))); connect(comboPeerID, SIGNAL(currentIndexChanged(int)), this, SLOT(enableSpoofingSettings(int))); // Proxy tab connect(comboProxyType_http, SIGNAL(currentIndexChanged(int)),this, SLOT(enableHTTPProxy(int))); @@ -683,7 +680,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ spinDownloadLimitAlt->setValue(Preferences::getAltGlobalDownloadLimit()); // Scheduler check_schedule->setChecked(Preferences::isSchedulerEnabled()); - enableSchedulerFields(check_schedule->isChecked()); schedule_from->setTime(Preferences::getSchedulerStartTime()); schedule_to->setTime(Preferences::getSchedulerEndTime()); schedule_days->setCurrentIndex((int)Preferences::getSchedulerDays()); @@ -771,9 +767,7 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ spinMaxUploadsPerTorrent->setEnabled(false); } checkDHT->setChecked(Preferences::isDHTEnabled()); - enableDHTSettings(checkDHT->isChecked()); checkDifferentDHTPort->setChecked(!Preferences::isDHTPortSameAsBT()); - enableDHTPortSettings(checkDifferentDHTPort->isChecked()); spinDHTPort->setValue(Preferences::getDHTPort()); checkPeX->setChecked(Preferences::isPeXEnabled()); checkLSD->setChecked(Preferences::isLSDEnabled()); @@ -1104,12 +1098,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ return checkAdditionDialog->isChecked(); } - void options_imp::enableSchedulerFields(bool checked) { - schedule_from->setEnabled(checked); - schedule_to->setEnabled(checked); - schedule_days->setEnabled(checked); - } - void options_imp::enableMaxConnecsLimit(bool checked){ spinMaxConnec->setEnabled(checked); } @@ -1166,22 +1154,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ spinRatio->setEnabled(checked); } - void options_imp::enableDHTPortSettings(bool checked) { - spinDHTPort->setEnabled(checked); - dh_port_lbl->setEnabled(checked); - } - - void options_imp::enableDHTSettings(bool checked) { - if(checked){ - checkDifferentDHTPort->setEnabled(true); - enableDHTPortSettings(checkDifferentDHTPort->isChecked()); - }else{ - checkDifferentDHTPort->setEnabled(false); - enableDHTPortSettings(false); - } - } - - void options_imp::enableDeleteRatio(bool checked){ spinMaxRatio->setEnabled(checked); } diff --git a/src/options_imp.h b/src/options_imp.h index f8838e86a..034d91ccf 100644 --- a/src/options_imp.h +++ b/src/options_imp.h @@ -137,13 +137,10 @@ protected slots: void enableMaxConnecsLimit(bool checked); void enableMaxConnecsLimitPerTorrent(bool checked); void enableMaxUploadsLimitPerTorrent(bool checked); - void enableSchedulerFields(bool checked); void enableShareRatio(bool checked); void enableDeleteRatio(bool checked); void enableFilter(bool checked); void enableRSS(bool checked); - void enableDHTSettings(bool checked); - void enableDHTPortSettings(bool checked); void enableSpoofingSettings(int index); void setStyle(QString style); void on_buttonBox_accepted(); diff --git a/src/ui/options.ui b/src/ui/options.ui index 6ba8d518e..1e40bb0f1 100644 --- a/src/ui/options.ui +++ b/src/ui/options.ui @@ -1006,8 +1006,8 @@ QGroupBox { 0 0 - 447 - 288 + 524 + 398 @@ -1251,8 +1251,8 @@ QGroupBox { 0 0 - 364 - 328 + 524 + 406 @@ -1261,143 +1261,103 @@ QGroupBox { Global speed limits - - - - - + + + + + + + + :/Icons/slow_off.png + + + + + + + - + Upload: - - :/Icons/slow_off.png + + true - - - - - - - 0 - 45 - - - - Upload: - - - true - - - - - - - - 0 - 37 - - - - Download: - - - - + + + + true + + + + + + 1 + + + 1000000 + + + 50 + + - - - - - - - - true - - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 50 - - - - - - - KiB/s - - - - - - - - - - - false - - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 100 - - - - - - - KiB/s - - - - - - + + + + KiB/s + + - - - - Qt::Horizontal + + + + Download: - - - 40 - 20 - + + + + + + false - + + + + + 1 + + + 1000000 + + + 100 + + + + + + + KiB/s + + + + + + Qt::Horizontal + + + + 200 + 20 + + + + @@ -1406,10 +1366,10 @@ QGroupBox { Alternative global speed limits - + - - + + @@ -1434,27 +1394,16 @@ QGroupBox { - - - + + + Upload: - - - - Download: - - - - - - - - + 1 @@ -1467,7 +1416,21 @@ QGroupBox { - + + + + KiB/s + + + + + + + Download: + + + + 1 @@ -1480,18 +1443,7 @@ QGroupBox { - - - - - - - - KiB/s - - - - + KiB/s @@ -1500,15 +1452,15 @@ QGroupBox { - + Qt::Horizontal - 40 - 20 + 222 + 59 @@ -1516,121 +1468,136 @@ QGroupBox { - - - - - Scheduled times: - - - - - - - false - - - hh:mm - - - false - - - - - - - - - - to - - - Qt::AlignCenter - - - - - - - false - - - hh:mm - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - On days: - - - - - - - false - - - - Every day - - - - - Week days - - - - - Week ends - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + QGroupBox::title { +font-weight: normal; +margin-left: 0px; +} +QGroupBox { + border-width: 0; +} + + + Schedule alternative speed limits + + + true + + + false + + + + + + + + from + + + + + + + hh:mm + + + false + + + + + + + + + + to + + + Qt::AlignCenter + + + + + + + hh:mm + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + When: + + + + + + + + Every day + + + + + Week days + + + + + Week ends + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + @@ -1643,7 +1610,7 @@ QGroupBox { 20 - 58 + 40 @@ -1666,8 +1633,8 @@ QGroupBox { 0 0 - 459 - 407 + 524 + 406 @@ -1678,86 +1645,98 @@ QGroupBox { - - - Enable DHT network (decentralized) - - - true + + + QGroupBox::title { +font-weight: normal; +margin-left: 0px; +} +QGroupBox { + border-width: 0; +} - - - - - - Use a different port for DHT and Bittorrent + + Enable DHT network (decentralized) - + true + + + 0 + + + + + QGroupBox::title { +font-weight: normal; +margin-left: 0px; +} +QGroupBox { + border-width: 0; +} + + + Use a different port for DHT and Bittorrent + + + true + + + false + + + + 0 + + + + + + + DHT port: + + + + + + + 1 + + + 65525 + + + 6881 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 20 - - - - - - - - false - - - DHT port: - - - - - - - false - - - 1 - - - 65525 - - - 6881 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + Exchange peers without compatible Bittorrent clients (µTorrent, Vuze, ...) + Enable Peer Exchange / PeX (requires restart) @@ -1768,6 +1747,9 @@ QGroupBox { + + Look for peers on your local network + Enable Local Peer Discovery @@ -1781,7 +1763,7 @@ QGroupBox { - Encryption: + Protocol encryption: @@ -3014,7 +2996,6 @@ QGroupBox { spinPort checkUPnP checkNATPMP - checkDHT checkLSD comboEncryption checkRatioLimit