From 8f7aec032b11a2e2b3034c9d9719a74726dad130 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Sun, 26 Oct 2014 23:44:20 +0100
Subject: Add dark, light, blue and colored theme from pe.

Replaces the old dark and light themes
---
 gui/MainWindow.ui                    |  2 ++
 gui/pages/LegacyJarModPage.h         |  2 +-
 gui/pages/global/ExternalToolsPage.h |  2 +-
 gui/pages/global/MultiMCPage.cpp     | 14 ++++++++++++++
 gui/pages/global/MultiMCPage.ui      | 12 +++++++++++-
 gui/widgets/IconLabel.cpp            | 15 ++++++++++++++-
 6 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'gui')

diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index a3edf6bd..9fce38c4 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -501,6 +501,8 @@
  <resources>
   <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/multimc/multimc.qrc"/>
   <include location="../resources/instances/instances.qrc"/>
  </resources>
diff --git a/gui/pages/LegacyJarModPage.h b/gui/pages/LegacyJarModPage.h
index 1a72abf3..90c7f228 100644
--- a/gui/pages/LegacyJarModPage.h
+++ b/gui/pages/LegacyJarModPage.h
@@ -41,7 +41,7 @@ public:
 	}
 	virtual QIcon icon() const
 	{
-		return QIcon::fromTheme("plugin-red");
+		return QIcon::fromTheme("jarmods");
 	}
 	virtual QString id() const
 	{
diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h
index 027e164e..1188f22b 100644
--- a/gui/pages/global/ExternalToolsPage.h
+++ b/gui/pages/global/ExternalToolsPage.h
@@ -37,7 +37,7 @@ public:
 	}
 	QIcon icon() const override
 	{
-		return QIcon::fromTheme("plugin-blue");
+		return QIcon::fromTheme("externaltools");
 	}
 	QString id() const override
 	{
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 73a5ff20..9694a138 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -276,6 +276,12 @@ void MultiMCPage::applySettings()
 	case 2:
 		s->set("IconTheme", "pe_light");
 		break;
+	case 3:
+		s->set("IconTheme", "pe_blue");
+		break;
+	case 4:
+		s->set("IconTheme", "pe_colored");
+		break;
 	case 0:
 	default:
 		s->set("IconTheme", "multimc");
@@ -333,6 +339,14 @@ void MultiMCPage::loadSettings()
 	{
 		ui->themeComboBox->setCurrentIndex(2);
 	}
+	else if (theme == "pe_blue")
+	{
+		ui->themeComboBox->setCurrentIndex(3);
+	}
+	else if (theme == "pe_colored")
+	{
+		ui->themeComboBox->setCurrentIndex(4);
+	}
 	else
 	{
 		ui->themeComboBox->setCurrentIndex(0);
diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui
index f456ebc1..94592476 100644
--- a/gui/pages/global/MultiMCPage.ui
+++ b/gui/pages/global/MultiMCPage.ui
@@ -336,7 +336,7 @@
             </item>
             <item>
              <property name="text">
-              <string>Simple</string>
+              <string>Simple (Dark Icons)</string>
              </property>
             </item>
             <item>
@@ -344,6 +344,16 @@
               <string>Simple (Light Icons)</string>
              </property>
             </item>
+            <item>
+             <property name="text">
+              <string>Simple (Blue Icons)</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Simple (Colored Icons)</string>
+             </property>
+            </item>
            </widget>
           </item>
          </layout>
diff --git a/gui/widgets/IconLabel.cpp b/gui/widgets/IconLabel.cpp
index 773f0b99..86c8a431 100644
--- a/gui/widgets/IconLabel.cpp
+++ b/gui/widgets/IconLabel.cpp
@@ -26,5 +26,18 @@ void IconLabel::setIcon(QIcon icon)
 void IconLabel::paintEvent(QPaintEvent *)
 {
 	QPainter p(this);
-	m_icon.paint(&p, contentsRect());
+	QRect rect = contentsRect();
+	int width = rect.width();
+	int height = rect.height();
+	if(width < height)
+	{
+		rect.setHeight(width);
+		rect.translate(0, (height - width) / 2);
+	}
+	else if (width > height)
+	{
+		rect.setWidth(height);
+		rect.translate((width - height) / 2, 0);
+	}
+	m_icon.paint(&p, rect);
 }
-- 
cgit