Merge pull request #211 from Drayshak/develop

Add Patreon button with logo

10 files changed, 32 insertions, 0 deletions

diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 19c5c66f..dcb6d3b5 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -1015,6 +1015,11 @@ void MainWindow::on_actionReportBug_triggered()
 	openWebPage(QUrl("https://github.com/MultiMC/MultiMC5/issues"));
 }
 
+void MainWindow::on_actionPatreon_triggered()
+{
+	openWebPage(QUrl("http://www.patreon.com/multimc"));
+}
+
 void MainWindow::on_actionMoreNews_triggered()
 {
 	openWebPage(QUrl("http://multimc.org/posts.html"));
diff --git a/gui/MainWindow.h b/gui/MainWindow.h
index 5ddfef7b..d610a87d 100644
--- a/gui/MainWindow.h
+++ b/gui/MainWindow.h
@@ -85,6 +85,8 @@ slots:
 
 	void on_actionReportBug_triggered();
 
+	void on_actionPatreon_triggered();
+
 	void on_actionMoreNews_triggered();
 
 	void newsButtonClicked();
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 2bd8ec22..1d7fbec9 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -74,6 +74,7 @@
    <addaction name="actionReportBug"/>
    <addaction name="actionAbout"/>
    <addaction name="separator"/>
+   <addaction name="actionPatreon"/>   
    <addaction name="actionCAT"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
@@ -268,6 +269,22 @@
     <string>Open the bug tracker to report a bug with MultiMC.</string>
    </property>
   </action>
+  <action name="actionPatreon">
+   <property name="icon">
+    <iconset theme="patreon">
+     <normaloff/>
+    </iconset>
+   </property>
+   <property name="text">
+    <string>Support us on Patreon!</string>
+   </property>
+   <property name="toolTip">
+    <string>Open the MultiMC Patreon page.</string>
+   </property>
+   <property name="statusTip">
+    <string>Open the MultiMC Patreon page.</string>
+   </property>
+  </action>  
   <action name="actionMoreNews">
    <property name="icon">
     <iconset theme="news">
diff --git a/resources/multimc/16x16/patreon.png b/resources/multimc/16x16/patreon.png
new file mode 100644
index 00000000..cde2b326
--- /dev/null
+++ b/resources/multimc/16x16/patreon.png
diff --git a/resources/multimc/22x22/patreon.png b/resources/multimc/22x22/patreon.png
new file mode 100644
index 00000000..b6235ad2
--- /dev/null
+++ b/resources/multimc/22x22/patreon.png
diff --git a/resources/multimc/24x24/patreon.png b/resources/multimc/24x24/patreon.png
new file mode 100644
index 00000000..c1da080f
--- /dev/null
+++ b/resources/multimc/24x24/patreon.png
diff --git a/resources/multimc/32x32/patreon.png b/resources/multimc/32x32/patreon.png
new file mode 100644
index 00000000..f5ae8a5e
--- /dev/null
+++ b/resources/multimc/32x32/patreon.png
diff --git a/resources/multimc/48x48/patreon.png b/resources/multimc/48x48/patreon.png
new file mode 100644
index 00000000..2708a85a
--- /dev/null
+++ b/resources/multimc/48x48/patreon.png
diff --git a/resources/multimc/64x64/patreon.png b/resources/multimc/64x64/patreon.png
new file mode 100644
index 00000000..7b4814ec
--- /dev/null
+++ b/resources/multimc/64x64/patreon.png
diff --git a/resources/multimc/multimc.qrc b/resources/multimc/multimc.qrc
index 363347de..d3068ff4 100644
--- a/resources/multimc/multimc.qrc
+++ b/resources/multimc/multimc.qrc
@@ -26,6 +26,14 @@
 		<file>48x48/bug.png</file>
 		<file>64x64/bug.png</file>
 
+		<!-- Patron logo. (C) 2014 Patreon, Inc., http://www.patreon.com/toolbox?ftyp=media -->
+		<file>16x16/patreon.png</file>
+		<file>22x22/patreon.png</file>
+		<file>24x24/patreon.png</file>
+		<file>32x32/patreon.png</file>
+		<file>48x48/patreon.png</file>
+		<file>64x64/patreon.png</file>
+
 		<!-- The cat button. Freeware, http://findicons.com/icon/73096/black_cat -->
 		<file>16x16/cat.png</file>
 		<file>22x22/cat.png</file>