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

NOISSUE put legacy FTB support in a namespace, fix its base URL

Browse Source
This commit is contained in:
Petr Mrázek
2019-11-03 23:48:12 +01:00
parent 0c9340a3d2
commit 47ed2f48d4
16 changed files with 260 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
application/pages/modplatform/FtbListModel.cpp → application/pages/modplatform/legacy_ftb/ListModel.cpp
View File

@ -1,4 +1,4 @@
#include "FtbListModel.h"
#include "ListModel.h"
#include "MultiMC.h"
#include <MMCStrings.h>
@ -12,17 +12,19 @@
#include "net/URLConstants.h"
FtbFilterModel::FtbFilterModel(QObject *parent) : QSortFilterProxyModel(parent)
namespace LegacyFTB {
FilterModel::FilterModel(QObject *parent) : QSortFilterProxyModel(parent)
{
currentSorting = Sorting::ByGameVersion;
sortings.insert(tr("Sort by name"), Sorting::ByName);
sortings.insert(tr("Sort by game version"), Sorting::ByGameVersion);
}
bool FtbFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
bool FilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
FtbModpack leftPack = sourceModel()->data(left, Qt::UserRole).value<FtbModpack>();
FtbModpack rightPack = sourceModel()->data(right, Qt::UserRole).value<FtbModpack>();
Modpack leftPack = sourceModel()->data(left, Qt::UserRole).value<Modpack>();
Modpack rightPack = sourceModel()->data(right, Qt::UserRole).value<Modpack>();
if(currentSorting == Sorting::ByGameVersion) {
Version lv(leftPack.mcVersion);
@ -38,66 +40,66 @@ bool FtbFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right)
return true;
}
bool FtbFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
bool FilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{
return true;
}
const QMap<QString, FtbFilterModel::Sorting> FtbFilterModel::getAvailableSortings()
const QMap<QString, FilterModel::Sorting> FilterModel::getAvailableSortings()
{
return sortings;
}
QString FtbFilterModel::translateCurrentSorting()
QString FilterModel::translateCurrentSorting()
{
return sortings.key(currentSorting);
}
void FtbFilterModel::setSorting(Sorting s)
void FilterModel::setSorting(Sorting s)
{
currentSorting = s;
invalidate();
}
FtbFilterModel::Sorting FtbFilterModel::getCurrentSorting()
FilterModel::Sorting FilterModel::getCurrentSorting()
{
return currentSorting;
}
FtbListModel::FtbListModel(QObject *parent) : QAbstractListModel(parent)
ListModel::ListModel(QObject *parent) : QAbstractListModel(parent)
{
}
FtbListModel::~FtbListModel()
ListModel::~ListModel()
{
}
QString FtbListModel::translatePackType(FtbPackType type) const
QString ListModel::translatePackType(PackType type) const
{
switch(type)
{
case FtbPackType::Public:
case PackType::Public:
return tr("Public Modpack");
case FtbPackType::ThirdParty:
case PackType::ThirdParty:
return tr("Third Party Modpack");
case FtbPackType::Private:
case PackType::Private:
return tr("Private Modpack");
}
qWarning() << "Unknown FTB modpack type:" << int(type);
return QString();
}
int FtbListModel::rowCount(const QModelIndex &parent) const
int ListModel::rowCount(const QModelIndex &parent) const
{
return modpacks.size();
}
int FtbListModel::columnCount(const QModelIndex &parent) const
int ListModel::columnCount(const QModelIndex &parent) const
{
return 1;
}
QVariant FtbListModel::data(const QModelIndex &index, int role) const
QVariant ListModel::data(const QModelIndex &index, int role) const
{
int pos = index.row();
if(pos >= modpacks.size() || pos < 0 || !index.isValid())
@ -105,7 +107,7 @@ QVariant FtbListModel::data(const QModelIndex &index, int role) const
return QString("INVALID INDEX %1").arg(pos);
}
FtbModpack pack = modpacks.at(pos);
Modpack pack = modpacks.at(pos);
if(role == Qt::DisplayRole)
{
return pack.name + "\n" + translatePackType(pack.type);
@ -129,7 +131,7 @@ QVariant FtbListModel::data(const QModelIndex &index, int role) const
return (m_logoMap.value(pack.logo));
}
QIcon icon = MMC->getThemedIcon("screenshot-placeholder");
((FtbListModel *)this)->requestLogo(pack.logo);
((ListModel *)this)->requestLogo(pack.logo);
return icon;
}
else if(role == Qt::TextColorRole)
@ -156,33 +158,33 @@ QVariant FtbListModel::data(const QModelIndex &index, int role) const
return QVariant();
}
void FtbListModel::fill(FtbModpackList modpacks)
void ListModel::fill(ModpackList modpacks)
{
beginResetModel();
this->modpacks = modpacks;
endResetModel();
}
void FtbListModel::addPack(FtbModpack modpack)
void ListModel::addPack(Modpack modpack)
{
beginResetModel();
this->modpacks.append(modpack);
endResetModel();
}
void FtbListModel::clear()
void ListModel::clear()
{
beginResetModel();
modpacks.clear();
endResetModel();
}
FtbModpack FtbListModel::at(int row)
Modpack ListModel::at(int row)
{
return modpacks.at(row);
}
void FtbListModel::remove(int row)
void ListModel::remove(int row)
{
if(row < 0 || row >= modpacks.size())
{
@ -194,20 +196,20 @@ void FtbListModel::remove(int row)
endRemoveRows();
}
void FtbListModel::logoLoaded(QString logo, QIcon out)
void ListModel::logoLoaded(QString logo, QIcon out)
{
m_loadingLogos.removeAll(logo);
m_logoMap.insert(logo, out);
emit dataChanged(createIndex(0, 0), createIndex(1, 0));
}
void FtbListModel::logoFailed(QString logo)
void ListModel::logoFailed(QString logo)
{
m_failedLogos.append(logo);
m_loadingLogos.removeAll(logo);
}
void FtbListModel::requestLogo(QString file)
void ListModel::requestLogo(QString file)
{
if(m_loadingLogos.contains(file) || m_failedLogos.contains(file))
{
@ -216,7 +218,7 @@ void FtbListModel::requestLogo(QString file)
MetaEntryPtr entry = ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
NetJob *job = new NetJob(QString("FTB Icon Download for %1").arg(file));
job->addNetAction(Net::Download::makeCached(QUrl(QString(URLConstants::FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
job->addNetAction(Net::Download::makeCached(QUrl(QString(URLConstants::LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
auto fullPath = entry->getFullPath();
QObject::connect(job, &NetJob::finished, this, [this, file, fullPath]
@ -238,7 +240,7 @@ void FtbListModel::requestLogo(QString file)
m_loadingLogos.append(file);
}
void FtbListModel::getLogo(const QString &logo, LogoCallback callback)
void ListModel::getLogo(const QString &logo, LogoCallback callback)
{
if(m_logoMap.contains(logo))
{
@ -250,7 +252,9 @@ void FtbListModel::getLogo(const QString &logo, LogoCallback callback)
}
}
Qt::ItemFlags FtbListModel::flags(const QModelIndex &index) const
Qt::ItemFlags ListModel::flags(const QModelIndex &index) const
{
return QAbstractListModel::flags(index);
}
}

30
application/pages/modplatform/FtbListModel.h → application/pages/modplatform/legacy_ftb/ListModel.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <modplatform/ftb/PackHelpers.h>
#include <modplatform/legacy_ftb/PackHelpers.h>
#include <RWStorage.h>
#include <QAbstractListModel>
@ -11,14 +11,16 @@
#include <functional>
typedef QMap<QString, QIcon> FtbLogoMap;
namespace LegacyFTB {
typedef QMap<QString, QIcon> FTBLogoMap;
typedef std::function<void(QString)> LogoCallback;
class FtbFilterModel : public QSortFilterProxyModel
class FilterModel : public QSortFilterProxyModel
{
Q_OBJECT
public:
FtbFilterModel(QObject* parent = Q_NULLPTR);
FilterModel(QObject* parent = Q_NULLPTR);
enum Sorting {
ByName,
ByGameVersion
@ -38,18 +40,18 @@ private:
};
class FtbListModel : public QAbstractListModel
class ListModel : public QAbstractListModel
{
Q_OBJECT
private:
FtbModpackList modpacks;
ModpackList modpacks;
QStringList m_failedLogos;
QStringList m_loadingLogos;
FtbLogoMap m_logoMap;
FTBLogoMap m_logoMap;
QMap<QString, LogoCallback> waitingCallbacks;
void requestLogo(QString file);
QString translatePackType(FtbPackType type) const;
QString translatePackType(PackType type) const;
private slots:
@ -57,18 +59,20 @@ private slots:
void logoLoaded(QString logo, QIcon out);
public:
FtbListModel(QObject *parent);
~FtbListModel();
ListModel(QObject *parent);
~ListModel();
int rowCount(const QModelIndex &parent) const override;
int columnCount(const QModelIndex &parent) const override;
QVariant data(const QModelIndex &index, int role) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;
void fill(FtbModpackList modpacks);
void addPack(FtbModpack modpack);
void fill(ModpackList modpacks);
void addPack(Modpack modpack);
void clear();
void remove(int row);
FtbModpack at(int row);
Modpack at(int row);
void getLogo(const QString &logo, LogoCallback callback);
};
}

114
application/pages/modplatform/FTBPage.cpp → application/pages/modplatform/legacy_ftb/Page.cpp
View File

@ -1,27 +1,29 @@
#include "FTBPage.h"
#include "ui_FTBPage.h"
#include "Page.h"
#include "ui_Page.h"
#include <QInputDialog>
#include "MultiMC.h"
#include "dialogs/CustomMessageBox.h"
#include "dialogs/NewInstanceDialog.h"
#include "modplatform/ftb/FtbPackFetchTask.h"
#include "modplatform/ftb/FtbPackInstallTask.h"
#include "modplatform/ftb/FtbPrivatePackManager.h"
#include "FtbListModel.h"
#include "modplatform/legacy_ftb/PackFetchTask.h"
#include "modplatform/legacy_ftb/PackInstallTask.h"
#include "modplatform/legacy_ftb/PrivatePackManager.h"
#include "ListModel.h"
FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
: QWidget(parent), dialog(dialog), ui(new Ui::FTBPage)
namespace LegacyFTB {
Page::Page(NewInstanceDialog* dialog, QWidget *parent)
: QWidget(parent), dialog(dialog), ui(new Ui::Page)
{
ftbFetchTask.reset(new FtbPackFetchTask());
ftbPrivatePacks.reset(new FtbPrivatePackManager());
ftbFetchTask.reset(new PackFetchTask());
ftbPrivatePacks.reset(new PrivatePackManager());
ui->setupUi(this);
{
publicFilterModel = new FtbFilterModel(this);
publicListModel = new FtbListModel(this);
publicFilterModel = new FilterModel(this);
publicListModel = new ListModel(this);
publicFilterModel->setSourceModel(publicListModel);
ui->publicPackList->setModel(publicFilterModel);
@ -39,8 +41,8 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
}
{
thirdPartyFilterModel = new FtbFilterModel(this);
thirdPartyModel = new FtbListModel(this);
thirdPartyFilterModel = new FilterModel(this);
thirdPartyModel = new ListModel(this);
thirdPartyFilterModel->setSourceModel(thirdPartyModel);
ui->thirdPartyPackList->setModel(thirdPartyFilterModel);
@ -53,8 +55,8 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
}
{
privateFilterModel = new FtbFilterModel(this);
privateListModel = new FtbListModel(this);
privateFilterModel = new FilterModel(this);
privateListModel = new ListModel(this);
privateFilterModel->setSourceModel(privateListModel);
ui->privatePackList->setModel(privateFilterModel);
@ -69,17 +71,17 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &FTBPage::onSortingSelectionChanged);
connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FTBPage::onVersionSelectionItemChanged);
connect(ui->sortByBox, &QComboBox::currentTextChanged, this, &Page::onSortingSelectionChanged);
connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &Page::onVersionSelectionItemChanged);
connect(ui->publicPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onPublicPackSelectionChanged);
connect(ui->thirdPartyPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onThirdPartyPackSelectionChanged);
connect(ui->privatePackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &FTBPage::onPrivatePackSelectionChanged);
connect(ui->publicPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &Page::onPublicPackSelectionChanged);
connect(ui->thirdPartyPackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &Page::onThirdPartyPackSelectionChanged);
connect(ui->privatePackList->selectionModel(), &QItemSelectionModel::currentChanged, this, &Page::onPrivatePackSelectionChanged);
connect(ui->addPackBtn, &QPushButton::pressed, this, &FTBPage::onAddPackClicked);
connect(ui->removePackBtn, &QPushButton::pressed, this, &FTBPage::onRemovePackClicked);
connect(ui->addPackBtn, &QPushButton::pressed, this, &Page::onAddPackClicked);
connect(ui->removePackBtn, &QPushButton::pressed, this, &Page::onRemovePackClicked);
connect(ui->tabWidget, &QTabWidget::currentChanged, this, &FTBPage::onTabChanged);
connect(ui->tabWidget, &QTabWidget::currentChanged, this, &Page::onTabChanged);
// ui->modpackInfo->setOpenExternalLinks(true);
@ -90,25 +92,25 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
onTabChanged(ui->tabWidget->currentIndex());
}
FTBPage::~FTBPage()
Page::~Page()
{
delete ui;
}
bool FTBPage::shouldDisplay() const
bool Page::shouldDisplay() const
{
return true;
}
void FTBPage::openedImpl()
void Page::openedImpl()
{
if(!initialized)
{
connect(ftbFetchTask.get(), &FtbPackFetchTask::finished, this, &FTBPage::ftbPackDataDownloadSuccessfully);
connect(ftbFetchTask.get(), &FtbPackFetchTask::failed, this, &FTBPage::ftbPackDataDownloadFailed);
connect(ftbFetchTask.get(), &PackFetchTask::finished, this, &Page::ftbPackDataDownloadSuccessfully);
connect(ftbFetchTask.get(), &PackFetchTask::failed, this, &Page::ftbPackDataDownloadFailed);
connect(ftbFetchTask.get(), &FtbPackFetchTask::privateFileDownloadFinished, this, &FTBPage::ftbPrivatePackDataDownloadSuccessfully);
connect(ftbFetchTask.get(), &FtbPackFetchTask::privateFileDownloadFailed, this, &FTBPage::ftbPrivatePackDataDownloadFailed);
connect(ftbFetchTask.get(), &PackFetchTask::privateFileDownloadFinished, this, &Page::ftbPrivatePackDataDownloadSuccessfully);
connect(ftbFetchTask.get(), &PackFetchTask::privateFileDownloadFailed, this, &Page::ftbPrivatePackDataDownloadFailed);
ftbFetchTask->fetch();
ftbPrivatePacks->load();
@ -118,13 +120,13 @@ void FTBPage::openedImpl()
suggestCurrent();
}
void FTBPage::suggestCurrent()
void Page::suggestCurrent()
{
if(isOpened)
{
if(!selected.broken)
{
dialog->setSuggestedPack(selected.name, new FtbPackInstallTask(selected, selectedVersion));
dialog->setSuggestedPack(selected.name, new PackInstallTask(selected, selectedVersion));
QString editedLogoName;
if(selected.logo.toLower().startsWith("ftb"))
{
@ -137,21 +139,21 @@ void FTBPage::suggestCurrent()
editedLogoName = editedLogoName.left(editedLogoName.lastIndexOf(".png"));
if(selected.type == FtbPackType::Public)
if(selected.type == PackType::Public)
{
publicListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
{
dialog->setSuggestedIconFromFile(logo, editedLogoName);
});
}
else if (selected.type == FtbPackType::ThirdParty)
else if (selected.type == PackType::ThirdParty)
{
thirdPartyModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
{
dialog->setSuggestedIconFromFile(logo, editedLogoName);
});
}
else if (selected.type == FtbPackType::Private)
else if (selected.type == PackType::Private)
{
privateListModel->getLogo(selected.logo, [this, editedLogoName](QString logo)
{
@ -166,23 +168,23 @@ void FTBPage::suggestCurrent()
}
}
void FTBPage::ftbPackDataDownloadSuccessfully(FtbModpackList publicPacks, FtbModpackList thirdPartyPacks)
void Page::ftbPackDataDownloadSuccessfully(ModpackList publicPacks, ModpackList thirdPartyPacks)
{
publicListModel->fill(publicPacks);
thirdPartyModel->fill(thirdPartyPacks);
}
void FTBPage::ftbPackDataDownloadFailed(QString reason)
void Page::ftbPackDataDownloadFailed(QString reason)
{
//TODO: Display the error
}
void FTBPage::ftbPrivatePackDataDownloadSuccessfully(FtbModpack pack)
void Page::ftbPrivatePackDataDownloadSuccessfully(Modpack pack)
{
privateListModel->addPack(pack);
}
void FTBPage::ftbPrivatePackDataDownloadFailed(QString reason, QString packCode)
void Page::ftbPrivatePackDataDownloadFailed(QString reason, QString packCode)
{
auto reply = QMessageBox::question(
this,
@ -195,40 +197,40 @@ void FTBPage::ftbPrivatePackDataDownloadFailed(QString reason, QString packCode)
}
}
void FTBPage::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
void Page::onPublicPackSelectionChanged(QModelIndex now, QModelIndex prev)
{
if(!now.isValid())
{
onPackSelectionChanged();
return;
}
FtbModpack selectedPack = publicFilterModel->data(now, Qt::UserRole).value<FtbModpack>();
Modpack selectedPack = publicFilterModel->data(now, Qt::UserRole).value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
void FTBPage::onThirdPartyPackSelectionChanged(QModelIndex now, QModelIndex prev)
void Page::onThirdPartyPackSelectionChanged(QModelIndex now, QModelIndex prev)
{
if(!now.isValid())
{
onPackSelectionChanged();
return;
}
FtbModpack selectedPack = thirdPartyFilterModel->data(now, Qt::UserRole).value<FtbModpack>();
Modpack selectedPack = thirdPartyFilterModel->data(now, Qt::UserRole).value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
void FTBPage::onPrivatePackSelectionChanged(QModelIndex now, QModelIndex prev)
void Page::onPrivatePackSelectionChanged(QModelIndex now, QModelIndex prev)
{
if(!now.isValid())
{
onPackSelectionChanged();
return;
}
FtbModpack selectedPack = privateFilterModel->data(now, Qt::UserRole).value<FtbModpack>();
Modpack selectedPack = privateFilterModel->data(now, Qt::UserRole).value<Modpack>();
onPackSelectionChanged(&selectedPack);
}
void FTBPage::onPackSelectionChanged(FtbModpack* pack)
void Page::onPackSelectionChanged(Modpack* pack)
{
ui->versionSelectionBox->clear();
if(pack)
@ -266,7 +268,7 @@ void FTBPage::onPackSelectionChanged(FtbModpack* pack)
suggestCurrent();
}
void FTBPage::onVersionSelectionItemChanged(QString data)
void Page::onVersionSelectionItemChanged(QString data)
{
if(data.isNull() || data.isEmpty())
{
@ -278,15 +280,15 @@ void FTBPage::onVersionSelectionItemChanged(QString data)
suggestCurrent();
}
void FTBPage::onSortingSelectionChanged(QString data)
void Page::onSortingSelectionChanged(QString data)
{
FtbFilterModel::Sorting toSet = publicFilterModel->getAvailableSortings().value(data);
FilterModel::Sorting toSet = publicFilterModel->getAvailableSortings().value(data);
publicFilterModel->setSorting(toSet);
thirdPartyFilterModel->setSorting(toSet);
privateFilterModel->setSorting(toSet);
}
void FTBPage::onTabChanged(int tab)
void Page::onTabChanged(int tab)
{
if(tab == 1)
{
@ -311,7 +313,7 @@ void FTBPage::onTabChanged(int tab)
QModelIndex idx = currentList->currentIndex();
if(idx.isValid())
{
auto pack = currentModel->data(idx, Qt::UserRole).value<FtbModpack>();
auto pack = currentModel->data(idx, Qt::UserRole).value<Modpack>();
onPackSelectionChanged(&pack);
}
else
@ -320,7 +322,7 @@ void FTBPage::onTabChanged(int tab)
}
}
void FTBPage::onAddPackClicked()
void Page::onAddPackClicked()
{
bool ok;
QString text = QInputDialog::getText(
@ -338,7 +340,7 @@ void FTBPage::onAddPackClicked()
}
}
void FTBPage::onRemovePackClicked()
void Page::onRemovePackClicked()
{
auto index = ui->privatePackList->currentIndex();
if(!index.isValid())
@ -346,7 +348,7 @@ void FTBPage::onRemovePackClicked()
return;
}
auto row = index.row();
FtbModpack pack = privateListModel->at(row);
Modpack pack = privateListModel->at(row);
auto answer = QMessageBox::question(
this,
tr("Remove pack"),
@ -362,3 +364,5 @@ void FTBPage::onRemovePackClicked()
privateListModel->remove(row);
onPackSelectionChanged();
}
}

59
application/pages/modplatform/FTBPage.h → application/pages/modplatform/legacy_ftb/Page.h
View File

@ -22,29 +22,32 @@
#include "pages/BasePage.h"
#include <MultiMC.h>
#include "tasks/Task.h"
#include "modplatform/ftb/PackHelpers.h"
#include "modplatform/ftb/FtbPackFetchTask.h"
#include "modplatform/legacy_ftb/PackHelpers.h"
#include "modplatform/legacy_ftb/PackFetchTask.h"
#include "QObjectPtr.h"
class NewInstanceDialog;
namespace LegacyFTB {
namespace Ui
{
class FTBPage;
class Page;
}
class FtbListModel;
class FtbFilterModel;
class NewInstanceDialog;
class FtbPrivatePackListModel;
class FtbPrivatePackFilterModel;
class FtbPrivatePackManager;
class ListModel;
class FilterModel;
class PrivatePackListModel;
class PrivatePackFilterModel;
class PrivatePackManager;
class FTBPage : public QWidget, public BasePage
class Page : public QWidget, public BasePage
{
Q_OBJECT
public:
explicit FTBPage(NewInstanceDialog * dialog, QWidget *parent = 0);
virtual ~FTBPage();
explicit Page(NewInstanceDialog * dialog, QWidget *parent = 0);
virtual ~Page();
QString displayName() const override
{
return tr("FTB Legacy");
@ -55,7 +58,7 @@ public:
}
QString id() const override
{
return "ftb";
return "legacy_ftb";
}
QString helpPage() const override
{
@ -66,13 +69,13 @@ public:
private:
void suggestCurrent();
void onPackSelectionChanged(FtbModpack *pack = nullptr);
void onPackSelectionChanged(Modpack *pack = nullptr);
private slots:
void ftbPackDataDownloadSuccessfully(FtbModpackList publicPacks, FtbModpackList thirdPartyPacks);
void ftbPackDataDownloadSuccessfully(ModpackList publicPacks, ModpackList thirdPartyPacks);
void ftbPackDataDownloadFailed(QString reason);
void ftbPrivatePackDataDownloadSuccessfully(FtbModpack pack);
void ftbPrivatePackDataDownloadSuccessfully(Modpack pack);
void ftbPrivatePackDataDownloadFailed(QString reason, QString packCode);
void onSortingSelectionChanged(QString data);
@ -88,27 +91,29 @@ private slots:
void onRemovePackClicked();
private:
FtbFilterModel* currentModel = nullptr;
FilterModel* currentModel = nullptr;
QTreeView* currentList = nullptr;
QTextBrowser* currentModpackInfo = nullptr;
bool initialized = false;
FtbModpack selected;
Modpack selected;
QString selectedVersion;
FtbListModel* publicListModel = nullptr;
FtbFilterModel* publicFilterModel = nullptr;
ListModel* publicListModel = nullptr;
FilterModel* publicFilterModel = nullptr;
FtbListModel *thirdPartyModel = nullptr;
FtbFilterModel *thirdPartyFilterModel = nullptr;
ListModel *thirdPartyModel = nullptr;
FilterModel *thirdPartyFilterModel = nullptr;
FtbListModel *privateListModel = nullptr;
FtbFilterModel *privateFilterModel = nullptr;
ListModel *privateListModel = nullptr;
FilterModel *privateFilterModel = nullptr;
unique_qobject_ptr<FtbPackFetchTask> ftbFetchTask;
std::unique_ptr<FtbPrivatePackManager> ftbPrivatePacks;
unique_qobject_ptr<PackFetchTask> ftbFetchTask;
std::unique_ptr<PrivatePackManager> ftbPrivatePacks;
NewInstanceDialog* dialog = nullptr;
Ui::FTBPage *ui = nullptr;
Ui::Page *ui = nullptr;
};
}

4
application/pages/modplatform/FTBPage.ui → application/pages/modplatform/legacy_ftb/Page.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FTBPage</class>
<widget class="QWidget" name="FTBPage">
<class>LegacyFTB::Page</class>
<widget class="QWidget" name="LegacyFTB::Page">
<property name="geometry">
<rect>
<x>0</x>