Replace getThemedIcon with APPLICATION->logo()
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include "BaseVersion.h"
|
||||
#include "tasks/Task.h"
|
||||
#include "ui/pages/BasePage.h"
|
||||
|
||||
@@ -54,7 +54,7 @@ class CustomPage : public QWidget, public BasePage {
|
||||
explicit CustomPage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~CustomPage();
|
||||
virtual QString displayName() const override { return tr("Custom"); }
|
||||
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("minecraft"); }
|
||||
virtual QIcon icon() const override { return QIcon::fromTheme("minecraft"); }
|
||||
virtual QString id() const override { return "vanilla"; }
|
||||
virtual QString helpPage() const override { return "Vanilla-platform"; }
|
||||
virtual bool shouldDisplay() const override;
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include "tasks/Task.h"
|
||||
#include "ui/pages/BasePage.h"
|
||||
|
||||
@@ -54,7 +53,7 @@ class ImportPage : public QWidget, public BasePage {
|
||||
explicit ImportPage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~ImportPage();
|
||||
virtual QString displayName() const override { return tr("Import"); }
|
||||
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("viewfolder"); }
|
||||
virtual QIcon icon() const override { return QIcon::fromTheme("viewfolder"); }
|
||||
virtual QString id() const override { return "import"; }
|
||||
virtual QString helpPage() const override { return "Zip-import"; }
|
||||
virtual bool shouldDisplay() const override;
|
||||
|
||||
@@ -65,7 +65,7 @@ auto ResourceModel::data(const QModelIndex& index, int role) const -> QVariant
|
||||
icon_or_none.has_value())
|
||||
return icon_or_none.value();
|
||||
|
||||
return APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||
return QIcon::fromTheme("screenshot-placeholder");
|
||||
} else {
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
|
||||
if (m_logoMap.contains(pack.safeName)) {
|
||||
return (m_logoMap.value(pack.safeName));
|
||||
}
|
||||
auto icon = APPLICATION->getThemedIcon("atlauncher-placeholder");
|
||||
auto icon = QIcon::fromTheme("atlauncher-placeholder");
|
||||
|
||||
auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/images/%1").arg(pack.safeName);
|
||||
((ListModel*)this)->requestLogo(pack.safeName, url);
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
#include <modplatform/atlauncher/ATLPackInstallTask.h>
|
||||
#include <QWidget>
|
||||
|
||||
#include "Application.h"
|
||||
#include "ui/pages/modplatform/ModpackProviderBasePage.h"
|
||||
|
||||
namespace Ui {
|
||||
@@ -57,7 +56,7 @@ class AtlPage : public QWidget, public ModpackProviderBasePage {
|
||||
explicit AtlPage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~AtlPage();
|
||||
virtual QString displayName() const override { return "ATLauncher"; }
|
||||
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("atlauncher"); }
|
||||
virtual QIcon icon() const override { return QIcon::fromTheme("atlauncher"); }
|
||||
virtual QString id() const override { return "atl"; }
|
||||
virtual QString helpPage() const override { return "ATL-platform"; }
|
||||
virtual bool shouldDisplay() const override;
|
||||
|
||||
@@ -50,7 +50,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
|
||||
if (m_logoMap.contains(pack->logoName)) {
|
||||
return (m_logoMap.value(pack->logoName));
|
||||
}
|
||||
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||
QIcon icon = QIcon::fromTheme("screenshot-placeholder");
|
||||
((ListModel*)this)->requestLogo(pack->logoName, pack->logoUrl);
|
||||
return icon;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include <QTimer>
|
||||
#include "modplatform/ModIndex.h"
|
||||
#include "ui/pages/modplatform/ModpackProviderBasePage.h"
|
||||
@@ -61,7 +60,7 @@ class FlamePage : public QWidget, public ModpackProviderBasePage {
|
||||
explicit FlamePage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~FlamePage();
|
||||
virtual QString displayName() const override { return "CurseForge"; }
|
||||
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("flame"); }
|
||||
virtual QIcon icon() const override { return QIcon::fromTheme("flame"); }
|
||||
virtual QString id() const override { return "flame"; }
|
||||
virtual QString helpPage() const override { return "Flame-platform"; }
|
||||
virtual bool shouldDisplay() const override;
|
||||
|
||||
@@ -40,7 +40,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <ui/pages/modplatform/DataPackPage.h>
|
||||
#include "Application.h"
|
||||
|
||||
#include "modplatform/ResourceAPI.h"
|
||||
|
||||
@@ -58,7 +57,7 @@ static inline QString displayName()
|
||||
}
|
||||
static inline QIcon icon()
|
||||
{
|
||||
return APPLICATION->getThemedIcon("flame");
|
||||
return QIcon::fromTheme("flame");
|
||||
}
|
||||
static inline QString id()
|
||||
{
|
||||
@@ -181,8 +180,6 @@ class FlameShaderPackPage : public ShaderPackResourcePage {
|
||||
void openUrl(const QUrl& url) override;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class FlameDataPackPage : public DataPackResourcePage {
|
||||
Q_OBJECT
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
#include <QTreeView>
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include "modplatform/import_ftb/PackHelpers.h"
|
||||
#include "ui/pages/modplatform/ModpackProviderBasePage.h"
|
||||
#include "ui/pages/modplatform/import_ftb/ListModel.h"
|
||||
@@ -42,7 +41,7 @@ class ImportFTBPage : public QWidget, public ModpackProviderBasePage {
|
||||
explicit ImportFTBPage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~ImportFTBPage();
|
||||
QString displayName() const override { return tr("FTB App Import"); }
|
||||
QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
|
||||
QIcon icon() const override { return QIcon::fromTheme("ftb_logo"); }
|
||||
QString id() const override { return "import_ftb"; }
|
||||
QString helpPage() const override { return "FTB-import"; }
|
||||
bool shouldDisplay() const override { return true; }
|
||||
|
||||
@@ -173,7 +173,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
|
||||
if (m_logoMap.contains(pack.logo)) {
|
||||
return (m_logoMap.value(pack.logo));
|
||||
}
|
||||
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||
QIcon icon = QIcon::fromTheme("screenshot-placeholder");
|
||||
((ListModel*)this)->requestLogo(pack.logo);
|
||||
return icon;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,6 @@
|
||||
#include <QTreeView>
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include "QObjectPtr.h"
|
||||
#include "modplatform/legacy_ftb/PackFetchTask.h"
|
||||
#include "modplatform/legacy_ftb/PackHelpers.h"
|
||||
@@ -64,7 +63,7 @@ class Page : public QWidget, public ModpackProviderBasePage {
|
||||
explicit Page(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~Page();
|
||||
QString displayName() const override { return "FTB Legacy"; }
|
||||
QIcon icon() const override { return APPLICATION->getThemedIcon("ftb_logo"); }
|
||||
QIcon icon() const override { return QIcon::fromTheme("ftb_logo"); }
|
||||
QString id() const override { return "legacy_ftb"; }
|
||||
QString helpPage() const override { return "FTB-legacy"; }
|
||||
bool shouldDisplay() const override;
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
#include "ModrinthModel.h"
|
||||
|
||||
#include "Application.h"
|
||||
#include "BuildConfig.h"
|
||||
#include "Json.h"
|
||||
#include "modplatform/ModIndex.h"
|
||||
@@ -91,7 +92,7 @@ auto ModpackListModel::data(const QModelIndex& index, int role) const -> QVarian
|
||||
if (m_logoMap.contains(pack->logoName))
|
||||
return m_logoMap.value(pack->logoName);
|
||||
|
||||
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||
QIcon icon = QIcon::fromTheme("screenshot-placeholder");
|
||||
((ModpackListModel*)this)->requestLogo(pack->logoName, pack->logoUrl);
|
||||
return icon;
|
||||
}
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Application.h"
|
||||
#include "modplatform/ModIndex.h"
|
||||
#include "modplatform/modrinth/ModrinthAPI.h"
|
||||
#include "ui/dialogs/NewInstanceDialog.h"
|
||||
@@ -64,7 +63,7 @@ class ModrinthPage : public QWidget, public ModpackProviderBasePage {
|
||||
~ModrinthPage() override;
|
||||
|
||||
QString displayName() const override { return tr("Modrinth"); }
|
||||
QIcon icon() const override { return APPLICATION->getThemedIcon("modrinth"); }
|
||||
QIcon icon() const override { return QIcon::fromTheme("modrinth"); }
|
||||
QString id() const override { return "modrinth"; }
|
||||
QString helpPage() const override { return "Modrinth-platform"; }
|
||||
|
||||
|
||||
@@ -38,8 +38,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Application.h"
|
||||
|
||||
#include "modplatform/ResourceAPI.h"
|
||||
|
||||
#include "ui/pages/modplatform/DataPackPage.h"
|
||||
@@ -57,7 +55,7 @@ static inline QString displayName()
|
||||
}
|
||||
static inline QIcon icon()
|
||||
{
|
||||
return APPLICATION->getThemedIcon("modrinth");
|
||||
return QIcon::fromTheme("modrinth");
|
||||
}
|
||||
static inline QString id()
|
||||
{
|
||||
|
||||
@@ -71,7 +71,7 @@ QVariant Technic::ListModel::data(const QModelIndex& index, int role) const
|
||||
if (m_logoMap.contains(pack.logoName)) {
|
||||
return (m_logoMap.value(pack.logoName));
|
||||
}
|
||||
QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
|
||||
QIcon icon = QIcon::fromTheme("screenshot-placeholder");
|
||||
((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
|
||||
return icon;
|
||||
}
|
||||
|
||||
@@ -38,7 +38,6 @@
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
|
||||
#include <Application.h>
|
||||
#include "TechnicData.h"
|
||||
#include "net/NetJob.h"
|
||||
#include "ui/pages/modplatform/ModpackProviderBasePage.h"
|
||||
@@ -61,7 +60,7 @@ class TechnicPage : public QWidget, public ModpackProviderBasePage {
|
||||
explicit TechnicPage(NewInstanceDialog* dialog, QWidget* parent = 0);
|
||||
virtual ~TechnicPage();
|
||||
virtual QString displayName() const override { return "Technic"; }
|
||||
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("technic"); }
|
||||
virtual QIcon icon() const override { return QIcon::fromTheme("technic"); }
|
||||
virtual QString id() const override { return "technic"; }
|
||||
virtual QString helpPage() const override { return "Technic-platform"; }
|
||||
virtual bool shouldDisplay() const override;
|
||||
|
||||
Reference in New Issue
Block a user