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

More developer credit updates. 

* Minor credit information updates.
* Add a packagers tab to the about dialog.
* Coding policy fixes.
This commit is contained in:
Wayne Stambaugh 2015-11-19 15:03:02 -05:00
parent 4b85adb7d3
commit 08d9b362be
4 changed files with 73 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/dialog_about/AboutDialog_main.cpp
View File

@ -400,26 +400,34 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
wxT( "Others" ) ) ); wxT( "Others" ) ) );
// Programm credits for icons // Programm credits for icons
info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), info.AddArtist( new Contributor( wxT( "Iñigo Zuluaga" ),
wxT( "inigo_zuluaga@yahoo.es" ), wxT( "inigo_zuluaga@yahoo.es" ),
wxT( "Icons by" ), wxT( "Icons by" ),
KiBitmapNew( edit_module_xpm ) ) ); KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Fabrizio Tappero" ),
wxT( "fabrizio.tappero@gmail.com" ),
wxT( "New icons by" ),
KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Konstantin Baranovskiy" ), info.AddArtist( new Contributor( wxT( "Konstantin Baranovskiy" ),
wxT( "baranovskiykonstantin@gmail.com" ), wxT( "baranovskiykonstantin@gmail.com" ),
wxT( "New icons by" ), wxT( "New icons by" ),
KiBitmapNew( edit_module_xpm ) ) ); KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Renie Marquet" ), info.AddArtist( new Contributor( wxT( "Fabrizio Tappero" ),
wxT( "reniemarquet@uol.com.br" ), wxT( "fabrizio.tappero@gmail.com" ),
wxT( "3D modules by" ), wxT( "New icons by" ),
KiBitmapNew( three_d_xpm ) ) ); KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), info.AddArtist( new Contributor( wxT( "Christophe Boschat" ),
wxT( "nox454@hotmail.fr" ), wxT( "nox454@hotmail.fr" ),
wxT( "3D modules by" ), wxT( "3D models by" ),
KiBitmapNew( three_d_xpm ) ) ); KiBitmapNew( three_d_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Renie Marquet" ),
wxT( "reniemarquet@uol.com.br" ),
wxT( "3D models by" ),
KiBitmapNew( three_d_xpm ) ) );
// Programm credits for package developers.
info.AddPackager( new Contributor( wxT( "Jean-Samuel Reynaud" ),
wxT( "js.reynaud@gmail.com" ) ) );
info.AddPackager( new Contributor( wxT( "Adam Wolfe" ),
wxT( "adamwolf@feelslikeburning.com" ) ) );
info.AddPackager( new Contributor( wxT( "Nick Østergaard" ),
wxT( "oe.nick@gmail.com" ) ) );
} }

47
common/dialog_about/aboutinfo.h
View File

@ -2,7 +2,7 @@
* 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 Rafael Sokolowski <Rafael.Sokolowski@web.de> * Copyright (C) 2014 Rafael Sokolowski <Rafael.Sokolowski@web.de>
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2014-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
@ -45,19 +45,41 @@ public:
AboutAppInfo() {}; AboutAppInfo() {};
virtual ~AboutAppInfo() {}; virtual ~AboutAppInfo() {};
void AddDeveloper( const Contributor* developer ) { if( developer != NULL ) void AddDeveloper( const Contributor* developer )
developers.Add( developer );} {
void AddDocWriter( const Contributor* docwriter ) { if( docwriter != NULL ) if( developer != NULL )
docwriters.Add( docwriter );} developers.Add( developer );
void AddArtist( const Contributor* artist ) { if( artist != NULL ) }
artists.Add( artist );}
void AddTranslator( const Contributor* translator ) { if( translator != NULL ) void AddDocWriter( const Contributor* docwriter )
translators.Add( translator );} {
if( docwriter != NULL )
docwriters.Add( docwriter );
}
void AddArtist( const Contributor* artist )
{
if( artist != NULL )
artists.Add( artist );
}
void AddTranslator( const Contributor* translator )
{
if( translator != NULL )
translators.Add( translator );
}
void AddPackager( const Contributor* packager )
{
if( packager != NULL )
packagers.Add( packager );
}
Contributors GetDevelopers() { return developers; } Contributors GetDevelopers() { return developers; }
Contributors GetDocWriters() { return docwriters; } Contributors GetDocWriters() { return docwriters; }
Contributors GetArtists() { return artists; } Contributors GetArtists() { return artists; }
Contributors GetTranslators() { return translators; } Contributors GetTranslators() { return translators; }
Contributors GetPackagers() { return packagers; }
void SetDescription( const wxString& text ) { description = text; } void SetDescription( const wxString& text ) { description = text; }
wxString& GetDescription() { return description; } wxString& GetDescription() { return description; }
@ -79,7 +101,6 @@ public:
return copyrightText; return copyrightText;
} }
void SetAppName( const wxString& name ) { appName = name; } void SetAppName( const wxString& name ) { appName = name; }
wxString& GetAppName() { return appName; } wxString& GetAppName() { return appName; }
@ -92,12 +113,12 @@ public:
void SetIcon( const wxIcon& icon ) { appIcon = icon; } void SetIcon( const wxIcon& icon ) { appIcon = icon; }
wxIcon& GetIcon() { return appIcon; } wxIcon& GetIcon() { return appIcon; }
protected:
private: private:
Contributors developers; Contributors developers;
Contributors docwriters; Contributors docwriters;
Contributors artists; Contributors artists;
Contributors translators; Contributors translators;
Contributors packagers;
wxString description; wxString description;
wxString license; wxString license;
@ -110,6 +131,7 @@ private:
wxIcon appIcon; wxIcon appIcon;
}; };
/** /**
* A contributor, a person which was involved in the development of the application * A contributor, a person which was involved in the development of the application
* or which has contributed in any kind somehow to the project. * or which has contributed in any kind somehow to the project.
@ -131,6 +153,7 @@ public:
wxBitmap* icon = NULL ) : wxBitmap* icon = NULL ) :
m_checked( false ) m_checked( false )
{ m_name = name; m_email = email; m_category = category; m_icon = icon; } { m_name = name; m_email = email; m_category = category; m_icon = icon; }
virtual ~Contributor() {} virtual ~Contributor() {}
wxString& GetName() { return m_name; } wxString& GetName() { return m_name; }
@ -139,7 +162,7 @@ public:
wxBitmap* GetIcon() { return m_icon; } wxBitmap* GetIcon() { return m_icon; }
void SetChecked( bool status ) { m_checked = status; } void SetChecked( bool status ) { m_checked = status; }
bool IsChecked() { return m_checked; } bool IsChecked() { return m_checked; }
protected:
private: private:
wxString m_name; wxString m_name;
wxString m_email; wxString m_email;

17
common/dialog_about/dialog_about.cpp
View File

@ -37,6 +37,7 @@ dialog_about::dialog_about(wxWindow *parent, AboutAppInfo& appInfo)
picArtists = KiBitmap( palette_xpm ); picArtists = KiBitmap( palette_xpm );
picTranslators = KiBitmap( language_xpm ); picTranslators = KiBitmap( language_xpm );
picLicense = KiBitmap( tools_xpm ); picLicense = KiBitmap( tools_xpm );
picPackagers = KiBitmap( zip_xpm );
m_bitmapApp->SetBitmap( info.GetIcon() ); m_bitmapApp->SetBitmap( info.GetIcon() );
@ -62,7 +63,7 @@ dialog_about::~dialog_about()
wxFlexGridSizer* dialog_about::CreateFlexGridSizer() wxFlexGridSizer* dialog_about::CreateFlexGridSizer()
{ {
// three colums with vertical and horizontal extra space of two pixels // three columns with vertical and horizontal extra space of two pixels
wxFlexGridSizer* fgSizer1 = new wxFlexGridSizer( 3, 2, 2 ); wxFlexGridSizer* fgSizer1 = new wxFlexGridSizer( 3, 2, 2 );
fgSizer1->SetFlexibleDirection( wxHORIZONTAL ); fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -89,6 +90,8 @@ void dialog_about::CreateNotebooks()
CreateNotebookPageByCategory( m_auiNotebook, _( "Artists" ), picArtists, info.GetArtists() ); CreateNotebookPageByCategory( m_auiNotebook, _( "Artists" ), picArtists, info.GetArtists() );
CreateNotebookPageByCategory( m_auiNotebook, _( "Translators" ), picTranslators, CreateNotebookPageByCategory( m_auiNotebook, _( "Translators" ), picTranslators,
info.GetTranslators() ); info.GetTranslators() );
CreateNotebookPageByCategory( m_auiNotebook, _( "Packagers" ), picPackagers,
info.GetPackagers() );
CreateNotebookHtmlPage( m_auiNotebook, _( "License" ), picLicense, info.GetLicense() ); CreateNotebookHtmlPage( m_auiNotebook, _( "License" ), picLicense, info.GetLicense() );
} }
@ -142,7 +145,7 @@ void dialog_about::CreateNotebookPage( wxAuiNotebook* parent, const wxString& ca
} }
else else
{ {
fgSizer1->AddSpacer(5); fgSizer1->AddSpacer( 5 );
} }
} }
@ -232,7 +235,7 @@ void dialog_about::CreateNotebookPageByCategory(wxAuiNotebook* parent, const wxS
fgSizer1->AddSpacer( 5 ); fgSizer1->AddSpacer( 5 );
} }
/* this contributor was added to the gui, /* this contributor was added to the GUI,
* thus can be ignored next time * thus can be ignored next time
*/ */
contributor->SetChecked( true ); contributor->SetChecked( true );
@ -309,15 +312,15 @@ void dialog_about::CreateNotebookHtmlPage( wxAuiNotebook* parent, const wxString
// used for all the other widgets // used for all the other widgets
wxString htmlColor = ( this->GetBackgroundColour() ).GetAsString( wxC2S_HTML_SYNTAX ); wxString htmlColor = ( this->GetBackgroundColour() ).GetAsString( wxC2S_HTML_SYNTAX );
// beginning of html structure // beginning of HTML structure
htmlPage.Append( wxT( "<html><body bgcolor='" ) + htmlColor + wxT( "'>" ) ); htmlPage.Append( wxT( "<html><body bgcolor='" ) + htmlColor + wxT( "'>" ) );
htmlPage.Append( htmlContent ); htmlPage.Append( htmlContent );
// end of html structure indicated by closing tags // end of HTML structure indicated by closing tags
htmlPage.Append( wxT( "</body></html>" ) ); htmlPage.Append( wxT( "</body></html>" ) );
// the html page is going to be created with previously created html content // the HTML page is going to be created with previously created HTML content
wxHtmlWindow* htmlWindow = new wxHtmlWindow( panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHtmlWindow* htmlWindow = new wxHtmlWindow( panel, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION ); wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION );
@ -332,7 +335,7 @@ void dialog_about::CreateNotebookHtmlPage( wxAuiNotebook* parent, const wxString
htmlWindow->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, htmlWindow->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED,
wxHtmlLinkEventHandler( dialog_about::OnHtmlLinkClicked ), NULL, this ); wxHtmlLinkEventHandler( dialog_about::OnHtmlLinkClicked ), NULL, this );
// no additional space around the html window as it is also the case by the other notebook pages // no additional space around the HTML window as it is also the case by the other notebook pages
bSizer->Add( htmlWindow, 1, wxALL|wxEXPAND, 0 ); bSizer->Add( htmlWindow, 1, wxALL|wxEXPAND, 0 );
panel->SetSizer( bSizer ); panel->SetSizer( bSizer );
panel->Layout(); panel->Layout();

13
common/dialog_about/dialog_about.h
View File

@ -2,7 +2,7 @@
* 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) 2010 Rafael Sokolowski <Rafael.Sokolowski@web.de> * Copyright (C) 2010 Rafael Sokolowski <Rafael.Sokolowski@web.de>
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2010-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
@ -55,14 +55,20 @@ class dialog_about : public dialog_about_base
private: private:
// Icons for the various tabs of wxAuiNotebook // Icons for the various tabs of wxAuiNotebook
wxBitmap picInformation, picDevelopers, picDocWriters, picArtists, picTranslators, wxBitmap picInformation;
picLicense; wxBitmap picDevelopers;
wxBitmap picDocWriters;
wxBitmap picArtists;
wxBitmap picTranslators;
wxBitmap picPackagers;
wxBitmap picLicense;
AboutAppInfo info; AboutAppInfo info;
public: public:
dialog_about( wxWindow* dlg, AboutAppInfo& appInfo ); dialog_about( wxWindow* dlg, AboutAppInfo& appInfo );
~dialog_about(); ~dialog_about();
private: private:
void initDialog(); void initDialog();
virtual void OnClose( wxCloseEvent& event ); virtual void OnClose( wxCloseEvent& event );
@ -89,4 +95,5 @@ private:
wxHyperlinkCtrl* CreateHyperlink( wxScrolledWindow* parent, const wxString& email ); wxHyperlinkCtrl* CreateHyperlink( wxScrolledWindow* parent, const wxString& email );
wxStaticBitmap* CreateStaticBitmap( wxScrolledWindow* parent, wxBitmap* icon ); wxStaticBitmap* CreateStaticBitmap( wxScrolledWindow* parent, wxBitmap* icon );
}; };
#endif // DIALOG_ABOUT_H #endif // DIALOG_ABOUT_H