From f7e1c6cb8b5c22167faed710111c1f9c18ad34c5 Mon Sep 17 00:00:00 2001
From: Dvogonen <github@kernen.se>
Date: Sat, 11 Jan 2014 22:33:01 +0100
Subject: [PATCH] Now formatted in 6 columns. Looks rather nice. Stripped
 http:// tags in donors text file to improve automatic formatting.

---
 DONATIONS.txt                        |  6 ++---
 companion/src/contributorsdialog.cpp | 38 ++++++++++++++++++----------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/DONATIONS.txt b/DONATIONS.txt
index d1ea683e8..7076054ce 100644
--- a/DONATIONS.txt
+++ b/DONATIONS.txt
@@ -95,8 +95,8 @@ Heinrich Illig
 Michael Collins
 Michael Manning
 Craig Lorentz
-Jonathan Modellismo - http://jonathan.it
-Aviomotive - http://www.aviomotive.com
+Jonathan Modellismo - jonathan.it
+Aviomotive - www.aviomotive.com
 André Lasseret
 Felipe Alexandre de Oliveira
 Brian Harris
@@ -126,7 +126,7 @@ Larisa Filocamo
 Alex Calderhead
 Hartmut Sahm
 Åke Brodin
-Aloft Hobbies - http://www.alofthobbies.com
+Aloft Hobbies - www.alofthobbies.com
 Ted Moss
 Filippos Tigarakis
 Chewytm
diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp
index 4372eb730..d49925caf 100644
--- a/companion/src/contributorsdialog.cpp
+++ b/companion/src/contributorsdialog.cpp
@@ -9,26 +9,38 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
     ui->setupUi(this);
     switch (contest) {
       case 0: {
-        ui->textBrowser->insertHtml(tr("<h3>People who have contributed to this project</h3>"));
-        ui->textBrowser->insertPlainText("\n");
         QFile file(":/DONATIONS.txt");
+        QString htmlString = "<table>";
+        htmlString += "<tr><td colspan=\"6\"><h3>People who have contributed to this project</h3></td></tr><tr>";
         if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
-             QString color = "black";
+             int i = 0;
              while (!file.atEnd()) {
-                 QByteArray line = file.readLine();
-                 ui->textBrowser->insertHtml(QString("<font color=\"") + color + QString("\">") + line + QString(",</font> &nbsp"));
-                 if (color == "black")
-                     color = "#505050";
-                 else
-                     color = "black";
-             }
+                   QByteArray line = file.readLine(); 
+                   htmlString += QString("<td>") + line + QString("</td>");
+                   i++;
+                   if (!(i%6)){
+                       htmlString += "</tr><tr>";
+                   }
+              }
+             htmlString += "</tr>";
         }
-        ui->textBrowser->insertPlainText("\n");
-        ui->textBrowser->insertHtml(tr("<h3>Coders</h3><p></p>"));
+
+        htmlString += "<tr></tr><tr><td colspan=\"6\"><h3>Coders</h3></td></tr><tr>";
         QFile file2(":/CREDITS.txt");
         if(file2.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
-            ui->textBrowser->insertPlainText(file2.readAll());
+             int i = 0;
+             while (!file2.atEnd()) {
+                   QByteArray line = file2.readLine();
+                   htmlString += QString("<td>") + line + QString("</td>");
+                   i++;
+                   if (!(i%6)){
+                       htmlString += "</tr><tr>";
+                   }
+              }
         }
+        htmlString += "</tr></table>";
+        ui->textBrowser->insertHtml(htmlString);
+
         ui->textBrowser->insertPlainText("\n\n");
         ui->textBrowser->insertPlainText(tr("Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which\ncompanion9x was forked out."));
         ui->textBrowser->insertPlainText("\n\n");