d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-27 06:54:20 +00:00
Code Issues Projects Releases Wiki Activity

Now qbt remembers the last used folder. Fixes #799697.

Browse Source 
Conflicts:

	src/preferences/options.ui
This commit is contained in:
sledgehammer_999 2011-09-06 22:13:02 +03:00
parent 4ffe100287
commit a82ccd8e95
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/preferences/options_imp.cpp
View File

@ -155,6 +155,7 @@ options_imp::options_imp(QWidget *parent):
connect(textSavePath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
connect(textTempPath, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton()));
connect(checkAppendLabel, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkLastLocation, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkAppendqB, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkPreallocateAll, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
connect(checkAdditionDialog, SIGNAL(toggled(bool)), this, SLOT(enableApplyButton()));
@ -391,6 +392,7 @@ void options_imp::saveOptions(){
#endif
pref.setTempPath(temp_path);
pref.setAppendTorrentLabel(checkAppendLabel->isChecked());
pref.setRememberLastLocation(checkLastLocation->isChecked());
#if LIBTORRENT_VERSION_MINOR > 14
pref.useIncompleteFilesExtension(checkAppendqB->isChecked());
#endif
@ -568,6 +570,7 @@ void options_imp::loadOptions(){
#endif
textTempPath->setText(temp_path);
checkAppendLabel->setChecked(pref.appendTorrentLabel());
checkLastLocation->setChecked(pref.rememberLastLocation());
#if LIBTORRENT_VERSION_MINOR > 14
checkAppendqB->setChecked(pref.useIncompleteFilesExtension());
#endif

16
src/preferences/preferences.h
View File

@ -229,6 +229,22 @@ public:
setValue("Preferences/Downloads/AppendLabel", b);
}
bool rememberLastLocation() const {
return value(QString::fromUtf8("Preferences/Downloads/RememberLastLocation"), false).toBool();
}
void setRememberLastLocation(bool b) {
setValue("Preferences/Downloads/RememberLastLocation", b);
}
QString lastLocationPath() const {
return value(QString::fromUtf8("Preferences/Downloads/LastLocationPath"), QString()).toString();
}
void setLastLocationPath(const QString &path) {
setValue(QString::fromUtf8("Preferences/Downloads/LastLocationPath"), path);
}
bool preAllocateAllFiles() const {
return value(QString::fromUtf8("Preferences/Downloads/PreAllocation"), false).toBool();
}

21
src/torrentadditiondlg.cpp
View File

@ -60,7 +60,7 @@ using namespace libtorrent;
torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
QDialog(parent), old_label(""), hidden_height(0), m_showContentList(true) {
const Preferences pref;
Preferences pref;
setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
setMinimumSize(0, 0);
@ -87,7 +87,18 @@ torrentAdditionDialog::torrentAdditionDialog(QWidget *parent) :
// Important: as a default, it inserts at the bottom which is not desirable
savePathTxt->setInsertPolicy(QComboBox::InsertAtCurrent);
//torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);
defaultSavePath = pref.getSavePath();
QString lastLocation = pref.lastLocationPath();
//lastLocation will always have '/' as separator since it is saved in
//::on_OkButton_clicked() after the conversion is done.
if (pref.rememberLastLocation() && !lastLocation.isEmpty() && QFile(lastLocation).exists())
defaultSavePath = lastLocation;
else
{
defaultSavePath = pref.getSavePath();
//In case of the LastLocationPath doesn't exist anymore, empty the string
pref.setLastLocationPath(QString());
}
appendLabelToSavePath = pref.appendTorrentLabel();
QString display_path = defaultSavePath.replace("\\", "/");
if(!display_path.endsWith("/"))
@ -686,6 +697,12 @@ void torrentAdditionDialog::on_OkButton_clicked(){
return;
}
}
//Save last location path
{//limit the scope of pref
Preferences pref;
if (pref.rememberLastLocation())
pref.setLastLocationPath(save_path);
}
// save filtered files
if(!is_magnet && t->num_files() > 1)
savePiecesPriorities();