diff -r 632dfc73cf83 -r 3f679f2fb45a QTfrontend/ui/widget/about.cpp --- a/QTfrontend/ui/widget/about.cpp Thu Dec 13 23:21:19 2018 +0100 +++ b/QTfrontend/ui/widget/about.cpp Fri Dec 14 00:15:30 2018 +0100 @@ -60,7 +60,7 @@ // Open the credits file /* *** FILE FORMAT OF CREDITS FILE *** - The credits file is an RFC-4180-compliant CSV file with 4 columns. + The credits file is an RFC-4180-compliant CSV file with 5 columns. The first column (column 1) is always 1 letter long and is the row type. The row type determines the meaning of the other columns. @@ -70,16 +70,17 @@ * Column 2: Task/contribution * Column 3: Contributor name * Column 4: Contributor e-mail + * Column 5: Contributor nickname * M: Alternative credits entry that is a placeholder for other or unknown authors - * Columns 2-4: Unused + * Columns 2-5: Unused * S: Section * Column 2: Section name - * Columns 3-4: Unused + * Columns 3-5: Unused * U: Subsection * Column 2: Subsection name - * Columns 3-4: Unused + * Columns 3-5: Unused - Column 2 MUST be in US-ASCII. + Columns 2, 3 and 5 MUST be in US-ASCII. */ QFile creditsFile(":/res/credits.csv"); if (!creditsFile.open(QIODevice::ReadOnly)) @@ -89,7 +90,7 @@ } QString creditsString = creditsFile.readAll(); QString out = QString("

" + tr("Credits") + "

\n"); - QStringList cells = QStringList() << QString("") << QString("") << QString("") << QString(""); + QStringList cells = QStringList() << QString("") << QString("") << QString("") << QString("") << QString(""); bool firstSection = true; unsigned long int column = 0; unsigned long int charInCell = 0; @@ -101,7 +102,7 @@ for(long long int i = 0; i%1").arg(mail); - if(task.isEmpty() && mail.isEmpty() && !name.isEmpty()) + if(task.isEmpty() && mail.isEmpty() && !showName.isEmpty()) { // Name only - out = out + "
  • " + name + "
  • \n"; + out = out + "
  • " + showName + "
  • \n"; } - else if(name.isEmpty() && mail.isEmpty() && !task.isEmpty()) + else if(showName.isEmpty() && mail.isEmpty() && !task.isEmpty()) { // Task only out = out + "
  • " + HWApplication::translate("credits", task.toLatin1().constData()) + "
  • \n"; @@ -185,8 +194,8 @@ else if(task.isEmpty()) { // Name and e-mail - //: Part of credits. %1: Contribution name. %2: E-mail address - out = out + "
  • " + tr("%1 <%2>").arg(name).arg(mailLink) + "
  • \n"; + //: Part of credits. %1: Contributor name. %2: E-mail address + out = out + "
  • " + tr("%1 <%2>").arg(showName).arg(mailLink) + "
  • \n"; } else if(mail.isEmpty()) { @@ -194,7 +203,7 @@ //: Part of credits. %1: Description of contribution. %2: Contributor name out = out + "
  • " + tr("%1: %2") .arg(HWApplication::translate("credits", task.toLatin1().constData())) - .arg(name) + .arg(showName) + "
  • \n"; } else @@ -203,7 +212,7 @@ //: Part of credits. %1: Description of contribution. %2: Contributor name. %3: E-mail address out = out + "
  • " + tr("%1: %2 <%3>") .arg(HWApplication::translate("credits", task.toLatin1().constData())) - .arg(name) + .arg(showName) .arg(mailLink) + "
  • \n"; } @@ -218,6 +227,7 @@ cells[1] = ""; cells[2] = ""; cells[3] = ""; + cells[4] = ""; charInCell = 0; }