From a445968d2ea6866b104070b0125c8b8bdbd64f7d Mon Sep 17 00:00:00 2001 From: Alexandre Quessy Date: Wed, 28 Dec 2016 13:52:41 -0500 Subject: [PATCH] Fix #303: Update list of contributors by hand --- AboutDialog.cpp | 11 ++++------ AboutDialog.h | 2 +- docs/informations/CONTRIBUTORS.html | 13 +++-------- docs/informations/CONTRIBUTORS.md | 13 +++-------- scripts/update-contributors.sh | 34 +++++++++++++++-------------- 5 files changed, 29 insertions(+), 44 deletions(-) diff --git a/AboutDialog.cpp b/AboutDialog.cpp index 0245ab1..b20e4bc 100644 --- a/AboutDialog.cpp +++ b/AboutDialog.cpp @@ -63,14 +63,12 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) createAboutTab(); // Changelog Tab createChangelogTab(); - // Librairies - createLibrairiesTab(); + // Libraries + createLibrariesTab(); // Contributors createContributorsTab(); // License createLicenseTab(); - - } void AboutDialog::createAboutTab() @@ -119,7 +117,7 @@ void AboutDialog::createChangelogTab() _tabWidget->addTab(_changelogTextBrowser, tr("Changelog")); } -void AboutDialog::createLibrairiesTab() +void AboutDialog::createLibrariesTab() { _librariesTextBrowser = new QTextBrowser; _librariesTextBrowser->setOpenExternalLinks(true); @@ -135,8 +133,7 @@ void AboutDialog::createLibrairiesTab() // Set librairies main text _librariesTextBrowser->setText(librairiesText); - - _tabWidget->addTab(_librariesTextBrowser, tr("Librairies")); + _tabWidget->addTab(_librariesTextBrowser, tr("Libraries")); } void AboutDialog::createContributorsTab() diff --git a/AboutDialog.h b/AboutDialog.h index 6d41ffd..2666d91 100644 --- a/AboutDialog.h +++ b/AboutDialog.h @@ -43,7 +43,7 @@ public slots: private: void createAboutTab(); void createChangelogTab(); - void createLibrairiesTab(); + void createLibrariesTab(); void createContributorsTab(); void createLicenseTab(); diff --git a/docs/informations/CONTRIBUTORS.html b/docs/informations/CONTRIBUTORS.html index 2a4af06..59c934f 100644 --- a/docs/informations/CONTRIBUTORS.html +++ b/docs/informations/CONTRIBUTORS.html @@ -1,17 +1,10 @@

Contributors

-

Ordered by first contribution.

- - -

Generated by scripts/update-contributors.sh.

diff --git a/docs/informations/CONTRIBUTORS.md b/docs/informations/CONTRIBUTORS.md index 62b9d6e..80339a7 100644 --- a/docs/informations/CONTRIBUTORS.md +++ b/docs/informations/CONTRIBUTORS.md @@ -1,15 +1,8 @@ ## Contributors -#### Ordered by first contribution. - -- Alexandre Quessy (alexandre.quessy@collabora.com) +- Sofian Audry (info@sofianaudry.com) +- Dame Diongue (baydamd@gmail.com) - Alexandre Quessy (alexandre@quessy.net) -- Tats (info@sofianaudry.com) -- sylvain (sylvain@jin-motion.com) -- Vasilis Liaskovitis (vasilis.liaskovitis@profitbricks.com) - Vasilis Liaskovitis (vliaskov@gmail.com) -- baydam (baydamd@gmail.com) +- Mike Latona (make_latona@hotmail.com) - Marc Lavallée (marc@hacklava.net) -- Bay Dam (baydamd@gmail.com) - -#### Generated by scripts/update-contributors.sh. diff --git a/scripts/update-contributors.sh b/scripts/update-contributors.sh index 228e299..712128a 100755 --- a/scripts/update-contributors.sh +++ b/scripts/update-contributors.sh @@ -2,22 +2,24 @@ # update CONTRIBUTORS.md based on git history. -git log --reverse --format='%aN (%aE)' | perl -we ' -BEGIN { - %seen = (), @authors = (); -} -while (<>) { - next if $seen{$_}; - $seen{$_} = push @authors, "- ", $_; +# git log --reverse --format='%aN (%aE)' | perl -we ' +# BEGIN { +# %seen = (), @authors = (); +# } +# while (<>) { +# next if $seen{$_}; +# $seen{$_} = push @authors, "- ", $_; +# +# } +# END { +# print "## Contributors\n\n"; +# print "#### Ordered by first contribution.\n\n"; +# print @authors, "\n"; +# print "#### Generated by scripts/update-contributors.sh.\n"; +# } +# ' > ../docs/informations/CONTRIBUTORS.md -} -END { - print "## Contributors\n\n"; - print "#### Ordered by first contribution.\n\n"; - print @authors, "\n"; - print "#### Generated by scripts/update-contributors.sh.\n"; -} -' > ../docs/informations/CONTRIBUTORS.md +echo "Please update docs/informations/CONTRIBUTORS.md by hand" # Convert markdown file to html -markdown ../docs/informations/CONTRIBUTORS.md > ../docs/informations/CONTRIBUTORS.html +markdown docs/informations/CONTRIBUTORS.md > docs/informations/CONTRIBUTORS.html