Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 22:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: cover both usages of the download dialog

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2025-04-19 06:48:04 -07:00
parent d0ccd110a1
commit 07a6606c9c
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
4 changed files with 37 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
launcher/ui/pages/instance/ModFolderPage.cpp
View File

@ -146,11 +146,11 @@ void ModFolderPage::downloadMods()
QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!")); QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
return; return;
} }
m_downloadDialog = new ResourceDownload::ModDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ModDownloadDialog(this, m_model, m_instance);
m_downloadDialog->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &ModFolderPage::downloadDialogFinished); connect(m_downloadDialog, &QDialog::finished, this, &ModFolderPage::downloadDialogFinished);
m_downloadDialog->open(); m_downloadDialog->open();
} }
@ -188,6 +188,8 @@ void ModFolderPage::downloadDialogFinished(int result)
m_model->update(); m_model->update();
} }
if (m_downloadDialog)
m_downloadDialog->deleteLater();
} }
void ModFolderPage::updateMods(bool includeDeps) void ModFolderPage::updateMods(bool includeDeps)
@ -313,38 +315,12 @@ void ModFolderPage::changeModVersion()
if (mods_list.length() != 1 || mods_list[0]->metadata() == nullptr) if (mods_list.length() != 1 || mods_list[0]->metadata() == nullptr)
return; return;
auto mdownload = new ResourceDownload::ModDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ModDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(this, &QObject::destroyed, mdownload, &QDialog::close); connect(m_downloadDialog, &QDialog::finished, this, &ModFolderPage::downloadDialogFinished);
mdownload->setResourceMetadata((*mods_list.begin())->metadata());
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Mods", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
tasks->deleteLater();
});
connect(tasks, &Task::aborted, [this, tasks]() {
CustomMessageBox::selectable(this, tr("Aborted"), tr("Download stopped by user."), QMessageBox::Information)->show();
tasks->deleteLater();
});
connect(tasks, &Task::succeeded, [this, tasks]() {
QStringList warnings = tasks->warnings();
if (warnings.count())
CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
tasks->deleteLater(); m_downloadDialog->setResourceMetadata((*mods_list.begin())->metadata());
}); m_downloadDialog->open();
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}
ProgressDialog loadDialog(this);
loadDialog.setSkipButton(true, tr("Abort"));
loadDialog.execWithTask(tasks);
m_model->update();
}
} }
void ModFolderPage::exportModMetadata() void ModFolderPage::exportModMetadata()

40
launcher/ui/pages/instance/ResourcePackPage.cpp
View File

@ -85,9 +85,9 @@ void ResourcePackPage::downloadResourcePacks()
return; // this is a null instance or a legacy instance return; // this is a null instance or a legacy instance
m_downloadDialog = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance);
m_downloadDialog->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &ResourcePackPage::downloadDialogFinished); connect(m_downloadDialog, &QDialog::finished, this, &ResourcePackPage::downloadDialogFinished);
m_downloadDialog->open(); m_downloadDialog->open();
} }
@ -125,6 +125,8 @@ void ResourcePackPage::downloadDialogFinished(int result)
m_model->update(); m_model->update();
} }
if (m_downloadDialog)
m_downloadDialog->deleteLater();
} }
void ResourcePackPage::updateResourcePacks() void ResourcePackPage::updateResourcePacks()
@ -247,36 +249,10 @@ void ResourcePackPage::changeResourcePackVersion()
if (resource.metadata() == nullptr) if (resource.metadata() == nullptr)
return; return;
auto mdownload = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ResourcePackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(this, &QObject::destroyed, mdownload, &QDialog::close); connect(m_downloadDialog, &QDialog::finished, this, &ResourcePackPage::downloadDialogFinished);
mdownload->setResourceMetadata(resource.metadata());
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Resource Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
tasks->deleteLater();
});
connect(tasks, &Task::aborted, [this, tasks]() {
CustomMessageBox::selectable(this, tr("Aborted"), tr("Download stopped by user."), QMessageBox::Information)->show();
tasks->deleteLater();
});
connect(tasks, &Task::succeeded, [this, tasks]() {
QStringList warnings = tasks->warnings();
if (warnings.count())
CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
tasks->deleteLater(); m_downloadDialog->setResourceMetadata(resource.metadata());
}); m_downloadDialog->open();
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}
ProgressDialog loadDialog(this);
loadDialog.setSkipButton(true, tr("Abort"));
loadDialog.execWithTask(tasks);
m_model->update();
}
} }

43
launcher/ui/pages/instance/ShaderPackPage.cpp
View File

@ -82,13 +82,14 @@ void ShaderPackPage::downloadShaderPack()
return; // this is a null instance or a legacy instance return; // this is a null instance or a legacy instance
m_downloadDialog = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance);
m_downloadDialog->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &ShaderPackPage::downloadDialogFinished); connect(m_downloadDialog, &QDialog::finished, this, &ShaderPackPage::downloadDialogFinished);
m_downloadDialog->open(); m_downloadDialog->open();
} }
void ShaderPackPage::downloadDialogFinished(int result) { void ShaderPackPage::downloadDialogFinished(int result)
{
if (result) { if (result) {
auto tasks = new ConcurrentTask("Download Shader Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt()); auto tasks = new ConcurrentTask("Download Shader Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) { connect(tasks, &Task::failed, [this, tasks](QString reason) {
@ -121,6 +122,8 @@ void ShaderPackPage::downloadDialogFinished(int result) {
m_model->update(); m_model->update();
} }
if (m_downloadDialog)
m_downloadDialog->deleteLater();
} }
void ShaderPackPage::updateShaderPacks() void ShaderPackPage::updateShaderPacks()
@ -243,36 +246,10 @@ void ShaderPackPage::changeShaderPackVersion()
if (resource.metadata() == nullptr) if (resource.metadata() == nullptr)
return; return;
auto mdownload = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::ShaderPackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(this, &QObject::destroyed, mdownload, &QDialog::close); connect(m_downloadDialog, &QDialog::finished, this, &ShaderPackPage::downloadDialogFinished);
mdownload->setResourceMetadata(resource.metadata());
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Shader Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
tasks->deleteLater();
});
connect(tasks, &Task::aborted, [this, tasks]() {
CustomMessageBox::selectable(this, tr("Aborted"), tr("Download stopped by user."), QMessageBox::Information)->show();
tasks->deleteLater();
});
connect(tasks, &Task::succeeded, [this, tasks]() {
QStringList warnings = tasks->warnings();
if (warnings.count())
CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
tasks->deleteLater(); m_downloadDialog->setResourceMetadata(resource.metadata());
}); m_downloadDialog->open();
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}
ProgressDialog loadDialog(this);
loadDialog.setSkipButton(true, tr("Abort"));
loadDialog.execWithTask(tasks);
m_model->update();
}
} }

43
launcher/ui/pages/instance/TexturePackPage.cpp
View File

@ -90,9 +90,10 @@ void TexturePackPage::downloadTexturePacks()
if (m_instance->typeName() != "Minecraft") if (m_instance->typeName() != "Minecraft")
return; // this is a null instance or a legacy instance return; // this is a null instance or a legacy instance
auto m_downloadDialog = new ResourceDownload::TexturePackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::TexturePackDownloadDialog(this, m_model, m_instance);
m_downloadDialog->setAttribute(Qt::WA_DeleteOnClose);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &TexturePackPage::downloadDialogFinished);
m_downloadDialog->open();
} }
void TexturePackPage::downloadDialogFinished(int result) void TexturePackPage::downloadDialogFinished(int result)
@ -129,6 +130,8 @@ void TexturePackPage::downloadDialogFinished(int result)
m_model->update(); m_model->update();
} }
if (m_downloadDialog)
m_downloadDialog->deleteLater();
} }
void TexturePackPage::updateTexturePacks() void TexturePackPage::updateTexturePacks()
@ -251,36 +254,10 @@ void TexturePackPage::changeTexturePackVersion()
if (resource.metadata() == nullptr) if (resource.metadata() == nullptr)
return; return;
auto mdownload = new ResourceDownload::TexturePackDownloadDialog(this, m_model, m_instance); m_downloadDialog = new ResourceDownload::TexturePackDownloadDialog(this, m_model, m_instance);
mdownload->setAttribute(Qt::WA_DeleteOnClose); connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(this, &QObject::destroyed, mdownload, &QDialog::close); connect(m_downloadDialog, &QDialog::finished, this, &TexturePackPage::downloadDialogFinished);
mdownload->setResourceMetadata(resource.metadata());
if (mdownload->exec()) {
auto tasks = new ConcurrentTask("Download Texture Packs", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
connect(tasks, &Task::failed, [this, tasks](QString reason) {
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
tasks->deleteLater();
});
connect(tasks, &Task::aborted, [this, tasks]() {
CustomMessageBox::selectable(this, tr("Aborted"), tr("Download stopped by user."), QMessageBox::Information)->show();
tasks->deleteLater();
});
connect(tasks, &Task::succeeded, [this, tasks]() {
QStringList warnings = tasks->warnings();
if (warnings.count())
CustomMessageBox::selectable(this, tr("Warnings"), warnings.join('\n'), QMessageBox::Warning)->show();
tasks->deleteLater(); m_downloadDialog->setResourceMetadata(resource.metadata());
}); m_downloadDialog->open();
for (auto& task : mdownload->getTasks()) {
tasks->addTask(task);
}
ProgressDialog loadDialog(this);
loadDialog.setSkipButton(true, tr("Abort"));
loadDialog.execWithTask(tasks);
m_model->update();
}
} }