Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra argument from ModFilterWidget::create

Browse Source 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
This commit is contained in:
Yihe Li
2025-04-02 16:28:49 +08:00
parent b0c85fd539
commit 3ae68114f6
6 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/pages/modplatform/flame/FlamePage.cpp
View File

@ -341,7 +341,7 @@ void FlamePage::setSearchTerm(QString term)
void FlamePage::createFilterWidget() void FlamePage::createFilterWidget()
{ {
auto widget = ModFilterWidget::create(nullptr, false, ModPlatform::ResourceProvider::FLAME, this); auto widget = ModFilterWidget::create(nullptr, false, this);
m_filterWidget.swap(widget); m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get()); auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
// because we replaced the widget we also need to delete it // because we replaced the widget we also need to delete it

2
launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
View File

@ -209,7 +209,7 @@ auto FlameShaderPackPage::shouldDisplay() const -> bool
unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget() unique_qobject_ptr<ModFilterWidget> FlameModPage::createFilterWidget()
{ {
return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), false, ModPlatform::ResourceProvider::FLAME, this); return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), false, this);
} }
void FlameModPage::prepareProviderCategories() void FlameModPage::prepareProviderCategories()

2
launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
View File

@ -391,7 +391,7 @@ QString ModrinthPage::getSerachTerm() const
void ModrinthPage::createFilterWidget() void ModrinthPage::createFilterWidget()
{ {
auto widget = ModFilterWidget::create(nullptr, true, ModPlatform::ResourceProvider::MODRINTH, this); auto widget = ModFilterWidget::create(nullptr, true, this);
m_filterWidget.swap(widget); m_filterWidget.swap(widget);
auto old = ui->splitter->replaceWidget(0, m_filterWidget.get()); auto old = ui->splitter->replaceWidget(0, m_filterWidget.get());
// because we replaced the widget we also need to delete it // because we replaced the widget we also need to delete it

2
launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
View File

@ -144,7 +144,7 @@ auto ModrinthShaderPackPage::shouldDisplay() const -> bool
unique_qobject_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget() unique_qobject_ptr<ModFilterWidget> ModrinthModPage::createFilterWidget()
{ {
return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), true, ModPlatform::ResourceProvider::MODRINTH, this); return ModFilterWidget::create(&static_cast<MinecraftInstance&>(m_baseInstance), true, this);
} }
void ModrinthModPage::prepareProviderCategories() void ModrinthModPage::prepareProviderCategories()

15
launcher/ui/widgets/ModFilterWidget.cpp
View File

@ -49,12 +49,9 @@
#include "Application.h" #include "Application.h"
#include "minecraft/PackProfile.h" #include "minecraft/PackProfile.h"
unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, unique_qobject_ptr<ModFilterWidget> ModFilterWidget::create(MinecraftInstance* instance, bool extended, QWidget* parent)
bool extended,
ModPlatform::ResourceProvider provider,
QWidget* parent)
{ {
return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, provider, parent)); return unique_qobject_ptr<ModFilterWidget>(new ModFilterWidget(instance, extended, parent));
} }
class VersionBasicModel : public QIdentityProxyModel { class VersionBasicModel : public QIdentityProxyModel {
@ -110,7 +107,7 @@ class AllVersionProxyModel : public QSortFilterProxyModel {
} }
}; };
ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, ModPlatform::ResourceProvider provider, QWidget* parent) ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, QWidget* parent)
: QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter()) : QTabWidget(parent), ui(new Ui::ModFilterWidget), m_instance(instance), m_filter(new Filter())
{ {
ui->setupUi(this); ui->setupUi(this);
@ -151,10 +148,10 @@ ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended, Mod
connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged); connect(ui->forge, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged); connect(ui->fabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged); connect(ui->quilt, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
if (provider == ModPlatform::ResourceProvider::FLAME) if (extended)
ui->liteLoader->setVisible(false);
else
connect(ui->liteLoader, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged); connect(ui->liteLoader, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
else
ui->liteLoader->setVisible(false);
if (extended) { if (extended) {
connect(ui->clientSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged); connect(ui->clientSide, &QCheckBox::stateChanged, this, &ModFilterWidget::onSideFilterChanged);

7
launcher/ui/widgets/ModFilterWidget.h
View File

@ -83,10 +83,7 @@ class ModFilterWidget : public QTabWidget {
} }
}; };
static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, static unique_qobject_ptr<ModFilterWidget> create(MinecraftInstance* instance, bool extended, QWidget* parent = nullptr);
bool extended,
ModPlatform::ResourceProvider provider,
QWidget* parent = nullptr);
virtual ~ModFilterWidget(); virtual ~ModFilterWidget();
auto getFilter() -> std::shared_ptr<Filter>; auto getFilter() -> std::shared_ptr<Filter>;
@ -99,7 +96,7 @@ class ModFilterWidget : public QTabWidget {
void setCategories(const QList<ModPlatform::Category>&); void setCategories(const QList<ModPlatform::Category>&);
private: private:
ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, ModPlatform::ResourceProvider provider, QWidget* parent = nullptr); ModFilterWidget(MinecraftInstance* instance, bool extendedSupport, QWidget* parent = nullptr);
void loadVersionList(); void loadVersionList();
void prepareBasicFilter(); void prepareBasicFilter();