diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 9b2cb4703..a0353e257 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -161,9 +161,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
// Connect signals / slots
// General tab
connect(checkShowSystray, SIGNAL(toggled(bool)), this, SLOT(setSystrayOptionsState(bool)));
- // Downloads tab
- connect(checkTempFolder, SIGNAL(toggled(bool)), this, SLOT(enableTempPathInput(bool)));
- connect(checkExportDir, SIGNAL(toggled(bool)), this, SLOT(enableTorrentExport(bool)));
// Connection tab
connect(checkUploadLimit, SIGNAL(toggled(bool)), this, SLOT(enableUploadLimit(bool)));
connect(checkDownloadLimit, SIGNAL(toggled(bool)), this, SLOT(enableDownloadLimit(bool)));
@@ -185,7 +182,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
// Misc tab
connect(checkIPFilter, SIGNAL(toggled(bool)), this, SLOT(enableFilter(bool)));
connect(checkEnableRSS, SIGNAL(toggled(bool)), this, SLOT(enableRSS(bool)));
- connect(checkEnableQueueing, SIGNAL(toggled(bool)), this, SLOT(enableQueueingSystem(bool)));
// Web UI tab
connect(checkWebUi, SIGNAL(toggled(bool)), this, SLOT(enableWebUi(bool)));
@@ -619,10 +615,8 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
if(Preferences::isTempPathEnabled()) {
// enable
checkTempFolder->setChecked(true);
- enableTempPathInput(checkTempFolder->isChecked());
} else {
checkTempFolder->setChecked(false);
- enableTempPathInput(checkTempFolder->isChecked());
}
QString temp_path = Preferences::getTempPath();
#ifdef Q_WS_WIN
@@ -641,7 +635,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
if(strValue.isEmpty()) {
// Disable
checkExportDir->setChecked(false);
- enableTorrentExport(checkExportDir->isChecked());
} else {
// enable
checkExportDir->setChecked(true);
@@ -649,7 +642,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
strValue = strValue.replace("/", "\\");
#endif
textExportDir->setText(strValue);
- enableTorrentExport(checkExportDir->isChecked());
}
intValue = Preferences::getActionOnDblClOnTorrentDl();
@@ -849,7 +841,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
// End RSS preferences
// Queueing system preferences
checkEnableQueueing->setChecked(Preferences::isQueueingSystemEnabled());
- enableQueueingSystem(checkEnableQueueing->isChecked());
spinMaxActiveDownloads->setValue(Preferences::getMaxActiveDownloads());
spinMaxActiveUploads->setValue(Preferences::getMaxActiveUploads());
spinMaxActiveTorrents->setValue(Preferences::getMaxActiveTorrents());
@@ -1109,16 +1100,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
}
}
- void options_imp::enableTempPathInput(bool checked){
- if(checked){
- textTempPath->setEnabled(true);
- browseTempDirButton->setEnabled(true);
- }else{
- textTempPath->setEnabled(false);
- browseTempDirButton->setEnabled(false);
- }
- }
-
bool options_imp::useAdditionDialog() const{
return checkAdditionDialog->isChecked();
}
@@ -1133,15 +1114,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
spinMaxConnec->setEnabled(checked);
}
- void options_imp::enableQueueingSystem(bool checked) {
- spinMaxActiveDownloads->setEnabled(checked);
- spinMaxActiveUploads->setEnabled(checked);
- label_max_active_dl->setEnabled(checked);
- label_max_active_up->setEnabled(checked);
- maxActiveTorrents_lbl->setEnabled(checked);
- spinMaxActiveTorrents->setEnabled(checked);
- }
-
void options_imp::enableMaxConnecsLimitPerTorrent(bool checked){
spinMaxConnecPerTorrent->setEnabled(checked);
}
@@ -1264,11 +1236,6 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
textProxyPassword_http->setEnabled(checked);
}
- void options_imp::enableTorrentExport(bool checked) {
- textExportDir->setEnabled(checked);
- browseExportDirButton->setEnabled(checked);
- }
-
bool options_imp::isSlashScreenDisabled() const {
return !checkShowSplash->isChecked();
}
diff --git a/src/options_imp.h b/src/options_imp.h
index 07626fd8c..f8838e86a 100644
--- a/src/options_imp.h
+++ b/src/options_imp.h
@@ -130,8 +130,6 @@ protected:
protected slots:
void enableUploadLimit(bool checked);
void enableDownloadLimit(bool checked);
- void enableTempPathInput(bool checked);
- void enableTorrentExport(bool checked);
void enablePeerProxy(int comboIndex);
void enablePeerProxyAuth(bool checked);
void enableHTTPProxy(int comboIndex);
@@ -146,7 +144,6 @@ protected slots:
void enableRSS(bool checked);
void enableDHTSettings(bool checked);
void enableDHTPortSettings(bool checked);
- void enableQueueingSystem(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 01f120bb6..6ba8d518e 100644
--- a/src/ui/options.ui
+++ b/src/ui/options.ui
@@ -539,11 +539,137 @@
0
0
- 632
- 686
+ 506
+ 630
-
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ When adding a torrent
+
+
+
+ 0
+
+
-
+
+
+ Display torrent content and some options
+
+
+ false
+
+
+
+ -
+
+
+ Do not start the download automatically
+
+
+
+
+
+
+ -
+
+
+ Torrent queueing
+
+
+ true
+
+
+ false
+
+
+
+ 0
+
+
-
+
+
+ Maximum active downloads:
+
+
+
+ -
+
+
+ -1
+
+
+ 999
+
+
+ 3
+
+
+
+ -
+
+
+ Maximum active uploads:
+
+
+
+ -
+
+
+ -1
+
+
+ 999
+
+
+ 3
+
+
+
+ -
+
+
+ Maximum active torrents:
+
+
+
+ -
+
+
+ -1
+
+
+ 999
+
+
+ 5
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
-
@@ -556,25 +682,37 @@
File system
+
+ 0
+
-
- QGroupBox::title {
+ QGroupBox::title {
font-weight: normal;
-margin-left: -3px;
+margin-left: 0px;
}
QGroupBox {
border-width: 0;
}
- Destination Folder:
+ Save files to location:
+
+ 0
+
-
-
+
+
+ 0
+ 0
+
+
@@ -608,7 +746,7 @@ QGroupBox {
-
- Append the torrent's label
+ Append the label of the torrent to the save path
@@ -616,63 +754,93 @@ QGroupBox {
-
-
+
- Use a different folder for incomplete downloads:
+ Pre-allocate disk space for all files
-
-
-
-
-
-
- false
-
-
- QLineEdit {
- margin-left: 23px;
+
+
+ QGroupBox::title {
+font-weight: normal;
+margin-left: 0px;
+}
+QGroupBox {
+ border-width: 0;
}
-
-
-
- -
-
-
- false
-
-
-
- 25
- 27
-
-
-
-
- 22
- 22
-
-
-
-
- 25
- 27
-
-
-
-
- :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png
-
-
-
-
+
+
+ Keep incomplete torrents in:
+
+
+ true
+
+
+ false
+
+
+
+ 0
+
+ -
+
+
+ -
+
+
+
+ 25
+ 27
+
+
+
+
+ 22
+ 22
+
+
+
+
+ 25
+ 27
+
+
+
+
+ :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png
+
+
+
+
+
+
+ -
+
+
+ Append .!qB extension to incomplete files' names
+
+
-
+
+ QGroupBox::title {
+font-weight: normal;
+margin-left: 0px;
+}
+QGroupBox {
+ border-width: 0;
+}
+
- Check Folders for .torrent Files:
+ Automatically add torrents from:
+
+ 0
+
-
-
@@ -686,7 +854,7 @@ QGroupBox {
250
- 150
+ 75
@@ -720,7 +888,7 @@ QGroupBox {
-
- Add folder ...
+ Add folder...
@@ -749,321 +917,76 @@ QGroupBox {
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Minimum
-
-
-
- 30
- 20
-
-
-
-
-
-
-
+
+
+ QGroupBox::title {
+font-weight: normal;
+margin-left: 0px;
+}
+QGroupBox {
+ border-width: 0;
+}
+
+
Copy .torrent files to:
-
-
- -
-
-
-
-
-
- false
-
-
- QLineEdit {
- margin-left: 23px;
-}
-
-
-
- -
-
-
- false
-
-
-
- 22
- 22
-
-
-
-
- 25
- 27
-
-
-
-
- :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png
-
-
-
-
-
- -
-
-
- Append .!qB extension to incomplete files
+
+ true
-
-
- -
-
-
- Pre-allocate all files
+
+ false
+
+
+ 0
+
+
-
+
+
+ -
+
+
+
+ 22
+ 22
+
+
+
+
+ 25
+ 27
+
+
+
+
+ :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png
+
+
+
+
-
-
-
-
-
-
- Torrent queueing
-
-
-
-
-
-
- Enable queueing system
-
-
-
- -
-
-
-
-
-
- false
-
-
- Maximum active downloads:
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- -1
-
-
- 999
-
-
- 3
-
-
-
-
-
- -
-
-
-
-
-
- false
-
-
- Maximum active uploads:
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- -1
-
-
- 999
-
-
- 3
-
-
-
-
-
- -
-
-
-
-
-
- false
-
-
- Maximum active torrents:
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 381
- 20
-
-
-
-
- -
-
-
- false
-
-
- -1
-
-
- 999
-
-
- 5
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- When adding a torrent
-
-
-
-
-
-
-
-
-
- Display torrent content and some options
-
-
- false
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
- Do not start download automatically
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
@@ -3086,7 +3009,6 @@ QGroupBox {
checkMinimizeToSysTray
textSavePath
browseSaveDirButton
- checkPreallocateAll
checkAdditionDialog
checkStartPaused
spinPort