diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-02 19:32:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-02 19:32:25 -0700 |
| commit | ca061080c13042642fb3bd49a29a863756f45866 (patch) | |
| tree | a468b90c31ecb0cb5f2ca7885c2ecc7d4ab09570 /launcher/ui/pages/modplatform/ShaderPackPage.cpp | |
| parent | 2680dba0aa74abefea58903dadad6578381101cb (diff) | |
| parent | 3ad559ab22b6b20264eebb826efc4227374a64cc (diff) | |
| download | PrismLauncher-ca061080c13042642fb3bd49a29a863756f45866.tar.gz PrismLauncher-ca061080c13042642fb3bd49a29a863756f45866.tar.bz2 PrismLauncher-ca061080c13042642fb3bd49a29a863756f45866.zip | |
Merge pull request #2 from Trial97/feat/acknowledge_release_type
Feat/acknowledge release type
Diffstat (limited to 'launcher/ui/pages/modplatform/ShaderPackPage.cpp')
| -rw-r--r-- | launcher/ui/pages/modplatform/ShaderPackPage.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/launcher/ui/pages/modplatform/ShaderPackPage.cpp b/launcher/ui/pages/modplatform/ShaderPackPage.cpp index 251c07e7..fbf94e84 100644 --- a/launcher/ui/pages/modplatform/ShaderPackPage.cpp +++ b/launcher/ui/pages/modplatform/ShaderPackPage.cpp @@ -13,8 +13,7 @@ namespace ResourceDownload { -ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) - : ResourcePage(dialog, instance) +ShaderPackResourcePage::ShaderPackResourcePage(ShaderPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance) { connect(m_ui->searchButton, &QPushButton::clicked, this, &ShaderPackResourcePage::triggerSearch); connect(m_ui->packView, &QListView::doubleClicked, this, &ShaderPackResourcePage::onResourceSelected); @@ -38,17 +37,20 @@ QMap<QString, QString> ShaderPackResourcePage::urlHandlers() const { QMap<QString, QString> map; map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/shaders\\/([^\\/]+)\\/?"), "modrinth"); - map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/customization\\/([^\\/]+)\\/?"), "curseforge"); + map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/customization\\/([^\\/]+)\\/?"), + "curseforge"); map.insert(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"), "curseforge"); return map; } -void ShaderPackResourcePage::addResourceToDialog(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& version) +void ShaderPackResourcePage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, + ModPlatform::IndexedVersion& version, + const std::shared_ptr<ResourceFolderModel> base_model) { + QString custom_target_folder; if (version.loaders.contains(QStringLiteral("canvas"))) - version.custom_target_folder = QStringLiteral("resourcepacks"); - - m_parent_dialog->addResource(pack, version); + custom_target_folder = QStringLiteral("resourcepacks"); + m_model->addPack(pack, version, base_model, false, custom_target_folder); } } // namespace ResourceDownload |