diff --git a/AUTHORS b/AUTHORS index bf2d02c9..5013f482 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,13 +1,162 @@ -Andreas Butti -Wilson Brenna (since 2012) -Marek Pikuła (since 2015) -Moreno Razzoli (since 2018) -Luca Errani (since 2018) -Ulrich Huber (since 2019) -Justin Jones (since 2019) -Bryan Tan (since 2019) -Justus Rossmeier (since 2019) -Fabian Keßler (since 2019) -lehmanju (since 2019) -Roland Lötscher (since 2020) -Tobias Hermann (since 2020) +Developer Team: + +2010-2021, Andreas Butti +2012-2018, Wilson Brenna +2015-2016, Marek Pikuła +2017-2019, Peter Klausing +2018-2019, Moreno Razzoli +2018-2019, Luca Errani +2019-2021, Ulrich Huber +2019-2019, Justin Jones +2019-2021, Bryan Tan +2019-2019, Justus Rossmeier +2019-2021, Fabian Keßler +2019-2020, Julius Lehmann +2020-2021, Tobias Hermann +2020-2021, Roland Lötscher + + +Contributors from the community: + +Adolfo Jayme Barrientos +Alex Veltman +Andreas Stallinger +Antonin Décimo +Archisman Panigrahi +Ari Breitkreuz +Atri Bhattacharya +Awais Lodhi +Azure Pipelines +Barak A. Pearlmutter +Baseng0815 <1shedex2@gmail.com> +Ben Kallus +Benjamin Hennion +Casey Jao +ChiDal +Clement Deschamps <46494175+clemdc@users.noreply.github.com> +Colin B. Macdonald +DUOLabs +David Leppla-Weber <5256992+David96@users.noreply.github.com> +Dominik Gedon +Elias Riedel Gårding +Enno Zickler +Fabian Thomas +Fatih +Felix Stupp +Florian Freund +Florian Klink +Florian Rücker +Florian Ulmschneider +Frédéric Simonis +Gabriel Ebner +Gaetan Bisson +Greg Meyer +Guldoman +Haelwenn (lanodan) Monnier +Heimen Stoffels +Henrik Dick +Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com> +Henry Heino +Holzfeind, Daniel Georg +Jan Hrdina +Jason Vander Woude +John Doe +Jonas Erbe +Julian Kuiyu CHANG +Keith Miyake +Kian Kasad +Kyle Godbey +Levi Ryffel +Lewin Bormann +Luca Citi +Luya Tshimbalanga +Malte Müller +Malte Splietker +Maniform <44653826+Maniform@users.noreply.github.com> +Marco Aurélio Graciotto Silva +Mark Miller <725mrm@gmail.com> +Mark Mueller +Mark Roman Miller <725mrm@gmail.com> +Mark W. Mueller +Marmare314 <49279081+Marmare314@users.noreply.github.com> +Martin Lellep +Martin Putzlocher +Mateusz Szczupak +Matthew J.P. Walker +Mazurel +Michael J Gruber +Michael Schaufelberger +Murali Mohan +Nicola Corna +Nicolae Stroncea +Niels Mündler +Nikolay Korotkiy +Pablo Alvarado-Moya +Pablo Arnalte-Mur +Paul Dettorer Hervot +PellelNitram +Plailect +Pēteris Birkants +Rasmus Thomsen +Rob Frohne +Romano Giannetti +Ruo Li +Rémi Emonet +Scott Tsai +Shem Pasamba +Shuhao Wu +Simon Fischer +StatErik +Stefan Wallentowitz +The one with the braid | Der mit dem Zopf +TheAssassin +TheOneWithTheBraid +ThierryM +ThoFrank +Thomas Frank +Tim Clifford +Tobias Mueller +Unknown <14054505+piegamesde@users.noreply.github.com> +Vivek Thazhathattil <63693789+VivekThazhathattil@users.noreply.github.com> +Vivek Thazhathattil +Vu Ngoc San +Will Nilges +William Pettersson +Yuri +Zeyphros +Zeyphros +alexruetz +andrewrembrandt +dadosch +danfai +demiurg337 +doraeric +duncan +edo0 <16632292+edo0@users.noreply.github.com> +fabian.thomas +frohro +hard-zero1 <59370464+hard-zero1@users.noreply.github.com> +hard-zero1 +hashworks +iczero +jonasBoss <31804124+jonasBoss@users.noreply.github.com> +lciti +matt_chan +maxirmx +mitzal <34011576+mitzal@users.noreply.github.com> +muelli +nicolae-stroncea <39338488+nicolae-stroncea@users.noreply.github.com> +pktiuk +pktiuk +redweasel <54547948+redweasel@users.noreply.github.com> +sanette +siliconninja +siliconninja +step +suokunlong +taaem +tattsan +transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com> +usrtrv +x2b +xifi-kif diff --git a/copyright.txt b/copyright.txt index 55b85222..5eca4a03 100644 --- a/copyright.txt +++ b/copyright.txt @@ -4,10 +4,10 @@ Upstream-Contact: https://github.com/xournalpp/xournalpp/issues/ Source: https://github.com/xournalpp/xournalpp/ Files: * -Copyright: 2012-2018, Wilson Brenna - 2013-2021, Andreas Butti +Copyright: 2010-2021, Andreas Butti + 2012-2018, Wilson Brenna 2015-2016, Marek Pikuła - 2017-2019, peetCreative + 2017-2019, Peter Klausing 2018-2019, Moreno Razzoli 2018-2019, Luca Errani 2019-2021, Ulrich Huber diff --git a/src/gui/dialog/AboutDialog.cpp b/src/gui/dialog/AboutDialog.cpp index 3022993d..55b8d786 100644 --- a/src/gui/dialog/AboutDialog.cpp +++ b/src/gui/dialog/AboutDialog.cpp @@ -4,6 +4,7 @@ #include #include "StringUtils.h" +#include "i18n.h" AboutDialog::AboutDialog(GladeSearchpath* gladeSearchPath): GladeGui(gladeSearchPath, "about.glade", "aboutDialog") { gtk_label_set_markup(GTK_LABEL(get("lbBuildDate")), __DATE__ ", " __TIME__); @@ -15,12 +16,33 @@ AboutDialog::AboutDialog(GladeSearchpath* gladeSearchPath): GladeGui(gladeSearch gtk_label_set_markup(GTK_LABEL(get("lbGtkVersion")), gtkVersion); - GtkWidget* w = get("vbox1"); - GtkWidget* linkButton = gtk_link_button_new("http://github.com/xournalpp/xournalpp"); - gtk_widget_show(linkButton); - gtk_box_pack_start(GTK_BOX(w), linkButton, true, true, 0); + auto w1 = get("vboxRepo"); + auto linkButton1 = gtk_link_button_new("https://github.com/xournalpp/xournalpp"); + gtk_widget_show(linkButton1); + gtk_box_pack_start(GTK_BOX(w1), linkButton1, true, true, 0); + + auto w2 = get("vboxWebsite"); + auto linkButton2 = gtk_link_button_new("https://xournalpp.github.io"); + gtk_widget_show(linkButton2); + gtk_box_pack_start(GTK_BOX(w2), linkButton2, true, true, 0); + + + auto w3 = get("vboxCommunity"); + auto linkButton3 = + gtk_link_button_new_with_label("https://raw.githubusercontent.com/xournalpp/xournalpp/master/AUTHORS", + _("See the full list of contributors")); + gtk_widget_show(linkButton3); + gtk_box_pack_start(GTK_BOX(w3), linkButton3, true, true, 0); + + + auto w4 = get("vboxLicense"); + auto linkButton4 = gtk_link_button_new_with_label( + "https://raw.githubusercontent.com/xournalpp/xournalpp/master/LICENSE", _("GNU GPLv2 or later")); + gtk_widget_show(linkButton4); + gtk_box_pack_start(GTK_BOX(w4), linkButton4, true, true, 0); } + AboutDialog::~AboutDialog() = default; void AboutDialog::show(GtkWindow* parent) { diff --git a/ui/about.glade b/ui/about.glade index d93fb1b9..f5e77ebe 100644 --- a/ui/about.glade +++ b/ui/about.glade @@ -16,12 +16,15 @@ True False + end vertical dialog-action_area2 True False + center + True end @@ -49,68 +52,38 @@ - - XournalIcon + + True False - pixmaps/com.github.xournalpp.xournalpp.svg - - - True - True - 12 - 2 - - - - - labelTitle - True - False - <span size="xx-large" weight="bold">Xournal++</span> -<i>The next generation</i> - True - center - - - False - False - 9 - 3 - - - - - True - False - vertical + True + + + XournalIcon + True + False + pixmaps/com.github.xournalpp.xournalpp.svg + + + 0 + 0 + + - + True False center + center + 12 10 - True - - - True - False - Version - - - - - - 0 - 0 - - lbVersion True False + start X.X.X @@ -122,6 +95,7 @@ True False + start Built on @@ -132,22 +106,11 @@ 2 - - - lbBuildDate - True - False - DATE TIME - - - 1 - 2 - - True False + start Git commit @@ -162,6 +125,7 @@ True False + start RELEASE_IDENTIFIER @@ -173,6 +137,7 @@ True False + start with libgtk @@ -187,6 +152,7 @@ True False + start X.X.X @@ -195,138 +161,343 @@ - - - - - - - + + lbBuildDate + True + False + start + DATE TIME + + + 1 + 2 + - + + True + False + start + Version + + + + + + 0 + 0 + - False - True - 0 + 1 + 0 + 2 - + + labelTitle True False - 10 - Authors: + <span size="xx-large" weight="bold">Xournal++</span> +<i>The next generation</i> + True center - - - - False - True - 4 + 0 + 1 - - lbAuthors + True False - 5 - Andreas Butti, 2010 - 2021 -Wilson Brenna, 2012 - 2015 -Marek Pikuła, 2015 - 2018 -Moreno Razzoli, 2018 - 2019 -Luca Errani, 2018 - 2019 -Ulrich Huber, 2019 -Justin Jones, 2019 -Bryan Tan, 2019 -Justus Rossmeier, 2019 -Fabian Keßler, 2019 -lehmanju, 2019 -Roland Lötscher, 2020 -Tobias Hermann, 2020 - True - center + 12 + 12 - False - True - 5 + 0 + 2 + 2 - - lbComunity + True False - 10 - 10 - With help from the community - True - center + start + vertical + 6 + + + True + False + vertical + + + True + False + 10 + Icon Designers + center + + + + + + False + True + 0 + + + + + lbAuthors + True + False + 5 + Nararyans R.I. +Luya Tshimbalanga + True + center + + + False + True + 1 + + + + + True + False + 8 + + + False + True + 2 + + + + + False + True + 0 + + + + + lbXournal + True + False + Partially based on Xournal +by Denis Auroux + True + center + + + False + True + 1 + + + + + True + False + 4 + + + False + True + 2 + + + + + True + False + vertical + + + True + False + Website + + + + + + False + True + 1 + + + + + False + True + 3 + + + + + True + False + vertical + + + True + False + 6 + Source Code / Bug Tracker + + + + + + False + True + 0 + + + + + False + True + 4 + + - False - True - 6 + 1 + 3 - - lbXournal + True False - Partially based on Xournal -by Denis Auroux - True - center + start + vertical + + + lbComunity + True + False + start + 6 + With help from the community + True + center + + + False + True + 0 + + - False - True - 7 + 0 + 4 - - lbLicense + True False - 10 - 10 - License - - - + vertical + + + lbLicense + True + False + start + 6 + License + + + + + + False + True + 0 + + - False - True - 8 + 1 + 4 - + True False - 10 - GNU GPLv2 or later + start + vertical + + + True + False + 10 + Authors + center + + + + + + False + True + 0 + + + + + lbAuthors + True + False + 5 + Andreas Butti +Wilson Brenna +Marek Pikuła +Peter Klausing +Moreno Razzoli +Luca Errani +Ulrich Huber +Justin Jones +Bryan Tan +Justus Rossmeier +Fabian Keßler +Julius Lehmann +Tobias Hermann +Roland Lötscher + True + center + + + False + True + 1 + + - False - True - 9 + 0 + 3 False True - 3 + 2