From 38455af7917c6ccd6ea9a32a7096693d2ddeeb53 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sun, 1 Feb 2015 01:27:51 +0200 Subject: [PATCH] Follow project coding style. Issue #2192. --- src/addnewtorrentdialog.cpp | 1018 ++++++++++++++++++----------------- src/addnewtorrentdialog.h | 90 ++-- 2 files changed, 559 insertions(+), 549 deletions(-) diff --git a/src/addnewtorrentdialog.cpp b/src/addnewtorrentdialog.cpp index fbc7ccbfb..7549b9224 100644 --- a/src/addnewtorrentdialog.cpp +++ b/src/addnewtorrentdialog.cpp @@ -51,644 +51,654 @@ using namespace libtorrent; -AddNewTorrentDialog::AddNewTorrentDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::AddNewTorrentDialog), - m_contentModel(0), - m_contentDelegate(0), - m_isMagnet(false), - m_hasMetadata(false), - m_hasRenamedFile(false), - m_oldIndex(0) +AddNewTorrentDialog::AddNewTorrentDialog(QWidget *parent) + : QDialog(parent) + , ui(new Ui::AddNewTorrentDialog) + , m_contentModel(0) + , m_contentDelegate(0) + , m_isMagnet(false) + , m_hasMetadata(false) + , m_hasRenamedFile(false) + , m_oldIndex(0) { - ui->setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); - ui->lblMetaLoading->setVisible(false); - ui->progMetaLoading->setVisible(false); + ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + ui->lblMetaLoading->setVisible(false); + ui->progMetaLoading->setVisible(false); - Preferences* const pref = Preferences::instance(); - ui->start_torrent_cb->setChecked(!pref->addTorrentsInPause()); - ui->save_path_combo->addItem(fsutils::toNativePath(pref->getSavePath()), pref->getSavePath()); - loadSavePathHistory(); - connect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), SLOT(onSavePathChanged(int))); - connect(ui->browse_button, SIGNAL(clicked()), SLOT(browseButton_clicked())); - ui->default_save_path_cb->setVisible(false); // Default path is selected by default + Preferences* const pref = Preferences::instance(); + ui->start_torrent_cb->setChecked(!pref->addTorrentsInPause()); + ui->save_path_combo->addItem(fsutils::toNativePath(pref->getSavePath()), pref->getSavePath()); + loadSavePathHistory(); + connect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), SLOT(onSavePathChanged(int))); + connect(ui->browse_button, SIGNAL(clicked()), SLOT(browseButton_clicked())); + ui->default_save_path_cb->setVisible(false); // Default path is selected by default - // Load labels - const QStringList customLabels = pref->getTorrentLabels(); - ui->label_combo->addItem(""); - foreach (const QString& label, customLabels) { - ui->label_combo->addItem(label); - } - ui->label_combo->model()->sort(0); - ui->content_tree->header()->setSortIndicator(0, Qt::AscendingOrder); - loadState(); - // Signal / slots - connect(ui->adv_button, SIGNAL(clicked(bool)), SLOT(showAdvancedSettings(bool))); - editHotkey = new QShortcut(QKeySequence("F2"), ui->content_tree, 0, 0, Qt::WidgetShortcut); - connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedFile())); - connect(ui->content_tree, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedFile())); + // Load labels + const QStringList customLabels = pref->getTorrentLabels(); + ui->label_combo->addItem(""); + foreach (const QString& label, customLabels) + ui->label_combo->addItem(label); + ui->label_combo->model()->sort(0); + ui->content_tree->header()->setSortIndicator(0, Qt::AscendingOrder); + loadState(); + // Signal / slots + connect(ui->adv_button, SIGNAL(clicked(bool)), SLOT(showAdvancedSettings(bool))); + editHotkey = new QShortcut(QKeySequence("F2"), ui->content_tree, 0, 0, Qt::WidgetShortcut); + connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedFile())); + connect(ui->content_tree, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedFile())); } AddNewTorrentDialog::~AddNewTorrentDialog() { - saveState(); - delete ui; - if (m_contentModel) - delete m_contentModel; - delete editHotkey; + saveState(); + delete ui; + if (m_contentModel) + delete m_contentModel; + delete editHotkey; } void AddNewTorrentDialog::loadState() { - const Preferences* const pref = Preferences::instance(); - m_headerState = pref->getAddNewTorrentDialogState(); - int width = pref->getAddNewTorrentDialogWidth(); - if (width >= 0) { - QRect geo = geometry(); - geo.setWidth(width); - setGeometry(geo); - } - ui->adv_button->setChecked(pref->getAddNewTorrentDialogExpanded()); + const Preferences* const pref = Preferences::instance(); + m_headerState = pref->getAddNewTorrentDialogState(); + int width = pref->getAddNewTorrentDialogWidth(); + if (width >= 0) { + QRect geo = geometry(); + geo.setWidth(width); + setGeometry(geo); + } + ui->adv_button->setChecked(pref->getAddNewTorrentDialogExpanded()); } void AddNewTorrentDialog::saveState() { - Preferences* const pref = Preferences::instance(); - if (m_contentModel) - pref->setAddNewTorrentDialogState(ui->content_tree->header()->saveState()); - pref->setAddNewTorrentDialogPos(pos().y()); - pref->setAddNewTorrentDialogWidth(width()); - pref->setAddNewTorrentDialogExpanded(ui->adv_button->isChecked()); + Preferences* const pref = Preferences::instance(); + if (m_contentModel) + pref->setAddNewTorrentDialogState(ui->content_tree->header()->saveState()); + pref->setAddNewTorrentDialogPos(pos().y()); + pref->setAddNewTorrentDialogWidth(width()); + pref->setAddNewTorrentDialogExpanded(ui->adv_button->isChecked()); } void AddNewTorrentDialog::showTorrent(const QString &torrent_path, const QString& from_url, QWidget *parent) { - AddNewTorrentDialog *dlg = new AddNewTorrentDialog(parent); - if (dlg->loadTorrent(torrent_path, from_url)) - dlg->open(); - else - delete dlg; + AddNewTorrentDialog *dlg = new AddNewTorrentDialog(parent); + if (dlg->loadTorrent(torrent_path, from_url)) + dlg->open(); + else + delete dlg; } void AddNewTorrentDialog::showMagnet(const QString& link, QWidget *parent) { - AddNewTorrentDialog *dlg = new AddNewTorrentDialog(parent); - if (dlg->loadMagnet(link)) - dlg->open(); - else - delete dlg; + AddNewTorrentDialog *dlg = new AddNewTorrentDialog(parent); + if (dlg->loadMagnet(link)) + dlg->open(); + else + delete dlg; } -void AddNewTorrentDialog::showEvent(QShowEvent *event) { - QDialog::showEvent(event); - Preferences* const pref = Preferences::instance(); - if (!pref->additionDialogFront()) - return; - activateWindow(); - raise(); +void AddNewTorrentDialog::showEvent(QShowEvent *event) +{ + QDialog::showEvent(event); + Preferences* const pref = Preferences::instance(); + if (!pref->additionDialogFront()) + return; + activateWindow(); + raise(); } void AddNewTorrentDialog::showAdvancedSettings(bool show) { - if (show) { - ui->adv_button->setText(QString::fromUtf8("▲")); - ui->settings_group->setVisible(true); - ui->info_group->setVisible(true); - if (m_hasMetadata && (m_torrentInfo->num_files() > 1)) { - ui->content_tree->setVisible(true); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - } else { - ui->content_tree->setVisible(false); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + if (show) { + ui->adv_button->setText(QString::fromUtf8("▲")); + ui->settings_group->setVisible(true); + ui->info_group->setVisible(true); + if (m_hasMetadata && (m_torrentInfo->num_files() > 1)) { + ui->content_tree->setVisible(true); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + } + else { + ui->content_tree->setVisible(false); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + } + static_cast(layout())->insertWidget(layout()->indexOf(ui->never_show_cb) + 1, ui->adv_button); } - static_cast(layout())->insertWidget(layout()->indexOf(ui->never_show_cb)+1, ui->adv_button); - } else { - ui->adv_button->setText(QString::fromUtf8("▼")); - ui->settings_group->setVisible(false); - ui->info_group->setVisible(false); - ui->buttonsHLayout->insertWidget(0, layout()->takeAt(layout()->indexOf(ui->never_show_cb)+1)->widget()); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - } - relayout(); + else { + ui->adv_button->setText(QString::fromUtf8("▼")); + ui->settings_group->setVisible(false); + ui->info_group->setVisible(false); + ui->buttonsHLayout->insertWidget(0, layout()->takeAt(layout()->indexOf(ui->never_show_cb) + 1)->widget()); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); + } + relayout(); } bool AddNewTorrentDialog::loadTorrent(const QString& torrent_path, const QString& from_url) { - m_isMagnet = false; - m_url = from_url; - if (torrent_path.startsWith("file://", Qt::CaseInsensitive)) - m_filePath = QUrl::fromEncoded(torrent_path.toLocal8Bit()).toLocalFile(); - else - m_filePath = torrent_path; + m_isMagnet = false; + m_url = from_url; + if (torrent_path.startsWith("file://", Qt::CaseInsensitive)) + m_filePath = QUrl::fromEncoded(torrent_path.toLocal8Bit()).toLocalFile(); + else + m_filePath = torrent_path; - if (!QFile::exists(m_filePath)) { - MessageBoxRaised::critical(0, tr("I/O Error"), tr("The torrent file does not exist.")); - return false; - } + if (!QFile::exists(m_filePath)) { + MessageBoxRaised::critical(0, tr("I/O Error"), tr("The torrent file does not exist.")); + return false; + } - m_hasMetadata = true; + m_hasMetadata = true; - try { - std::vector buffer; - lazy_entry entry; - libtorrent::error_code ec; - misc::loadBencodedFile(m_filePath, buffer, entry, ec); - m_torrentInfo = new torrent_info(entry); - m_hash = misc::toQString(m_torrentInfo->info_hash()); - } - catch(const std::exception& e) { - MessageBoxRaised::critical(0, tr("Invalid torrent"), tr("Failed to load the torrent: %1").arg(misc::toQStringU(e.what()))); - return false; - } + try { + std::vector buffer; + lazy_entry entry; + libtorrent::error_code ec; + misc::loadBencodedFile(m_filePath, buffer, entry, ec); + m_torrentInfo = new torrent_info(entry); + m_hash = misc::toQString(m_torrentInfo->info_hash()); + } + catch(const std::exception& e) { + MessageBoxRaised::critical(0, tr("Invalid torrent"), tr("Failed to load the torrent: %1").arg(misc::toQStringU(e.what()))); + return false; + } - // Prevent showing the dialog if download is already present - if (QBtSession::instance()->getTorrentHandle(m_hash).is_valid()) { - MessageBoxRaised::information(0, tr("Already in download list"), tr("Torrent is already in download list. Merging trackers."), QMessageBox::Ok); - QBtSession::instance()->addTorrent(m_filePath, false, m_url);; - return false; - } + // Prevent showing the dialog if download is already present + if (QBtSession::instance()->getTorrentHandle(m_hash).is_valid()) { + MessageBoxRaised::information(0, tr("Already in download list"), tr("Torrent is already in download list. Merging trackers."), QMessageBox::Ok); + QBtSession::instance()->addTorrent(m_filePath, false, m_url);; + return false; + } - setupTreeview(); - return true; + setupTreeview(); + return true; } bool AddNewTorrentDialog::loadMagnet(const QString &magnet_uri) { - connect(QBtSession::instance(), SIGNAL(metadataReceivedHidden(const QTorrentHandle&)), SLOT(updateMetadata(const QTorrentHandle&))); - m_isMagnet = true; - m_url = magnet_uri; - m_hash = misc::magnetUriToHash(m_url); - if (m_hash.isEmpty()) { - MessageBoxRaised::critical(0, tr("Invalid magnet link"), tr("This magnet link was not recognized")); - return false; - } + connect(QBtSession::instance(), SIGNAL(metadataReceivedHidden(const QTorrentHandle &)), SLOT(updateMetadata(const QTorrentHandle &))); + m_isMagnet = true; + m_url = magnet_uri; + m_hash = misc::magnetUriToHash(m_url); + if (m_hash.isEmpty()) { + MessageBoxRaised::critical(0, tr("Invalid magnet link"), tr("This magnet link was not recognized")); + return false; + } - // Prevent showing the dialog if download is already present - if (QBtSession::instance()->getTorrentHandle(m_hash).is_valid()) { - MessageBoxRaised::information(0, tr("Already in download list"), tr("Magnet link is already in download list. Merging trackers."), QMessageBox::Ok); + // Prevent showing the dialog if download is already present + if (QBtSession::instance()->getTorrentHandle(m_hash).is_valid()) { + MessageBoxRaised::information(0, tr("Already in download list"), tr("Magnet link is already in download list. Merging trackers."), QMessageBox::Ok); + QBtSession::instance()->addMagnetUri(m_url, false); + return false; + } + + // Set dialog title + QString torrent_name = misc::magnetUriToName(m_url); + setWindowTitle(torrent_name.isEmpty() ? tr("Magnet link") : torrent_name); + + setupTreeview(); + // Set dialog position + setdialogPosition(); + + // Override save path + TorrentTempData::setSavePath(m_hash, QString(QDir::tempPath() + "/" + m_hash)); + HiddenData::addData(m_hash); QBtSession::instance()->addMagnetUri(m_url, false); - return false; - } + setMetadataProgressIndicator(true, tr("Retrieving metadata...")); - // Set dialog title - QString torrent_name = misc::magnetUriToName(m_url); - setWindowTitle(torrent_name.isEmpty() ? tr("Magnet link") : torrent_name); - - setupTreeview(); - // Set dialog position - setdialogPosition(); - - // Override save path - TorrentTempData::setSavePath(m_hash, QString(QDir::tempPath() + "/" + m_hash)); - HiddenData::addData(m_hash); - QBtSession::instance()->addMagnetUri(m_url, false); - setMetadataProgressIndicator(true, tr("Retrieving metadata...")); - - return true; + return true; } void AddNewTorrentDialog::saveSavePathHistory() const { - QDir selected_save_path(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()); - Preferences* const pref = Preferences::instance(); - // Get current history - QStringList history = pref->getAddNewTorrentDialogPathHistory(); - QList history_dirs; - foreach(const QString dir, history) - history_dirs << QDir(dir); - if (!history_dirs.contains(selected_save_path)) { - // Add save path to history - history << selected_save_path.absolutePath(); - // Limit list size - if (history.size() > 8) - history.removeFirst(); - // Save history - pref->setAddNewTorrentDialogPathHistory(history); - } + QDir selected_save_path(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()); + Preferences* const pref = Preferences::instance(); + // Get current history + QStringList history = pref->getAddNewTorrentDialogPathHistory(); + QList history_dirs; + foreach(const QString dir, history) + history_dirs << QDir(dir); + if (!history_dirs.contains(selected_save_path)) { + // Add save path to history + history << selected_save_path.absolutePath(); + // Limit list size + if (history.size() > 8) + history.removeFirst(); + // Save history + pref->setAddNewTorrentDialogPathHistory(history); + } } // save_path is a folder, not an absolute file path int AddNewTorrentDialog::indexOfSavePath(const QString &save_path) { - QDir saveDir(save_path); - for(int i=0; isave_path_combo->count()-1; ++i) { - if (QDir(ui->save_path_combo->itemData(i).toString()) == saveDir) - return i; - } - return -1; + QDir saveDir(save_path); + for(int i = 0; isave_path_combo->count() - 1; ++i) + if (QDir(ui->save_path_combo->itemData(i).toString()) == saveDir) + return i; + return -1; } void AddNewTorrentDialog::updateFileNameInSavePaths(const QString &new_filename) { - for(int i=0; isave_path_combo->count()-1; ++i) { - const QDir folder(ui->save_path_combo->itemData(i).toString()); - ui->save_path_combo->setItemText(i, fsutils::toNativePath(folder.absoluteFilePath(new_filename))); - } + for(int i = 0; isave_path_combo->count() - 1; ++i) { + const QDir folder(ui->save_path_combo->itemData(i).toString()); + ui->save_path_combo->setItemText(i, fsutils::toNativePath(folder.absoluteFilePath(new_filename))); + } } -void AddNewTorrentDialog::updateDiskSpaceLabel() { - // Determine torrent size - qulonglong torrent_size = 0; +void AddNewTorrentDialog::updateDiskSpaceLabel() +{ + // Determine torrent size + qulonglong torrent_size = 0; - if (m_hasMetadata) { - if (m_contentModel) { - const std::vector priorities = m_contentModel->model()->getFilesPriorities(); - Q_ASSERT(priorities.size() == (uint) m_torrentInfo->num_files()); - for (uint i=0; i 0) - torrent_size += m_torrentInfo->files().file_size(i); - } - } else { - torrent_size = m_torrentInfo->total_size(); + if (m_hasMetadata) { + if (m_contentModel) { + const std::vector priorities = m_contentModel->model()->getFilesPriorities(); + Q_ASSERT(priorities.size() == (uint) m_torrentInfo->num_files()); + for (uint i = 0; i 0) + torrent_size += m_torrentInfo->files().file_size(i); + } + else { + torrent_size = m_torrentInfo->total_size(); + } } - } - QString size_string = torrent_size ? misc::friendlyUnit(torrent_size) : QString(tr("Not Available", "This size is unavailable.")); - size_string += " ("; - size_string += tr("Disk space: %1").arg(misc::friendlyUnit(fsutils::freeDiskSpaceOnPath( - ui->save_path_combo->itemData( - ui->save_path_combo->currentIndex()).toString()))); - size_string += ")"; - ui->size_lbl->setText(size_string); + QString size_string = torrent_size ? misc::friendlyUnit(torrent_size) : QString(tr("Not Available", "This size is unavailable.")); + size_string += " ("; + size_string += tr("Disk space: %1").arg(misc::friendlyUnit(fsutils::freeDiskSpaceOnPath( + ui->save_path_combo->itemData( + ui->save_path_combo->currentIndex()).toString()))); + size_string += ")"; + ui->size_lbl->setText(size_string); } void AddNewTorrentDialog::onSavePathChanged(int index) { - // Toggle default save path setting checkbox visibility - ui->default_save_path_cb->setChecked(false); - ui->default_save_path_cb->setVisible(QDir(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()) != QDir(Preferences::instance()->getSavePath())); - relayout(); + // Toggle default save path setting checkbox visibility + ui->default_save_path_cb->setChecked(false); + ui->default_save_path_cb->setVisible(QDir(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()) != QDir(Preferences::instance()->getSavePath())); + relayout(); - // Remember index - m_oldIndex = index; + // Remember index + m_oldIndex = index; } void AddNewTorrentDialog::browseButton_clicked() { - disconnect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSavePathChanged(int))); - // User is asking for a new save path - QString cur_save_path = ui->save_path_combo->itemText(m_oldIndex); - QString new_path, old_filename, new_filename; + disconnect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSavePathChanged(int))); + // User is asking for a new save path + QString cur_save_path = ui->save_path_combo->itemText(m_oldIndex); + QString new_path, old_filename, new_filename; - if (m_torrentInfo && m_torrentInfo->num_files() == 1) { - old_filename = fsutils::fileName(cur_save_path); - new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), cur_save_path, QString(), 0, QFileDialog::DontConfirmOverwrite); - if (!new_path.isEmpty()) - new_path = fsutils::branchPath(new_path, &new_filename); - qDebug() << "new_path: " << new_path; - qDebug() << "new_filename: " << new_filename; - } else { - if (!cur_save_path.isEmpty() && QDir(cur_save_path).exists()) - new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), cur_save_path); - else - new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath()); - } - if (!new_path.isEmpty()) { - const int existing_index = indexOfSavePath(new_path); - if (existing_index >= 0) - ui->save_path_combo->setCurrentIndex(existing_index); + if (m_torrentInfo && m_torrentInfo->num_files() == 1) { + old_filename = fsutils::fileName(cur_save_path); + new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), cur_save_path, QString(), 0, QFileDialog::DontConfirmOverwrite); + if (!new_path.isEmpty()) + new_path = fsutils::branchPath(new_path, &new_filename); + qDebug() << "new_path: " << new_path; + qDebug() << "new_filename: " << new_filename; + } else { - // New path, prepend to combo box - if (!new_filename.isEmpty()) - ui->save_path_combo->insertItem(0, fsutils::toNativePath(QDir(new_path).absoluteFilePath(new_filename)), new_path); - else - ui->save_path_combo->insertItem(0, fsutils::toNativePath(new_path), new_path); - ui->save_path_combo->setCurrentIndex(0); + if (!cur_save_path.isEmpty() && QDir(cur_save_path).exists()) + new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), cur_save_path); + else + new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath()); } - // Update file name in all save_paths - if (!new_filename.isEmpty() && !fsutils::sameFileNames(old_filename, new_filename)) { - m_hasRenamedFile = true; - m_filesPath[0] = new_filename; - updateFileNameInSavePaths(new_filename); + if (!new_path.isEmpty()) { + const int existing_index = indexOfSavePath(new_path); + if (existing_index >= 0) { + ui->save_path_combo->setCurrentIndex(existing_index); + } + else { + // New path, prepend to combo box + if (!new_filename.isEmpty()) + ui->save_path_combo->insertItem(0, fsutils::toNativePath(QDir(new_path).absoluteFilePath(new_filename)), new_path); + else + ui->save_path_combo->insertItem(0, fsutils::toNativePath(new_path), new_path); + ui->save_path_combo->setCurrentIndex(0); + } + // Update file name in all save_paths + if (!new_filename.isEmpty() && !fsutils::sameFileNames(old_filename, new_filename)) { + m_hasRenamedFile = true; + m_filesPath[0] = new_filename; + updateFileNameInSavePaths(new_filename); + } + + onSavePathChanged(0); } + else { + // Restore index + ui->save_path_combo->setCurrentIndex(m_oldIndex); + } + connect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), SLOT(onSavePathChanged(int))); - onSavePathChanged(0); - } else { - // Restore index - ui->save_path_combo->setCurrentIndex(m_oldIndex); - } - connect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), SLOT(onSavePathChanged(int))); - - updateDiskSpaceLabel(); + updateDiskSpaceLabel(); } void AddNewTorrentDialog::relayout() { - qApp->processEvents(); - int min_width = minimumWidth(); - setMinimumWidth(width()); - adjustSize(); - setMinimumWidth(min_width); + qApp->processEvents(); + int min_width = minimumWidth(); + setMinimumWidth(width()); + adjustSize(); + setMinimumWidth(min_width); } void AddNewTorrentDialog::renameSelectedFile() { - const QModelIndexList selectedIndexes = ui->content_tree->selectionModel()->selectedRows(0); - if (selectedIndexes.size() != 1) - return; - const QModelIndex &index = selectedIndexes.first(); - if (!index.isValid()) - return; - // Ask for new name - bool ok; - const QString new_name_last = AutoExpandableDialog::getText(this, tr("Rename the file"), - tr("New name:"), QLineEdit::Normal, - index.data().toString(), &ok).trimmed(); - if (ok && !new_name_last.isEmpty()) { - if (!fsutils::isValidFileSystemName(new_name_last)) { - MessageBoxRaised::warning(this, tr("The file could not be renamed"), - tr("This file name contains forbidden characters, please choose a different one."), - QMessageBox::Ok); - return; - } - if (m_contentModel->itemType(index) == TorrentContentModelItem::FileType) { - // File renaming - const int file_index = m_contentModel->getFileIndex(index); - QString old_name = fsutils::fromNativePath(m_filesPath.at(file_index)); - qDebug("Old name: %s", qPrintable(old_name)); - QStringList path_items = old_name.split("/"); - path_items.removeLast(); - path_items << new_name_last; - QString new_name = path_items.join("/"); - if (fsutils::sameFileNames(old_name, new_name)) { - qDebug("Name did not change"); + const QModelIndexList selectedIndexes = ui->content_tree->selectionModel()->selectedRows(0); + if (selectedIndexes.size() != 1) return; - } - new_name = fsutils::expandPath(new_name); - qDebug("New name: %s", qPrintable(new_name)); - // Check if that name is already used - for (int i=0; inum_files(); ++i) { - if (i == file_index) continue; - if (fsutils::sameFileNames(m_filesPath.at(i), new_name)) { - // Display error message - MessageBoxRaised::warning(this, tr("The file could not be renamed"), - tr("This name is already in use in this folder. Please use a different name."), - QMessageBox::Ok); - return; + const QModelIndex &index = selectedIndexes.first(); + if (!index.isValid()) + return; + // Ask for new name + bool ok; + const QString new_name_last = AutoExpandableDialog::getText(this, tr("Rename the file"), + tr("New name:"), QLineEdit::Normal, + index.data().toString(), &ok).trimmed(); + if (ok && !new_name_last.isEmpty()) { + if (!fsutils::isValidFileSystemName(new_name_last)) { + MessageBoxRaised::warning(this, tr("The file could not be renamed"), + tr("This file name contains forbidden characters, please choose a different one."), + QMessageBox::Ok); + return; } - } - qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name)); - // Rename file in files_path - m_filesPath.replace(file_index, new_name); - m_hasRenamedFile = true; - // Rename in torrent files model too - m_contentModel->setData(index, new_name_last); - } else { - // Folder renaming - QStringList path_items; - path_items << index.data().toString(); - QModelIndex parent = m_contentModel->parent(index); - while(parent.isValid()) { - path_items.prepend(parent.data().toString()); - parent = m_contentModel->parent(parent); - } - const QString old_path = path_items.join("/"); - path_items.removeLast(); - path_items << new_name_last; - QString new_path = path_items.join("/"); - if (!new_path.endsWith("/")) new_path += "/"; - // Check for overwriting - for (int i=0; inum_files(); ++i) { - const QString ¤t_name = m_filesPath.at(i); + if (m_contentModel->itemType(index) == TorrentContentModelItem::FileType) { + // File renaming + const int file_index = m_contentModel->getFileIndex(index); + QString old_name = fsutils::fromNativePath(m_filesPath.at(file_index)); + qDebug("Old name: %s", qPrintable(old_name)); + QStringList path_items = old_name.split("/"); + path_items.removeLast(); + path_items << new_name_last; + QString new_name = path_items.join("/"); + if (fsutils::sameFileNames(old_name, new_name)) { + qDebug("Name did not change"); + return; + } + new_name = fsutils::expandPath(new_name); + qDebug("New name: %s", qPrintable(new_name)); + // Check if that name is already used + for (int i = 0; inum_files(); ++i) { + if (i == file_index) continue; + if (fsutils::sameFileNames(m_filesPath.at(i), new_name)) { + // Display error message + MessageBoxRaised::warning(this, tr("The file could not be renamed"), + tr("This name is already in use in this folder. Please use a different name."), + QMessageBox::Ok); + return; + } + } + qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name)); + // Rename file in files_path + m_filesPath.replace(file_index, new_name); + m_hasRenamedFile = true; + // Rename in torrent files model too + m_contentModel->setData(index, new_name_last); + } + else { + // Folder renaming + QStringList path_items; + path_items << index.data().toString(); + QModelIndex parent = m_contentModel->parent(index); + while(parent.isValid()) { + path_items.prepend(parent.data().toString()); + parent = m_contentModel->parent(parent); + } + const QString old_path = path_items.join("/"); + path_items.removeLast(); + path_items << new_name_last; + QString new_path = path_items.join("/"); + if (!new_path.endsWith("/")) new_path += "/"; + // Check for overwriting + for (int i = 0; inum_files(); ++i) { + const QString ¤t_name = m_filesPath.at(i); #if defined(Q_OS_UNIX) || defined(Q_WS_QWS) - if (current_name.startsWith(new_path, Qt::CaseSensitive)) { + if (current_name.startsWith(new_path, Qt::CaseSensitive)) { #else - if (current_name.startsWith(new_path, Qt::CaseInsensitive)) { + if (current_name.startsWith(new_path, Qt::CaseInsensitive)) { #endif - MessageBoxRaised::warning(this, tr("The folder could not be renamed"), - tr("This name is already in use in this folder. Please use a different name."), - QMessageBox::Ok); - return; + MessageBoxRaised::warning(this, tr("The folder could not be renamed"), + tr("This name is already in use in this folder. Please use a different name."), + QMessageBox::Ok); + return; + } + } + // Replace path in all files + for (int i = 0; inum_files(); ++i) { + const QString ¤t_name = m_filesPath.at(i); + if (current_name.startsWith(old_path)) { + QString new_name = current_name; + new_name.replace(0, old_path.length(), new_path); + new_name = fsutils::expandPath(new_name); + qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name)); + // Rename in files_path + m_filesPath.replace(i, new_name); + } + } + m_hasRenamedFile = true; + // Rename folder in torrent files model too + m_contentModel->setData(index, new_name_last); } - } - // Replace path in all files - for (int i=0; inum_files(); ++i) { - const QString ¤t_name = m_filesPath.at(i); - if (current_name.startsWith(old_path)) { - QString new_name = current_name; - new_name.replace(0, old_path.length(), new_path); - new_name = fsutils::expandPath(new_name); - qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name)); - // Rename in files_path - m_filesPath.replace(i, new_name); - } - } - m_hasRenamedFile = true; - // Rename folder in torrent files model too - m_contentModel->setData(index, new_name_last); } - } } void AddNewTorrentDialog::setdialogPosition() { - qApp->processEvents(); - QPoint center(misc::screenCenter(this)); - // Adjust y - int y = Preferences::instance()->getAddNewTorrentDialogPos(); - if (y >= 0) { - center.setY(y); - } else { - center.ry() -= 120; - if (center.y() < 0) - center.setY(0); - } - move(center); + qApp->processEvents(); + QPoint center(misc::screenCenter(this)); + // Adjust y + int y = Preferences::instance()->getAddNewTorrentDialogPos(); + if (y >= 0) { + center.setY(y); + } + else { + center.ry() -= 120; + if (center.y() < 0) + center.setY(0); + } + move(center); } void AddNewTorrentDialog::loadSavePathHistory() { - QDir default_save_path(Preferences::instance()->getSavePath()); - // Load save path history - QStringList raw_path_history = Preferences::instance()->getAddNewTorrentDialogPathHistory(); - foreach (const QString &sp, raw_path_history) { - if (QDir(sp) != default_save_path) - ui->save_path_combo->addItem(fsutils::toNativePath(sp), sp); - } + QDir default_save_path(Preferences::instance()->getSavePath()); + // Load save path history + QStringList raw_path_history = Preferences::instance()->getAddNewTorrentDialogPathHistory(); + foreach (const QString &sp, raw_path_history) + if (QDir(sp) != default_save_path) + ui->save_path_combo->addItem(fsutils::toNativePath(sp), sp); } -void AddNewTorrentDialog::displayContentTreeMenu(const QPoint&) { - QMenu myFilesLlistMenu; - const QModelIndexList selectedRows = ui->content_tree->selectionModel()->selectedRows(0); - QAction *actRename = 0; - if (selectedRows.size() == 1 && m_torrentInfo->num_files() > 1) { - actRename = myFilesLlistMenu.addAction(IconProvider::instance()->getIcon("edit-rename"), tr("Rename...")); - myFilesLlistMenu.addSeparator(); - } - QMenu subMenu; - subMenu.setTitle(tr("Priority")); - subMenu.addAction(ui->actionNot_downloaded); - subMenu.addAction(ui->actionNormal); - subMenu.addAction(ui->actionHigh); - subMenu.addAction(ui->actionMaximum); - myFilesLlistMenu.addMenu(&subMenu); - // Call menu - QAction *act = myFilesLlistMenu.exec(QCursor::pos()); - if (act) { - if (act == actRename) { - renameSelectedFile(); - } else { - int prio = prio::NORMAL; - if (act == ui->actionHigh) - prio = prio::HIGH; - else { - if (act == ui->actionMaximum) { - prio = prio::MAXIMUM; - } else { - if (act == ui->actionNot_downloaded) - prio = prio::IGNORED; - } - } - qDebug("Setting files priority"); - foreach (const QModelIndex &index, selectedRows) { - qDebug("Setting priority(%d) for file at row %d", prio, index.row()); - m_contentModel->setData(m_contentModel->index(index.row(), PRIORITY, index.parent()), prio); - } +void AddNewTorrentDialog::displayContentTreeMenu(const QPoint&) +{ + QMenu myFilesLlistMenu; + const QModelIndexList selectedRows = ui->content_tree->selectionModel()->selectedRows(0); + QAction *actRename = 0; + if (selectedRows.size() == 1 && m_torrentInfo->num_files() > 1) { + actRename = myFilesLlistMenu.addAction(IconProvider::instance()->getIcon("edit-rename"), tr("Rename...")); + myFilesLlistMenu.addSeparator(); + } + QMenu subMenu; + subMenu.setTitle(tr("Priority")); + subMenu.addAction(ui->actionNot_downloaded); + subMenu.addAction(ui->actionNormal); + subMenu.addAction(ui->actionHigh); + subMenu.addAction(ui->actionMaximum); + myFilesLlistMenu.addMenu(&subMenu); + // Call menu + QAction *act = myFilesLlistMenu.exec(QCursor::pos()); + if (act) { + if (act == actRename) { + renameSelectedFile(); + } + else { + int prio = prio::NORMAL; + if (act == ui->actionHigh) { + prio = prio::HIGH; + } + else { + if (act == ui->actionMaximum) + prio = prio::MAXIMUM; + else + if (act == ui->actionNot_downloaded) + prio = prio::IGNORED; + } + qDebug("Setting files priority"); + foreach (const QModelIndex &index, selectedRows) { + qDebug("Setting priority(%d) for file at row %d", prio, index.row()); + m_contentModel->setData(m_contentModel->index(index.row(), PRIORITY, index.parent()), prio); + } + } } - } } void AddNewTorrentDialog::accept() { - if (m_isMagnet) - disconnect(this, SLOT(updateMetadata(const QTorrentHandle&))); + if (m_isMagnet) + disconnect(this, SLOT(updateMetadata(const QTorrentHandle &))); - Preferences* const pref = Preferences::instance(); - // Save Temporary data about torrent - QString save_path = ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString(); - TorrentTempData::setSavePath(m_hash, save_path); - if (ui->skip_check_cb->isChecked()) { - // TODO: Check if destination actually exists - TorrentTempData::setSeedingMode(m_hash, true); - } + Preferences* const pref = Preferences::instance(); + // Save Temporary data about torrent + QString save_path = ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString(); + TorrentTempData::setSavePath(m_hash, save_path); + if (ui->skip_check_cb->isChecked()) + // TODO: Check if destination actually exists + TorrentTempData::setSeedingMode(m_hash, true); - // Label - const QString label = ui->label_combo->currentText(); - if (!label.isEmpty()) - TorrentTempData::setLabel(m_hash, label); + // Label + const QString label = ui->label_combo->currentText(); + if (!label.isEmpty()) + TorrentTempData::setLabel(m_hash, label); - // Save file priorities - if (m_contentModel) - TorrentTempData::setFilesPriority(m_hash, m_contentModel->model()->getFilesPriorities()); + // Save file priorities + if (m_contentModel) + TorrentTempData::setFilesPriority(m_hash, m_contentModel->model()->getFilesPriorities()); - // Rename files if necessary - if (m_hasRenamedFile) - TorrentTempData::setFilesPath(m_hash, m_filesPath); + // Rename files if necessary + if (m_hasRenamedFile) + TorrentTempData::setFilesPath(m_hash, m_filesPath); - TorrentTempData::setAddPaused(m_hash, !ui->start_torrent_cb->isChecked()); + TorrentTempData::setAddPaused(m_hash, !ui->start_torrent_cb->isChecked()); - // Add torrent - if (m_isMagnet) - QBtSession::instance()->unhideMagnet(m_hash); - else - QBtSession::instance()->addTorrent(m_filePath, false, m_url); + // Add torrent + if (m_isMagnet) + QBtSession::instance()->unhideMagnet(m_hash); + else + QBtSession::instance()->addTorrent(m_filePath, false, m_url); - saveSavePathHistory(); - // Save settings - pref->useAdditionDialog(!ui->never_show_cb->isChecked()); - if (ui->default_save_path_cb->isChecked()) { - pref->setSavePath(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()); - QBtSession::instance()->setDefaultSavePath(pref->getSavePath()); - } - QDialog::accept(); + saveSavePathHistory(); + // Save settings + pref->useAdditionDialog(!ui->never_show_cb->isChecked()); + if (ui->default_save_path_cb->isChecked()) { + pref->setSavePath(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()); + QBtSession::instance()->setDefaultSavePath(pref->getSavePath()); + } + QDialog::accept(); } -void AddNewTorrentDialog::reject() { - if (m_isMagnet) { - disconnect(this, SLOT(updateMetadata(const QTorrentHandle&))); - setMetadataProgressIndicator(false); - QBtSession::instance()->deleteTorrent(m_hash, true); - } - QDialog::reject(); +void AddNewTorrentDialog::reject() +{ + if (m_isMagnet) { + disconnect(this, SLOT(updateMetadata(const QTorrentHandle &))); + setMetadataProgressIndicator(false); + QBtSession::instance()->deleteTorrent(m_hash, true); + } + QDialog::reject(); } -void AddNewTorrentDialog::updateMetadata(const QTorrentHandle &h) { - try { - if (h.hash() != m_hash) - return; +void AddNewTorrentDialog::updateMetadata(const QTorrentHandle &h) +{ + try { + if (h.hash() != m_hash) + return; - disconnect(this, SLOT(updateMetadata(const QTorrentHandle&))); - Q_ASSERT(h.has_metadata()); + disconnect(this, SLOT(updateMetadata(const QTorrentHandle &))); + Q_ASSERT(h.has_metadata()); #if LIBTORRENT_VERSION_NUM < 10000 - m_torrentInfo = new torrent_info(h.get_torrent_info()); + m_torrentInfo = new torrent_info(h.get_torrent_info()); #else - m_torrentInfo = new torrent_info(*h.torrent_file()); + m_torrentInfo = new torrent_info(*h.torrent_file()); #endif - // Good to go - m_hasMetadata = true; - setMetadataProgressIndicator(true, tr("Parsing metadata...")); + // Good to go + m_hasMetadata = true; + setMetadataProgressIndicator(true, tr("Parsing metadata...")); - // Update UI - setupTreeview(); - setMetadataProgressIndicator(false, tr("Metadata retrieval complete")); - } catch (invalid_handle&) { - MessageBoxRaised::critical(0, tr("I/O Error"), ("Unknown error.")); - setMetadataProgressIndicator(false, tr("Unknown error")); - return; - } + // Update UI + setupTreeview(); + setMetadataProgressIndicator(false, tr("Metadata retrieval complete")); + } catch (invalid_handle&) { + MessageBoxRaised::critical(0, tr("I/O Error"), ("Unknown error.")); + setMetadataProgressIndicator(false, tr("Unknown error")); + return; + } } -void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText) { - // Always show info label when waiting for metadata - ui->lblMetaLoading->setVisible(true); - ui->lblMetaLoading->setText(labelText); - ui->progMetaLoading->setVisible(visibleIndicator); +void AddNewTorrentDialog::setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText) +{ + // Always show info label when waiting for metadata + ui->lblMetaLoading->setVisible(true); + ui->lblMetaLoading->setText(labelText); + ui->progMetaLoading->setVisible(visibleIndicator); } -void AddNewTorrentDialog::setupTreeview() { - if (!m_hasMetadata) { - ui->comment_lbl->setText(tr("Not Available", "This comment is unavailable")); - ui->date_lbl->setText(tr("Not Available", "This date is unavailable")); - } - else { - // Set dialog title - setWindowTitle(misc::toQStringU(m_torrentInfo->name())); +void AddNewTorrentDialog::setupTreeview() +{ + if (!m_hasMetadata) { + ui->comment_lbl->setText(tr("Not Available", "This comment is unavailable")); + ui->date_lbl->setText(tr("Not Available", "This date is unavailable")); + } + else { + // Set dialog title + setWindowTitle(misc::toQStringU(m_torrentInfo->name())); - // Set torrent information - QString comment = misc::toQString(m_torrentInfo->comment()); - ui->comment_lbl->setText(comment.replace('\n', ' ')); - ui->date_lbl->setText(m_torrentInfo->creation_date() ? misc::toQString(*m_torrentInfo->creation_date()) : tr("Not available")); + // Set torrent information + QString comment = misc::toQString(m_torrentInfo->comment()); + ui->comment_lbl->setText(comment.replace('\n', ' ')); + ui->date_lbl->setText(m_torrentInfo->creation_date() ? misc::toQString(*m_torrentInfo->creation_date()) : tr("Not available")); - file_storage const& fs = m_torrentInfo->files(); + file_storage const& fs = m_torrentInfo->files(); - // Populate m_filesList - for (int i = 0; i < fs.num_files(); ++i) { - m_filesPath << misc::toQStringU(fs.file_path(i)); + // Populate m_filesList + for (int i = 0; i < fs.num_files(); ++i) + m_filesPath << misc::toQStringU(fs.file_path(i)); + + // Prepare content tree + if (fs.num_files() > 1) { + m_contentModel = new TorrentContentFilterModel(this); + connect(m_contentModel->model(), SIGNAL(filteredFilesChanged()), SLOT(updateDiskSpaceLabel())); + ui->content_tree->setModel(m_contentModel); + ui->content_tree->hideColumn(PROGRESS); + m_contentDelegate = new PropListDelegate(); + ui->content_tree->setItemDelegate(m_contentDelegate); + connect(ui->content_tree, SIGNAL(clicked(const QModelIndex &)), ui->content_tree, SLOT(edit(const QModelIndex &))); + connect(ui->content_tree, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(displayContentTreeMenu(const QPoint &))); + + // List files in torrent + m_contentModel->model()->setupModelData(*m_torrentInfo); + if (!m_headerState.isEmpty()) + ui->content_tree->header()->restoreState(m_headerState); + + // Expand root folder + ui->content_tree->setExpanded(m_contentModel->index(0, 0), true); + } + else { + // Update save paths (append file name to them) + QString single_file_relpath = misc::toQStringU(fs.file_path(0)); + for (int i = 0; isave_path_combo->count() - 1; ++i) + ui->save_path_combo->setItemText(i, fsutils::toNativePath(QDir(ui->save_path_combo->itemText(i)).absoluteFilePath(single_file_relpath))); + } } - // Prepare content tree - if (fs.num_files() > 1) { - m_contentModel = new TorrentContentFilterModel(this); - connect(m_contentModel->model(), SIGNAL(filteredFilesChanged()), SLOT(updateDiskSpaceLabel())); - ui->content_tree->setModel(m_contentModel); - ui->content_tree->hideColumn(PROGRESS); - m_contentDelegate = new PropListDelegate(); - ui->content_tree->setItemDelegate(m_contentDelegate); - connect(ui->content_tree, SIGNAL(clicked(const QModelIndex&)), ui->content_tree, SLOT(edit(const QModelIndex&))); - connect(ui->content_tree, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayContentTreeMenu(const QPoint&))); - - // List files in torrent - m_contentModel->model()->setupModelData(*m_torrentInfo); - if (!m_headerState.isEmpty()) - ui->content_tree->header()->restoreState(m_headerState); - - // Expand root folder - ui->content_tree->setExpanded(m_contentModel->index(0, 0), true); - } else { - // Update save paths (append file name to them) - QString single_file_relpath = misc::toQStringU(fs.file_path(0)); - for (int i=0; isave_path_combo->count()-1; ++i) { - ui->save_path_combo->setItemText(i, fsutils::toNativePath(QDir(ui->save_path_combo->itemText(i)).absoluteFilePath(single_file_relpath))); - } - } - } - - updateDiskSpaceLabel(); - showAdvancedSettings(Preferences::instance()->getAddNewTorrentDialogExpanded()); - // Set dialog position - setdialogPosition(); + updateDiskSpaceLabel(); + showAdvancedSettings(Preferences::instance()->getAddNewTorrentDialogExpanded()); + // Set dialog position + setdialogPosition(); } diff --git a/src/addnewtorrentdialog.h b/src/addnewtorrentdialog.h index 2b5642946..8b9d0ee79 100644 --- a/src/addnewtorrentdialog.h +++ b/src/addnewtorrentdialog.h @@ -40,69 +40,69 @@ QT_BEGIN_NAMESPACE namespace Ui { -class AddNewTorrentDialog; + class AddNewTorrentDialog; } QT_END_NAMESPACE class TorrentContentFilterModel; class PropListDelegate; -class AddNewTorrentDialog : public QDialog +class AddNewTorrentDialog: public QDialog { - Q_OBJECT - -public: - ~AddNewTorrentDialog(); + Q_OBJECT - static void showTorrent(const QString& torrent_path, const QString& from_url, QWidget *parent = 0); - static void showMagnet(const QString& torrent_link, QWidget *parent = 0); +public: + ~AddNewTorrentDialog(); + + static void showTorrent(const QString& torrent_path, const QString& from_url, QWidget *parent = 0); + static void showMagnet(const QString& torrent_link, QWidget *parent = 0); protected: - void showEvent(QShowEvent *event); + void showEvent(QShowEvent *event); private slots: - void showAdvancedSettings(bool show); - void displayContentTreeMenu(const QPoint&); - void updateDiskSpaceLabel(); - void onSavePathChanged(int); - void relayout(); - void renameSelectedFile(); - void setdialogPosition(); - void updateMetadata(const QTorrentHandle& h); - void browseButton_clicked(); + void showAdvancedSettings(bool show); + void displayContentTreeMenu(const QPoint&); + void updateDiskSpaceLabel(); + void onSavePathChanged(int); + void relayout(); + void renameSelectedFile(); + void setdialogPosition(); + void updateMetadata(const QTorrentHandle& h); + void browseButton_clicked(); protected slots: - virtual void accept(); - virtual void reject(); + virtual void accept(); + virtual void reject(); private: - explicit AddNewTorrentDialog(QWidget *parent = 0); - bool loadTorrent(const QString& torrent_path, const QString& from_url); - bool loadMagnet(const QString& magnet_uri); - void loadSavePathHistory(); - void saveSavePathHistory() const; - int indexOfSavePath(const QString& save_path); - void updateFileNameInSavePaths(const QString& new_filename); - void loadState(); - void saveState(); - void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString()); - void setupTreeview(); + explicit AddNewTorrentDialog(QWidget *parent = 0); + bool loadTorrent(const QString& torrent_path, const QString& from_url); + bool loadMagnet(const QString& magnet_uri); + void loadSavePathHistory(); + void saveSavePathHistory() const; + int indexOfSavePath(const QString& save_path); + void updateFileNameInSavePaths(const QString& new_filename); + void loadState(); + void saveState(); + void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString()); + void setupTreeview(); private: - Ui::AddNewTorrentDialog *ui; - TorrentContentFilterModel *m_contentModel; - PropListDelegate *m_contentDelegate; - bool m_isMagnet; - bool m_hasMetadata; - QString m_filePath; - QString m_url; - QString m_hash; - boost::intrusive_ptr m_torrentInfo; - QStringList m_filesPath; - bool m_hasRenamedFile; - QShortcut *editHotkey; - QByteArray m_headerState; - int m_oldIndex; + Ui::AddNewTorrentDialog *ui; + TorrentContentFilterModel *m_contentModel; + PropListDelegate *m_contentDelegate; + bool m_isMagnet; + bool m_hasMetadata; + QString m_filePath; + QString m_url; + QString m_hash; + boost::intrusive_ptr m_torrentInfo; + QStringList m_filesPath; + bool m_hasRenamedFile; + QShortcut *editHotkey; + QByteArray m_headerState; + int m_oldIndex; }; #endif // ADDNEWTORRENTDIALOG_H