diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index 5d71bef..b86d602 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -671,11 +671,11 @@ void ContentManager::cancelBook(const QString& id, QModelIndex index) auto text = gt("cancel-download-text"); text = text.replace("{{ZIM}}", QString::fromStdString(mp_library->getBookById(id).getTitle())); showConfirmBox(gt("cancel-download"), text, mp_view, [=]() { - cancelBook(id); + reallyCancelBook(id); }); } -void ContentManager::cancelBook(const QString& id) +void ContentManager::reallyCancelBook(const QString& id) { auto& b = mp_library->getBookById(id); auto download = mp_downloader->getDownload(b.getDownloadId()); diff --git a/src/contentmanager.h b/src/contentmanager.h index ed8a1fd..2302d8b 100644 --- a/src/contentmanager.h +++ b/src/contentmanager.h @@ -61,9 +61,9 @@ public slots: void updateCategories(const QString& content); void pauseBook(const QString& id); void resumeBook(const QString& id); - void cancelBook(const QString& id); void pauseBook(const QString& id, QModelIndex index); void resumeBook(const QString& id, QModelIndex index); + // cancelBook() asks for confirmation (reallyCancelBook() doesn't) void cancelBook(const QString& id, QModelIndex index); void onCustomContextMenu(const QPoint &point); void openBookWithIndex(const QModelIndex& index); @@ -71,6 +71,8 @@ public slots: private: // functions QStringList getBookIds(); + // reallyCancelBook() doesn't ask for confirmation (unlike cancelBook()) + void reallyCancelBook(const QString& id); // reallyEraseBook() doesn't ask for confirmation (unlike eraseBook()) void reallyEraseBook(const QString& id, bool moveToTrash); void eraseBookFilesFromComputer(const QString dirPath, const QString filename, const bool moveToTrash);