Merge branch 'main' of https://github.com/mixxxdj/mixxx into harmonic-wheel

7 files changed, 36 insertions, 50 deletions

diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp
index 5e9e4b1ad1..3029b9b3be 100644
--- a/src/dialog/dlgabout.cpp
+++ b/src/dialog/dlgabout.cpp
@@ -1,7 +1,12 @@
 #include "dialog/dlgabout.h"
-#include "util/version.h"
+
 #include <QFile>
 
+#include "defs_urls.h"
+#include "moc_dlgabout.cpp"
+#include "util/color/color.h"
+#include "util/version.h"
+
 DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
     setupUi(this);
 
@@ -93,9 +98,20 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
             << "Simon Harst"
             << "Harshit Maurya"
             << "Janek Fischer"
+            << "St&eacute;phane Lepin"
+            << "J&eacute;r&ocirc;me Blanchi"
             << "Chris Hills"
             << "David Lowenfels"
-            << "Sanskar Bajpai";
+            << "Matthieu Bouron"
+            << "Nathan Korth"
+            << "Kristiyan Katsarov"
+            << "J&ouml;rg Wartenberg"
+            << "Sanskar Bajpai"
+            << "Edward Millen"
+            << "Frank Breitling"
+            << "Christian"
+            << "Geraldo Nascimento"
+            << "Albert Aparicio";
 
     QStringList specialThanks;
     specialThanks
@@ -322,4 +338,15 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() {
              << sectionTemplate.arg(s_specialThanks,
                                     specialThanks.join("<br>"));
     textBrowser->setHtml(sections.join(""));
+
+    textWebsiteLink->setText(
+            QString("<a style=\"color:%1;\" href=\"%2\">%3</a>")
+                    .arg(Color::blendColors(palette().link().color(),
+                                 palette().text().color())
+                                    .name(),
+                            MIXXX_WEBSITE_URL,
+                            tr("Official Website")));
+
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgAbout::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgAbout::reject);
 }
diff --git a/src/dialog/dlgabout.h b/src/dialog/dlgabout.h
index e0ecbe980c..a704fc2c37 100644
--- a/src/dialog/dlgabout.h
+++ b/src/dialog/dlgabout.h
@@ -1,5 +1,4 @@
-#ifndef DIALOG_DLGABOUT_H
-#define DIALOG_DLGABOUT_H
+#pragma once
 
 #include <QWidget>
 
@@ -11,5 +10,3 @@ class DlgAbout : public QDialog, public Ui::DlgAboutDlg {
   public:
     DlgAbout(QWidget* parent);
 };
-
-#endif  // DIALOG_DLGABOUT_H
diff --git a/src/dialog/dlgaboutdlg.ui b/src/dialog/dlgaboutdlg.ui
index 012646b3d4..9d6d6deda7 100644
--- a/src/dialog/dlgaboutdlg.ui
+++ b/src/dialog/dlgaboutdlg.ui
@@ -171,10 +171,7 @@ p, li { white-space: pre-wrap; }
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>&lt;a href=&quot;http://mixxx.org/&quot;&gt;Official Website&lt;/a&gt;</string>
-       </property>
+      <widget class="QLabel" name="textWebsiteLink">
        <property name="openExternalLinks">
         <bool>true</bool>
        </property>
@@ -210,38 +207,4 @@ p, li { white-space: pre-wrap; }
   <include location="../../res/mixxx.qrc"/>
   <include location="../../res/mixxx.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>DlgAboutDlg</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>DlgAboutDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>
diff --git a/src/dialog/dlgdevelopertools.cpp b/src/dialog/dlgdevelopertools.cpp
index d6fe5951dd..22e73f2cc2 100644
--- a/src/dialog/dlgdevelopertools.cpp
+++ b/src/dialog/dlgdevelopertools.cpp
@@ -3,9 +3,10 @@
 #include <QDateTime>
 
 #include "control/control.h"
+#include "moc_dlgdevelopertools.cpp"
 #include "util/cmdlineargs.h"
-#include "util/statsmanager.h"
 #include "util/logging.h"
+#include "util/statsmanager.h"
 
 DlgDeveloperTools::DlgDeveloperTools(QWidget* pParent,
                                      UserSettingsPointer pConfig)
diff --git a/src/dialog/dlgdevelopertools.h b/src/dialog/dlgdevelopertools.h
index d36c65f769..f3e607eac4 100644
--- a/src/dialog/dlgdevelopertools.h
+++ b/src/dialog/dlgdevelopertools.h
@@ -1,5 +1,4 @@
-#ifndef DIALOG_DLGDEVELOPERTOOLS_H
-#define DIALOG_DLGDEVELOPERTOOLS_H
+#pragma once
 
 #include <QDialog>
 #include <QFile>
@@ -36,5 +35,3 @@ class DlgDeveloperTools : public QDialog, public Ui::DlgDeveloperTools {
     QFile m_logFile;
     QTextCursor m_logCursor;
 };
-
-#endif // DIALOG_DLGDEVELOPERTOOLS_H
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 0a68619bc5..b1047173e5 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -10,6 +10,7 @@
 #include "engine/controls/cuecontrol.h"
 #include "library/dao/cuedao.h"
 #include "library/queryutil.h"
+#include "moc_dlgreplacecuecolor.cpp"
 #include "preferences/colorpalettesettings.h"
 #include "track/track.h"
 #include "util/color/predefinedcolorpalettes.h"
diff --git a/src/dialog/dlgreplacecuecolor.h b/src/dialog/dlgreplacecuecolor.h
index 9ded791ef2..397595f729 100644
--- a/src/dialog/dlgreplacecuecolor.h
+++ b/src/dialog/dlgreplacecuecolor.h
@@ -43,7 +43,7 @@ class DlgReplaceCueColor : public QDialog, public Ui::DlgReplaceCueColor {
     void setCurrentColor(mixxx::RgbColor color);
 
   signals:
-    void databaseTracksChanged(QSet<TrackId> Trackids);
+    void databaseTracksChanged(const QSet<TrackId>& Trackids);
 
   private slots:
     void slotApply();