dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor About dialog by removing contributor information and reducing height of the dialog. Update README.md to clarify the fork's source and upstream repository links.

Browse Source
This commit is contained in:
David Helkowski
2026-01-22 18:48:06 +09:00
parent 3f9de8e1d9
commit 6a1d8bbc87
4 changed files with 17 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/dialogs/about.cpp
View File

@@ -31,7 +31,6 @@
#include <QLabel>
#include <QPushButton>
#include <QKeySequence>
#include <QTextBrowser>
#include "about.h"
#include "ui_about.h"
@@ -44,52 +43,6 @@ About::About(QWidget *parent) : QDialog(parent), ui_{} {
setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
setWindowTitle(tr("About Strawberry"));
strawberry_authors_ \
<< Person(u"Jonas Kvinge"_s);
strawberry_contributors_ \
<< Person(u"Gavin D. Howard"_s)
<< Person(u"Martin Delille"_s)
<< Person(u"Roman Lebedev"_s)
<< Person(u"Daniel Ostertag"_s)
<< Person(u"Gustavo L Conte"_s);
clementine_authors_
<< Person(u"David Sansome"_s)
<< Person(u"John Maguire"_s)
<< Person(u"Paweł Bara"_s)
<< Person(u"Arnaud Bienner"_s);
clementine_contributors_ \
<< Person(u"Jakub Stachowski"_s)
<< Person(u"Paul Cifarelli"_s)
<< Person(u"Felipe Rivera"_s)
<< Person(u"Alexander Peitz"_s)
<< Person(u"Andreas Muttscheller"_s)
<< Person(u"Mark Furneaux"_s)
<< Person(u"Florian Bigard"_s)
<< Person(u"Alex Bikadorov"_s)
<< Person(u"Mattias Andersson"_s)
<< Person(u"Alan Briolat"_s)
<< Person(u"Arun Narayanankutty"_s)
<< Person(u"Bartłomiej Burdukiewicz"_s)
<< Person(u"Andre Siviero"_s)
<< Person(u"Santiago Gil"_s)
<< Person(u"Tyler Rhodes"_s)
<< Person(u"Vikram Ambrose"_s)
<< Person(u"David Guillen"_s)
<< Person(u"Krzysztof Sobiecki"_s)
<< Person(u"Valeriy Malov"_s)
<< Person(u"Nick Lanham"_s);
strawberry_thanks_ \
<< Person(u"Mark Kretschmann"_s)
<< Person(u"Max Howell"_s)
<< Person(u"Artur Rona"_s)
<< Person(u"Robert-André Mauchin"_s)
<< Person(u"Thomas Pierson"_s)
<< Person(u"Fabio Loli"_s);
QFont title_font;
title_font.setBold(true);
title_font.setPointSize(title_font.pointSize() + 4);
@@ -97,8 +50,6 @@ About::About(QWidget *parent) : QDialog(parent), ui_{} {
ui_.label_title->setFont(title_font);
ui_.label_title->setText(windowTitle());
ui_.label_text->setText(MainHtml());
ui_.text_contributors->document()->setDefaultStyleSheet(QStringLiteral("a {color: %1; }").arg(palette().text().color().name()));
ui_.text_contributors->setText(ContributorsHtml());
ui_.buttonBox->button(QDialogButtonBox::Close)->setShortcut(QKeySequence::Close);
@@ -113,83 +64,17 @@ QString About::MainHtml() const {
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += tr("Strawberry is a music player and music collection organizer.");
ret += "<br />"_L1;
ret += tr("It is a fork of Clementine released in 2018 aimed at music collectors and audiophiles.");
ret += tr("Fork of %1.").arg(QStringLiteral("<a style=\"color:%1;\" href=\"https://github.com/clementine-player/Clementine\">Clementine</a>").arg(palette().text().color().name()));
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += tr("Strawberry is free software released under GPL. The source code is available on %1").arg(QStringLiteral("<a style=\"color:%1;\" href=\"https://github.com/strawberrymusicplayer/strawberry\">GitHub</a>.").arg(palette().text().color().name()));
ret += "<br />"_L1;
ret += tr("You should have received a copy of the GNU General Public License along with this program. If not, see %1").arg(QStringLiteral("<a style=\"color:%1;\" href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a>").arg(palette().text().color().name()));
ret += tr("Source code: %1").arg(QStringLiteral("<a style=\"color:%1;\" href=\"https://gitea.dryark.com/dryark/strawberry\">gitea.dryark.com/dryark/strawberry</a>").arg(palette().text().color().name()));
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += tr("License: %1").arg(QStringLiteral("<a style=\"color:%1;\" href=\"https://www.gnu.org/licenses/gpl-3.0.html\">GPLv3</a>").arg(palette().text().color().name()));
ret += "</p>"_L1;
return ret;
}
QString About::ContributorsHtml() const {
QString ret;
ret += "<p>"_L1;
ret += "<b>"_L1;
ret += tr("Author and maintainer");
ret += "</b>"_L1;
for (const Person &person : strawberry_authors_) {
ret += "<br />"_L1 + PersonToHtml(person);
}
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += "<b>"_L1;
ret += tr("Contributors");
ret += "</b>"_L1;
for (const Person &person : strawberry_contributors_) {
ret += "<br />"_L1 + PersonToHtml(person);
}
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += "<b>"_L1;
ret += tr("Clementine authors");
ret += "</b>"_L1;
for (const Person &person : clementine_authors_) {
ret += "<br />"_L1 + PersonToHtml(person);
}
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += "<b>"_L1;
ret += tr("Clementine contributors");
ret += "</b>"_L1;
for (const Person &person : clementine_contributors_) {
ret += "<br />"_L1 + PersonToHtml(person);
}
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += "<b>"_L1;
ret += tr("Thanks to");
ret += "</b>"_L1;
for (const Person &person : strawberry_thanks_) {
ret += "<br />"_L1 + PersonToHtml(person);
}
ret += "</p>"_L1;
ret += "<p>"_L1;
ret += tr("Thanks to all the other Amarok and Clementine contributors.");
ret += "</p>"_L1;
return ret;
}
QString About::PersonToHtml(const Person &person) {
if (person.email.isEmpty()) {
return person.name;
}
return QStringLiteral("%1 &lt;<a href=\"mailto:%2\">%3</a>&gt;").arg(person.name, person.email, person.email);
}