CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add list of watched folders

Browse Source 
move explanation text into dialog class and it's own label

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2022-11-11 18:05:19 -07:00
parent 51c27e2748
commit 9af1b00df5
4 changed files with 86 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -393,13 +393,10 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
qWarning() << "Blocked mods found, displaying mod list";
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"),
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.<br/><br/>"
"Your configured global mods folder and default downloads folder<br/>"
"are automatically checked for the downloaded mods and they will be copied to the instance if found.<br/>"
"Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch<br/>"
"if you did not download the mods to a default location."),
blocked_mods);
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."),
blocked_mods);
message_dialog->setModal(true);
if (message_dialog->exec()) {

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

@ -211,22 +211,17 @@ void PackInstallTask::onResolveModsSucceeded()
qDebug() << "Blocked files found, displaying file list";
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/>"
"You will need to manually download them and add them to the instance.<br/><br/>"
"Your configured global mods folder and default downloads folder<br/>"
"are automatically checked for the downloaded mods and they will be copied to the instance if found.<br/>"
"Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch<br/>"
"if you did not download the mods to a default location."),
m_blocked_mods);
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."),
m_blocked_mods);
if (message_dialog->exec() == QDialog::Accepted) {
qDebug() << "Post dialog blocked mods list: " << m_blocked_mods;
createInstance();
}
else {
} else {
abort();
}
} else {
createInstance();
}