diff --git a/application/dialogs/AboutDialog.cpp b/application/dialogs/AboutDialog.cpp
index ca1dfd94c..a556ec056 100644
--- a/application/dialogs/AboutDialog.cpp
+++ b/application/dialogs/AboutDialog.cpp
@@ -23,56 +23,43 @@
#include "HoeDown.h"
+namespace {
// Credits
// This is a hack, but I can't think of a better way to do this easily without screwing with QTextDocument...
-static QString getCreditsHtml(QStringList patrons)
+QString getCreditsHtml(QStringList patrons)
{
- QString creditsHtml = QObject::tr(
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- ""
- "MultiMC Developers
"
- "Andrew Okin <forkk@forkk.net>
"
- "Petr Mrázek <peterix@gmail.com>
"
- "Sky Welch <multimc@bunnies.io>
"
- "Jan (02JanDal) <02jandal@gmail.com>
"
- "RoboSky <@RoboSky_>
"
- ""
- "With thanks to
"
- "Orochimarufan <orochimarufan.x3@gmail.com>
"
- "TakSuyu <taksuyu@gmail.com>
"
- "Kilobyte <stiepen22@gmx.de>
"
- "Rootbear75 <@rootbear75>
"
- ""
- "Patrons
"
- "%1"
- ""
- ""
- "");
- if (patrons.isEmpty())
- return creditsHtml.arg(QObject::tr("Loading...
"));
- else
- {
- QString patronsStr;
+ QString patronsHeading = QObject::tr("Patrons", "About Credits");
+ QString output;
+ QTextStream stream(&output);
+ stream << "\n";
+ // TODO: possibly retrieve from git history at build time?
+ stream << "" << QObject::tr("MultiMC Developers", "About Credits") << "
\n";
+ stream << "Andrew Okin <forkk@forkk.net>
\n";
+ stream << "Petr Mrázek <peterix@gmail.com>
\n";
+ stream << "Sky Welch <multimc@bunnies.io>
\n";
+ stream << "Jan (02JanDal) <02jandal@gmail.com>
\n";
+ stream << "RoboSky <@RoboSky_>
\n";
+ stream << "
\n";
+
+ stream << "" << QObject::tr("With thanks to", "About Credits") << "
\n";
+ stream << "Orochimarufan <orochimarufan.x3@gmail.com>
\n";
+ stream << "TakSuyu <taksuyu@gmail.com>
\n";
+ stream << "Kilobyte <stiepen22@gmx.de>
\n";
+ stream << "Rootbear75 <@rootbear75>
\n";
+ stream << "
\n";
+
+ if(!patrons.isEmpty()) {
+ stream << "" << QObject::tr("Patrons", "About Credits") << "
\n";
for (QString patron : patrons)
{
- patronsStr.append(QString("%1
").arg(patron));
+ stream << "" << patron << "
\n";
}
-
- return creditsHtml.arg(patronsStr);
}
+ stream << "\n";
+ return output;
}
-static QString getLicenseHtml()
+QString getLicenseHtml()
{
HoeDown hoedown;
QFile dataFile(":/documents/COPYING.md");
@@ -81,6 +68,8 @@ static QString getLicenseHtml()
return output;
}
+}
+
AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDialog)
{
ui->setupUi(this);
@@ -109,6 +98,15 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
else
ui->channelLabel->setVisible(false);
+ ui->redistributionText->setHtml(tr(
+"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.
\n"
+"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).
\n"
+"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.
"
+ ));
+
connect(ui->closeButton, SIGNAL(clicked()), SLOT(close()));
connect(ui->aboutQt, &QPushButton::clicked, &QApplication::aboutQt);
diff --git a/application/dialogs/AboutDialog.ui b/application/dialogs/AboutDialog.ui
index 47ec02938..c4096b32b 100644
--- a/application/dialogs/AboutDialog.ui
+++ b/application/dialogs/AboutDialog.ui
@@ -217,16 +217,6 @@
- -
-
-
- No Language file loaded.
-
-
- true
-
-
-
@@ -263,18 +253,7 @@
-
-
-
- <!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:'Noto Sans'; font-size:12pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:11pt;">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.</span></p>
-<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:'Bitstream Vera Sans'; font-size:11pt;"><br /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:11pt;">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).</span></p>
-<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:'Bitstream Vera Sans'; font-size:11pt;"><br /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Bitstream Vera Sans'; font-size:11pt;">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 </span><span style=" font-family:'Bitstream Vera Sans'; font-size:11pt; font-weight:600;">without</span><span style=" font-family:'Bitstream Vera Sans'; font-size:11pt;"> implying that you have our blessing.</span></p></body></html>
-
+
Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse
@@ -323,14 +302,11 @@ p, li { white-space: pre-wrap; }
tabWidget
creditsText
- translationInfo
licenseText
- textEdit
+ redistributionText
aboutQt
closeButton
-
-
-
+