GH-796 Icon theme loading workaround

Replacing the Qt machinery with other Qt machinery under our control

7 files changed, 15 insertions, 9 deletions

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 <MultiMC.h>
 
 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 <QWidget>
 
 #include "gui/pages/BasePage.h"
+#include <MultiMC.h>
 
 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 <MultiMC.h>
 
 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 <MultiMC.h>
 
 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 <MultiMC.h>
 
 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 <MultiMC.h>
 
 namespace Ui
 {
@@ -40,7 +41,7 @@ public:
 	}
 	QIcon icon() const override
 	{
-		return QIcon::fromTheme("proxy");
+		return MMC->getThemedIcon("proxy");
 	}
 	QString id() const override
 	{