Skip to content

K
kicad-source-mirror
Commit 6fb03f15 authored by Rafael Sokolowski's avatar Rafael Sokolowski Committed by jean-pierre charras
Browse files
Options

Commit new patch for kicad about dialog (Dialog refinements).

parents 76adcc60 44269729
Hide whitespace changes
Inline Side-by-side
Showing with 379 additions and 344 deletions
common/dialog_about/AboutDialog_main.cpp
View file @ 6fb03f15
/*************************************************************** /***************************************************************
* Name: AboutDialog_main.cpp * Name: AboutDialog_main.cpp
* Purpose: Code for Application Class * Purpose: Code for Application Class
* Author: Rafael Sokolowski (rafael.sokolowski@web.de) * Author: Rafael Sokolowski (rafael.sokolowski@web.de)
* Created: 2010-08-06 * Created: 2010-08-06
* Copyright: Rafael Sokolowski () * Copyright: Rafael Sokolowski ()
* License: * License:
**************************************************************/# include "dialog_about.h" **************************************************************/
#include "aboutinfo.h" #include "dialog_about.h"
#include <wx/aboutdlg.h> #include "aboutinfo.h"
#include <wx/aboutdlg.h>
#include <wx/textctrl.h>
/* Used icons:
* lang_xx_xpm[]; // Icons of various national flags
* show_3d_xpm[]; // 3D icon /* Used icons:
* edit_module_xpm[]; * lang_xx_xpm[]; // Icons of various national flags
* kicad_icon_xpm[]; // Icon of the application * show_3d_xpm[]; // 3D icon
*/ * edit_module_xpm[];
#include "bitmaps.h" * kicad_icon_xpm[]; // Icon of the application
*/
#include "bitmaps.h"
#include "build_version.h" #include "wxstruct.h"
#include "common.h"
#include "appl_wxstruct.h"
#include <wx/arrimpl.cpp> #include "build_version.h"
WX_DEFINE_OBJARRAY( Contributors );
// Helper functions: #include <wx/arrimpl.cpp>
static wxString HtmlHyperlink( const wxString& url, const wxString& description = wxEmptyString ); WX_DEFINE_OBJARRAY( Contributors );
static wxString HtmlNewline( const unsigned int amount = 1 );
// 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 /**
*/ * Initializes the <code>AboutAppInfo</code> object with applicaion specific information.
static void InitKiCadAboutNew( AboutAppInfo& info ) *
{ * @info is the object which holds all information about the application
/* set application specific icon */ */
static void InitKiCadAboutNew( AboutAppInfo& info )
// COULD BE: use another function call to get appropriate icon; its hardcoded because there is no top level window existing here {
// do something like: /* Set application specific icon */
// wxTheApp->GetTopWindow()->GetIcon() ??? or...
// const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow); ??? const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow);
// if( tlw ) info.SetIcon( tlw->GetIcon() ); ??? if( tlw )
info.SetIcon( kicad_icon_xpm ); info.SetIcon( tlw->GetIcon() );
else
/* Set title */ info.SetIcon( kicad_icon_xpm );
// COULD BE: info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) ); /* Set title */
info.SetAppName( wxT( ".: KiCad :." ) ); info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );
/* copyright information */ /* Copyright information */
info.SetCopyright( wxT( "(C) 1992-2010 KiCad Developers Team" ) ); info.SetCopyright( wxT( "(C) 1992-2010 KiCad Developers Team" ) );
/* KiCad build version */ /* KiCad build version */
wxString version; wxString version;
version << wxT( "Build: " ) << GetBuildVersion(); version << wxT( "Build: " ) << GetBuildVersion();
info.SetBuildVersion( version ); info.SetBuildVersion( version );
/* 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
/* Operating System Information */ /* Operating System Information */
#if defined __WINDOWS__ #if defined __WINDOWS__
libVersion << wxT( "on Windows" ); libVersion << wxT( "on Windows" );
/* Check for wxMAC */ /* Check for wxMAC */
# elif defined __WXMAC__ # elif defined __WXMAC__
libVersion << wxT( "on Macintosh" ); libVersion << wxT( "on Macintosh" );
/* Linux 64 bits */ /* Linux 64 bits */
# elif defined _LP64 && __LINUX__ # elif defined _LP64 && __LINUX__
libVersion << wxT( "on 64 Bits GNU/Linux" ); libVersion << wxT( "on 64 Bits GNU/Linux" );
/* Linux 32 bits */ /* Linux 32 bits */
# elif defined __LINUX__ # elif defined __LINUX__
libVersion << wxT( "on 32 Bits GNU/Linux" ); libVersion << wxT( "on 32 Bits GNU/Linux" );
/* OpenBSD */ /* OpenBSD */
# elif defined __OpenBSD__ # elif defined __OpenBSD__
libVersion << wxT( "on OpenBSD" ); libVersion << wxT( "on OpenBSD" );
/* FreeBSD */ /* FreeBSD */
# elif defined __FreeBSD__ # elif defined __FreeBSD__
libVersion << wxT( "on FreeBSD" ); libVersion << wxT( "on FreeBSD" );
#endif #endif
info.SetLibVersion( libVersion ); info.SetLibVersion( libVersion );
/* info/description part HTML formatted */ /* info/description part HTML formatted */
wxString description; wxString description;
/* 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
// bulletet list with some http links // bulletet list with some http links
description << wxT( "<ul>" ); description << wxT( "<ul>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT( description << wxT( "<li>" ) << HtmlHyperlink( wxT(
"http://iut-tice.ujf-grenoble.fr/kicad" ), "http://iut-tice.ujf-grenoble.fr/kicad" ),
_( "The original site of the initiator of Kicad" ) ) _( "The original site of the initiator of Kicad" ) )
<< wxT( "</li>" ); << wxT( "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT( HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT(
"</li>" ); "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://kicad.sourceforge.net" ), HtmlHyperlink( wxT( "http://kicad.sourceforge.net" ),
_( "Wiki on Sourceforge with many information" ) ) << wxT( "</li>" ); _( "Wiki on Sourceforge with many information" ) ) << wxT( "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://www.kicadlib.org" ), HtmlHyperlink( wxT( "http://www.kicadlib.org" ),
_( "Repository with additional component libraries" ) ) << wxT( "</li>" ); _( "Repository with additional component libraries" ) ) << wxT( "</li>" );
description << wxT( "</ul>" ); description << wxT( "</ul>" );
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
// bulletet list with some http links // bulletet list with some http links
description << wxT( "<ul>" ); description << wxT( "<ul>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ), HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
_( "Report bugs if you found any" ) ) << wxT( "</li>" ); _( "Report bugs if you found any" ) ) << wxT( "</li>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT( description << wxT( "<li>" ) << HtmlHyperlink( wxT(
"https://blueprints.launchpad.net/kicad" ), "https://blueprints.launchpad.net/kicad" ),
_( "File an idea for improvement" ) ) << wxT( _( "File an idea for improvement" ) ) << wxT(
"</li>" ); "</li>" );
description << wxT( "<li>" ) << description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ), HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
_( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" ); _( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" );
description << wxT( "</ul>" ); description << wxT( "</ul>" );
description << wxT( "</p>" ); description << wxT( "</p>" );
info.SetDescription( description ); info.SetDescription( description );
/* License information also HTML formatted */ /* License information also HTML formatted */
wxString license; wxString license;
license license
<< wxT( "<div align='center'>" ) << wxT( "<div align='center'>" )
<< 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" ) ) _( "GNU General Public License (GPL) version 2" ) )
<< wxT( "</div>" ); << wxT( "</div>" );
info.SetLicense( license ); info.SetLicense( license );
/* A contributor consists of the following information: /* A contributor consists of the following information:
* Mandatory: * Mandatory:
* - Name * - Name
* - EMail address * - EMail address
* Optional: * Optional:
* - Category * - Category
* - Category specific icon * - Category specific icon
* *
* All contributors of the same category will be enumerated under this category * All contributors of the same category will be enumerated under this category
* which should be represented by the same icon. * which should be represented by the same icon.
*/ */
/* The developers */ /* The developers */
info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ), info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ),
wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) );
info.AddDeveloper( new Contributor( wxT( "Dick Hollenbeck" ), wxT( "dick@softplc.com" ) ) ); 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( "Hauptmech" ), wxT( "hauptmech@gmail.com" ) ) );
info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ), info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ),
wxT( "xor.gate.engineering@gmail.com" ) ) ); wxT( "xor.gate.engineering@gmail.com" ) ) );
info.AddDeveloper( new Contributor( wxT( "Jonas Diemer" ), wxT( "diemer@gmx.de" ) ) ); info.AddDeveloper( new Contributor( wxT( "Jonas Diemer" ), wxT( "diemer@gmx.de" ) ) );
info.AddDeveloper( new Contributor( wxT( "KBool Library" ), info.AddDeveloper( new Contributor( wxT( "KBool Library" ),
wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) ); wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) );
info.AddDeveloper( new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) ); 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( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) );
info.AddDeveloper( new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) );
info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ), info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ),
wxT( "rafael.sokolowski@web.de" ) ) ); wxT( "rafael.sokolowski@web.de" ) ) );
info.AddDeveloper( new Contributor( wxT( "Rok Markovic" ), wxT( "rok@kanardia.eu" ) ) ); 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( "Tim Hanson" ), wxT( "sideskate@gmail.com" ) ) );
info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) ); info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) );
info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) ); info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) );
/* The document writers */ /* The document writers */
info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ), info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ),
wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) );
info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ) ) ); info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@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( new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ), info.AddTranslator( new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ),
wxT( "Czech (CZ)" ), new wxBitmap( lang_cs_xpm ) ) ); wxT( "Czech (CZ)" ), new wxBitmap( lang_cs_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ), info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ),
wxT( "xor.gate.engineering@gmail.com" ), wxT( "Dutch (NL)" ), wxT( "xor.gate.engineering@gmail.com" ), wxT( "Dutch (NL)" ),
new wxBitmap( lang_nl_xpm ) ) ); new wxBitmap( lang_nl_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ), info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ),
wxT( "Finnish (FI)" ), new wxBitmap( lang_fi_xpm ) ) ); wxT( "Finnish (FI)" ), new wxBitmap( lang_fi_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ), info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ),
wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ), wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ),
wxT( "French (FR)" ), new wxBitmap( lang_fr_xpm ) ) ); wxT( "French (FR)" ), new wxBitmap( lang_fr_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ), info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ),
wxT( "Polish (PL)" ), new wxBitmap( lang_pl_xpm ) ) ); wxT( "Polish (PL)" ), new wxBitmap( lang_pl_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), info.AddTranslator( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ),
wxT( "Portuguese (PT)" ), new wxBitmap( lang_pt_xpm ) ) ); wxT( "Portuguese (PT)" ), new wxBitmap( lang_pt_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ), info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ),
wxT( "Russian (RU)" ), new wxBitmap( lang_ru_xpm ) ) ); wxT( "Russian (RU)" ), new wxBitmap( lang_ru_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ), info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ),
wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) ); wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ), info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ),
wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) ); wxT( "Spanish (ES)" ), new wxBitmap( lang_es_xpm ) ) );
info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ), info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ),
wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ),
new wxBitmap( lang_de_xpm ) ) ); 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 */ /* 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( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) );
info.AddTranslator( new Contributor( wxT( "David Briscoe" ), 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( "Dominique Laigle" ), wxEmptyString, wxT( "Others" ) ) );
info.AddTranslator( new Contributor( wxT( "Paul Burke" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "Paul Burke" ), wxEmptyString, wxT( "Others" ) ) );
/* Programm credits for icons */ /* Programm credits for icons */
info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ), info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ),
wxT( "Icons by" ), new wxBitmap( edit_module_xpm ) ) ); wxT( "Icons by" ), new wxBitmap( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ),
wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) ); wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ), info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ),
wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) ); wxT( "3D modules by" ), new wxBitmap( show_3d_xpm ) ) );
} }
bool ShowAboutDialog( wxWindow* parent ) bool ShowAboutDialog( wxWindow* parent )
{ {
AboutAppInfo info; AboutAppInfo info;
InitKiCadAboutNew( info ); InitKiCadAboutNew( info );
dialog_about* dlg = new dialog_about( parent, info ); dialog_about* dlg = new dialog_about( parent, info );
dlg->SetIcon( info.GetIcon() ); dlg->SetIcon( info.GetIcon() );
dlg->Show(); dlg->Show();
return true; return true;
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Helper functions /// Helper functions
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/** /**
* Wraps the given url with a HTML anchor tag containing a hyperlink text reference * Wraps the given url with a HTML anchor tag containing a hyperlink text reference
* to form a HTML hyperlink. * to form a HTML hyperlink.
* *
* @url the url that will be embedded in an anchor tag containing a hyperlink reference * @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. * @description 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& url, const wxString& description )
{ {
wxString hyperlink = wxEmptyString; wxString hyperlink = wxEmptyString;
if( description.IsEmpty() ) if( description.IsEmpty() )
hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << url << wxT( "</a>" ); hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << url << wxT( "</a>" );
else else
hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << description << wxT( "</a>" ); hyperlink << wxT( "<a href='" ) << url << wxT( "'>" ) << description << wxT( "</a>" );
return hyperlink; return hyperlink;
} }
/** /**
* Creates a HTML newline character sequence. * Creates a HTML newline character sequence.
* *
* @amount the amount of HTML newline tags to concatenate, default is to return just one <br> tag * @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> * @return the concatenated amount of HTML newline tag(s) <br>
*/ */
static wxString HtmlNewline( const unsigned int amount ) static wxString HtmlNewline( const unsigned int amount )
{ {
wxString newlineTags = wxEmptyString; wxString newlineTags = wxEmptyString;
for( size_t i = 0; i<amount; ++i ) for( size_t i = 0; i<amount; ++i )
newlineTags << wxT( "<br>" ); newlineTags << wxT( "<br>" );
return newlineTags; return newlineTags;
} }
common/dialog_about/dialog_about_base.cpp
View file @ 6fb03f15
...@@ -19,31 +19,37 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS ...@@ -19,31 +19,37 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
wxBoxSizer* bSizer3; wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxHORIZONTAL ); bSizer3 = new wxBoxSizer( wxHORIZONTAL );
bSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
m_bitmapApp = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); m_bitmapApp = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
bSizer3->Add( m_bitmapApp, 0, wxALIGN_CENTER|wxALL, 5 ); bSizer3->Add( m_bitmapApp, 1, wxALIGN_CENTER|wxALL, 5 );
wxBoxSizer* b_apptitleSizer; wxBoxSizer* b_apptitleSizer;
b_apptitleSizer = new wxBoxSizer( wxVERTICAL ); b_apptitleSizer = new wxBoxSizer( wxVERTICAL );
m_staticTextAppTitle = new wxStaticText( this, wxID_ANY, _("App Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE ); m_staticTextAppTitle = new wxStaticText( this, wxID_ANY, _("App Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticTextAppTitle->Wrap( -1 ); m_staticTextAppTitle->Wrap( -1 );
m_staticTextAppTitle->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) ); m_staticTextAppTitle->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
b_apptitleSizer->Add( m_staticTextAppTitle, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); b_apptitleSizer->Add( m_staticTextAppTitle, 0, wxALIGN_CENTER|wxALL, 5 );
m_staticTextCopyright = new wxStaticText( this, wxID_ANY, _("Copyright Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE ); m_staticTextCopyright = new wxStaticText( this, wxID_ANY, _("Copyright Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticTextCopyright->Wrap( -1 ); m_staticTextCopyright->Wrap( -1 );
b_apptitleSizer->Add( m_staticTextCopyright, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 1 ); b_apptitleSizer->Add( m_staticTextCopyright, 0, wxALIGN_CENTER|wxALL, 1 );
m_staticTextBuildVersion = new wxStaticText( this, wxID_ANY, _("Build Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE ); m_staticTextBuildVersion = new wxStaticText( this, wxID_ANY, _("Build Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticTextBuildVersion->Wrap( -1 ); m_staticTextBuildVersion->Wrap( -1 );
b_apptitleSizer->Add( m_staticTextBuildVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); b_apptitleSizer->Add( m_staticTextBuildVersion, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
m_staticTextLibVersion = new wxStaticText( this, wxID_ANY, _("Lib Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE|wxST_NO_AUTORESIZE ); m_staticTextLibVersion = new wxStaticText( this, wxID_ANY, _("Lib Version Info"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
m_staticTextLibVersion->Wrap( -1 ); m_staticTextLibVersion->Wrap( -1 );
b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
bSizer3->Add( b_apptitleSizer, 10, wxEXPAND, 5 );
bSizer3->Add( b_apptitleSizer, 1, wxEXPAND, 5 ); bSizer3->Add( 0, 0, 2, wxEXPAND, 5 );
bSizer1->Add( bSizer3, 0, wxEXPAND, 5 ); bSizer1->Add( bSizer3, 0, wxEXPAND, 5 );
......
common/dialog_about/dialog_about_base.fbp
View file @ 6fb03f15
...@@ -84,10 +84,20 @@ ...@@ -84,10 +84,20 @@
<property name="name">bSizer3</property> <property name="name">bSizer3</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER|wxALL</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">1</property>
<object class="wxStaticBitmap" expanded="1"> <object class="wxStaticBitmap" expanded="1">
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap"></property> <property name="bitmap"></property>
...@@ -136,7 +146,7 @@ ...@@ -136,7 +146,7 @@
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">10</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">b_apptitleSizer</property> <property name="name">b_apptitleSizer</property>
...@@ -144,7 +154,7 @@ ...@@ -144,7 +154,7 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg"></property> <property name="bg"></property>
...@@ -161,7 +171,7 @@ ...@@ -161,7 +171,7 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
...@@ -195,7 +205,7 @@ ...@@ -195,7 +205,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">1</property> <property name="border">1</property>
<property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg"></property> <property name="bg"></property>
...@@ -212,7 +222,7 @@ ...@@ -212,7 +222,7 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
...@@ -246,7 +256,7 @@ ...@@ -246,7 +256,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property> <property name="flag">wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg"></property> <property name="bg"></property>
...@@ -263,7 +273,7 @@ ...@@ -263,7 +273,7 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
...@@ -297,7 +307,7 @@ ...@@ -297,7 +307,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND</property> <property name="flag">wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="bg"></property> <property name="bg"></property>
...@@ -314,7 +324,7 @@ ...@@ -314,7 +324,7 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxALIGN_CENTRE|wxST_NO_AUTORESIZE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
...@@ -348,6 +358,16 @@ ...@@ -348,6 +358,16 @@
</object> </object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">2</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
......
common/dialog_about/dialog_about_base.h
View file @ 6fb03f15
...@@ -37,11 +37,13 @@ class dialog_about_base : public wxDialog ...@@ -37,11 +37,13 @@ class dialog_about_base : public wxDialog
wxButton* m_buttonOK; wxButton* m_buttonOK;
protected: protected:
wxStaticBitmap* m_bitmapApp; wxStaticBitmap* m_bitmapApp;
wxStaticText* m_staticTextAppTitle; wxStaticText* m_staticTextAppTitle;
wxStaticText* m_staticTextCopyright; wxStaticText* m_staticTextCopyright;
wxStaticText* m_staticTextBuildVersion; wxStaticText* m_staticTextBuildVersion;
wxStaticText* m_staticTextLibVersion; wxStaticText* m_staticTextLibVersion;
wxAuiNotebook* m_auiNotebook; wxAuiNotebook* m_auiNotebook;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
......
pcbnew/onrightclick.cpp
View file @ 6fb03f15
...@@ -421,15 +421,17 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -421,15 +421,17 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
{ {
if( Track->IsPointOnEnds( cursorPosition, -1 ) != 0 ) if( Track->IsPointOnEnds( cursorPosition, -1 ) != 0 )
{ {
msg = AddHotkeyName( _( "Move Node" ), s_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_MOVE_TRACK_NODE,
_( "Move Node" ), move_xpm ); msg, move_xpm );
} }
else else
{ {
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT_KEEP_SLOPE, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT_KEEP_SLOPE,
_( "Drag Segments, Keep Slope" ), drag_segment_withslope_xpm ); _( "Drag Segments, Keep Slope" ), drag_segment_withslope_xpm );
msg = AddHotkeyName( _( "Drag Segment" ), s_Board_Editor_Hokeys_Descr, HK_DRAG_ITEM );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT,
_( "Drag Segment" ), drag_track_segment_xpm ); msg, drag_track_segment_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_BREAK_TRACK, ADD_MENUITEM( PopMenu, ID_POPUP_PCB_BREAK_TRACK,
_( "Break Track" ), break_line_xpm ); _( "Break Track" ), break_line_xpm );
} }
...@@ -483,10 +485,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -483,10 +485,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ), ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ),
ID_POPUP_PCB_SELECT_WIDTH, ID_POPUP_PCB_SELECT_WIDTH,
_( "Select Track Width" ), width_track_xpm ); _( "Select Track Width" ), width_track_xpm );
PopMenu->AppendSeparator();
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE,
_( "Global Tracks and Vias Edition" ), width_track_via_xpm );
PopMenu->AppendSeparator();
} }
else // Allows switching to an other track/via size when routing else // Allows switching to an other track/via size when routing
...@@ -494,10 +492,10 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -494,10 +492,10 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ), ADD_MENUITEM_WITH_SUBMENU( PopMenu, Append_Track_Width_List( GetBoard() ),
ID_POPUP_PCB_SELECT_WIDTH, ID_POPUP_PCB_SELECT_WIDTH,
_( "Select Track Width" ), width_track_xpm ); _( "Select Track Width" ), width_track_xpm );
PopMenu->AppendSeparator();
} }
// Delete control: // Delete control:
PopMenu->AppendSeparator();
wxMenu* track_mnu = new wxMenu; wxMenu* track_mnu = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu, ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu,
ID_POPUP_PCB_DELETE_TRACK_MNU, _( "Delete" ), delete_xpm ); ID_POPUP_PCB_DELETE_TRACK_MNU, _( "Delete" ), delete_xpm );
...@@ -516,6 +514,16 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -516,6 +514,16 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET, ADD_MENUITEM( track_mnu, ID_POPUP_PCB_DELETE_TRACKNET,
_( "Delete Net" ), delete_net_xpm ); _( "Delete Net" ), delete_net_xpm );
} }
// Add global edition command
if( !flags )
{
PopMenu->AppendSeparator();
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_ALL_VIAS_AND_TRACK_SIZE,
_( "Global Tracks and Vias Edition" ), width_track_via_xpm );
}
// Add lock/unlock flags menu:
track_mnu = new wxMenu; track_mnu = new wxMenu;
ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu, ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu,
...@@ -530,7 +538,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) ...@@ -530,7 +538,6 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
if( !flags ) if( !flags )
{ {
track_mnu->AppendSeparator();
track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACK, _( "Track Locked: Yes" ) ); track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACK, _( "Track Locked: Yes" ) );
track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACK, _( "Track Locked: No" ) ); track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACK, _( "Track Locked: No" ) );
track_mnu->AppendSeparator(); track_mnu->AppendSeparator();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment