diff --git a/.gitignore b/.gitignore
index 4fdc8d70a..d02b6cacd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ release*/
.DS_Store
.version
+desktop.ini
\.scannerwork/
/snap/.snapcraft/
diff --git a/share/about-contributors.html b/share/about-contributors.html
deleted file mode 100644
index 77ceadb5f..000000000
--- a/share/about-contributors.html
+++ /dev/null
@@ -1,54 +0,0 @@
-VIP Patreon Supporters:
-
- - John Cook
- - Max Anderson
-
-Notable Code Contributions:
-
- - droidmonkey
- - phoerious
- - TheZ3ro
- - louib
- - weslly
- - varjolintu (KeePassXC-Browser)
- - hifi (SSH Agent)
- - frostasm
- - fonic (Entry Table View)
- - kylemanna (YubiKey)
- - keithbennett (KeePassHTTP)
- - Typz (KeePassHTTP)
- - denk-mal (KeePassHTTP)
- - angelsl (KDBX 4)
- - seatedscribe (CSV Import)
- - debfx (KeePassX)
- - BlueIce (KeePassX)
-
-Patreon Supporters:
-
- - Ashura
- - Alexanderjb
- - Andreas Kollmann
- - Richard Ames
-
-Translations:
-
- - Basque: azken_tximinoa, Hey_neken
- - Catalan: capitantrueno, dsoms, mcus, raulua, ZJaume
- - Chinese (China): Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku
- - Chinese (Taiwan): BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808
- - Czech: DanielMilde, JosefVitu, pavelb, tpavelek
- - Danish: nlkl
- - Dutch: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea
- - Finnish: artnay, Jarppi, MawKKe
- - French: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset
- - German: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster
- - Greek: magkopian, nplatis, tassos.b, xinomilo
- - Hungarian: bubu, meskobalazs, urbalazs
- - Indonesian: zk
- - Italian: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo
- - Japanese: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato
- - Korean: cancantun, peremen
- - Lithuanian: Moo
- - Polish: keypress, konradmb, mrerexx, psobczak
- - Portuguese (Brazil): danielbibit, fabiom, flaviobn, vitor895, weslly
-
diff --git a/share/about.html b/share/about.html
deleted file mode 100644
index 3d0e8974d..000000000
--- a/share/about.html
+++ /dev/null
@@ -1,14 +0,0 @@
-Website: https://keepassxc.org
-Report bugs at: https://github.com
-KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.
-Project Maintainers:
-
-Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.
\ No newline at end of file
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 86cece993..0de79fccc 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -20,13 +20,144 @@
#include "ui_AboutDialog.h"
#include "config-keepassx.h"
-#include "git-info.h"
#include "core/FilePath.h"
#include "crypto/Crypto.h"
+#include "git-info.h"
#include
#include
+static const QString aboutMaintainers = R"(
+
+)";
+
+static const QString aboutContributors = R"(
+VIP Patreon Supporters:
+
+ - John Cook
+ - Max Anderson
+ - l0b0
+ - NarwhalOfAges
+ - Caleb Currie
+ - Igor Zinovik
+ - Morgan Courbet
+ - Sergiu Coroi
+
+Notable Code Contributions:
+
+ - droidmonkey
+ - phoerious
+ - TheZ3ro
+ - louib
+ - weslly
+ - varjolintu (KeePassXC-Browser)
+ - hifi (SSH Agent)
+ - ckieschnick (KeeShare)
+ - seatedscribe (CSV Import)
+ - brainplot (many improvements)
+ - kneitinger (many improvements)
+ - frostasm (many improvements)
+ - fonic (Entry Table View)
+ - kylemanna (YubiKey)
+ - keithbennett (KeePassHTTP)
+ - Typz (KeePassHTTP)
+ - denk-mal (KeePassHTTP)
+ - angelsl (KDBX 4)
+ - debfx (KeePassX)
+ - BlueIce (KeePassX)
+
+Patreon Supporters:
+
+ - Ashura
+ - Alexanderjb
+ - Andreas Kollmann
+ - Richard Ames
+ - Christian Rasmussen
+ - Gregory Werbin
+ - Nuutti Toivola
+ - SLmanDR
+ - Tyler Gass
+ - Lionel Laské
+ - Dmitrii Galinskii
+ - Sergei Maximov
+ - John-Ivar
+ - Clayton Casciato
+
+Translations:
+
+ - Arabic: AboShanab, Night1, kmutahar, muha_abdulaziz, omar.nsy
+ - Basque: azken_tximinoa, Hey_neken
+ - Bengali: codesmite
+ - Burmese: Phyu
+ - Catalan: capitantrueno, dsoms, mcus, raulua, ZJaume
+ - Chinese (China): Biggulu, Brandon_c, Dy64, Felix2yu, Small_Ku, Z4HD,
+ carp0129, ef6, holic, kikyous, kofzhanganguo, ligyxy, remonli, slgray, umi_neko, vc5
+ - Chinese (Taiwan): BestSteve, MiauLightouch, Small_Ku, flachesis, gojpdchx,
+ raymondtau, th3lusive, yan12125, ymhuang0808
+ - Czech: DanielMilde, JosefVitu, awesomevojta, pavelb, tpavelek
+ - Danish: nlkl, KalleDK, MannVera, alfabetacain, ebbe, thniels
+ - Dutch: Bubbel, Dr.Default, apie, bartlibert, evanoosten, fvw, KnooL,
+ srgvg, Vistaus, wanderingidea, Stephan_P, Zombaya1, e2jk, ovisicnarf, pietermj, rigrig,
+ theniels17
+ - English (UK): YCMHARHZ, rookwood01, throne3d
+ - Esperanto: batisteo
+ - Estonian: Hermanio
+ - Finnish: artnay, Jarppi, MawKKe, petri, tomisalmi, hifi, varjolintu
+ - French: yahoe.001, A1RO, Albynton, Cabirto, Fumble, Gui13, MartialBis,
+ MrHeadwar, Nesousx, Raphi111, Scrat15, aghilas.messara, alexisju, b_mortgat, benoitbalon,
+ bisaloo, e2jk, ebrious, frgnca, ggtr1138, gilbsgilbs, gtalbot, houdini, houdini69,
+ iannick, jlutran, kyodev, lacnic, laetilodie, logut, mlpo, narzb, nekopep, pBouillon,
+ plunkets, theodex, tl_pierre, wilfriedroset
+ - German: origin_de, mithrial, andreas.maier, NotAName, Atalanttore,
+ Hativ, muellerma, mircsicz, derhagen, Wyrrrd, mbetz, kflesch, nursoda, BasicBaer,
+ mfernau77, for1real, joe776, waster, eth0, marcbone, mcliquid, transi_222, MarcEdinger,
+ DavidHamburg, jensrutschmann, codejunky, vlenzer, montilo, antsas, rgloor, Calyrx,
+ omnisome4, pcrcoding
+ - Greek: magkopian, nplatis, tassos.b, xinomilo
+ - Hungarian: bubu, meskobalazs, urbalazs, andras_tim
+ - Indonesian: zk, bora_ach
+ - Italian: the.sailor, VosaxAlo, tosky, seatedscribe, bovirus, Peo,
+ NITAL, FranzMari, Gringoarg, amaxis, salvatorecordiano, duncanmid, lucaim
+ - Japanese: masoo, metalic_cat, p2635, Shinichirou_Yamada,
+ vargas.peniel, vmemjp, yukinakato, gojpdchx, saita
+ - Korean: cancantun, peremen
+ - Lithuanian: Moo, pauliusbaulius, rookwood101
+ - Norweigian Bokmål: sattor, ysteinalver, jumpingmushroom,
+ JardarBolin, eothred, torgeirf, haarek
+ - Polish: keypress, konradmb, mrerexx, psobczak, SebJez, hoek
+ - Portuguese: weslly, xendez
+ - Portuguese (Brazil): danielbibit, guilherme__sr, Havokdan, fabiom,
+ flaviobn, weslly, newmanisaac, rafaelnp, RockyTV, xendez, lucasjsoliveira, vitor895,
+ mauri.andres, andersoniop
+ - Portuguese (Portugal): American_Jesus, xendez, hds, arainho, a.santos,
+ pfialho, smarquespt, mihai.ile, smiguel, lmagomes, xnenjm
+ - Russian: Mogost, alexminza, KekcuHa, NcNZllQnHVU, ruslan.denisenko,
+ agag11507, anm, cl0ne, JayDi85, RKuchma, Rakleed, vsvyatski, NetWormKido, DG,
+ Mr.GreyWolf, VictorR2007, _nomoretears_, netforhack, denoos, wkill95, Shevchuk,
+ talvind, artemkonenko, ShareDVI
+ - Slovak: l.martinicky, Slavko, crazko, pecer
+ - Spanish: gonrial, iglpdc, vsvyatski, Xlate1984, erinm, AndreachongB,
+ piegope, lupa18, e2jk, capitantrueno, LeoBeltran, antifaz, Zranz, AdrianClv,
+ EdwardNavarro, rodolfo.guagnini, NicolasCGN, caralu74, puchrojo, DarkHolme,
+ pdinoto, masanchez5000, adolfogc, systurbed, mauri.andres, Bendhet, vargas.peniel,
+ eliluminado, jojobrambs, pquin
+ - Swedish: theschitz, Anders_Bergqvist, LIINdd, krklns, henziger,
+ jpyllman, peron, Thelin, baxtex, zeroxfourc
+ - Thai: arthit, rayg
+ - Turkish: TeknoMobil, etc, SeLeNLeR, ethem578, cagries, N3pp
+ - Ukrainian: brisk022, exlevan, chulivska, cl0ne, zoresvit,
+ netforhack, ShareDVI
+
+)";
+
AboutDialog::AboutDialog(QWidget* parent)
: QDialog(parent)
, m_ui(new Ui::AboutDialog())
@@ -107,6 +238,9 @@ AboutDialog::AboutDialog(QWidget* parent)
m_ui->debugInfo->setPlainText(debugInfo);
+ m_ui->maintainers->setText(aboutMaintainers);
+ m_ui->contributors->setText(aboutContributors);
+
setAttribute(Qt::WA_DeleteOnClose);
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(close()));
connect(m_ui->copyToClipboard, SIGNAL(clicked()), SLOT(copyToClipboard()));
diff --git a/src/gui/AboutDialog.ui b/src/gui/AboutDialog.ui
index 2b274544a..8bd8ea01f 100644
--- a/src/gui/AboutDialog.ui
+++ b/src/gui/AboutDialog.ui
@@ -163,7 +163,7 @@
-
-
+
0
@@ -171,15 +171,7 @@
- <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änttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
-</ul>
+
true
@@ -238,8 +230,8 @@
0
0
- 449
- 845
+ 466
+ 246
@@ -255,61 +247,7 @@
IBeamCursor
- <h3>VIP Patreon Supporters:</h3>
-<ul>
- <li>John Cook</li>
- <li>Max Anderson</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>hifi (SSH Agent)</li>
- <li>frostasm</li>
- <li>fonic (Entry Table View)</li>
- <li>kylemanna (YubiKey)</li>
- <li>keithbennett (KeePassHTTP)</li>
- <li>Typz (KeePassHTTP)</li>
- <li>denk-mal (KeePassHTTP)</li>
- <li>angelsl (KDBX 4)</li>
- <li>seatedscribe (CSV Import)</li>
- <li>debfx (KeePassX)</li>
- <li>BlueIce (KeePassX)</li>
-</ul>
-<h3>Patreon Supporters:</h3>
-<ul>
- <li>Ashura</li>
- <li>Alexanderjb</li>
- <li>Andreas Kollmann</li>
- <li>Richard Ames</li>
-</ul>
-<h3>Translations:</h3>
-<ul>
- <li><strong>Basque</strong>: azken_tximinoa, Hey_neken</li>
- <li><strong>Catalan</strong>: capitantrueno, dsoms, mcus, raulua, ZJaume</li>
- <li><strong>Chinese (China)</strong>: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku</li>
- <li><strong>Chinese (Taiwan)</strong>: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808</li>
- <li><strong>Czech</strong>: DanielMilde, JosefVitu, pavelb, tpavelek</li>
- <li><strong>Danish</strong>: nlkl</li>
- <li><strong>Dutch</strong>: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea</li>
- <li><strong>Finnish</strong>: artnay, Jarppi, MawKKe</li>
- <li><strong>French</strong>: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset</li>
- <li><strong>German</strong>: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster</li>
- <li><strong>Greek</strong>: magkopian, nplatis, tassos.b, xinomilo</li>
- <li><strong>Hungarian</strong>: bubu, meskobalazs, urbalazs</li>
- <li><strong>Indonesian</strong>: zk</li>
- <li><strong>Italian</strong>: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo</li>
- <li><strong>Japanese</strong>: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato</li>
- <li><strong>Korean</strong>: cancantun, peremen</li>
- <li><strong>Lithuanian</strong>: Moo</li>
- <li><strong>Polish</strong>: keypress, konradmb, mrerexx, psobczak</li>
- <li><strong>Portuguese (Brazil)</strong>: danielbibit, fabiom, flaviobn, vitor895, weslly</li>
-</ul>
-
+
Qt::AutoText