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

NOISSUE separate new mods model from the simple one

Browse Source 
It should list mods in various locations...
This commit is contained in:
Petr Mrázek
2018-07-15 14:04:09 +02:00
parent 128bce6acb
commit 03280cc62e
15 changed files with 582 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/InstancePageProvider.h
View File

@ -40,7 +40,7 @@ public:
auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods");
modsPage->setFilter("%1 (*.zip *.jar *.litemod)");
values.append(modsPage);
auto modsPage2 = new NewModFolderPage(onesix.get(), onesix->loaderModList(), "newmods", "newloadermods", tr("New loader mods"), "New-loader-mods");
auto modsPage2 = new NewModFolderPage(onesix.get(), onesix->modsModel(), "newmods", "newloadermods", tr("New loader mods"), "New-loader-mods");
modsPage2->setFilter("%1 (*.zip *.jar *.litemod)");
values.append(modsPage2);
values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods"));

6
application/pages/instance/ModFolderPage.cpp
View File

@ -25,13 +25,13 @@
#include "dialogs/CustomMessageBox.h"
#include "dialogs/ModEditDialogCommon.h"
#include <GuiUtil.h>
#include "minecraft/ModList.h"
#include "minecraft/SimpleModList.h"
#include "minecraft/Mod.h"
#include "minecraft/VersionFilterData.h"
#include "minecraft/ComponentList.h"
#include <DesktopServices.h>
ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods, QString id,
QString iconName, QString displayName, QString helpPage,
QWidget *parent)
: QWidget(parent), ui(new Ui::ModFolderPage)
@ -76,7 +76,7 @@ void ModFolderPage::on_filterTextChanged(const QString& newContents)
}
CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods,
CoreModFolderPage::CoreModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods,
QString id, QString iconName, QString displayName,
QString helpPage, QWidget *parent)
: ModFolderPage(inst, mods, id, iconName, displayName, helpPage, parent)

8
application/pages/instance/ModFolderPage.h
View File

@ -21,7 +21,7 @@
#include "pages/BasePage.h"
#include <MultiMC.h>
class ModList;
class SimpleModList;
namespace Ui
{
class ModFolderPage;
@ -32,7 +32,7 @@ class ModFolderPage : public QWidget, public BasePage
Q_OBJECT
public:
explicit ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
explicit ModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods, QString id,
QString iconName, QString displayName, QString helpPage = "",
QWidget *parent = 0);
virtual ~ModFolderPage();
@ -71,7 +71,7 @@ protected:
protected:
Ui::ModFolderPage *ui;
std::shared_ptr<ModList> m_mods;
std::shared_ptr<SimpleModList> m_mods;
QSortFilterProxyModel *m_filterModel;
QString m_iconName;
QString m_id;
@ -98,7 +98,7 @@ slots:
class CoreModFolderPage : public ModFolderPage
{
public:
explicit CoreModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
explicit CoreModFolderPage(BaseInstance *inst, std::shared_ptr<SimpleModList> mods, QString id,
QString iconName, QString displayName, QString helpPage = "",
QWidget *parent = 0);
virtual ~CoreModFolderPage()

4
application/pages/instance/NewModFolderPage.cpp
View File

@ -25,13 +25,13 @@
#include "dialogs/CustomMessageBox.h"
#include "dialogs/ModEditDialogCommon.h"
#include <GuiUtil.h>
#include "minecraft/ModList.h"
#include "minecraft/ModsModel.h"
#include "minecraft/Mod.h"
#include "minecraft/VersionFilterData.h"
#include "minecraft/ComponentList.h"
#include <DesktopServices.h>
NewModFolderPage::NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
NewModFolderPage::NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModsModel> mods, QString id,
QString iconName, QString displayName, QString helpPage,
QWidget *parent)
: QWidget(parent), ui(new Ui::NewModFolderPage)

6
application/pages/instance/NewModFolderPage.h
View File

@ -21,7 +21,7 @@
#include "pages/BasePage.h"
#include <MultiMC.h>
class ModList;
class SimpleModList;
namespace Ui
{
class NewModFolderPage;
@ -32,7 +32,7 @@ class NewModFolderPage : public QWidget, public BasePage
Q_OBJECT
public:
explicit NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods, QString id,
explicit NewModFolderPage(BaseInstance *inst, std::shared_ptr<ModsModel> mods, QString id,
QString iconName, QString displayName, QString helpPage = "",
QWidget *parent = 0);
virtual ~NewModFolderPage();
@ -71,7 +71,7 @@ protected:
protected:
Ui::NewModFolderPage *ui;
std::shared_ptr<ModList> m_mods;
std::shared_ptr<ModsModel> m_mods;
QSortFilterProxyModel *m_filterModel;
QString m_iconName;
QString m_id;