From 547f6f77d02caf41bd681d1bf2553a8b8af1c2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Mon, 27 Oct 2014 00:15:52 +0100
Subject: Add iOS and OSX icon themes by pe

---
 gui/pages/global/AccountListPage.h |  7 ++++++-
 gui/pages/global/MultiMCPage.cpp   | 14 ++++++++++++++
 gui/pages/global/MultiMCPage.ui    | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'gui/pages/global')

diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h
index fd2c96e3..cc695614 100644
--- a/gui/pages/global/AccountListPage.h
+++ b/gui/pages/global/AccountListPage.h
@@ -42,7 +42,12 @@ public:
 	}
 	QIcon icon() const override
 	{
-		return QIcon::fromTheme("noaccount");
+		auto icon = QIcon::fromTheme("accounts");
+		if(icon.isNull())
+		{
+			icon = QIcon::fromTheme("noaccount");
+		}
+		return icon;
 	}
 	QString id() const override
 	{
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 9694a138..79797aa7 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -282,6 +282,12 @@ void MultiMCPage::applySettings()
 	case 4:
 		s->set("IconTheme", "pe_colored");
 		break;
+	case 5:
+		s->set("IconTheme", "OSX");
+		break;
+	case 6:
+		s->set("IconTheme", "iOS");
+		break;
 	case 0:
 	default:
 		s->set("IconTheme", "multimc");
@@ -347,6 +353,14 @@ void MultiMCPage::loadSettings()
 	{
 		ui->themeComboBox->setCurrentIndex(4);
 	}
+	else if (theme == "OSX")
+	{
+		ui->themeComboBox->setCurrentIndex(5);
+	}
+	else if (theme == "iOS")
+	{
+		ui->themeComboBox->setCurrentIndex(6);
+	}
 	else
 	{
 		ui->themeComboBox->setCurrentIndex(0);
diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui
index 94592476..308d8842 100644
--- a/gui/pages/global/MultiMCPage.ui
+++ b/gui/pages/global/MultiMCPage.ui
@@ -354,6 +354,16 @@
               <string>Simple (Colored Icons)</string>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>OSX</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>iOS</string>
+             </property>
+            </item>
            </widget>
           </item>
          </layout>
-- 
cgit v1.2.3