Replace getThemedIcon with APPLICATION->logo()

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad
2025-09-19 00:03:22 +01:00
parent 1724bdaeb9
commit cd4f119e4b
67 changed files with 93 additions and 133 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ class DataPackPage : public ExternalResourcesPage {
explicit DataPackPage(BaseInstance* instance, std::shared_ptr<DataPackFolderModel> model, QWidget* parent = nullptr);
QString displayName() const override { return QObject::tr("Data Packs"); }
QIcon icon() const override { return APPLICATION->getThemedIcon("datapacks"); }
QIcon icon() const override { return QIcon::fromTheme("datapacks"); }
QString id() const override { return "datapacks"; }
QString helpPage() const override { return "Data-packs"; }
bool shouldDisplay() const override { return true; }
+1 -2
View File
@@ -38,7 +38,6 @@
#include <QString>
#include <QWidget>
#include <Application.h>
#include "ui/pages/BasePage.h"
namespace Ui {
@@ -59,7 +58,7 @@ class GameOptionsPage : public QWidget, public BasePage {
void closedImpl() override;
virtual QString displayName() const override { return tr("Game Options"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("settings"); }
virtual QIcon icon() const override { return QIcon::fromTheme("settings"); }
virtual QString id() const override { return "gameoptions"; }
virtual QString helpPage() const override { return "Game-Options-management"; }
void retranslate() override;
@@ -36,7 +36,6 @@
#pragma once
#include <QWidget>
#include "Application.h"
#include "BaseInstance.h"
#include "ui/pages/BasePage.h"
#include "ui/widgets/MinecraftSettingsWidget.h"
@@ -53,7 +52,7 @@ class InstanceSettingsPage : public MinecraftSettingsWidget, public BasePage {
}
~InstanceSettingsPage() override {}
QString displayName() const override { return tr("Settings"); }
QIcon icon() const override { return APPLICATION->getThemedIcon("instance-settings"); }
QIcon icon() const override { return QIcon::fromTheme("instance-settings"); }
QString id() const override { return "settings"; }
bool apply() override
{
+1 -2
View File
@@ -38,7 +38,6 @@
#include <QIdentityProxyModel>
#include <QWidget>
#include <Application.h>
#include "BaseInstance.h"
#include "launch/LaunchTask.h"
#include "ui/pages/BasePage.h"
@@ -67,7 +66,7 @@ class LogPage : public QWidget, public BasePage {
explicit LogPage(InstancePtr instance, QWidget* parent = 0);
virtual ~LogPage();
virtual QString displayName() const override { return tr("Minecraft Log"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
virtual QIcon icon() const override { return QIcon::fromTheme("log"); }
virtual QString id() const override { return "console"; }
virtual bool apply() override;
virtual QString helpPage() const override { return "Minecraft-Logs"; }
@@ -166,7 +166,7 @@ QString ManagedPackPage::displayName() const
QIcon ManagedPackPage::icon() const
{
return APPLICATION->getThemedIcon(m_inst->getManagedPackType());
return QIcon::fromTheme(m_inst->getManagedPackType());
}
QString ManagedPackPage::helpPage() const
+3 -3
View File
@@ -52,7 +52,7 @@ class ModFolderPage : public ExternalResourcesPage {
void setFilter(const QString& filter) { m_fileSelectionFilter = filter; }
virtual QString displayName() const override { return tr("Mods"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("loadermods"); }
virtual QIcon icon() const override { return QIcon::fromTheme("loadermods"); }
virtual QString id() const override { return "mods"; }
virtual QString helpPage() const override { return "Loader-mods"; }
@@ -83,7 +83,7 @@ class CoreModFolderPage : public ModFolderPage {
virtual ~CoreModFolderPage() = default;
virtual QString displayName() const override { return tr("Core Mods"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("coremods"); }
virtual QIcon icon() const override { return QIcon::fromTheme("coremods"); }
virtual QString id() const override { return "coremods"; }
virtual QString helpPage() const override { return "Core-mods"; }
@@ -97,7 +97,7 @@ class NilModFolderPage : public ModFolderPage {
virtual ~NilModFolderPage() = default;
virtual QString displayName() const override { return tr("Nilmods"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("coremods"); }
virtual QIcon icon() const override { return QIcon::fromTheme("coremods"); }
virtual QString id() const override { return "nilmods"; }
virtual QString helpPage() const override { return "Nilmods"; }
+2 -3
View File
@@ -37,7 +37,6 @@
#include <QWidget>
#include <Application.h>
#include "BaseInstance.h"
#include "ui/pages/BasePage.h"
@@ -54,9 +53,9 @@ class NotesPage : public QWidget, public BasePage {
virtual QString displayName() const override { return tr("Notes"); }
virtual QIcon icon() const override
{
auto icon = APPLICATION->getThemedIcon("notes");
auto icon = QIcon::fromTheme("notes");
if (icon.isNull())
icon = APPLICATION->getThemedIcon("news");
icon = QIcon::fromTheme("news");
return icon;
}
virtual QString id() const override { return "notes"; }
+1 -1
View File
@@ -57,7 +57,7 @@ class OtherLogsPage : public QWidget, public BasePage {
QString id() const override { return m_id; }
QString displayName() const override { return m_displayName; }
QIcon icon() const override { return APPLICATION->getThemedIcon("log"); }
QIcon icon() const override { return QIcon::fromTheme("log"); }
QString helpPage() const override { return m_helpPage; }
void retranslate() override;
@@ -51,7 +51,7 @@ class ResourcePackPage : public ExternalResourcesPage {
explicit ResourcePackPage(MinecraftInstance* instance, std::shared_ptr<ResourcePackFolderModel> model, QWidget* parent = 0);
QString displayName() const override { return tr("Resource Packs"); }
QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
QIcon icon() const override { return QIcon::fromTheme("resourcepacks"); }
QString id() const override { return "resourcepacks"; }
QString helpPage() const override { return "Resource-packs"; }
@@ -134,7 +134,7 @@ class FilterModel : public QIdentityProxyModel {
{
m_thumbnailingPool.setMaxThreadCount(4);
m_thumbnailCache = std::make_shared<SharedIconCache>();
m_thumbnailCache->add("placeholder", APPLICATION->getThemedIcon("screenshot-placeholder"));
m_thumbnailCache->add("placeholder", QIcon::fromTheme("screenshot-placeholder"));
connect(&watcher, &QFileSystemWatcher::fileChanged, this, &FilterModel::fileChanged);
}
virtual ~FilterModel()
+1 -2
View File
@@ -37,7 +37,6 @@
#include <QMainWindow>
#include <Application.h>
#include "ui/pages/BasePage.h"
#include "settings/Setting.h"
@@ -67,7 +66,7 @@ class ScreenshotsPage : public QMainWindow, public BasePage {
virtual bool eventFilter(QObject*, QEvent*) override;
virtual QString displayName() const override { return tr("Screenshots"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("screenshots"); }
virtual QIcon icon() const override { return QIcon::fromTheme("screenshots"); }
virtual QString id() const override { return "screenshots"; }
virtual QString helpPage() const override { return "Screenshots-management"; }
virtual bool apply() override { return !m_uploadActive; }
+2 -1
View File
@@ -36,6 +36,7 @@
*/
#include "ServersPage.h"
#include "Application.h"
#include "ServerPingTask.h"
#include "ui/dialogs/CustomMessageBox.h"
#include "ui_ServersPage.h"
@@ -319,7 +320,7 @@ class ServersModel : public QAbstractListModel {
if (px.loadFromData(bytes))
return QIcon(px);
}
return APPLICATION->getThemedIcon("unknown_server");
return QIcon::fromTheme("unknown_server");
}
case 1:
return m_servers[row].m_address;
+2 -2
View File
@@ -39,7 +39,7 @@
#include <QMainWindow>
#include <QString>
#include <Application.h>
#include "BaseInstance.h"
#include "ui/pages/BasePage.h"
#include "settings/Setting.h"
@@ -63,7 +63,7 @@ class ServersPage : public QMainWindow, public BasePage {
void closedImpl() override;
virtual QString displayName() const override { return tr("Servers"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("server"); }
virtual QIcon icon() const override { return QIcon::fromTheme("server"); }
virtual QString id() const override { return "servers"; }
virtual QString helpPage() const override { return "Servers-management"; }
void retranslate() override;
+1 -1
View File
@@ -48,7 +48,7 @@ class ShaderPackPage : public ExternalResourcesPage {
~ShaderPackPage() override = default;
QString displayName() const override { return tr("Shader Packs"); }
QIcon icon() const override { return APPLICATION->getThemedIcon("shaderpacks"); }
QIcon icon() const override { return QIcon::fromTheme("shaderpacks"); }
QString id() const override { return "shaderpacks"; }
QString helpPage() const override { return "shader-packs"; }
+1 -1
View File
@@ -51,7 +51,7 @@ class TexturePackPage : public ExternalResourcesPage {
explicit TexturePackPage(MinecraftInstance* instance, std::shared_ptr<TexturePackFolderModel> model, QWidget* parent = nullptr);
QString displayName() const override { return tr("Texture packs"); }
QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
QIcon icon() const override { return QIcon::fromTheme("resourcepacks"); }
QString id() const override { return "texturepacks"; }
QString helpPage() const override { return "Texture-packs"; }
+3 -3
View File
@@ -91,12 +91,12 @@ class IconProxy : public QIdentityProxyModel {
if (!var.isNull()) {
auto string = var.toString();
if (string == "warning") {
return APPLICATION->getThemedIcon("status-yellow");
return QIcon::fromTheme("status-yellow");
} else if (string == "error") {
return APPLICATION->getThemedIcon("status-bad");
return QIcon::fromTheme("status-bad");
}
}
return APPLICATION->getThemedIcon("status-good");
return QIcon::fromTheme("status-good");
}
return var;
}
+2 -2
View File
@@ -48,10 +48,10 @@
#include <QKeyEvent>
#include <QMenu>
#include <QMessageBox>
#include <QPushButton>
#include <QSortFilterProxyModel>
#include <QTreeView>
#include <Qt>
#include <QPushButton>
#include "FileSystem.h"
#include "tools/MCEditTool.h"
@@ -77,7 +77,7 @@ class WorldListProxyModel : public QSortFilterProxyModel {
auto iconFile = worlds->data(sourceIndex, WorldList::IconFileRole).toString();
if (iconFile.isNull()) {
// NOTE: Minecraft uses the same placeholder for servers AND worlds
return APPLICATION->getThemedIcon("unknown_server");
return QIcon::fromTheme("unknown_server");
}
return QIcon(iconFile);
}
+1 -2
View File
@@ -37,7 +37,6 @@
#include <QMainWindow>
#include <Application.h>
#include <LoggedProcess.h>
#include "minecraft/MinecraftInstance.h"
#include "ui/pages/BasePage.h"
@@ -57,7 +56,7 @@ class WorldListPage : public QMainWindow, public BasePage {
virtual ~WorldListPage();
virtual QString displayName() const override { return tr("Worlds"); }
virtual QIcon icon() const override { return APPLICATION->getThemedIcon("worlds"); }
virtual QIcon icon() const override { return QIcon::fromTheme("worlds"); }
virtual QString id() const override { return "worlds"; }
virtual QString helpPage() const override { return "Worlds"; }
virtual bool shouldDisplay() const override;