haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Developer credit and copyright updates. 

* Remove duplicate developer credits added in last commit.
* Update developer email addresses.
* Change copyright.h from GPL2+ to GPL3+ per FSF.
* Update newstroke license from CC-BY to CC0 with permission by author
  Vladimir Uryvaev which reflects the official license on the newstroke
  website http://vovanium.ru/sledy/newstroke/en.
* Coding policy fixes in AboutDialog_main.cpp.
This commit is contained in:
Wayne Stambaugh 2015-11-19 10:04:12 -05:00
parent 4749921bbc
commit 4b85adb7d3
4 changed files with 246 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AUTHORS.txt
View File

@ -5,7 +5,8 @@
== Main Authors == Main Authors
Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab-dot-inpg-dot-fr> Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab-dot-inpg-dot-fr>
Dick Hollenbeck <dick[at]softplc-dot-com> Dick Hollenbeck <dick[at]softplc-dot-com>
Wayne Stambaugh <stambaughw[at]verizon-dot-net> Wayne Stambaugh <stambaughw[at]gmail-dot-com>
== Contributors == Contributors
Hauptmech <hauptmech[at]gmail-dot-com> Hauptmech <hauptmech[at]gmail-dot-com>
@ -34,7 +35,6 @@ Cirilo Bernardo <cirilo_bernardo[at]yahoo-dot-com>
Adam Wolfe <adamwolf[at]feelslikeburning-dot-com> Adam Wolfe <adamwolf[at]feelslikeburning-dot-com>
Bernhard Stegmaier <stegmaier[at]sw-systems-dot-de> Bernhard Stegmaier <stegmaier[at]sw-systems-dot-de>
Chris Pavlina <pavlina.chris[at]gmail-dot-com> Chris Pavlina <pavlina.chris[at]gmail-dot-com>
Mark Roszko <mark.roszko[at]gmail-dot-com>
Simon Richter <Simon.Richter[at]hogyros-dot-de> Simon Richter <Simon.Richter[at]hogyros-dot-de>
See also CHANGELOG.txt for contributors. See also CHANGELOG.txt for contributors.
@ -45,27 +45,28 @@ Igor Plyatov <plyatov[at]gmail-dot-com>
Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com> Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com>
Marco Ciampa <ciampix[at]libero-dot-it> Marco Ciampa <ciampix[at]libero-dot-it>
== Translators == Translators
Czech (CZ) Martin Kratoška <martin[at]ok1rr-dot-com> Czech (CZ) Martin Kratoška <martin[at]ok1rr-dot-com>
Dutch (NL) Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com> Dutch (NL) Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com>
Finnish (FI) Vesa Solonen <vesa.solonen[at]hut-dot-fi> Finnish (FI) Vesa Solonen <vesa.solonen[at]hut-dot-fi>
French (FR) Jean-Pierre Charras <jean-pierre.charras[at]inpg-dot-fr> French (FR) Jean-Pierre Charras <jean-pierre.charras[at]inpg-dot-fr>
Polish (PL) Mateusz Skowro¿ski <skowri[at]gmail-dot-com> Polish (PL) Mateusz Skowro¿ski <skowri[at]gmail-dot-com>
Polish (PL) Kerusey Karyu <keruseykaryu@o2.pl> Polish (PL) Kerusey Karyu <keruseykaryu[at]o2.pl>
Portuguese (PT) Renie Marquet <reniemarquet[at]uol-dot-com-dot-br>" Portuguese (PT) Renie Marquet <reniemarquet[at]uol-dot-com-dot-br>"
Russian (RU) Igor Plyatov <plyatov[at]gmail-dot-com> Russian (RU) Igor Plyatov <plyatov[at]gmail-dot-com>
Russian (RU) Andrey Fedorushkov <andrf@mail.ru> Russian (RU) Andrey Fedorushkov <andrf[at]mail-dot-ru>
Russian (RU) Eldar Khayrullin <eldar.khayrullin@mail.ru> Russian (RU) Eldar Khayrullin <eldar.khayrullin[at]mail-dot-ru>
Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es> Spanish (ES) Pedro Martin del Valle <pkicad[at]yahoo-dot-es>
Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es> Spanish (ES) Iñigo Zuluaga <inigo_zuluaga[at]yahoo-dot-es>
German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de German (DE) Rafael Sokolowski <Rafael.Sokolowski[at]web-dot-de
Japanese (JA) Kenta Yonekura <midpika@hotmail-dot-com> Japanese (JA) Kenta Yonekura <yoneken[at]kicad-dot-jp>
Japanese (JA) yoneken <midpika@hotmail-dot-com>
Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke Remy Halvick, David Briscoe, Dominique Laigle, Paul Burke
== Programm credits for icons and others == Programm credits for icons and others
Icons by Iñigo Zuluagaz <inigo_zuluaga[at]yahoo-dot-es> Icons by Iñigo Zuluagaz <inigo_zuluaga[at]yahoo-dot-es>
New Icons by Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com> New Icons by Fabrizio Tappero <fabrizio-dot-tappero[at]gmail-dot-com>
3D modules by Renie Marquet <reniemarquet[at]uol.com-dot-br> 3D modules by Renie Marquet <reniemarquet[at]uol-dot-com-dot-br>
3D modules by Christophe Boschat <nox454[at]hotmail-dot-fr> 3D modules by Christophe Boschat <nox454[at]hotmail-dot-fr>

376
common/dialog_about/AboutDialog_main.cpp
View File

@ -58,7 +58,8 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
static void InitKiCadAboutNew( AboutAppInfo& info ) static void InitKiCadAboutNew( AboutAppInfo& info )
{ {
// Set application specific icon // Set application specific icon
const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(), wxTopLevelWindow ); const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(),
wxTopLevelWindow );
if( tlw ) if( tlw )
info.SetIcon( tlw->GetIcon() ); info.SetIcon( tlw->GetIcon() );
@ -92,17 +93,16 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
/* wxWidgets version */ /* wxWidgets version */
wxString libVersion; wxString libVersion;
libVersion libVersion << wxT( "wxWidgets " )
<< wxT( "wxWidgets " ) << wxMAJOR_VERSION << wxT( "." )
<< wxMAJOR_VERSION << wxT( "." ) << wxMINOR_VERSION << wxT( "." )
<< wxMINOR_VERSION << wxT( "." ) << wxRELEASE_NUMBER
<< wxRELEASE_NUMBER
/* Unicode or ANSI version */ /* Unicode or ANSI version */
#if wxUSE_UNICODE #if wxUSE_UNICODE
<< wxT( " Unicode " ); << wxT( " Unicode " );
#else #else
<< wxT( " ANSI " ); << wxT( " ANSI " );
#endif #endif
// Just in case someone builds KiCad with the platform native of Boost instead of // Just in case someone builds KiCad with the platform native of Boost instead of
@ -127,17 +127,22 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
/* short description */ /* short description */
description << wxT( "<p>" ); description << wxT( "<p>" );
description << wxT( "<b><u>" ) << _( "Description" ) << wxT( "</u></b>" ); // bold & underlined font for caption description << wxT( "<b><u>" )
<< _( "Description" )
<< wxT( "</u></b>" ); // bold & underlined font for caption
description << wxT( "<p>" ) << description << wxT( "<p>" )
_( "The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards." ) << _( "The KiCad EDA Suite is a set of open source applications for the "
"creation of electronic schematics and to design printed circuit boards." )
<< wxT( "</p>" ); << wxT( "</p>" );
description << wxT( "</p>" ); description << wxT( "</p>" );
/* websites */ /* websites */
description << wxT( "<p>" ); description << wxT( "<p>" );
description << wxT( "<b><u>" ) << _( "KiCad on the web" ) << wxT( "</u></b>" ); // bold & underlined font for caption description << wxT( "<b><u>" )
<< _( "KiCad on the web" )
<< wxT( "</u></b>" ); // bold & underlined font for caption
// bullet-ed list with some http links // bullet-ed list with some http links
description << wxT( "<ul>" ); description << wxT( "<ul>" );
@ -161,7 +166,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "</p>" ); description << wxT( "</p>" );
description << wxT( "<p>" ); description << wxT( "<p>" );
description << wxT( "<b><u>" ) << _( "Contribute to KiCad" ) << wxT( "</u></b>" ); // bold & underlined font caption description << wxT( "<b><u>" )
<< _( "Contribute to KiCad" )
<< wxT( "</u></b>" ); // bold & underlined font caption
// bullet-ed list with some http links // bullet-ed list with some http links
description << wxT( "<ul>" ); description << wxT( "<ul>" );
@ -191,7 +198,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
<< HtmlNewline( 4 ) << HtmlNewline( 4 )
<< _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 ) << _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 )
<< HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ), << HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ),
_( "GNU General Public License (GPL) version 2 or any later version" ) ) _( "GNU General Public License (GPL) version 3 or any later version" ) )
<< wxT( "</div>" ); << wxT( "</div>" );
info.SetLicense( license ); info.SetLicense( license );
@ -210,140 +217,209 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
*/ */
// The core developers // The core developers
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ),
new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ) ) ); wxT( "jp.charras@wanadoo.fr" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Dick Hollenbeck" ),
new Contributor( wxT( "Dick Hollenbeck" ), wxT( "dick@softplc.com" ) ) ); wxT( "dick@softplc.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ),
new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) ); wxT( "stambaughw@gmail.com" ) ) );
// alphabetically by last name after main 3 above: // alphabetically by last name after main 3 above:
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Frank Bennett" ),
new Contributor( wxT( "Frank Bennett" ), wxT( "bennett78@lpbroadband.net" ) ) ); wxT( "bennett78@lpbroadband.net" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Cirilo Bernardo" ),
new Contributor( wxT( "Cirilo Bernardo" ), wxT( "cirilo_bernardo@yahoo.com" ) ) ); wxT( "cirilo_bernardo@yahoo.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Jonas Diemer" ),
new Contributor( wxT( "Jonas Diemer" ), wxT( "diemer@gmx.de" ) ) ); wxT( "diemer@gmx.de" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Torsten Hüter" ),
new Contributor( wxT( "Torsten Hüter" ), wxT( "torstenhtr@gmx.de" ) ) ); wxT( "torstenhtr@gmx.de" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ),
new Contributor( wxT( "Jerry Jacobs" ), wxT( "xor.gate.engineering@gmail.com" ) ) ); wxT( "xor.gate.engineering@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Daniel Majewski" ),
new Contributor( wxT( "Daniel Majewski" ), wxT( "lordblick@gmail.com" ) ) ); wxT( "lordblick@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Lorenzo Marcantonio" ),
new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) ); wxT( "lomarcan@tin.it" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Marco Mattila" ),
new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) ); wxT( "marcom99@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Chris Pavlina" ),
new Contributor( wxT( "Miguel Angel Ajo Pelayo" ), wxT( "miguelangel@nbee.es" ) ) ); wxT( "pavlina.chris@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Miguel Angel Ajo Pelayo" ),
new Contributor( wxT( "Jacobo Aragunde Perez" ), wxT( "jaragunde@igalia.com" ) ) ); wxT( "miguelangel@nbee.es" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Jacobo Aragunde Perez" ),
new Contributor( wxT( "Mark Roszko" ), wxT( "mark.roszko@gmail.com" ) ) ); wxT( "jaragunde@igalia.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Simon Richter" ),
new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) ); wxT( "Simon.Richter@hogyros.de" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Mark Roszko" ),
new Contributor( wxT( "Brian Sidebotham" ), wxT( "brian.sidebotham@gmail.com" ) ) ); wxT( "mark.roszko@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ),
new Contributor( wxT( "Orson (Maciej Sumiński)" ), wxT( "maciej.suminski@cern.ch" ) ) ); wxT( "marco.serantoni@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Brian Sidebotham" ),
new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ) ) ); wxT( "brian.sidebotham@gmail.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Orson (Maciej Sumiński)" ),
new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) ); wxT( "maciej.suminski@cern.ch" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ),
new Contributor( wxT( "Tomasz Wlostowski" ), wxT( "tomasz.wlostowski@cern.ch" ) ) ); wxT( "rafael.sokolowski@web.de" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ),
new Contributor( wxT( "Alexander Zakamaldin" ), wxT( "zaka62@mail.ru" ) ) ); wxT( "vesa.solonen@hut.fi" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Bernhard Stegmaier" ),
new Contributor( wxT( "Henner Zeller" ), wxT( "h.zeller@acm.org" ) ) ); wxT( "stegmaier@sw-systems.de" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Tomasz Wlostowski" ),
new Contributor( wxT( "Andrew Zonenberg" ), wxT( "azonenberg@drawersteak.com" ) ) ); wxT( "tomasz.wlostowski@cern.ch" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Adam Wolfe" ),
new Contributor( wxT( "Nick Østergaard" ), wxT( "oe.nick@gmail.com" ) ) ); wxT( "adamwolf@feelslikeburning.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Alexander Zakamaldin" ),
new Contributor( wxT( "Adam Wolfe" ), wxT( "adamwolf@feelslikeburning.com" ) ) ); wxT( "zaka62@mail.ru" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Henner Zeller" ),
new Contributor( wxT( "Bernhard Stegmaier" ), wxT( "stegmaier@sw-systems.de" ) ) ); wxT( "h.zeller@acm.org" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Andrew Zonenberg" ),
new Contributor( wxT( "Chris Pavlina" ), wxT( "pavlina.chris@gmail.com" ) ) ); wxT( "azonenberg@drawersteak.com" ) ) );
info.AddDeveloper( info.AddDeveloper( new Contributor( wxT( "Nick Østergaard" ),
new Contributor( wxT( "Mark Roszko" ), wxT( "mark.roszko@gmail.com" ) ) ); wxT( "oe.nick@gmail.com" ) ) );
info.AddDeveloper(
new Contributor( wxT( "Simon Richter" ), wxT( "Simon.Richter@hogyros.de" ) ) );
// The document writers // The document writers
info.AddDocWriter( info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ),
new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ) ) ); wxT( "jp.charras@wanadoo.fr" ) ) );
info.AddDocWriter( info.AddDocWriter( new Contributor( wxT( "Marco Ciampa" ),
new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ) ) ); wxT( "ciampix@libero.it" ) ) );
info.AddDocWriter( info.AddDocWriter( new Contributor( wxT( "Dick Hollenbeck" ),
new Contributor( wxT( "Fabrizio Tappero" ), wxT( "fabrizio.tappero@gmail.com" ) ) ); wxT( "dick@softplc.com" ) ) );
info.AddDocWriter( info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ),
new Contributor( wxT( "Marco Ciampa" ), wxT( "ciampix@libero.it" ) ) ); wxT( "plyatov@gmail.com" ) ) );
info.AddDocWriter( new Contributor( wxT( "Wayne Stambaugh" ),
wxT( "stambaughw@gmail.com" ) ) );
info.AddDocWriter( new Contributor( wxT( "Fabrizio Tappero" ),
wxT( "fabrizio.tappero@gmail.com" ) ) );
/* The translators /* The translators
* As category the language to which the translation was done is used * As category the language to which the translation was done is used
* and as icon the national flag of the corresponding country. * and as icon the national flag of the corresponding country.
*/ */
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Martin Kratoška" ),
new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ), wxT( "Czech (CZ)" ), KiBitmapNew( lang_cs_xpm ) ) ); wxT( "martin@ok1rr.com" ),
info.AddTranslator( wxT( "Czech (CZ)" ),
new Contributor( wxT( "Jerry Jacobs" ), wxT( "xor.gate.engineering@gmail.com" ),wxT( "Dutch (NL)" ), KiBitmapNew( lang_nl_xpm ) ) ); KiBitmapNew( lang_cs_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ),
new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ), wxT( "Finnish (FI)" ), KiBitmapNew( lang_fi_xpm ) ) ); wxT( "xor.gate.engineering@gmail.com" ),
info.AddTranslator( wxT( "Dutch (NL)" ),
new Contributor( wxT( "Jean-Pierre Charras" ), wxT( "jp.charras@wanadoo.fr" ), wxT( "French (FR)" ), KiBitmapNew( lang_fr_xpm ) ) ); KiBitmapNew( lang_nl_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ),
new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); wxT( "vesa.solonen@hut.fi" ),
info.AddTranslator( wxT( "Finnish (FI)" ),
new Contributor( wxT( "Kerusey Karyu" ), wxT( "keruseykaryu@o2.pl" ), wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); KiBitmapNew( lang_fi_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ),
new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) ); wxT( "jp.charras@wanadoo.fr" ),
info.AddTranslator( wxT( "French (FR)" ),
new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); KiBitmapNew( lang_fr_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ),
new Contributor( wxT( "Andrey Fedorushkov" ), wxT( "andrf@mail.ru" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); wxT( "skowri@gmail.com" ),
info.AddTranslator( wxT( "Polish (PL)" ),
new Contributor( wxT( "Eldar Khayrullin" ), wxT( "eldar.khayrullin@mail.ru" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); KiBitmapNew( lang_pl_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Kerusey Karyu" ),
new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ), wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); wxT( "keruseykaryu@o2.pl" ),
info.AddTranslator( wxT( "Polish (PL)" ),
new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ), wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); KiBitmapNew( lang_pl_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Renie Marquet" ),
new Contributor( wxT( "Rafael Sokolowski" ), wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), KiBitmapNew( lang_de_xpm ) ) ); wxT( "reniemarquet@uol.com.br" ),
info.AddTranslator( wxT( "Portuguese (PT)" ),
new Contributor( wxT( "Kenta Yonekura" ), wxT( "yoneken@kicad.jp" ), wxT( "Japanese (JA)" ), KiBitmapNew( lang_jp_xpm ) ) ); KiBitmapNew( lang_pt_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ),
new Contributor( wxT( "Manolis Stefanis" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); wxT( "plyatov@gmail.com" ),
info.AddTranslator( wxT( "Russian (RU)" ),
new Contributor( wxT( "Athanasios Vlastos" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); KiBitmapNew( lang_ru_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Andrey Fedorushkov" ),
new Contributor( wxT( "Milonas Kostas" ), wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); wxT( "andrf@mail.ru" ),
info.AddTranslator( wxT( "Russian (RU)" ),
new Contributor( wxT( "Michail Misirlis" ), wxT( "mmisirlis@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) ); KiBitmapNew( lang_ru_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Eldar Khayrullin" ),
new Contributor( wxT( "Massimo Cioce" ), wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) ); wxT( "eldar.khayrullin@mail.ru" ),
info.AddTranslator( wxT( "Russian (RU)" ),
new Contributor( wxT( "Marco Ciampa" ), wxT( "ciampix@libero.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) ); KiBitmapNew( lang_ru_xpm ) ) );
info.AddTranslator( info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ),
new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), KiBitmapNew( lang_bg_xpm ) ) ); wxT( "pkicad@yahoo.es" ),
wxT( "Spanish (ES)" ),
KiBitmapNew( lang_es_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ),
wxT( "inigo_zuluaga@yahoo.es" ),
wxT( "Spanish (ES)" ),
KiBitmapNew( lang_es_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Iñigo Figuero" ),
wxT( "ifs@elektroquark.com" ),
wxT( "Spanish (ES)" ),
KiBitmapNew( lang_es_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ),
wxT( "rafael.sokolowski@web.de" ),
wxT( "German (DE)" ),
KiBitmapNew( lang_de_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ),
wxT( "yoneken@kicad.jp" ),
wxT( "Japanese (JA)" ),
KiBitmapNew( lang_jp_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Manolis Stefanis" ),
wxT( "" ),
wxT( "Greek (el_GR)" ),
KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Athanasios Vlastos" ),
wxT( "" ),
wxT( "Greek (el_GR)" ),
KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Milonas Kostas" ),
wxT( "milonas.ko@gmail.com" ),
wxT( "Greek (el_GR)" ),
KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Michail Misirlis" ),
wxT( "mmisirlis@gmail.com" ),
wxT( "Greek (el_GR)" ),
KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Massimo Cioce" ),
wxT( "ciocemax@alice.it" ),
wxT( "Italian (IT)" ),
KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Marco Ciampa" ),
wxT( "ciampix@libero.it" ),
wxT( "Italian (IT)" ),
KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Evgeniy Ivanov" ),
wxT( "evgeniy_p_ivanov@yahoo.ca" ),
wxT( "Bulgarian (BG)" ),
KiBitmapNew( lang_bg_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); // TODO: are these all russian translators,
info.AddTranslator( new Contributor( wxT( "David Briscoe" ), wxEmptyString, wxT( "Others" ) ) ); // placed them here now,
info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ), wxEmptyString, wxT( "Others" ) ) ); // or else align them below other language maintainer with mail adress
info.AddTranslator( new Contributor( wxT( "Paul Burke" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "Remy Halvick" ),
wxEmptyString,
wxT( "Others" ) ) );
info.AddTranslator( new Contributor( wxT( "David Briscoe" ),
wxEmptyString,
wxT( "Others" ) ) );
info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ),
wxEmptyString,
wxT( "Others" ) ) );
info.AddTranslator( new Contributor( wxT( "Paul Burke" ),
wxEmptyString,
wxT( "Others" ) ) );
// Programm credits for icons // Programm credits for icons
info.AddArtist( info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ),
new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ), wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) ); wxT( "inigo_zuluaga@yahoo.es" ),
info.AddArtist( wxT( "Icons by" ),
new Contributor( wxT( "Fabrizio Tappero" ), wxT( "fabrizio.tappero@gmail.com" ), wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( info.AddArtist( new Contributor( wxT( "Fabrizio Tappero" ),
new Contributor( wxT( "Konstantin Baranovskiy" ), wxT( "baranovskiykonstantin@gmail.com" ), wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); wxT( "fabrizio.tappero@gmail.com" ),
info.AddArtist( wxT( "New icons by" ),
new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( info.AddArtist( new Contributor( wxT( "Konstantin Baranovskiy" ),
new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ), wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); wxT( "baranovskiykonstantin@gmail.com" ),
wxT( "New icons by" ),
KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Renie Marquet" ),
wxT( "reniemarquet@uol.com.br" ),
wxT( "3D modules by" ),
KiBitmapNew( three_d_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Christophe Boschat" ),
wxT( "nox454@hotmail.fr" ),
wxT( "3D modules by" ),
KiBitmapNew( three_d_xpm ) ) );
} }
@ -366,39 +442,43 @@ bool ShowAboutDialog( wxWindow* parent )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/** /**
* Wraps the given url with a HTML anchor tag containing a hyperlink text reference * Function HtmlHyperlink
*
* wraps \a aUrl with a HTML anchor tag containing a hyperlink text reference
* to form a HTML hyperlink. * to form a HTML hyperlink.
* *
* @param url the url that will be embedded in an anchor tag containing a hyperlink reference * @param aUrl the url that will be embedded in an anchor tag containing a hyperlink reference
* @param description the optional describing text that will be represented as a hyperlink. * @param aDescription the optional describing text that will be represented as a hyperlink.
* If not specified the url will be used as hyperlink. * If not specified the url will be used as hyperlink.
* @return a HTML conform hyperlink like <a href='url'>description</a> * @return a HTML conform hyperlink like <a href='url'>description</a>
*/ */
static wxString HtmlHyperlink( const wxString& url, const wxString& description ) static wxString HtmlHyperlink( const wxString& aUrl, const wxString& aDescription )
{ {
wxString hyperlink = wxEmptyString; wxString hyperlink = wxEmptyString;
if( description.IsEmpty() ) if( aDescription.IsEmpty() )
hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << url << wxT( "</a>" ); hyperlink << wxT( "<a href='" ) << aUrl << wxT( "'>" ) << aUrl << wxT( "</a>" );
else else
hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << description << wxT( "</a>" ); hyperlink << wxT( "<a href='" ) << aUrl << wxT( "'>" ) << aDescription << wxT( "</a>" );
return hyperlink; return hyperlink;
} }
/** /**
* Creates a HTML newline character sequence. * Function HtmlNewline
* *
* @param amount - the amount of HTML newline tags to concatenate, default is to return just * creates an HTML newline character sequence of \a aCount.
* one <br> tag *
* @param aCount the number of HTML newline tags to concatenate, default is to return just
* one <br> tag.
* @return the concatenated amount of HTML newline tag(s) <br> * @return the concatenated amount of HTML newline tag(s) <br>
*/ */
static wxString HtmlNewline( const unsigned int amount ) static wxString HtmlNewline( const unsigned int aCount )
{ {
wxString newlineTags = wxEmptyString; wxString newlineTags = wxEmptyString;
for( size_t i = 0; i<amount; ++i ) for( size_t i = 0; i<aCount; ++i )
newlineTags << wxT( "<br>" ); newlineTags << wxT( "<br>" );
return newlineTags; return newlineTags;

16
copyright.h
View File

@ -1,23 +1,23 @@
Copyright template Copyright template
A copyright message which may be added to all source files A copyright message which may be added to all source files at their top.
at their top. There is one line that represents the main copyright holder which There is one line that represents the main copyright holder which is its
is its original author. original author.
Workers who earn partial copyright holder status of a source module Workers who earn partial copyright holder status of a source module may
may choose to document this corresponding work in the CHANGELOG.txt file. choose to document this corresponding work in the CHANGELOG.txt file.
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2014 <author> * Copyright (C) 2015 <author>
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2015 KiCad Developers, see CHANGELOG.TXT for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

2
helpers/tools_to_build_newstroke-font/README.txt
View File

@ -29,4 +29,4 @@ Usage
awk -f fontconv.awk symbol.lib font.lib charlist.txt >newstroke_font.h awk -f fontconv.awk symbol.lib font.lib charlist.txt >newstroke_font.h
Released under CC-BY licence. Released under CC0 licence.