Browse Source

Merge pull request #3 from mutoso/master

Add the ability to choose the save path when using magnet links
adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
0e425d6a04
  1. 7
      src/torrentadditiondlg.cpp

7
src/torrentadditiondlg.cpp

@ -200,8 +200,8 @@ void torrentAdditionDialog::showLoadMagnetURI(QString magnet_uri) {
// Disable Save path combox and browse button // Disable Save path combox and browse button
// Save path should be default for magnet links // Save path should be default for magnet links
savePathTxt->setEnabled(false); savePathTxt->setEnabled(true);
browseButton->setEnabled(false); browseButton->setEnabled(true);
// Get torrent hash // Get torrent hash
hash = misc::magnetUriToHash(magnet_uri); hash = misc::magnetUriToHash(magnet_uri);
@ -528,10 +528,10 @@ void torrentAdditionDialog::updateDiskSpaceLabels() {
} }
void torrentAdditionDialog::on_browseButton_clicked() { void torrentAdditionDialog::on_browseButton_clicked() {
Q_ASSERT(!is_magnet);
QString new_path; QString new_path;
QString root_folder; QString root_folder;
const QString label_name = comboLabel->currentText(); const QString label_name = comboLabel->currentText();
if (!is_magnet) {
if (t->num_files() == 1) { if (t->num_files() == 1) {
new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText(), QString(), 0, QFileDialog::DontConfirmOverwrite); new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText(), QString(), 0, QFileDialog::DontConfirmOverwrite);
if (!new_path.isEmpty()) { if (!new_path.isEmpty()) {
@ -545,6 +545,7 @@ void torrentAdditionDialog::on_browseButton_clicked() {
// Construct new_path // Construct new_path
new_path = path_parts.join(QDir::separator()); new_path = path_parts.join(QDir::separator());
} }
}
} else { } else {
QString truncated_path = getCurrentTruncatedSavePath(&root_folder); QString truncated_path = getCurrentTruncatedSavePath(&root_folder);
if (!truncated_path.isEmpty() && QDir(truncated_path).exists()) { if (!truncated_path.isEmpty() && QDir(truncated_path).exists()) {

Loading…
Cancel
Save