0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use BlockedModsDialog for ftb packs as well

Browse Source 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
This commit is contained in:
kumquat-ir 2022-07-31 15:05:47 -04:00
parent 579582740e
commit 9c105914f0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -48,7 +48,7 @@
#include "Application.h" #include "Application.h"
#include "BuildConfig.h" #include "BuildConfig.h"
#include "ui/dialogs/ScrollMessageBox.h" #include "ui/dialogs/BlockedModsDialog.h"
namespace ModpacksCH { namespace ModpacksCH {
@ -173,6 +173,7 @@ void PackInstallTask::onResolveModsSucceeded()
m_abortable = false; m_abortable = false;
QString text; QString text;
QList<QUrl> urls;
auto anyBlocked = false; auto anyBlocked = false;
Flame::Manifest results = m_mod_id_resolver_task->getResults(); Flame::Manifest results = m_mod_id_resolver_task->getResults();
@ -190,6 +191,7 @@ void PackInstallTask::onResolveModsSucceeded()
type[0] = type[0].toUpper(); type[0] = type[0].toUpper();
text += QString("%1: %2 - <a href='%3'>%3</a><br/>").arg(type, local_file.name, results_file.websiteUrl); text += QString("%1: %2 - <a href='%3'>%3</a><br/>").arg(type, local_file.name, results_file.websiteUrl);
urls.append(QUrl(results_file.websiteUrl));
anyBlocked = true; anyBlocked = true;
} else { } else {
local_file.url = results_file.url.toString(); local_file.url = results_file.url.toString();
@ -201,10 +203,11 @@ void PackInstallTask::onResolveModsSucceeded()
if (anyBlocked) { if (anyBlocked) {
qDebug() << "Blocked files found, displaying file list"; qDebug() << "Blocked files found, displaying file list";
auto message_dialog = new ScrollMessageBox(m_parent, tr("Blocked files found"), auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked files found"),
tr("The following files are not available for download in third party launchers.<br/>" tr("The following files are not available for download in third party launchers.<br/>"
"You will need to manually download them and add them to the instance."), "You will need to manually download them and add them to the instance."),
text); text,
urls);
if (message_dialog->exec() == QDialog::Accepted) if (message_dialog->exec() == QDialog::Accepted)
downloadPack(); downloadPack();