Added new KiCad about dialog, from Rafael Sokolowski <Rafael.Sokolowski@web.de> (72c48d46) · Commits · Elphel / kicad-source-mirror

common/CMakeLists.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,14 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
	../polygon		../polygon
	)		)

			set( COMMON_ABOUT_DLG_SRCS
			dialog_about/AboutDialog_main.cpp
			dialog_about/dialog_about.cpp
			dialog_about/dialog_about_base.cpp
			)

	set(COMMON_SRCS		set(COMMON_SRCS
			${COMMON_ABOUT_DLG_SRCS}
	about_kicad.cpp		about_kicad.cpp
	base_screen.cpp		base_screen.cpp
	base_struct.cpp		base_struct.cpp

common/basicframe.cpp

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,8 @@
	#include "macros.h"		#include "macros.h"
	#include "bitmaps.h"		#include "bitmaps.h"

			// Uncomment this line to use the new KiCad About dialog
			#define USE_NEW_ABOUT_DIALOG

	/*		/*
	* Class constructor for WinEDA_BasicFrame general options		* Class constructor for WinEDA_BasicFrame general options
	@@ -286,9 +288,14 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event )
	*/		*/
	void WinEDA_BasicFrame::GetKicadAbout( wxCommandEvent& WXUNUSED(event) )		void WinEDA_BasicFrame::GetKicadAbout( wxCommandEvent& WXUNUSED(event) )
	{		{
			#ifdef USE_NEW_ABOUT_DIALOG
			bool ShowAboutDialog(wxWindow * parent);
			ShowAboutDialog(this);
			#else
	wxAboutDialogInfo info;		wxAboutDialogInfo info;
	InitKiCadAbout(info);		InitKiCadAbout(info);
	wxAboutBox(info);		wxAboutBox(info);
			#endif
	}		}

common/dialog_about/AboutDialog_main.cpp

0 → 100644

+311 −0

Original line number	Original line	Diff line number	Diff line
			/***************************************************************
			* Name: AboutDialog_main.cpp
			* Purpose: Code for Application Class
			* Author: Rafael Sokolowski (rafael.sokolowski@web.de)
			* Created: 2010-08-06
			* Copyright: Rafael Sokolowski ()
			* License:
			**************************************************************/# include "dialog_about.h"
			#include "aboutinfo.h"
			#include <wx/aboutdlg.h>


			/* Used icons:
			* lang_xx_xpm[]; // Icons of various national flags
			* show_3d_xpm[]; // 3D icon
			* edit_module_xpm[];
			* kicad_icon_xpm[]; // Icon of the application
			*/
			#include "bitmaps.h"


			#include "build_version.h"


			#include <wx/arrimpl.cpp>
			WX_DEFINE_OBJARRAY( Contributors );

			// Helper functions:
			static wxString HtmlHyperlink( const wxString& url, const wxString& description = wxEmptyString );
			static wxString HtmlNewline( const unsigned int amount = 1 );


			/**
			* Initializes the <code>AboutAppInfo</code> object with applicaion specific information.
			*
			* @info is the object which holds all information about the application
			*/
			static void InitKiCadAboutNew( AboutAppInfo& info )
			{
			/* set application specific icon */

			// COULD BE: use another function call to get appropriate icon; its hardcoded because there is no top level window existing here
			// do something like:
			// wxTheApp->GetTopWindow()->GetIcon() ??? or...
			// const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow); ???
			// if( tlw ) info.SetIcon( tlw->GetIcon() ); ???
			info.SetIcon( kicad_icon_xpm );

			/* Set title */

			// COULD BE: info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );
			info.SetAppName( wxT( ".: KiCad :." ) );

			/* copyright information */
			info.SetCopyright( wxT( "(C) 1992-2010 KiCad Developers Team" ) );

			/* KiCad build version */
			wxString version;
			version << wxT( "Build: " ) << GetBuildVersion();
			info.SetBuildVersion( version );

			/* wxWidgets version */
			wxString libVersion;
			libVersion
			<< wxT( "wxWidgets " )
			<< wxMAJOR_VERSION << wxT( "." )
			<< wxMINOR_VERSION << wxT( "." )
			<< wxRELEASE_NUMBER

			/* Unicode or Ansi version */
			#if wxUSE_UNICODE
			<< wxT( " Unicode " );
			#else
			<< wxT( " Ansi " );
			#endif


			/* Operating System Information */

			#if defined __WINDOWS__
			libVersion << wxT( "on Windows" );

			/* Check for wxMAC */
			# elif defined __WXMAC__
			libVersion << wxT( "on Macintosh" );

			/* Linux 64 bits */
			# elif defined _LP64 && __LINUX__
			libVersion << wxT( "on 64 Bits GNU/Linux" );

			/* Linux 32 bits */
			# elif defined __LINUX__
			libVersion << wxT( "on 32 Bits GNU/Linux" );

			/* OpenBSD */
			# elif defined __OpenBSD__
			libVersion << wxT( "on OpenBSD" );

			/* FreeBSD */
			# elif defined __FreeBSD__
			libVersion << wxT( "on FreeBSD" );

			#endif

			info.SetLibVersion( libVersion );


			/* info/description part HTML formatted */

			wxString description;

			/* short description */
			description << wxT( "<p>" );
			description << wxT( "<b><u>" ) << _( "Description" ) << wxT( "</u></b>" ); // bold & underlined font for caption

			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.</p>" );

			description << wxT( "</p>" );

			/* websites */
			description << wxT( "<p>" );
			description << wxT( "<b><u>" ) << _( "KiCad on the web" ) << wxT( "</u></b>" ); // bold & underlined font for caption

			// bulletet list with some http links
			description << wxT( "<ul>" );
			description << wxT( "<li>" ) << HtmlHyperlink( wxT(
			"http://iut-tice.ujf-grenoble.fr/kicad" ),
			_( "The original site of the initiator of Kicad" ) )
			<< wxT( "</li>" );
			description << wxT( "<li>" ) <<
			HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT(
			"</li>" );
			description << wxT( "<li>" ) <<
			HtmlHyperlink( wxT( "http://kicad.sourceforge.net" ),
			_( "Wiki on Sourceforge with many information" ) ) << wxT( "</li>" );
			description << wxT( "<li>" ) <<
			HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
			_( "Repository with additional component libraries" ) ) << wxT( "</li>" );
			description << wxT( "</ul>" );

			description << wxT( "</p>" );

			description << wxT( "<p>" );
			description << wxT( "<b><u>" ) << _( "Contribute to KiCad" ) << wxT( "</u></b>" ); // bold & underlined font caption

			// bulletet list with some http links
			description << wxT( "<ul>" );
			description << wxT( "<li>" ) <<
			HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
			_( "Report bugs if you found any" ) ) << wxT( "</li>" );
			description << wxT( "<li>" ) << HtmlHyperlink( wxT(
			"https://blueprints.launchpad.net/kicad" ),
			_( "File an idea for improvement" ) ) << wxT(
			"</li>" );
			description << wxT( "<li>" ) <<
			HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
			_( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" );
			description << wxT( "</ul>" );

			description << wxT( "</p>" );

			info.SetDescription( description );


			/* License information also HTML formatted */
			wxString license;
			license
			<< wxT( "<div align='center'>" )
			<< HtmlNewline( 4 )
			<< _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 )
			<< HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ),
			_( "GNU General Public License version 2" ) )
			<< wxT( "</div>" );

			info.SetLicense( license );


			/* A contributor consists of the following information:
			* Mandatory:
			* - Name
			* - EMail address
			* Optional:
			* - Category
			* - Category specific icon
			*
			* All contributors of the same category will be enumerated under this category
			* which should be represented by the same icon.
			*/

			/* The developers */
			info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ),
			wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Dick Hollenbeck" ), wxT( "dick@softplc.com" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Hauptmech" ), wxT( "hauptmech@gmail.com" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ),
			wxT( "xor.gate.engineering@gmail.com" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Jonas Diemer" ), wxT( "diemer@gmx.de" ) ) );
			info.AddDeveloper( new Contributor( wxT( "KBool Library" ),
			wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Rok Markovic" ), wxT( "rok@kanardia.eu" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Tim Hanson" ), wxT( "sideskate@gmail.com" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) );
			info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) );

			/* The document writers */
			info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ),
			wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) );
			info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ) ) );

			/* The translators
			* As category the language to which the translation was done is used
			* and as icon the national flag of the corresponding country.
			*/
			info.AddTranslator( new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ),
			wxT( "Czech (CZ)" ), new wxBitmap( lang_cs_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ),
			wxT( "xor.gate.engineering@gmail.com" ), wxT( "Dutch (NL)" ),
			new wxBitmap( lang_nl_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ),
			wxT( "Finnish (FI)" ), new wxBitmap( lang_fi_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ),
			wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ),
			wxT( "French (FR)" ), new wxBitmap( lang_fr_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ),
			wxT( "Polish (PL)" ), new wxBitmap( lang_pl_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ),
			wxT( "Portuguese (PT)" ), new wxBitmap( lang_pt_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ),
			wxT( "Russian (RU)" ), new wxBitmap( lang_ru_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ),
			wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ),
			wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) );
			info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ),
			wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ),
			new wxBitmap( lang_de_xpm ) ) );

			/* TODO: are these all russian translators, placed them here now, or else align them below other language maintainer with mail adress */
			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 */
			info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ),
			wxT( "Icons by" ), new wxBitmap( edit_module_xpm ) ) );
			info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ),
			wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) );
			info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ),
			wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) );
			}


			bool ShowAboutDialog( wxWindow* parent )
			{
			AboutAppInfo info;

			InitKiCadAboutNew( info );

			dialog_about* dlg = new dialog_about( parent, info );
			dlg->SetIcon( info.GetIcon() );
			dlg->Show();

			return true;
			}


			///////////////////////////////////////////////////////////////////////////////
			/// Helper functions
			///////////////////////////////////////////////////////////////////////////////

			/**
			* Wraps the given url with a HTML anchor tag containing a hyperlink text reference
			* to form a HTML hyperlink.
			*
			* @url the url that will be embedded in an anchor tag containing a hyperlink reference
			* @description the optional describing text that will be represented as a hyperlink.
			* If not specified the url will be used as hyperlink.
			* @return a HTML conform hyperlink like <a href='url'>description</a>
			*/
			static wxString HtmlHyperlink( const wxString& url, const wxString& description )
			{
			wxString hyperlink = wxEmptyString;

			if( description.IsEmpty() )
			hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << url << wxT( "</a>" );
			else
			hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << description << wxT( "</a>" );

			return hyperlink;
			}


			/**
			* Creates a HTML newline character sequence.
			*
			* @amount the amount of HTML newline tags to concatenate, default is to return just one <br> tag
			* @return the concatenated amount of HTML newline tag(s) <br>
			*/
			static wxString HtmlNewline( const unsigned int amount )
			{
			wxString newlineTags = wxEmptyString;

			for( size_t i = 0; i<amount; ++i )
			newlineTags << wxT( "<br>" );

			return newlineTags;
			}

common/dialog_about/aboutinfo.h

0 → 100644

+127 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef ABOUTAPPINFO_H
			#define ABOUTAPPINFO_H

			#include <wx/aboutdlg.h>
			#include <wx/bitmap.h>
			#include <wx/dynarray.h>

			class Contributor;

			WX_DECLARE_OBJARRAY( Contributor, Contributors );


			/**
			* An object of this class is meant to be used to store application specific information
			* like who has contributed in which area of the application, the license, copyright
			* and other descriptive information.
			*/
			class AboutAppInfo
			{
			public:
			AboutAppInfo() {};
			virtual ~AboutAppInfo() {};

			void AddDeveloper( const Contributor* developer ) { if( developer != NULL )
			developers.Add( developer );}
			void AddDocWriter( const Contributor* docwriter ) { 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 );}

			Contributors GetDevelopers() { return developers; }
			Contributors GetDocWriters() { return docwriters; }
			Contributors GetArtists() { return artists; }
			Contributors GetTranslators() { return translators; }

			void SetDescription( const wxString& text ) { description = text; }
			wxString& GetDescription() { return description; }

			void SetLicense( const wxString& text ) { license = text; }
			wxString& GetLicense() { return license; }

			void SetCopyright( const wxString& text ) { copyright = text; }
			wxString GetCopyright()
			{
			wxString copyrightText = copyright;

			#if wxUSE_UNICODE
			const wxString utf8_copyrightSign = wxString::FromUTF8( "\xc2\xa9" );
			copyrightText.Replace( _T( "(c)" ), utf8_copyrightSign );
			copyrightText.Replace( _T( "(C)" ), utf8_copyrightSign );
			#endif // wxUSE_UNICODE

			return copyrightText;
			}


			void SetAppName( const wxString& name ) { appName = name; }
			wxString& GetAppName() { return appName; }

			void SetBuildVersion( const wxString& version ) { buildVersion = version; }
			wxString& GetBuildVersion() { return buildVersion; }

			void SetLibVersion( const wxString& version ) { libVersion = version; }
			wxString& GetLibVersion() { return libVersion; }

			void SetIcon( const wxIcon& icon ) { appIcon = icon; }
			wxIcon& GetIcon() { return appIcon; }

			protected:
			private:
			Contributors developers;
			Contributors docwriters;
			Contributors artists;
			Contributors translators;

			wxString description;
			wxString license;

			wxString copyright; // Todo: copyright sign in unicode
			wxString appName;
			wxString buildVersion;
			wxString libVersion;

			wxIcon appIcon;
			};

			/**
			* A contributor, a person which was involved in the development of the application
			* or which has contributed in any kind somehow to the project.
			*
			* A contributor consists of the following mandatory information:
			* - Name
			* - EMail address
			*
			* Each contributor can have optional information assigned like:
			* - A category
			* - A category specific icon
			*/
			class Contributor
			{
			public:
			Contributor( const wxString& name,
			const wxString& email,
			const wxString& category = wxEmptyString,
			wxBitmap* icon = NULL ) :
			m_checked( false )
			{ m_name = name; m_email = email; m_category = category; m_icon = icon; }
			virtual ~Contributor() {}

			wxString& GetName() { return m_name; }
			wxString& GetEMail() { return m_email; }
			wxString& GetCategory() { return m_category; }
			wxBitmap* GetIcon() { return m_icon; }
			void SetChecked( bool status ) { m_checked = status; }
			bool IsChecked() { return m_checked; }
			protected:
			private:
			wxString m_name;
			wxString m_email;
			wxString m_category;
			wxBitmap* m_icon;
			bool m_checked;
			};

			#endif // ABOUTAPPINFO_H

Admin message