From 605a33405723ef4e8a4d3e8e92a0c9b754ab4ff9 Mon Sep 17 00:00:00 2001 From: Forkk Date: Thu, 1 May 2014 12:43:55 -0500 Subject: Show Patreon patrons in the about dialog --- gui/dialogs/AboutDialog.cpp | 73 +++++++++++++++++++++++++++++++++++++++++++++ gui/dialogs/AboutDialog.h | 12 ++++++++ gui/dialogs/AboutDialog.ui | 45 +++++++++++----------------- 3 files changed, 102 insertions(+), 28 deletions(-) diff --git a/gui/dialogs/AboutDialog.cpp b/gui/dialogs/AboutDialog.cpp index 9883aafb..211303cc 100644 --- a/gui/dialogs/AboutDialog.cpp +++ b/gui/dialogs/AboutDialog.cpp @@ -20,11 +20,65 @@ #include "gui/Platform.h" #include "BuildConfig.h" +#include + +// Credits +// This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument... +QString getCreditsHtml(QStringList patrons) +{ + QString creditsHtml = + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "

MultiMC Developers

" + "

Andrew Okin <forkk@forkk.net>

" + "

Petr Mrázek <peterix@gmail.com>

" + "

Sky <@drayshak>

" + "

Jan (02JanDal) <02jandal@gmail.com>

" + "" + "

With thanks to

" + "

Orochimarufan <orochimarufan.x3@gmail.com>

" + "

TakSuyu <taksuyu@gmail.com>

" + "

Kilobyte <stiepen22@gmx.de>

" + "

Robotbrain <@skylordelros>

" + "

Rootbear75 <@rootbear75> (build server)

" + "" + "

Patreon Patrons

" + "%1" + "" + "" + ""; + if (patrons.isEmpty()) + return creditsHtml.arg("

"); + else + { + QString patronsStr; + for (QString patron : patrons) + { + patronsStr.append(QString("

").arg(patron)); + } + + return creditsHtml.arg(patronsStr); + } +} + AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog) { MultiMCPlatform::fixWM_CLASS(this); ui->setupUi(this); + QString chtml = getCreditsHtml(QStringList()); + ui->creditsText->setHtml(chtml); + ui->urlLabel->setOpenExternalLinks(true); ui->icon->setPixmap(QIcon(":/icons/multimc/scalable/apps/multimc.svg").pixmap(64)); @@ -47,9 +101,28 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia connect(ui->closeButton, SIGNAL(clicked()), SLOT(close())); MMC->connect(ui->aboutQt, SIGNAL(clicked()), SLOT(aboutQt())); + + loadPatronList(); } AboutDialog::~AboutDialog() { delete ui; } + +void AboutDialog::loadPatronList() +{ + NetJob* job = new NetJob("Patreon Patron List"); + patronListDownload = ByteArrayDownload::make(QUrl("http://files.multimc.org/patrons.txt")); + job->addNetAction(patronListDownload); + connect(job, &NetJob::succeeded, this, &AboutDialog::patronListLoaded); + job->start(); +} + +void AboutDialog::patronListLoaded() +{ + QString patronListStr(patronListDownload->m_data); + QString html = getCreditsHtml(patronListStr.split("\n", QString::SkipEmptyParts)); + ui->creditsText->setHtml(html); +} + diff --git a/gui/dialogs/AboutDialog.h b/gui/dialogs/AboutDialog.h index 9d747bac..ba8e8607 100644 --- a/gui/dialogs/AboutDialog.h +++ b/gui/dialogs/AboutDialog.h @@ -17,6 +17,8 @@ #include +#include + namespace Ui { class AboutDialog; @@ -30,6 +32,16 @@ public: explicit AboutDialog(QWidget *parent = 0); ~AboutDialog(); +public +slots: + /// Starts loading a list of Patreon patrons. + void loadPatronList(); + + /// Slot for when the patron list loads successfully. + void patronListLoaded(); + private: Ui::AboutDialog *ui; + + ByteArrayDownloadPtr patronListDownload; }; diff --git a/gui/dialogs/AboutDialog.ui b/gui/dialogs/AboutDialog.ui index b13c379f..04983299 100644 --- a/gui/dialogs/AboutDialog.ui +++ b/gui/dialogs/AboutDialog.ui @@ -59,7 +59,7 @@ - :/icons/multimc/scalable/apps/multimc.svg + :/icons/multimc/scalable/apps/multimc.svg @@ -96,7 +96,7 @@ - 0 + 1 @@ -104,7 +104,7 @@ 0 0 689 - 311 + 331 @@ -229,7 +229,7 @@ 0 0 689 - 311 + 331 @@ -245,19 +245,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;"> -MultiMC -Andrew Okin <<a href="mailto:forkk@forkk.net">forkk@forkk.net</a>> -Petr Mrázek <<a href="mailto:peterix@gmail.com">peterix@gmail.com</a>> -Sky <<a href="https://www.twitter.com/drayshak">@drayshak</a>> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;"> -With thanks to -Orochimarufan <<a href="mailto:orochimarufan.x3@gmail.com">orochimarufan.x3@gmail.com</a>> -TakSuyu <<a href="mailto:taksuyu@gmail.com">taksuyu@gmail.com</a>> -Kilobyte <<a href="mailto:stiepen22@gmx.de">stiepen22@gmx.de</a>> -Jan (02JanDal) <<a href="mailto:02jandal@gmail.com">02jandal@gmail.com</a>> -Robotbrain <<a href="https://twitter.com/skylordelros">@skylordelros</a>> -Rootbear75 <<a href="https://twitter.com/rootbear75">@rootbear75</a>> (build server)</body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> + </body></html> Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse @@ -282,7 +271,7 @@ p, li { white-space: pre-wrap; } 0 0 689 - 311 + 331 @@ -309,7 +298,7 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:9pt; font-weight:400; font-style:normal;"> MultiMC Copyright 2012-2014 MultiMC Contributors Licensed under the Apache License, Version 2.0 (the "License"); @@ -433,7 +422,7 @@ p, li { white-space: pre-wrap; } */ Java IconLoader class - + Copyright (c) 2011, Chris Molini All rights reserved. @@ -471,7 +460,7 @@ p, li { white-space: pre-wrap; } 0 0 689 - 311 + 331 @@ -484,12 +473,12 @@ p, li { white-space: pre-wrap; } <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:400; font-style:normal;"> -We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license. - -Part of the reason for using the Apache license is we don't want people using the "MultiMC" name when redistributing the project. This means people must take the time to go through the source code and remove all references to "MultiMC", including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title). - -The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. However, it should be abundantly clear that the project is a fork without implying that you have our blessing.</body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +We keep MultiMC open source because we think it's important to be able to see the source code for a project like this, and we do so using the Apache license. + +Part of the reason for using the Apache license is we don't want people using the "MultiMC" name when redistributing the project. This means people must take the time to go through the source code and remove all references to "MultiMC", including but not limited to the project icon and the title of windows, (no *MultiMC-fork* in the title). + +The Apache license covers reasonable use for the name - a mention of the project's origins in the About dialog and the license is acceptable. However, it should be abundantly clear that the project is a fork without implying that you have our blessing.</body></html> Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -537,7 +526,7 @@ p, li { white-space: pre-wrap; } - + -- cgit v1.2.3