From 19b6f56a0a6934e5bf3b27b4558126d0f4f4ba05 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 29 Sep 2019 10:41:51 +0800 Subject: [PATCH 1/2] Move DeletionConfirmationDialog class to its own .cpp file --- src/gui/CMakeLists.txt | 1 + src/gui/deletionconfirmationdialog.cpp | 89 ++++++++++++++++++++++++++ src/gui/deletionconfirmationdialog.h | 66 ++++--------------- src/gui/gui.pri | 1 + 4 files changed, 102 insertions(+), 55 deletions(-) create mode 100644 src/gui/deletionconfirmationdialog.cpp diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index dc67cad88..50d11d796 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -74,6 +74,7 @@ categoryfilterproxymodel.cpp categoryfilterwidget.cpp cookiesdialog.cpp cookiesmodel.cpp +deletionconfirmationdialog.cpp downloadfromurldialog.cpp executionlogwidget.cpp fspathedit.cpp diff --git a/src/gui/deletionconfirmationdialog.cpp b/src/gui/deletionconfirmationdialog.cpp new file mode 100644 index 000000000..7e9eddac7 --- /dev/null +++ b/src/gui/deletionconfirmationdialog.cpp @@ -0,0 +1,89 @@ +/* + * Bittorrent Client using Qt and libtorrent. + * Copyright (C) 2006 Christophe Dumez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give permission to + * link this program with the OpenSSL project's "OpenSSL" library (or with + * modified versions of it that use the same license as the "OpenSSL" library), + * and distribute the linked executables. You must obey the GNU General Public + * License in all respects for all of the code used other than "OpenSSL". If you + * modify file(s), you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete this + * exception statement from your version. + */ + +#include "deletionconfirmationdialog.h" + +#include + +#include "base/preferences.h" +#include "uithememanager.h" +#include "utils.h" + +DeletionConfirmationDialog::DeletionConfirmationDialog(QWidget *parent, const int size, const QString &name, const bool defaultDeleteFiles) + : QDialog(parent) + , m_ui(new Ui::DeletionConfirmationDialog) +{ + m_ui->setupUi(this); + if (size == 1) + m_ui->label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); + else + m_ui->label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); + // Icons + const QSize iconSize = Utils::Gui::largeIconSize(); + m_ui->labelWarning->setPixmap(UIThemeManager::instance()->getIcon("dialog-warning").pixmap(iconSize)); + m_ui->labelWarning->setFixedWidth(iconSize.width()); + m_ui->rememberBtn->setIcon(UIThemeManager::instance()->getIcon("object-locked")); + m_ui->rememberBtn->setIconSize(Utils::Gui::mediumIconSize()); + + m_ui->checkPermDelete->setChecked(defaultDeleteFiles || Preferences::instance()->deleteTorrentFilesAsDefault()); + connect(m_ui->checkPermDelete, &QCheckBox::clicked, this, &DeletionConfirmationDialog::updateRememberButtonState); + m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setFocus(); + + Utils::Gui::resize(this); +} + +DeletionConfirmationDialog::~DeletionConfirmationDialog() +{ + delete m_ui; +} + +bool DeletionConfirmationDialog::shouldDeleteLocalFiles() const +{ + return m_ui->checkPermDelete->isChecked(); +} + +bool DeletionConfirmationDialog::askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, const int size, const QString &name) +{ + DeletionConfirmationDialog dlg(parent, size, name, deleteLocalFiles); + if (dlg.exec() == QDialog::Accepted) { + deleteLocalFiles = dlg.shouldDeleteLocalFiles(); + return true; + } + return false; +} + +void DeletionConfirmationDialog::updateRememberButtonState() +{ + m_ui->rememberBtn->setEnabled(m_ui->checkPermDelete->isChecked() != Preferences::instance()->deleteTorrentFilesAsDefault()); +} + +void DeletionConfirmationDialog::on_rememberBtn_clicked() +{ + Preferences::instance()->setDeleteTorrentFilesAsDefault(m_ui->checkPermDelete->isChecked()); + m_ui->rememberBtn->setEnabled(false); +} diff --git a/src/gui/deletionconfirmationdialog.h b/src/gui/deletionconfirmationdialog.h index c2616e58f..46b11c0bb 100644 --- a/src/gui/deletionconfirmationdialog.h +++ b/src/gui/deletionconfirmationdialog.h @@ -30,72 +30,28 @@ #define DELETIONCONFIRMATIONDIALOG_H #include -#include -#include "base/preferences.h" #include "ui_deletionconfirmationdialog.h" -#include "uithememanager.h" -#include "utils.h" + +namespace Ui +{ + class DeletionConfirmationDialog; +} class DeletionConfirmationDialog : public QDialog { Q_OBJECT public: - DeletionConfirmationDialog(QWidget *parent, const int &size, const QString &name, bool defaultDeleteFiles) - : QDialog(parent) - , m_ui(new Ui::DeletionConfirmationDialog) - { - m_ui->setupUi(this); - if (size == 1) - m_ui->label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); - else - m_ui->label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); - // Icons - const QSize iconSize = Utils::Gui::largeIconSize(); - m_ui->labelWarning->setPixmap(UIThemeManager::instance()->getIcon("dialog-warning").pixmap(iconSize)); - m_ui->labelWarning->setFixedWidth(iconSize.width()); - m_ui->rememberBtn->setIcon(UIThemeManager::instance()->getIcon("object-locked")); - m_ui->rememberBtn->setIconSize(Utils::Gui::mediumIconSize()); - - m_ui->checkPermDelete->setChecked(defaultDeleteFiles || Preferences::instance()->deleteTorrentFilesAsDefault()); - connect(m_ui->checkPermDelete, &QCheckBox::clicked, this, &DeletionConfirmationDialog::updateRememberButtonState); - m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setFocus(); - - Utils::Gui::resize(this); - } + DeletionConfirmationDialog(QWidget *parent, int size, const QString &name, bool defaultDeleteFiles); + ~DeletionConfirmationDialog(); - ~DeletionConfirmationDialog() - { - delete m_ui; - } - - bool shouldDeleteLocalFiles() const - { - return m_ui->checkPermDelete->isChecked(); - } - - static bool askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, const int &size, const QString &name) - { - DeletionConfirmationDialog dlg(parent, size, name, deleteLocalFiles); - if (dlg.exec() == QDialog::Accepted) { - deleteLocalFiles = dlg.shouldDeleteLocalFiles(); - return true; - } - return false; - } + bool shouldDeleteLocalFiles() const; + static bool askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, int size, const QString &name); private slots: - void updateRememberButtonState() - { - m_ui->rememberBtn->setEnabled(m_ui->checkPermDelete->isChecked() != Preferences::instance()->deleteTorrentFilesAsDefault()); - } - - void on_rememberBtn_clicked() - { - Preferences::instance()->setDeleteTorrentFilesAsDefault(m_ui->checkPermDelete->isChecked()); - m_ui->rememberBtn->setEnabled(false); - } + void updateRememberButtonState(); + void on_rememberBtn_clicked(); private: Ui::DeletionConfirmationDialog *m_ui; diff --git a/src/gui/gui.pri b/src/gui/gui.pri index 78b0d838a..0dbeb36fb 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -79,6 +79,7 @@ SOURCES += \ $$PWD/categoryfilterwidget.cpp \ $$PWD/cookiesdialog.cpp \ $$PWD/cookiesmodel.cpp \ + $$PWD/deletionconfirmationdialog.cpp \ $$PWD/downloadfromurldialog.cpp \ $$PWD/executionlogwidget.cpp \ $$PWD/fspathedit.cpp \ From c632a91ee5f17c1ee3a178a384b8adf460a63e3d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 29 Sep 2019 10:50:07 +0800 Subject: [PATCH 2/2] Handle "Delete confirmation" dialog result asynchronously This is to avoid creating nested event loops as discussed in https://github.com/qbittorrent/qBittorrent/pull/10786#issuecomment-502795822 --- src/gui/deletionconfirmationdialog.cpp | 14 ++------ src/gui/deletionconfirmationdialog.h | 3 +- src/gui/transferlistwidget.cpp | 48 ++++++++++++++++++-------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/src/gui/deletionconfirmationdialog.cpp b/src/gui/deletionconfirmationdialog.cpp index 7e9eddac7..d0b860c7f 100644 --- a/src/gui/deletionconfirmationdialog.cpp +++ b/src/gui/deletionconfirmationdialog.cpp @@ -39,10 +39,12 @@ DeletionConfirmationDialog::DeletionConfirmationDialog(QWidget *parent, const in , m_ui(new Ui::DeletionConfirmationDialog) { m_ui->setupUi(this); + if (size == 1) m_ui->label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); else m_ui->label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); + // Icons const QSize iconSize = Utils::Gui::largeIconSize(); m_ui->labelWarning->setPixmap(UIThemeManager::instance()->getIcon("dialog-warning").pixmap(iconSize)); @@ -62,21 +64,11 @@ DeletionConfirmationDialog::~DeletionConfirmationDialog() delete m_ui; } -bool DeletionConfirmationDialog::shouldDeleteLocalFiles() const +bool DeletionConfirmationDialog::isDeleteFileSelected() const { return m_ui->checkPermDelete->isChecked(); } -bool DeletionConfirmationDialog::askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, const int size, const QString &name) -{ - DeletionConfirmationDialog dlg(parent, size, name, deleteLocalFiles); - if (dlg.exec() == QDialog::Accepted) { - deleteLocalFiles = dlg.shouldDeleteLocalFiles(); - return true; - } - return false; -} - void DeletionConfirmationDialog::updateRememberButtonState() { m_ui->rememberBtn->setEnabled(m_ui->checkPermDelete->isChecked() != Preferences::instance()->deleteTorrentFilesAsDefault()); diff --git a/src/gui/deletionconfirmationdialog.h b/src/gui/deletionconfirmationdialog.h index 46b11c0bb..1e06be218 100644 --- a/src/gui/deletionconfirmationdialog.h +++ b/src/gui/deletionconfirmationdialog.h @@ -46,8 +46,7 @@ public: DeletionConfirmationDialog(QWidget *parent, int size, const QString &name, bool defaultDeleteFiles); ~DeletionConfirmationDialog(); - bool shouldDeleteLocalFiles() const; - static bool askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, int size, const QString &name); + bool isDeleteFileSelected() const; private slots: void updateRememberButtonState(); diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index eb739b0f1..acf2c193a 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -96,6 +96,14 @@ namespace return false; } + + void removeTorrents(const QVector &torrents, const bool isDeleteFileSelected) + { + auto *session = BitTorrent::Session::instance(); + const DeleteOption deleteOption = isDeleteFileSelected ? TorrentAndFiles : Torrent; + for (const BitTorrent::TorrentHandle *torrent : torrents) + session->deleteTorrent(torrent->hash(), deleteOption); + } } TransferListWidget::TransferListWidget(QWidget *parent, MainWindow *mainWindow) @@ -363,19 +371,25 @@ void TransferListWidget::permDeleteSelectedTorrents() deleteSelectedTorrents(true); } -void TransferListWidget::deleteSelectedTorrents(bool deleteLocalFiles) +void TransferListWidget::deleteSelectedTorrents(const bool deleteLocalFiles) { if (m_mainWindow->currentTabWidget() != this) return; const QVector torrents = getSelectedTorrents(); if (torrents.empty()) return; - if (Preferences::instance()->confirmTorrentDeletion() - && !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name())) - return; - const DeleteOption deleteOption = deleteLocalFiles ? TorrentAndFiles : Torrent; - for (const BitTorrent::TorrentHandle *torrent : torrents) - BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteOption); + if (Preferences::instance()->confirmTorrentDeletion()) { + auto *dialog = new DeletionConfirmationDialog(this, torrents.size(), torrents[0]->name(), deleteLocalFiles); + dialog->setAttribute(Qt::WA_DeleteOnClose); + connect(dialog, &DeletionConfirmationDialog::accepted, this, [dialog, torrents]() + { + removeTorrents(torrents, dialog->isDeleteFileSelected()); + }); + dialog->open(); + } + else { + removeTorrents(torrents, deleteLocalFiles); + } } void TransferListWidget::deleteVisibleTorrents() @@ -386,14 +400,18 @@ void TransferListWidget::deleteVisibleTorrents() for (int i = 0; i < m_sortFilterModel->rowCount(); ++i) torrents << m_listModel->torrentHandle(mapToSource(m_sortFilterModel->index(i, 0))); - bool deleteLocalFiles = false; - if (Preferences::instance()->confirmTorrentDeletion() - && !DeletionConfirmationDialog::askForDeletionConfirmation(this, deleteLocalFiles, torrents.size(), torrents[0]->name())) - return; - - const DeleteOption deleteOption = deleteLocalFiles ? TorrentAndFiles : Torrent; - for (const BitTorrent::TorrentHandle *torrent : asConst(torrents)) - BitTorrent::Session::instance()->deleteTorrent(torrent->hash(), deleteOption); + if (Preferences::instance()->confirmTorrentDeletion()) { + auto *dialog = new DeletionConfirmationDialog(this, torrents.size(), torrents[0]->name(), false); + dialog->setAttribute(Qt::WA_DeleteOnClose); + connect(dialog, &DeletionConfirmationDialog::accepted, this, [dialog, torrents]() + { + removeTorrents(torrents, dialog->isDeleteFileSelected()); + }); + dialog->open(); + } + else { + removeTorrents(torrents, false); + } } void TransferListWidget::increaseQueuePosSelectedTorrents()