From a74bad1630dcd9c280ddb126926e1313b2741333 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 29 Nov 2017 18:05:35 -0500 Subject: [PATCH] About dialog fixes. Remove developer email addresses as requested on the developers mailing list. Update source contributor list. Add place holders for symbol and footprint library contributors. Remove unnecessary wxT() macros. --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/edit_component.cpp | 81 ++++ common/dialog_about/AboutDialog_main.cpp | 499 +++++++++++------------ common/dialog_about/aboutinfo.h | 4 +- include/bitmaps.h | 1 + 5 files changed, 320 insertions(+), 266 deletions(-) create mode 100644 bitmaps_png/cpp_26/edit_component.cpp diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 503a1bbd58..9f486c1ff5 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -209,6 +209,7 @@ set( BMAPS_MID drc duplicate edges_sketch + edit_component edit_comp_footprint edit_comp_ref edit_comp_value diff --git a/bitmaps_png/cpp_26/edit_component.cpp b/bitmaps_png/cpp_26/edit_component.cpp new file mode 100644 index 0000000000..bb1e49ad66 --- /dev/null +++ b/bitmaps_png/cpp_26/edit_component.cpp @@ -0,0 +1,81 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x03, 0xfd, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x7b, 0x48, 0x53, + 0x51, 0x1c, 0xc7, 0x7f, 0x77, 0xaf, 0xb6, 0x6b, 0x6f, 0xb3, 0x07, 0x51, 0x59, 0x54, 0x94, 0x45, + 0x64, 0x99, 0x28, 0xd1, 0xb0, 0x34, 0x03, 0xe9, 0x8f, 0x1e, 0x68, 0x05, 0x61, 0x42, 0x14, 0x81, + 0x5a, 0x56, 0xa6, 0x85, 0x45, 0x4e, 0x5d, 0x0f, 0x63, 0xff, 0xc8, 0xd4, 0x52, 0x53, 0x04, 0x29, + 0x68, 0xff, 0x45, 0x91, 0x39, 0x29, 0x0c, 0x2c, 0xd3, 0x4d, 0x57, 0x8a, 0xa9, 0x4b, 0x53, 0x5b, + 0x68, 0x64, 0x25, 0xe6, 0x72, 0x3e, 0xb6, 0x5f, 0xe7, 0xdc, 0xdd, 0x85, 0xda, 0x76, 0x9d, 0x42, + 0x83, 0x2f, 0xf7, 0x9e, 0xc3, 0xee, 0xef, 0x73, 0x7e, 0x8f, 0x73, 0x7e, 0x07, 0x60, 0xd2, 0x2f, + 0x1d, 0x20, 0x80, 0x3c, 0x18, 0xf8, 0x9f, 0x3f, 0x02, 0x09, 0x26, 0x42, 0x15, 0xc3, 0x54, 0x64, + 0x01, 0xac, 0x98, 0x89, 0x8d, 0xe6, 0xed, 0xdb, 0x97, 0xb5, 0x84, 0x85, 0x75, 0xb6, 0x47, 0x47, + 0x7f, 0x6b, 0x8f, 0x89, 0xb9, 0x85, 0xd1, 0xd1, 0x62, 0x77, 0xa0, 0x30, 0x0a, 0x4a, 0x67, 0x18, + 0x54, 0x89, 0xc5, 0xbf, 0xc8, 0x7b, 0xdc, 0xb4, 0x41, 0x41, 0x41, 0xa5, 0x6d, 0x51, 0x51, 0xf8, + 0xe9, 0xc4, 0x09, 0x34, 0xef, 0xdf, 0x8f, 0x1f, 0x42, 0x42, 0x0e, 0x79, 0x04, 0x19, 0x8a, 0x8a, + 0xb0, 0x58, 0xa9, 0x74, 0xf0, 0xde, 0x95, 0x13, 0xef, 0x96, 0x7b, 0x03, 0x89, 0x8b, 0x8b, 0x0b, + 0xc9, 0x57, 0xa9, 0xba, 0xca, 0xb4, 0xda, 0xde, 0xda, 0xa4, 0xa4, 0x97, 0xad, 0x7b, 0xf6, 0x8c, + 0x7c, 0x08, 0x0e, 0x5e, 0xef, 0x11, 0x64, 0xd6, 0xeb, 0xd1, 0x66, 0xb3, 0x61, 0x4d, 0x6e, 0x2e, + 0x66, 0xca, 0xe5, 0x76, 0x95, 0x48, 0x34, 0x40, 0xe6, 0x4f, 0x0b, 0x86, 0x3d, 0x3d, 0x5d, 0x94, + 0x90, 0x10, 0x5f, 0x97, 0xab, 0xd5, 0x8e, 0x96, 0x96, 0x96, 0x62, 0x7e, 0x7e, 0x3e, 0x3e, 0x8a, + 0x8c, 0xcc, 0xf2, 0x94, 0xa3, 0xbf, 0xa0, 0xe1, 0xe1, 0x61, 0x4e, 0x5f, 0x5b, 0x5a, 0xf0, 0xfe, + 0xce, 0x9d, 0x76, 0x3e, 0xa4, 0x4f, 0xd5, 0x00, 0xcb, 0xdc, 0x7d, 0x5b, 0x9b, 0x2c, 0x3b, 0x5e, + 0x9b, 0xaa, 0xb0, 0xd9, 0xb4, 0x73, 0x4c, 0xf5, 0x25, 0xb1, 0xad, 0x1a, 0xcd, 0x1d, 0x6b, 0x6c, + 0x6c, 0xec, 0x4a, 0xaf, 0x41, 0x54, 0xb6, 0xa1, 0x21, 0xac, 0xd6, 0x68, 0x30, 0x43, 0x2a, 0xb5, + 0x67, 0x88, 0xc5, 0x7d, 0xe4, 0x3f, 0x13, 0xe2, 0x6e, 0x38, 0x0d, 0xd2, 0x86, 0x14, 0x68, 0xef, + 0x54, 0x49, 0x0c, 0x98, 0xc7, 0xe2, 0xa8, 0x56, 0xf1, 0x5d, 0x1d, 0x1f, 0x95, 0x2d, 0x54, 0x75, + 0x6e, 0x41, 0x2e, 0x7d, 0x31, 0x99, 0xf0, 0x6e, 0x60, 0xa0, 0xcb, 0x3b, 0xdd, 0x0d, 0x00, 0x5f, + 0xfa, 0x5d, 0xfd, 0x25, 0x48, 0x6c, 0x48, 0x05, 0x87, 0x5d, 0xcb, 0x36, 0x51, 0x50, 0xeb, 0x75, + 0xb1, 0x5e, 0x7f, 0x6e, 0xc1, 0x44, 0x6f, 0x54, 0x00, 0x89, 0xe4, 0x43, 0x3d, 0x15, 0x79, 0x37, + 0x50, 0x23, 0x8d, 0x3a, 0x1d, 0x67, 0xf8, 0xa7, 0xc5, 0xc2, 0x85, 0xce, 0x25, 0x3a, 0x1e, 0xb2, + 0x5a, 0xb1, 0x4a, 0xad, 0xc6, 0x0c, 0x89, 0xc4, 0x4e, 0x2a, 0xf3, 0x5b, 0xf6, 0x3c, 0x38, 0x62, + 0x4a, 0x81, 0x1e, 0x8b, 0x5a, 0xf2, 0x9a, 0x42, 0x6c, 0x39, 0x8a, 0xde, 0xba, 0x4b, 0x70, 0xfb, + 0x1f, 0x2f, 0x3c, 0x81, 0xac, 0xfd, 0xfd, 0x98, 0x25, 0x97, 0x23, 0xb7, 0x7a, 0x5e, 0x74, 0x4c, + 0xe7, 0xe9, 0x22, 0x2c, 0x46, 0x23, 0xe6, 0x6d, 0xd9, 0x32, 0xf6, 0x20, 0x14, 0x90, 0x80, 0x88, + 0x37, 0x8a, 0x4f, 0x14, 0xd4, 0x9c, 0x26, 0xd6, 0x57, 0x27, 0xc3, 0xe2, 0xa9, 0x36, 0xec, 0x84, + 0xd0, 0xb9, 0xf3, 0x68, 0x7c, 0x28, 0x07, 0xfb, 0xbe, 0x60, 0x7d, 0xaa, 0x02, 0x4d, 0x67, 0xa4, + 0x48, 0x21, 0x03, 0xd9, 0x8a, 0xde, 0xda, 0x0b, 0x70, 0xcd, 0x9b, 0x93, 0x41, 0x30, 0x47, 0x93, + 0xd5, 0xfd, 0xf8, 0x22, 0xbe, 0x4f, 0x93, 0xe3, 0x68, 0xc1, 0x0a, 0x0e, 0x54, 0x79, 0x94, 0xc1, + 0x9b, 0x2c, 0x94, 0x10, 0x1b, 0xb3, 0x67, 0x04, 0x72, 0x85, 0x6b, 0xc2, 0xdc, 0xf7, 0x2e, 0x7c, + 0x97, 0xc6, 0xe2, 0x8f, 0xb2, 0xdd, 0x1c, 0xe4, 0x57, 0x51, 0x00, 0xbe, 0x38, 0xaf, 0xa4, 0x1b, + 0xdc, 0x41, 0x0a, 0xe5, 0x37, 0xb1, 0x53, 0x35, 0x2e, 0x25, 0x89, 0x53, 0x82, 0xfa, 0x7b, 0x7a, + 0xb8, 0xdc, 0xd0, 0xe7, 0x78, 0x50, 0xa7, 0xee, 0x14, 0x36, 0x5e, 0xf3, 0x41, 0x47, 0xb1, 0xd3, + 0x1b, 0x73, 0x41, 0x04, 0x3e, 0x3b, 0x17, 0x3f, 0x33, 0x10, 0xcd, 0x49, 0xc7, 0xab, 0x57, 0x5c, + 0x21, 0xd0, 0xa7, 0x2b, 0x47, 0x83, 0xbd, 0xad, 0x68, 0xba, 0x22, 0xc3, 0x81, 0x87, 0xe1, 0x1c, + 0xa4, 0x2f, 0x2f, 0x00, 0x1f, 0x46, 0x2c, 0xa1, 0x65, 0x4f, 0x8f, 0xad, 0x7b, 0xd3, 0x0a, 0x9d, + 0x50, 0xd5, 0x75, 0x94, 0x1d, 0xc1, 0xe6, 0x4c, 0x5f, 0x74, 0x14, 0x2e, 0xe6, 0x40, 0xe5, 0x31, + 0x22, 0xcc, 0x94, 0x89, 0x2d, 0x64, 0xe5, 0xe1, 0x1e, 0x8d, 0x4f, 0xb5, 0x8f, 0x26, 0x7b, 0x34, + 0xd0, 0x6d, 0xc4, 0x86, 0x54, 0x11, 0xfe, 0xbc, 0x1f, 0xca, 0x41, 0x1a, 0xe3, 0xa5, 0x58, 0x1c, + 0x08, 0xaf, 0x6f, 0x02, 0x2c, 0x10, 0xf4, 0x42, 0x08, 0xe4, 0x2e, 0x47, 0xe6, 0xc2, 0x7d, 0xd8, + 0x74, 0x75, 0x1e, 0x8e, 0xe5, 0xb0, 0xe8, 0xc8, 0x65, 0xb1, 0xfa, 0x0c, 0xf3, 0x06, 0x3d, 0x37, + 0x4a, 0x3a, 0x4f, 0xfb, 0x91, 0x6c, 0x5a, 0x55, 0xd7, 0x59, 0x51, 0x8c, 0xe4, 0x4c, 0xc3, 0xb6, + 0xb3, 0x32, 0xce, 0x9b, 0xcf, 0x19, 0xd2, 0x9a, 0x9a, 0x8b, 0xb0, 0xd7, 0x03, 0x40, 0x4a, 0xe4, + 0x03, 0xce, 0x7c, 0xb1, 0xd3, 0x3a, 0x54, 0x2b, 0x8f, 0x31, 0x0e, 0x63, 0x02, 0x33, 0x46, 0x20, + 0x63, 0xc4, 0x9b, 0x91, 0xfa, 0x14, 0xd0, 0xb9, 0x01, 0xcc, 0x22, 0x9a, 0x4f, 0xb4, 0x90, 0x7f, + 0xce, 0xe5, 0x81, 0xde, 0xb5, 0x89, 0x12, 0xa5, 0x1f, 0x36, 0x3d, 0xda, 0x61, 0xfb, 0x58, 0x1e, + 0xd9, 0x3d, 0xf8, 0x60, 0x6d, 0x5d, 0x57, 0xa6, 0xa4, 0xea, 0x6d, 0x32, 0x84, 0x8e, 0x03, 0xc8, + 0x89, 0x16, 0x81, 0xb3, 0x8d, 0x2c, 0xe1, 0xdf, 0x17, 0xf2, 0x20, 0xd6, 0xeb, 0xc6, 0x67, 0x28, + 0x08, 0x32, 0xb6, 0x3c, 0x09, 0xc6, 0x8e, 0x97, 0x87, 0xb1, 0xe3, 0xc5, 0x41, 0x7c, 0x9f, 0xb3, + 0xaa, 0x8c, 0x07, 0xb0, 0xbc, 0x71, 0x7f, 0x22, 0x7a, 0x62, 0xd3, 0x6e, 0xbc, 0x14, 0x9c, 0x27, + 0xbb, 0x0f, 0x9f, 0x23, 0xf7, 0xe5, 0x5d, 0x57, 0x58, 0xf8, 0x4f, 0x2b, 0x6f, 0x7b, 0xb6, 0xcb, + 0x68, 0x7e, 0x1e, 0x41, 0x20, 0x87, 0xd0, 0x5c, 0x1e, 0x6e, 0xaf, 0xd4, 0x6c, 0xda, 0xcd, 0x1b, + 0xa6, 0xad, 0x7a, 0x2d, 0xd1, 0x6a, 0x7e, 0xec, 0xc7, 0xc3, 0x45, 0x1e, 0x6f, 0x53, 0x42, 0x97, + 0x93, 0x94, 0x93, 0xfe, 0xfd, 0x25, 0xb7, 0x42, 0xf1, 0x63, 0x45, 0xe4, 0xef, 0x27, 0xf7, 0x76, + 0x25, 0x91, 0xa9, 0xcd, 0xe0, 0xbc, 0x9a, 0x6d, 0x20, 0x5a, 0xc3, 0x7b, 0x20, 0xf5, 0xea, 0xaa, + 0x26, 0x74, 0xdd, 0x5a, 0xe7, 0xef, 0x33, 0xa2, 0xdc, 0xe1, 0x67, 0xbd, 0x7c, 0x6a, 0xe3, 0x41, + 0x32, 0xdc, 0xca, 0x7b, 0x42, 0xc3, 0x34, 0x47, 0x70, 0xf5, 0x02, 0x30, 0x77, 0x17, 0x48, 0xc9, + 0x81, 0x88, 0xe5, 0x6d, 0xdb, 0xb6, 0xf9, 0x6e, 0x04, 0xe7, 0xc6, 0x74, 0xad, 0x9c, 0xf1, 0x16, + 0xf0, 0x07, 0xee, 0x46, 0x80, 0xb1, 0x1b, 0x5c, 0xad, 0x5e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, + 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE edit_component_xpm[1] = {{ png, sizeof( png ), "edit_component_xpm" }}; + +//EOF diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 409862e422..22ef1ec94a 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -64,17 +64,17 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf aInfo.SetAppName( Pgm().App().GetAppName() ); /* Copyright information */ - aInfo.SetCopyright( wxT( "(C) 1992-2017 KiCad Developers Team" ) ); + aInfo.SetCopyright( "(C) 1992-2017 KiCad Developers Team" ); /* KiCad build version */ wxString version; version << GetBuildVersion() #ifdef DEBUG - << wxT( ", debug" ) + << ", debug" #else - << wxT( ", release" ) + << ", release" #endif - << wxT( " build" ); + << " build"; aInfo.SetBuildVersion( version ); @@ -91,16 +91,15 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf // Just in case someone builds KiCad with the platform native of Boost instead of // the version included with the KiCad source. - libVersion << wxT( "and Boost " ) << ( BOOST_VERSION / 100000 ) << wxT( "." ) - << ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION % 100 ) - << wxT( "\n" ); + libVersion << "and Boost " << ( BOOST_VERSION / 100000 ) << "." + << ( BOOST_VERSION / 100 % 1000 ) << "." << ( BOOST_VERSION % 100 ) + << "\n"; // Operating System Information wxPlatformInfo platformInfo; - libVersion << wxT( "Platform: " ) << wxGetOsDescription() << wxT( ", " ) - << platformInfo.GetArchName(); + libVersion << "Platform: " << wxGetOsDescription() << ", " << platformInfo.GetArchName(); aInfo.SetLibVersion( libVersion ); @@ -110,70 +109,70 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf wxString description; /* short description */ - description << wxT( "

" ); - description << wxT( "" ) + description << "

"; + description << "" << _( "Description" ) - << wxT( "" ); // bold & underlined font for caption + << ""; // bold & underlined font for caption - description << wxT( "

" ) + description << "

" << _( "The KiCad EDA Suite is a set of open source applications for the " "creation of electronic schematics and printed circuit boards." ) - << wxT( "

" ); + << "

"; - description << wxT( "

" ); + description << "

"; /* websites */ - description << wxT( "

" ) + description << "

" << _( "KiCad on the web" ) - << wxT( "" ); // bold & underlined font for caption + << ""; // bold & underlined font for caption // bullet-ed list with some http links - description << wxT( "

"; - description << wxT( "

" ) + description << "

" << _( "Bug tracker" ) - << wxT( "" ); // bold & underlined font caption + << ""; // bold & underlined font caption // bullet-ed list with some http links - description << wxT( "

"; - description << wxT( "

" ) + description << "

" << _( "KiCad user's groups and community" ) - << wxT( "" ); // bold & underlined font caption + << ""; // bold & underlined font caption - description << wxT( "

"; aInfo.SetDescription( description ); @@ -181,12 +180,12 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf // License information also HTML formatted: wxString license; license - << wxT( "
" ) + << "
" << HtmlNewline( 4 ) << _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 ) - << HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ), + << HtmlHyperlink( "http://www.gnu.org/licenses", _( "GNU General Public License (GPL) version 3 or any later version" ) ) - << wxT( "
" ); + << "
"; aInfo.SetLicense( license ); @@ -194,8 +193,8 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf /* A contributor consists of the following information: * Mandatory: * - Name - * - EMail address * Optional: + * - EMail address * - Category * - Category specific icon * @@ -204,230 +203,206 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf */ // The core developers - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Jean-Pierre Charras" ), - wxT( "jp.charras@wanadoo.fr" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Dick Hollenbeck" ), - wxT( "dick@softplc.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Wayne Stambaugh" ), - wxT( "stambaughw@gmail.com" ) ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Jean-Pierre Charras" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Dick Hollenbeck" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Wayne Stambaugh" ) ); // alphabetically by last name after main 3 above: - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Frank Bennett" ), - wxT( "bennett78@lpbroadband.net" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Cirilo Bernardo" ), - wxT( "cirilo_bernardo@yahoo.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Jonas Diemer" ), - wxT( "diemer@gmx.de" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Torsten Hüter" ), - wxT( "torstenhtr@gmx.de" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Jerry Jacobs" ), - wxT( "xor.gate.engineering@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Mario Luzeiro" ), - wxT( "mrluzeiro@ua.pt" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Daniel Majewski" ), - wxT( "lordblick@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Lorenzo Marcantonio" ), - wxT( "lomarcan@tin.it" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Marco Mattila" ), - wxT( "marcom99@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Chris Pavlina" ), - wxT( "pavlina.chris@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Miguel Angel Ajo Pelayo" ), - wxT( "miguelangel@nbee.es" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Jacobo Aragunde Perez" ), - wxT( "jaragunde@igalia.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Simon Richter" ), - wxT( "Simon.Richter@hogyros.de" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Mark Roszko" ), - wxT( "mark.roszko@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Marco Serantoni" ), - wxT( "marco.serantoni@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Brian Sidebotham" ), - wxT( "brian.sidebotham@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Mateusz Skowroński" ), - wxT( "skowri@gmail.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Rafael Sokolowski" ), - wxT( "rafael.sokolowski@web.de" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Vesa Solonen" ), - wxT( "vesa.solonen@hut.fi" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Bernhard Stegmaier" ), - wxT( "stegmaier@sw-systems.de" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Orson (Maciej Sumiński)" ), - wxT( "maciej.suminski@cern.ch" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Tomasz Wlostowski" ), - wxT( "tomasz.wlostowski@cern.ch" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Adam Wolf" ), - wxT( "adamwolf@feelslikeburning.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Alexander Zakamaldin" ), - wxT( "zaka62@mail.ru" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Henner Zeller" ), - wxT( "h.zeller@acm.org" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Andrew Zonenberg" ), - wxT( "azonenberg@drawersteak.com" ) ) ); - aInfo.AddDeveloper( new CONTRIBUTOR( wxT( "Nick Østergaard" ), - wxT( "oe.nick@gmail.com" ) ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Frank Bennett" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Cirilo Bernardo" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Jonas Diemer" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Jon Evans" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Seth Hillbrand" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Torsten Hüter" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Jerry Jacobs" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Mario Luzeiro" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Daniel Majewski" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Lorenzo Marcantonio" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Marco Mattila" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Russell Oliver" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Chris Pavlina" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Miguel Angel Ajo Pelayo" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Jacobo Aragunde Perez" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Simon Richter" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Mark Roszko" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Marco Serantoni" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Brian Sidebotham" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Mateusz Skowroński" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Rafael Sokolowski" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Vesa Solonen" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Bernhard Stegmaier" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Orson (Maciej Sumiński)" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Oliver Walters" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Tomasz Wlostowski" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Adam Wolf" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Alexander Zakamaldin" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Henner Zeller" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Andrew Zonenberg" ) ); + aInfo.AddDeveloper( new CONTRIBUTOR( "Nick Østergaard" ) ); // The document writers - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Jean-Pierre Charras" ), - wxT( "jp.charras@wanadoo.fr" ) ) ); - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Marco Ciampa" ), - wxT( "ciampix@libero.it" ) ) ); - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Dick Hollenbeck" ), - wxT( "dick@softplc.com" ) ) ); - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Igor Plyatov" ), - wxT( "plyatov@gmail.com" ) ) ); - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Wayne Stambaugh" ), - wxT( "stambaughw@gmail.com" ) ) ); - aInfo.AddDocWriter( new CONTRIBUTOR( wxT( "Fabrizio Tappero" ), - wxT( "fabrizio.tappero@gmail.com" ) ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Jean-Pierre Charras" ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Marco Ciampa" ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Dick Hollenbeck" ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Igor Plyatov" ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Wayne Stambaugh" ) ); + aInfo.AddDocWriter( new CONTRIBUTOR( "Fabrizio Tappero" ) ); /* The translators * As category the language to which the translation was done is used * and as icon the national flag of the corresponding country. */ - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Robert Buj" ), - wxT( "rbuj@fedoraproject.org" ), - wxT( "Catalan (CA)" ), - KiBitmapNew( lang_catalan_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Martin Kratoška" ), - wxT( "martin@ok1rr.com" ), - wxT( "Czech (CZ)" ), - KiBitmapNew( lang_cs_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jerry Jacobs" ), - wxT( "xor.gate.engineering@gmail.com" ), - wxT( "Dutch (NL)" ), - KiBitmapNew( lang_nl_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Vesa Solonen" ), - wxT( "vesa.solonen@hut.fi" ), - wxT( "Finnish (FI)" ), - KiBitmapNew( lang_fi_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Jean-Pierre Charras" ), - wxT( "jp.charras@wanadoo.fr" ), - wxT( "French (FR)" ), - KiBitmapNew( lang_fr_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Mateusz Skowroński" ), - wxT( "skowri@gmail.com" ), - wxT( "Polish (PL)" ), - KiBitmapNew( lang_pl_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kerusey Karyu" ), - wxT( "keruseykaryu@o2.pl" ), - wxT( "Polish (PL)" ), - KiBitmapNew( lang_pl_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Renie Marquet" ), - wxT( "reniemarquet@uol.com.br" ), - wxT( "Portuguese (PT)" ), - KiBitmapNew( lang_pt_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Igor Plyatov" ), - wxT( "plyatov@gmail.com" ), - wxT( "Russian (RU)" ), + aInfo.AddTranslator( new CONTRIBUTOR( "Robert Buj", + wxEmptyString, + "Catalan (CA)", + KiBitmapNew( lang_catalan_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Martin Kratoška", + wxEmptyString, + "Czech (CZ)", + KiBitmapNew( lang_cs_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Jerry Jacobs", + wxEmptyString, + "Dutch (NL)", + KiBitmapNew( lang_nl_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Vesa Solonen", + wxEmptyString, + "Finnish (FI)", + KiBitmapNew( lang_fi_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Jean-Pierre Charras", + wxEmptyString, + "French (FR)", + KiBitmapNew( lang_fr_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Mateusz Skowroński", + wxEmptyString, + "Polish (PL)", + KiBitmapNew( lang_pl_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Kerusey Karyu", + wxEmptyString, + "Polish (PL)", + KiBitmapNew( lang_pl_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Renie Marquet", + wxEmptyString, + "Portuguese (PT)", + KiBitmapNew( lang_pt_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Igor Plyatov", + wxEmptyString, + "Russian (RU)", + KiBitmapNew( lang_ru_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Andrey Fedorushkov", + wxEmptyString, + "Russian (RU)", + KiBitmapNew( lang_ru_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Eldar Khayrullin", + wxEmptyString, + "Russian (RU)", KiBitmapNew( lang_ru_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Andrey Fedorushkov" ), - wxT( "andrf@mail.ru" ), - wxT( "Russian (RU)" ), - KiBitmapNew( lang_ru_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Eldar Khayrullin" ), - wxT( "eldar.khayrullin@mail.ru" ), - wxT( "Russian (RU)" ), - KiBitmapNew( lang_ru_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Pedro Martin del Valle" ), - wxT( "pkicad@yahoo.es" ), - wxT( "Spanish (ES)" ), - KiBitmapNew( lang_es_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Iñigo Zuluaga" ), - wxT( "inigo_zuluaga@yahoo.es" ), - wxT( "Spanish (ES)" ), - KiBitmapNew( lang_es_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Iñigo Figuero" ), - wxT( "ifs@elektroquark.com" ), - wxT( "Spanish (ES)" ), - KiBitmapNew( lang_es_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Rafael Sokolowski" ), - wxT( "rafael.sokolowski@web.de" ), - wxT( "German (DE)" ), - KiBitmapNew( lang_de_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Kenta Yonekura" ), - wxT( "yoneken@kicad.jp" ), - wxT( "Japanese (JA)" ), - KiBitmapNew( lang_jp_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Manolis Stefanis" ), - wxT( "" ), - wxT( "Greek (el_GR)" ), - KiBitmapNew( lang_gr_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Athanasios Vlastos" ), - wxT( "" ), - wxT( "Greek (el_GR)" ), - KiBitmapNew( lang_gr_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Milonas Kostas" ), - wxT( "milonas.ko@gmail.com" ), - wxT( "Greek (el_GR)" ), - KiBitmapNew( lang_gr_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Michail Misirlis" ), - wxT( "mmisirlis@gmail.com" ), - wxT( "Greek (el_GR)" ), - KiBitmapNew( lang_gr_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Massimo Cioce" ), - wxT( "ciocemax@alice.it" ), - wxT( "Italian (IT)" ), - KiBitmapNew( lang_it_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Marco Ciampa" ), - wxT( "ciampix@libero.it" ), - wxT( "Italian (IT)" ), - KiBitmapNew( lang_it_xpm ) ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Evgeniy Ivanov" ), - wxT( "evgeniy_p_ivanov@yahoo.ca" ), - wxT( "Bulgarian (BG)" ), - KiBitmapNew( lang_bg_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Pedro Martin del Valle", + wxEmptyString, + "Spanish (ES)", + KiBitmapNew( lang_es_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Iñigo Zuluaga", + wxEmptyString, + "Spanish (ES)", + KiBitmapNew( lang_es_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Iñigo Figuero", + wxEmptyString, + "Spanish (ES)", + KiBitmapNew( lang_es_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Rafael Sokolowski", + wxEmptyString, + "German (DE)", + KiBitmapNew( lang_de_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Kenta Yonekura", + wxEmptyString, + "Japanese (JA)", + KiBitmapNew( lang_jp_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Manolis Stefanis", + wxEmptyString, + "Greek (el_GR)", + KiBitmapNew( lang_gr_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Athanasios Vlastos", + wxEmptyString, + "Greek (el_GR)", + KiBitmapNew( lang_gr_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Milonas Kostas", + wxEmptyString, + "Greek (el_GR)", + KiBitmapNew( lang_gr_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Michail Misirlis", + wxEmptyString, + "Greek (el_GR)", + KiBitmapNew( lang_gr_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Massimo Cioce", + wxEmptyString, + "Italian (IT)", + KiBitmapNew( lang_it_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Marco Ciampa", + wxEmptyString, + "Italian (IT)", + KiBitmapNew( lang_it_xpm ) ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Evgeniy Ivanov", + wxEmptyString, + "Bulgarian (BG)", + KiBitmapNew( lang_bg_xpm ) ) ); // Maintainer who helper in translations, but not in a specific translation #define OTHERS_IN_TRANSLATION _( "Others" ) - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Remy Halvick" ), - wxEmptyString, - OTHERS_IN_TRANSLATION ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "David Briscoe" ), - wxEmptyString, - OTHERS_IN_TRANSLATION ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Dominique Laigle" ), - wxEmptyString, - OTHERS_IN_TRANSLATION ) ); - aInfo.AddTranslator( new CONTRIBUTOR( wxT( "Paul Burke" ), - wxEmptyString, - OTHERS_IN_TRANSLATION ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Remy Halvick", + wxEmptyString, + OTHERS_IN_TRANSLATION ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "David Briscoe", + wxEmptyString, + OTHERS_IN_TRANSLATION ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Dominique Laigle", + wxEmptyString, + OTHERS_IN_TRANSLATION ) ); + aInfo.AddTranslator( new CONTRIBUTOR( "Paul Burke", + wxEmptyString, + OTHERS_IN_TRANSLATION ) ); // Programm credits for icons #define ICON_CONTRIBUTION _( "Icons by" ) - aInfo.AddArtist( new CONTRIBUTOR( wxT( "Iñigo Zuluaga" ), - wxT( "inigo_zuluaga@yahoo.es" ), - ICON_CONTRIBUTION, - KiBitmapNew( edit_module_xpm ) ) ); - aInfo.AddArtist( new CONTRIBUTOR( wxT( "Konstantin Baranovskiy" ), - wxT( "baranovskiykonstantin@gmail.com" ), - ICON_CONTRIBUTION, - KiBitmapNew( edit_module_xpm ) ) ); - aInfo.AddArtist( new CONTRIBUTOR( wxT( "Fabrizio Tappero" ), - wxT( "fabrizio.tappero@gmail.com" ), - ICON_CONTRIBUTION, - KiBitmapNew( edit_module_xpm ) ) ); + aInfo.AddArtist( new CONTRIBUTOR( "Iñigo Zuluaga", + wxEmptyString, + ICON_CONTRIBUTION, + KiBitmapNew( svg_file_xpm ) ) ); + aInfo.AddArtist( new CONTRIBUTOR( "Konstantin Baranovskiy", + wxEmptyString, + ICON_CONTRIBUTION, + KiBitmapNew( svg_file_xpm ) ) ); + aInfo.AddArtist( new CONTRIBUTOR( "Fabrizio Tappero", + wxEmptyString, + ICON_CONTRIBUTION, + KiBitmapNew( svg_file_xpm ) ) ); - // Programm credits for 3d models + // Program credits for 3d models #define MODELS_3D_CONTRIBUTION _( "3D models by" ) - aInfo.AddArtist( new CONTRIBUTOR( wxT( "Christophe Boschat" ), - wxT( "nox454@hotmail.fr" ), - MODELS_3D_CONTRIBUTION, - KiBitmapNew( three_d_xpm ) ) ); - aInfo.AddArtist( new CONTRIBUTOR( wxT( "Renie Marquet" ), - wxT( "reniemarquet@uol.com.br" ), - MODELS_3D_CONTRIBUTION, - KiBitmapNew( three_d_xpm ) ) ); + aInfo.AddArtist( new CONTRIBUTOR( "Christophe Boschat", + wxEmptyString, + MODELS_3D_CONTRIBUTION, + KiBitmapNew( three_d_xpm ) ) ); + aInfo.AddArtist( new CONTRIBUTOR( "Renie Marquet", + wxEmptyString, + MODELS_3D_CONTRIBUTION, + KiBitmapNew( three_d_xpm ) ) ); - // Programm credits for package developers. - aInfo.AddPackager( new CONTRIBUTOR( wxT( "Jean-Samuel Reynaud" ), - wxT( "js.reynaud@gmail.com" ) ) ); - aInfo.AddPackager( new CONTRIBUTOR( wxT( "Bernhard Stegmaier" ), - wxT( "stegmaier@sw-systems.de" ) ) ); - aInfo.AddPackager( new CONTRIBUTOR( wxT( "Adam Wolf" ), - wxT( "adamwolf@feelslikeburning.com" ) ) ); - aInfo.AddPackager( new CONTRIBUTOR( wxT( "Nick Østergaard" ), - wxT( "oe.nick@gmail.com" ) ) ); + #define SYMBOL_LIB_CONTRIBUTION _( "Symbols by" ) + aInfo.AddArtist( new CONTRIBUTOR( "Leet Hacker1", + wxEmptyString, + SYMBOL_LIB_CONTRIBUTION, + KiBitmapNew( edit_component_xpm ) ) ); + + #define FOOTPRINT_LIB_CONTRIBUTION _( "Footprints by" ) + aInfo.AddArtist( new CONTRIBUTOR( "Leet Hacker2", + wxEmptyString, + FOOTPRINT_LIB_CONTRIBUTION, + KiBitmapNew( edit_module_xpm ) ) ); + + // Program credits for package developers. + aInfo.AddPackager( new CONTRIBUTOR( "Jean-Samuel Reynaud" ) ); + aInfo.AddPackager( new CONTRIBUTOR( "Bernhard Stegmaier" ) ); + aInfo.AddPackager( new CONTRIBUTOR( "Adam Wolf" ) ); + aInfo.AddPackager( new CONTRIBUTOR( "Nick Østergaard" ) ); } @@ -446,9 +421,7 @@ void ShowAboutDialog( EDA_BASE_FRAME* aParent ) /////////////////////////////////////////////////////////////////////////////// /** - * Function HtmlHyperlink - * - * wraps \a aUrl with a HTML anchor tag containing a hyperlink text reference + * Wrap \a aUrl with a HTML anchor tag containing a hyperlink text reference * to form a HTML hyperlink. * * @param aUrl the url that will be embedded in an anchor tag containing a hyperlink reference @@ -461,18 +434,16 @@ static wxString HtmlHyperlink( const wxString& aUrl, const wxString& aDescriptio wxString hyperlink = wxEmptyString; if( aDescription.IsEmpty() ) - hyperlink << wxT( "" ) << aUrl << wxT( "" ); + hyperlink << "" << aUrl << ""; else - hyperlink << wxT( "" ) << aDescription << wxT( "" ); + hyperlink << "" << aDescription << ""; return hyperlink; } /** - * Function HtmlNewline - * - * creates an HTML newline character sequence of \a aCount. + * Create an HTML newline character sequence of \a aCount. * * @param aCount the number of HTML newline tags to concatenate, default is to return just * one
tag. @@ -483,7 +454,7 @@ static wxString HtmlNewline( const unsigned int aCount ) wxString newlineTags = wxEmptyString; for( size_t i = 0; i" ); + newlineTags << "
"; return newlineTags; } diff --git a/common/dialog_about/aboutinfo.h b/common/dialog_about/aboutinfo.h index 8104ce891c..0d51c8941f 100644 --- a/common/dialog_about/aboutinfo.h +++ b/common/dialog_about/aboutinfo.h @@ -127,9 +127,9 @@ private: * * A contributor consists of the following mandatory information: * - Name - * - EMail address * * Each contributor can have optional information assigned like: + * - EMail address * - A category * - A category specific icon */ @@ -137,7 +137,7 @@ class CONTRIBUTOR { public: CONTRIBUTOR( const wxString& aName, - const wxString& aEmail, + const wxString& aEmail = wxEmptyString, const wxString& aCategory = wxEmptyString, wxBitmap* aIcon = NULL ) { diff --git a/include/bitmaps.h b/include/bitmaps.h index 84401dc11e..fa2e71eda4 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -141,6 +141,7 @@ EXTERN_BITMAP( drc_xpm ) EXTERN_BITMAP( duplicate_xpm ) EXTERN_BITMAP( edges_sketch_xpm ) EXTERN_BITMAP( edit_comp_footprint_xpm ) +EXTERN_BITMAP( edit_component_xpm ) EXTERN_BITMAP( edit_comp_ref_xpm ) EXTERN_BITMAP( edit_comp_value_xpm ) EXTERN_BITMAP( edit_module_xpm )