Merge remote-tracking branch 'upstream/2.3' into dirty-fix

1 files changed, 24 insertions, 15 deletions

diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp
index 55ecc52bf9..ea5c2da019 100644
--- a/src/dialog/dlgabout.cpp
+++ b/src/dialog/dlgabout.cpp
@@ -61,20 +61,11 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     recentContributors
             << "Tuukka Pasanen"
             << "Nino MP"
-            << "Nico Schl&ouml;mer"
             << "Ferran Pujol Camins"
-            << "Joan Marc&egrave; i Igual"
             << "Josep Maria Antol&iacute;n Segura"
             << "Daniel Poelzleithner"
             << "St&eacute;phane Lepin"
-            << "Stefan Weber"
-            << "Kshitij Gupta"
-            << "Matthew Nicholson"
-            << "Jamie Gifford"
             << "luzpaz"
-            << "Sebastian Reu&szlig;e"
-            << "Pawe&#322; Goli&#324;ski"
-            << "beenisss"
             << "Bernd Binder"
             << "Pradyuman"
             << "Nik Martin"
@@ -108,7 +99,13 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
             << "Frank Breitling"
             << "Christian"
             << "Geraldo Nascimento"
-            << "Albert Aparicio";
+            << "Albert Aparicio"
+            << "Pierre Le Gall"
+            << "David Baker"
+            << "Justin Kourie"
+            << "Waylon Robertson"
+            << "Al Hadebe"
+            << "Javier Vilarroig";
 
     QStringList specialThanks;
     specialThanks
@@ -319,7 +316,16 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
             << "Johan Lasperas"
             << "Olaf Hering"
             << "Eduardo Acero"
-            << "Thomas Jarosch";
+            << "Thomas Jarosch"
+            << "Nico Schl&ouml;mer"
+            << "Joan Marc&egrave; i Igual"
+            << "Stefan Weber"
+            << "Kshitij Gupta"
+            << "Matthew Nicholson"
+            << "Jamie Gifford"
+            << "Sebastian Reu&szlig;e"
+            << "Pawe&#322; Goli&#324;ski"
+            << "beenisss";
 
     QString sectionTemplate = QString(
         "<p align=\"center\"><b>%1</b></p><p align=\"center\">%2</p>");
@@ -343,11 +349,14 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
                                     .name(),
                             MIXXX_WEBSITE_URL,
                             tr("Official Website")));
-
-    if (!Color::isDimColor(palette().text().color())) {
-        btnDonate->setIcon(QIcon(":/images/heart_icon_light.svg"));
+    if (std::rand() % 6) {
+        if (!Color::isDimColor(palette().text().color())) {
+            btnDonate->setIcon(QIcon(":/images/heart_icon_light.svg"));
+        } else {
+            btnDonate->setIcon(QIcon(":/images/heart_icon_dark.svg"));
+        }
     } else {
-        btnDonate->setIcon(QIcon(":/images/heart_icon_dark.svg"));
+        btnDonate->setIcon(QIcon(":/images/heart_icon_rainbow.svg"));
     }
     btnDonate->setText(tr("Donate"));
     connect(btnDonate, &QPushButton::clicked, this, [] {