0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #211 from Drayshak/develop

Browse Source 
Add Patreon button with logo
This commit is contained in:
Sky 2014-04-12 02:11:51 +01:00
commit 6e42d51283
10 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/MainWindow.cpp
View File

@ -1015,6 +1015,11 @@ void MainWindow::on_actionReportBug_triggered()
openWebPage(QUrl("https://github.com/MultiMC/MultiMC5/issues")); 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() void MainWindow::on_actionMoreNews_triggered()
{ {
openWebPage(QUrl("http://multimc.org/posts.html")); openWebPage(QUrl("http://multimc.org/posts.html"));

2
gui/MainWindow.h
View File

@ -85,6 +85,8 @@ slots:
void on_actionReportBug_triggered(); void on_actionReportBug_triggered();
void on_actionPatreon_triggered();
void on_actionMoreNews_triggered(); void on_actionMoreNews_triggered();
void newsButtonClicked(); void newsButtonClicked();

17
gui/MainWindow.ui
View File

@ -74,6 +74,7 @@
<addaction name="actionReportBug"/> <addaction name="actionReportBug"/>
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionPatreon"/>
<addaction name="actionCAT"/> <addaction name="actionCAT"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
@ -268,6 +269,22 @@
<string>Open the bug tracker to report a bug with MultiMC.</string> <string>Open the bug tracker to report a bug with MultiMC.</string>
</property> </property>
</action> </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"> <action name="actionMoreNews">
<property name="icon"> <property name="icon">
<iconset theme="news"> <iconset theme="news">

BIN
resources/multimc/16x16/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

BIN
resources/multimc/22x22/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 976 B

BIN
resources/multimc/24x24/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
resources/multimc/32x32/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
resources/multimc/48x48/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
resources/multimc/64x64/patreon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

8
resources/multimc/multimc.qrc
View File

@ -26,6 +26,14 @@
<file>48x48/bug.png</file> <file>48x48/bug.png</file>
<file>64x64/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 --> <!-- The cat button. Freeware, http://findicons.com/icon/73096/black_cat -->
<file>16x16/cat.png</file> <file>16x16/cat.png</file>
<file>22x22/cat.png</file> <file>22x22/cat.png</file>