dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes for new changes

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-04-29 12:15:58 +01:00
parent fadbcf2d04
commit 80fb1a8f4e
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
6 changed files with 41 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

32
launcher/ui/pages/instance/DataPackPage.cpp
View file

@ -17,11 +17,13 @@
*/
#include "DataPackPage.h"
#include <ui/dialogs/ResourceUpdateDialog.h>
#include "minecraft/PackProfile.h"
#include "ui_ExternalResourcesPage.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ProgressDialog.h"
#include "ui/dialogs/ResourceDownloadDialog.h"
#include "ui/dialogs/ResourceUpdateDialog.h"
DataPackPage::DataPackPage(BaseInstance* instance, std::shared_ptr<DataPackFolderModel> model, QWidget* parent)
: ExternalResourcesPage(instance, model, parent), m_model(model)
@ -65,9 +67,23 @@ void DataPackPage::downloadDataPacks()
if (m_instance->typeName() != "Minecraft")
return; // this is a null instance or a legacy instance
ResourceDownload::DataPackDownloadDialog mdownload(this, std::static_pointer_cast<DataPackFolderModel>(m_model), m_instance);
if (mdownload.exec()) {
auto tasks = new ConcurrentTask("Download Data Pack", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
auto profile = static_cast<MinecraftInstance*>(m_instance)->getPackProfile();
if (!profile->getModLoaders().has_value()) {
QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
return;
}
m_downloadDialog = new ResourceDownload::DataPackDownloadDialog(this, m_model, m_instance);
connect(this, &QObject::destroyed, m_downloadDialog, &QDialog::close);
connect(m_downloadDialog, &QDialog::finished, this, &DataPackPage::downloadDialogFinished);
m_downloadDialog->open();
}
void DataPackPage::downloadDialogFinished(int result)
{
if (result) {
auto tasks = new ConcurrentTask(tr("Download Data 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();
@ -84,9 +100,13 @@ void DataPackPage::downloadDataPacks()
tasks->deleteLater();
});
for (auto& task : mdownload.getTasks()) {
if (m_downloadDialog) {
for (auto& task : m_downloadDialog->getTasks()) {
tasks->addTask(task);
}
} else {
qWarning() << "ResourceDownloadDialog vanished before we could collect tasks!";
}
ProgressDialog loadDialog(this);
loadDialog.setSkipButton(true, tr("Abort"));
@ -94,6 +114,8 @@ void DataPackPage::downloadDataPacks()
m_model->update();
}
if (m_downloadDialog)
m_downloadDialog->deleteLater();
}
void DataPackPage::updateDataPacks()

8
launcher/ui/pages/instance/DataPackPage.h
View file

@ -18,9 +18,10 @@
#pragma once
#include <QVBoxLayout>
#include "ExternalResourcesPage.h"
#include "minecraft/mod/DataPackFolderModel.h"
#include "ui_ExternalResourcesPage.h"
#include "ui/dialogs/ResourceDownloadDialog.h"
class DataPackPage : public ExternalResourcesPage {
Q_OBJECT
@ -36,13 +37,14 @@ class DataPackPage : public ExternalResourcesPage {
public slots:
void updateFrame(const QModelIndex& current, const QModelIndex& previous) override;
void downloadDataPacks();
void downloadDialogFinished(int result);
void updateDataPacks();
void deleteDataPackMetadata();
void changeDataPackVersion();
private:
std::shared_ptr<DataPackFolderModel> m_model;
QPointer<ResourceDownload::DataPackDownloadDialog> m_downloadDialog;
};
/**
@ -63,7 +65,7 @@ class GlobalDataPackPage : public QWidget, public BasePage {
void openedImpl() override;
void closedImpl() override;
void setParentContainer(BasePageContainer *container) override;
void setParentContainer(BasePageContainer* container) override;
private:
void updateContent();

4
launcher/ui/pages/modplatform/DataPackModel.cpp
View file

@ -21,13 +21,13 @@ ResourceAPI::SearchArgs DataPackResourceModel::createSearchArguments()
return { ModPlatform::ResourceType::DATA_PACK, m_next_search_offset, m_search_term, sort, ModPlatform::ModLoaderType::DataPack };
}
ResourceAPI::VersionSearchArgs DataPackResourceModel::createVersionsArguments(QModelIndex& entry)
ResourceAPI::VersionSearchArgs DataPackResourceModel::createVersionsArguments(const QModelIndex& entry)
{
auto& pack = m_packs[entry.row()];
return { *pack, {}, ModPlatform::ModLoaderType::DataPack };
}
ResourceAPI::ProjectInfoArgs DataPackResourceModel::createInfoArguments(QModelIndex& entry)
ResourceAPI::ProjectInfoArgs DataPackResourceModel::createInfoArguments(const QModelIndex& entry)
{
auto& pack = m_packs[entry.row()];
return { *pack };

4
launcher/ui/pages/modplatform/DataPackModel.h
View file

@ -32,8 +32,8 @@ class DataPackResourceModel : public ResourceModel {
public slots:
ResourceAPI::SearchArgs createSearchArguments() override;
ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override;
ResourceAPI::VersionSearchArgs createVersionsArguments(const QModelIndex&) override;
ResourceAPI::ProjectInfoArgs createInfoArguments(const QModelIndex&) override;
protected:
const BaseInstance& m_base_instance;

6
launcher/ui/pages/modplatform/DataPackPage.cpp
View file

@ -4,7 +4,6 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "DataPackPage.h"
#include "modplatform/ModIndex.h"
#include "ui_ResourcePage.h"
#include "DataPackModel.h"
@ -15,10 +14,7 @@
namespace ResourceDownload {
DataPackResourcePage::DataPackResourcePage(DataPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance)
{
connect(m_ui->packView, &QListView::doubleClicked, this, &DataPackResourcePage::onResourceSelected);
}
DataPackResourcePage::DataPackResourcePage(DataPackDownloadDialog* dialog, BaseInstance& instance) : ResourcePage(dialog, instance) {}
/******** Callbacks to events in the UI (set up in the derived classes) ********/

5
launcher/ui/pages/modplatform/DataPackPage.h
View file

@ -5,8 +5,8 @@
#pragma once
#include "ui/pages/modplatform/ResourcePage.h"
#include "ui/pages/modplatform/DataPackModel.h"
#include "ui/pages/modplatform/ResourcePage.h"
namespace Ui {
class ResourcePage;
@ -26,8 +26,9 @@ class DataPackResourcePage : public ResourcePage {
auto page = new T(dialog, instance);
auto model = static_cast<DataPackResourceModel*>(page->getModel());
connect(model, &ResourceModel::versionListUpdated, page, &ResourcePage::updateVersionList);
connect(model, &ResourceModel::versionListUpdated, page, &ResourcePage::versionListUpdated);
connect(model, &ResourceModel::projectInfoUpdated, page, &ResourcePage::updateUi);
connect(model, &QAbstractListModel::modelReset, page, &ResourcePage::modelReset);
return page;
}