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

NOISSUE Some happy little refactors

Browse Source
This commit is contained in:
Petr Mrázek
2021-11-20 16:22:22 +01:00
parent eafeb64dec
commit 0c861db7a2
142 changed files with 812 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/pages/modplatform/legacy_ftb/ListModel.cpp
View File

@ -1,5 +1,5 @@
#include "ListModel.h"
#include "Launcher.h"
#include "Application.h"
#include <MMCStrings.h>
#include <Version.h>
@ -130,7 +130,7 @@ QVariant ListModel::data(const QModelIndex &index, int role) const
{
return (m_logoMap.value(pack.logo));
}
QIcon icon = LAUNCHER->getThemedIcon("screenshot-placeholder");
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
((ListModel *)this)->requestLogo(pack.logo);
return icon;
}
@ -216,7 +216,7 @@ void ListModel::requestLogo(QString file)
return;
}
MetaEntryPtr entry = ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(file.section(".", 0, 0)));
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(BuildConfig.LEGACY_FTB_CDN_BASE_URL + "static/%1").arg(file)), entry));
@ -244,7 +244,7 @@ void ListModel::getLogo(const QString &logo, LogoCallback callback)
{
if(m_logoMap.contains(logo))
{
callback(ENV.metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
callback(ENV->metacache()->resolveEntry("FTBPacks", QString("logos/%1").arg(logo.section(".", 0, 0)))->getFullPath());
}
else
{

2
launcher/pages/modplatform/legacy_ftb/Page.cpp
View File

@ -3,7 +3,7 @@
#include <QInputDialog>
#include "Launcher.h"
#include "Application.h"
#include "dialogs/CustomMessageBox.h"
#include "dialogs/NewInstanceDialog.h"
#include "modplatform/legacy_ftb/PackFetchTask.h"

4
launcher/pages/modplatform/legacy_ftb/Page.h
View File

@ -20,7 +20,7 @@
#include <QTextBrowser>
#include "pages/BasePage.h"
#include <Launcher.h>
#include <Application.h>
#include "tasks/Task.h"
#include "modplatform/legacy_ftb/PackHelpers.h"
#include "modplatform/legacy_ftb/PackFetchTask.h"
@ -54,7 +54,7 @@ public:
}
QIcon icon() const override
{
return LAUNCHER->getThemedIcon("ftb_logo");
return APPLICATION->getThemedIcon("ftb_logo");
}
QString id() const override
{