From b3fb4e3aa73cd8ef42434afc0359972b111a7681 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 3 Jun 2021 15:48:26 -0400
Subject: [PATCH] credits: fix the separation division
Change-Id: I14675194280de9a01d9e2196cb362ad97268586b
---
projectcredits.html | 6 ++++--
src/utils.cpp | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/projectcredits.html b/projectcredits.html
index 4895a0678..21106c254 100644
--- a/projectcredits.html
+++ b/projectcredits.html
@@ -1,3 +1,4 @@
+Created by:
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Adrien Béraud</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Albert BabÃ</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Alexandre Lision</p>
@@ -10,7 +11,6 @@
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Andreas Traczyk</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Anthony Léonard</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Brando Tovar</p>
-<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Charlotte Hoffmann</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Cyrille Béraud</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Dorina Mosku</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Eden Abitbol</p>
@@ -25,7 +25,6 @@
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Julien Grossholtz</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Kateryna Kostiuk</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Loïc Siret</p>
-<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Marianne Forget</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Mingrui Zhang</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Mohamed Chibani</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Mohamed Amine Younes Bouacida</p>
@@ -50,4 +49,7 @@
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Thibault Wittemberg</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Vsevolod Ivanov</p>
<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Yang Wang</p>
+Artwork by:
+<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Charlotte Hoffmann</p>
+<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Marianne Forget</p>
<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>
\ No newline at end of file
diff --git a/src/utils.cpp b/src/utils.cpp
index 1184ffa75..05997bf4d 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -451,18 +451,20 @@ Utils::getProjectCredits()
in.setCodec("UTF-8");
while (!in.atEnd()) {
QString currentLine = in.readLine();
- if (credits.isEmpty()) {
+ if (currentLine.contains("Created by:")) {
credits += "<h3 align=\"center\" style=\" margin-top:0px; "
+ QString("margin-bottom:0px; margin-left:0px; margin-right:0px; ")
+ "-qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">"
+ QObject::tr("Created by:") + "</span></h3>";
- } else if (currentLine.contains("Marianne Forget")) {
+ continue;
+ } else if (currentLine.contains("Artwork by:")) {
credits
+= "<h3 align=\"center\" style=\" margin-top:0px; margin-bottom:0px; "
+ QString(
"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">")
+ "<span style=\" font-weight:600;\">" + QObject::tr("Artwork by:")
+ "</span></h3>";
+ continue;
}
credits += currentLine;
}
--
GitLab