From 9e8a74cc89e2d53197b2cccc4d4198776848a696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 27 Oct 2014 00:41:40 +0100
Subject: Fix some issues in the newly added themes

---
 gui/MainWindow.ui                    | 5 ++---
 gui/dialogs/AboutDialog.cpp          | 2 +-
 gui/dialogs/AboutDialog.ui           | 7 ++-----
 gui/pages/global/ExternalToolsPage.h | 7 ++++++-
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'gui')

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index e6812353..69e2c465 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -14,8 +14,7 @@
    <string>MultiMC 5</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources/multimc/multimc.qrc">
-    <normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
+   <iconset theme="multimc"/>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -502,7 +501,7 @@
   <include location="../resources/pe_dark/pe_dark.qrc"/>
   <include location="../resources/pe_light/pe_light.qrc"/>
   <include location="../resources/pe_blue/pe_blue.qrc"/>
-  <include location="../resources/pe_clolored/pe_colored.qrc"/>
+  <include location="../resources/pe_colored/pe_colored.qrc"/>
   <include location="../resources/multimc/multimc.qrc"/>
   <include location="../resources/instances/instances.qrc"/>
   <include location="../resources/OSX/OSX.qrc"/>
diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp
index 71b2f6d6..3d8848c3 100644
--- a/gui/dialogs/AboutDialog.cpp
+++ b/gui/dialogs/AboutDialog.cpp
@@ -81,7 +81,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
 
 	ui->urlLabel->setOpenExternalLinks(true);
 
-	ui->icon->setPixmap(QIcon(":/icons/multimc/scalable/apps/multimc.svg").pixmap(64));
+	ui->icon->setPixmap(QIcon::fromTheme("multimc").pixmap(64));
 	ui->title->setText("MultiMC 5 " + BuildConfig.printableVersionString());
 
 	ui->versionLabel->setText(tr("Version") +": " + BuildConfig.printableVersionString());
diff --git a/gui/dialogs/AboutDialog.ui b/gui/dialogs/AboutDialog.ui
index 93fa8963..de9b7915 100644
--- a/gui/dialogs/AboutDialog.ui
+++ b/gui/dialogs/AboutDialog.ui
@@ -58,9 +58,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../../resources/multimc/multimc.qrc">:/icons/multimc/scalable/apps/multimc.svg</pixmap>
-       </property>
       </widget>
      </item>
      <item>
@@ -464,8 +461,8 @@ p, li { white-space: pre-wrap; }
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>98</width>
-        <height>88</height>
+        <width>689</width>
+        <height>311</height>
        </rect>
       </property>
       <attribute name="label">
diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h
index 1188f22b..5a2a397d 100644
--- a/gui/pages/global/ExternalToolsPage.h
+++ b/gui/pages/global/ExternalToolsPage.h
@@ -37,7 +37,12 @@ public:
 	}
 	QIcon icon() const override
 	{
-		return QIcon::fromTheme("externaltools");
+		auto icon = QIcon::fromTheme("externaltools");
+		if(icon.isNull())
+		{
+			icon = QIcon::fromTheme("loadermods");
+		}
+		return icon;
 	}
 	QString id() const override
 	{
-- 
cgit v1.2.3