1 files changed, 34 insertions, 29 deletions

diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 4b9fe5f85..b97d62590 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -20,7 +20,7 @@
 #include "ui_AboutDialog.h"
 
 #include "config-keepassx.h"
-#include "core/FilePath.h"
+#include "core/Resources.h"
 #include "core/Tools.h"
 #include "crypto/Crypto.h"
 
@@ -30,11 +30,10 @@ static const QString aboutMaintainers = R"(
 <p><ul>
     <li>Jonathan White (<a href="https://github.com/droidmonkey">droidmonkey</a>)</li>
     <li>Janek Bevendorff (<a href="https://github.com/phoerious">phoerious</a>)</li>
-    <li><a href="https://github.com/TheZ3ro">TheZ3ro</a></li>
-    <li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
-    <li>Weslly Honorato (<a href="https://github.com/weslly">weslly</a>)</li>
-    <li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
     <li>Sami V&auml;nttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
+    <li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
+    <li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
+    <li><a href="https://github.com/TheZ3ro">TheZ3ro</a> (retired)</li>
 </ul></p>
 )";
 
@@ -57,64 +56,68 @@ static const QString aboutContributors = R"(
     <li>Riley Moses</li>
     <li>Korbinian Schildmann</li>
     <li>Andreas (nitrohorse)</li>
+    <li>Kernellinux</li>
+    <li>Micha Ober</li>
+    <li>PublicByte</li>
 </ul>
 <h3>Notable Code Contributions:</h3>
 <ul>
     <li>droidmonkey</li>
     <li>phoerious</li>
-    <li>TheZ3ro</li>
-    <li>louib</li>
-    <li>weslly</li>
-    <li>varjolintu (KeePassXC-Browser)</li>
+    <li>louib (CLI)</li>
+    <li>varjolintu (Browser Integration)</li>
     <li>hifi (SSH Agent)</li>
     <li>ckieschnick (KeeShare)</li>
     <li>seatedscribe (CSV Import)</li>
-    <li>Aetf (Secret Storage Server)</li>
+    <li>Aetf (FdoSecrets Storage Server)</li>
+    <li>weslly (macOS improvements)</li>
     <li>brainplot (many improvements)</li>
     <li>kneitinger (many improvements)</li>
     <li>frostasm (many improvements)</li>
     <li>fonic (Entry Table View)</li>
     <li>kylemanna (YubiKey)</li>
     <li>c4rlo (Offline HIBP Checker)</li>
-    <li>wolframroesler (HTML Exporter)</li>
+    <li>wolframroesler (HTML Export, Statistics, Password Health, HIBP integration)</li>
     <li>mdaniel (OpVault Importer)</li>
-    <li>keithbennett (KeePassHTTP)</li>
-    <li>Typz (KeePassHTTP)</li>
-    <li>denk-mal (KeePassHTTP)</li>
     <li>angelsl (KDBX 4)</li>
+    <li>TheZ3ro (retired lead)</li>
     <li>debfx (KeePassX)</li>
     <li>BlueIce (KeePassX)</li>
 </ul>
 <h3>Patreon Supporters:</h3>
 <ul>
+    <li>Igor Zinovik</li>
     <li>Alexanderjb</li>
-    <li>Andreas Kollmann</li>
     <li>Richard Ames</li>
-    <li>Christian Rasmussen</li>
-    <li>Gregory Werbin</li>
-    <li>Nuutti Toivola</li>
     <li>SLmanDR</li>
-    <li>Ashura</li>
+    <li>Christian Rasmussen</li>
     <li>Tyler Gass</li>
-    <li>Lionel Laské</li>
-    <li>Dmitrii Galinskii</li>
-    <li>Sergei Maximov</li>
-    <li>John-Ivar</li>
-    <li>Clayton Casciato</li>
-    <li>John</li>
+    <li>Nuutti Toivola</li>
+    <li>Gregory Werbin</li>
+    <li>Lionel Laské</li>
+    <li>Ivar</li>
     <li>Darren</li>
     <li>Brad</li>
     <li>Mathieu Peltier</li>
+    <li>gonczor</li>
     <li>Oleksii Aleksieiev</li>
-    <li>Daniel Epp</li>
     <li>Gernot Premper</li>
     <li>Julian Stier</li>
-    <li>gonczor</li>
+    <li>Daniel Epp</li>
     <li>Ruben Schade</li>
     <li>Esteban Martinez</li>
+    <li>Niels Ganser</li>
     <li>turin231</li>
     <li>judd</li>
-    <li>Niels Ganser</li>
+    <li>Tarek Sherif</li>
+    <li>Bernhard</li>
+    <li>William Komanetsky</li>
+    <li>Clark Henry</li>
+    <li>Justin Carroll</li>
+    <li>Shintaro Matsushima</li>
+    <li>Larry Siden</li>
+    <li>Thammachart Chinvarapon</li>
+    <li>Patrick Evans</li>
 </ul>
 <h3>Translations:</h3>
 <ul>
@@ -207,7 +210,7 @@ AboutDialog::AboutDialog(QWidget* parent)
     nameLabelFont.setPointSize(nameLabelFont.pointSize() + 4);
     m_ui->nameLabel->setFont(nameLabelFont);
 
-    m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(48));
+    m_ui->iconLabel->setPixmap(resources()->applicationIcon().pixmap(48));
 
     QString debugInfo = Tools::debugInfo().append("\n").append(Crypto::debugInfo());
     m_ui->debugInfo->setPlainText(debugInfo);
@@ -218,6 +221,8 @@ AboutDialog::AboutDialog(QWidget* parent)
     setAttribute(Qt::WA_DeleteOnClose);
     connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
     connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard()));
+
+    m_ui->buttonBox->button(QDialogButtonBox::Close)->setDefault(true);
 }
 
 AboutDialog::~AboutDialog()