From ceec70e014db629aa8ba3472839cc42781d73d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 1 Mar 2015 22:20:57 +0100 Subject: GH-796 Icon theme loading workaround Replacing the Qt machinery with other Qt machinery under our control --- gui/pages/InstanceSettingsPage.h | 3 ++- gui/pages/LegacyJarModPage.h | 3 ++- gui/pages/LegacyUpgradePage.h | 3 ++- gui/pages/LogPage.h | 3 ++- gui/pages/ModFolderPage.h | 3 ++- gui/pages/NotesPage.h | 5 +++-- gui/pages/OtherLogsPage.h | 3 ++- gui/pages/ScreenshotsPage.cpp | 3 ++- gui/pages/ScreenshotsPage.h | 3 ++- gui/pages/global/AccountListPage.h | 5 +++-- gui/pages/global/ExternalToolsPage.h | 5 +++-- gui/pages/global/JavaPage.h | 3 ++- gui/pages/global/MinecraftPage.h | 3 ++- gui/pages/global/MultiMCPage.cpp | 2 +- gui/pages/global/MultiMCPage.h | 3 ++- gui/pages/global/ProxyPage.h | 3 ++- 16 files changed, 34 insertions(+), 19 deletions(-) (limited to 'gui/pages') diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h index a95e65e4..b43ce610 100644 --- a/gui/pages/InstanceSettingsPage.h +++ b/gui/pages/InstanceSettingsPage.h @@ -21,6 +21,7 @@ #include "logic/net/NetJob.h" #include "logic/java/JavaChecker.h" #include "BasePage.h" +#include "MultiMC.h" class JavaChecker; namespace Ui @@ -41,7 +42,7 @@ public: } virtual QIcon icon() const override { - return QIcon::fromTheme("instance-settings"); + return MMC->getThemedIcon("instance-settings"); } virtual QString id() const override { diff --git a/gui/pages/LegacyJarModPage.h b/gui/pages/LegacyJarModPage.h index cda6d2a0..e1ffd5d6 100644 --- a/gui/pages/LegacyJarModPage.h +++ b/gui/pages/LegacyJarModPage.h @@ -19,6 +19,7 @@ #include "logic/net/NetJob.h" #include "BasePage.h" +#include class ModList; class LegacyInstance; @@ -41,7 +42,7 @@ public: } virtual QIcon icon() const { - return QIcon::fromTheme("jarmods"); + return MMC->getThemedIcon("jarmods"); } virtual QString id() const { diff --git a/gui/pages/LegacyUpgradePage.h b/gui/pages/LegacyUpgradePage.h index 7a53c21a..969b5440 100644 --- a/gui/pages/LegacyUpgradePage.h +++ b/gui/pages/LegacyUpgradePage.h @@ -20,6 +20,7 @@ #include "logic/OneSixInstance.h" #include "logic/net/NetJob.h" #include "BasePage.h" +#include class EnabledItemFilter; namespace Ui @@ -40,7 +41,7 @@ public: } virtual QIcon icon() const override { - return QIcon::fromTheme("checkupdate"); + return MMC->getThemedIcon("checkupdate"); } virtual QString id() const override { diff --git a/gui/pages/LogPage.h b/gui/pages/LogPage.h index c566528d..7d073a53 100644 --- a/gui/pages/LogPage.h +++ b/gui/pages/LogPage.h @@ -21,6 +21,7 @@ #include "logic/net/NetJob.h" #include "logic/MinecraftProcess.h" #include "BasePage.h" +#include class EnabledItemFilter; class MinecraftProcess; @@ -43,7 +44,7 @@ public: } virtual QIcon icon() const override { - return QIcon::fromTheme("log"); + return MMC->getThemedIcon("log"); } virtual QString id() const override { diff --git a/gui/pages/ModFolderPage.h b/gui/pages/ModFolderPage.h index 09f6adc7..8859ad99 100644 --- a/gui/pages/ModFolderPage.h +++ b/gui/pages/ModFolderPage.h @@ -20,6 +20,7 @@ #include "logic/OneSixInstance.h" #include "logic/net/NetJob.h" #include "BasePage.h" +#include class EnabledItemFilter; class ModList; @@ -43,7 +44,7 @@ public: } virtual QIcon icon() const override { - return QIcon::fromTheme(m_iconName); + return MMC->getThemedIcon(m_iconName); } virtual QString id() const override { diff --git a/gui/pages/NotesPage.h b/gui/pages/NotesPage.h index bbe9d856..f77ea530 100644 --- a/gui/pages/NotesPage.h +++ b/gui/pages/NotesPage.h @@ -20,6 +20,7 @@ #include "logic/BaseInstance.h" #include "logic/net/NetJob.h" #include "BasePage.h" +#include class EnabledItemFilter; namespace Ui @@ -40,9 +41,9 @@ public: } virtual QIcon icon() const override { - auto icon = QIcon::fromTheme("notes"); + auto icon = MMC->getThemedIcon("notes"); if(icon.isNull()) - icon = QIcon::fromTheme("news"); + icon = MMC->getThemedIcon("news"); return icon; } virtual QString id() const override diff --git a/gui/pages/OtherLogsPage.h b/gui/pages/OtherLogsPage.h index 86844749..5777cb83 100644 --- a/gui/pages/OtherLogsPage.h +++ b/gui/pages/OtherLogsPage.h @@ -18,6 +18,7 @@ #include #include "BasePage.h" +#include namespace Ui { @@ -46,7 +47,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("log"); + return MMC->getThemedIcon("log"); } QString helpPage() const override { diff --git a/gui/pages/ScreenshotsPage.cpp b/gui/pages/ScreenshotsPage.cpp index d47a2897..1771a118 100644 --- a/gui/pages/ScreenshotsPage.cpp +++ b/gui/pages/ScreenshotsPage.cpp @@ -16,6 +16,7 @@ #include #include +#include #include "gui/dialogs/ProgressDialog.h" #include "gui/dialogs/CustomMessageBox.h" @@ -103,7 +104,7 @@ public: { m_thumbnailingPool.setMaxThreadCount(4); m_thumbnailCache = std::make_shared(); - m_thumbnailCache->add("placeholder", QIcon::fromTheme("screenshot-placeholder")); + m_thumbnailCache->add("placeholder", MMC->getThemedIcon("screenshot-placeholder")); connect(&watcher, SIGNAL(fileChanged(QString)), SLOT(fileChanged(QString))); // FIXME: the watched file set is not updated when files are removed } diff --git a/gui/pages/ScreenshotsPage.h b/gui/pages/ScreenshotsPage.h index ccf3856d..6be2a26d 100644 --- a/gui/pages/ScreenshotsPage.h +++ b/gui/pages/ScreenshotsPage.h @@ -19,6 +19,7 @@ #include "logic/OneSixInstance.h" #include "BasePage.h" +#include class QFileSystemModel; class QIdentityProxyModel; @@ -53,7 +54,7 @@ public: } virtual QIcon icon() const override { - return QIcon::fromTheme("screenshots"); + return MMC->getThemedIcon("screenshots"); } virtual QString id() const override { diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h index 87f773d9..9fd894b8 100644 --- a/gui/pages/global/AccountListPage.h +++ b/gui/pages/global/AccountListPage.h @@ -21,6 +21,7 @@ #include "gui/pages/BasePage.h" #include "logic/auth/MojangAccountList.h" +#include namespace Ui { @@ -42,10 +43,10 @@ public: } QIcon icon() const override { - auto icon = QIcon::fromTheme("accounts"); + auto icon = MMC->getThemedIcon("accounts"); if(icon.isNull()) { - icon = QIcon::fromTheme("noaccount"); + icon = MMC->getThemedIcon("noaccount"); } return icon; } diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h index 79078fa3..7c5efad6 100644 --- a/gui/pages/global/ExternalToolsPage.h +++ b/gui/pages/global/ExternalToolsPage.h @@ -18,6 +18,7 @@ #include #include "gui/pages/BasePage.h" +#include namespace Ui { class ExternalToolsPage; @@ -37,10 +38,10 @@ public: } QIcon icon() const override { - auto icon = QIcon::fromTheme("externaltools"); + auto icon = MMC->getThemedIcon("externaltools"); if(icon.isNull()) { - icon = QIcon::fromTheme("loadermods"); + icon = MMC->getThemedIcon("loadermods"); } return icon; } diff --git a/gui/pages/global/JavaPage.h b/gui/pages/global/JavaPage.h index 779ca86d..f70d9dbd 100644 --- a/gui/pages/global/JavaPage.h +++ b/gui/pages/global/JavaPage.h @@ -20,6 +20,7 @@ #include "logic/java/JavaChecker.h" #include "gui/pages/BasePage.h" +#include class SettingsObject; @@ -42,7 +43,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("java"); + return MMC->getThemedIcon("java"); } QString id() const override { diff --git a/gui/pages/global/MinecraftPage.h b/gui/pages/global/MinecraftPage.h index a47fd48b..6dd86338 100644 --- a/gui/pages/global/MinecraftPage.h +++ b/gui/pages/global/MinecraftPage.h @@ -20,6 +20,7 @@ #include "logic/java/JavaChecker.h" #include "gui/pages/BasePage.h" +#include class SettingsObject; @@ -42,7 +43,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("minecraft"); + return MMC->getThemedIcon("minecraft"); } QString id() const override { diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp index cc2b2781..cc923b2f 100644 --- a/gui/pages/global/MultiMCPage.cpp +++ b/gui/pages/global/MultiMCPage.cpp @@ -302,7 +302,7 @@ void MultiMCPage::applySettings() if(original != s->get("IconTheme")) { - QIcon::setThemeName(s->get("IconTheme").toString()); + MMC->setIconTheme(s->get("IconTheme").toString()); } // Console settings diff --git a/gui/pages/global/MultiMCPage.h b/gui/pages/global/MultiMCPage.h index 1a6ad39a..96e56f47 100644 --- a/gui/pages/global/MultiMCPage.h +++ b/gui/pages/global/MultiMCPage.h @@ -20,6 +20,7 @@ #include "logic/java/JavaChecker.h" #include "gui/pages/BasePage.h" +#include class QTextCharFormat; class SettingsObject; @@ -43,7 +44,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("multimc"); + return MMC->getThemedIcon("multimc"); } QString id() const override { diff --git a/gui/pages/global/ProxyPage.h b/gui/pages/global/ProxyPage.h index 014548dd..edb7587a 100644 --- a/gui/pages/global/ProxyPage.h +++ b/gui/pages/global/ProxyPage.h @@ -20,6 +20,7 @@ #include "logic/java/JavaChecker.h" #include "gui/pages/BasePage.h" +#include namespace Ui { @@ -40,7 +41,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("proxy"); + return MMC->getThemedIcon("proxy"); } QString id() const override { -- cgit v1.2.3