Commit f43ed909 authored by jean-pierre charras's avatar jean-pierre charras

Add specific bitmaps in export IDF and export DSN menus.

Add missing calls to Show( false ) to some main frames (Kicad, eeschema, gerbview), to force config saving when closing these windows.
Code cleanup and minor coding style fixes in footprint_wizard_frame.
parents 2ac58935 ce6b907f
......@@ -141,6 +141,9 @@ void EDA_3D_FRAME::Exit3DFrame( wxCommandEvent& event )
void EDA_3D_FRAME::OnCloseWindow( wxCloseEvent& Event )
{
SaveSettings();
Show( false );
if( Parent() )
Parent()->m_Draw3DFrame = NULL;
......
......@@ -234,6 +234,8 @@ set( BMAPS_MID
ercwarn
erc
exit
export_dsn
export_idf
export_footprint_names
export_module
export_options_pad
......
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
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, 0x04, 0x96, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x95, 0x4b, 0x4c, 0x54,
0x57, 0x18, 0xc7, 0x7f, 0xdf, 0xbd, 0xf3, 0x64, 0x86, 0x87, 0x03, 0xa3, 0x22, 0x5a, 0x20, 0xbe,
0x42, 0x35, 0x86, 0x62, 0x2d, 0x0a, 0x24, 0xa4, 0x54, 0xdb, 0x6e, 0xba, 0x6a, 0x62, 0xd2, 0x95,
0x89, 0xba, 0xeb, 0xc2, 0xc4, 0x54, 0xfb, 0x4e, 0xba, 0xe8, 0xae, 0x3b, 0x77, 0xdd, 0xb9, 0x20,
0x69, 0x62, 0x9b, 0xa6, 0x0b, 0x13, 0x09, 0x8d, 0x40, 0x6d, 0xd3, 0x04, 0x04, 0xac, 0xa6, 0xa9,
0x46, 0xa5, 0xc2, 0x88, 0x82, 0x32, 0x58, 0x98, 0x19, 0x66, 0x98, 0x7b, 0xef, 0x39, 0xa7, 0x0b,
0x60, 0x64, 0x10, 0x94, 0x9a, 0x9e, 0xe4, 0xe6, 0x3c, 0x72, 0xce, 0xf7, 0x3b, 0xdf, 0xff, 0x9e,
0xf3, 0x3f, 0x02, 0xd8, 0xc0, 0x2b, 0x80, 0xc5, 0xff, 0x53, 0xe6, 0x8c, 0x31, 0x93, 0x2b, 0x07,
0x7d, 0xc0, 0xee, 0xce, 0xce, 0xce, 0x1f, 0x62, 0xb1, 0x58, 0xc5, 0xcb, 0x46, 0x36, 0xc6, 0x90,
0xcd, 0x66, 0xad, 0x48, 0x24, 0xa2, 0xbb, 0xba, 0xba, 0x7a, 0x44, 0xe4, 0xa4, 0x31, 0x66, 0x7e,
0x25, 0xc8, 0xaa, 0x0a, 0x85, 0xaa, 0x4b, 0x95, 0xaa, 0x30, 0x80, 0x88, 0x20, 0x22, 0x20, 0x02,
0x8b, 0xfd, 0xa5, 0x76, 0x28, 0x1e, 0xc7, 0xf2, 0xf9, 0x8a, 0x20, 0x5a, 0x6b, 0xba, 0xbb, 0xbb,
0x19, 0x1d, 0x1f, 0xa3, 0xb5, 0xb9, 0x85, 0x78, 0x3c, 0x5e, 0x0e, 0xc8, 0x6a, 0x19, 0x31, 0xda,
0xd9, 0x19, 0x7a, 0x7c, 0xf9, 0xf2, 0x0b, 0x77, 0xde, 0x7a, 0xee, 0x1c, 0x55, 0x4d, 0x4d, 0x45,
0x63, 0x7d, 0x7d, 0x7d, 0xdc, 0xf3, 0x25, 0xf8, 0xb3, 0xe1, 0x36, 0x72, 0x15, 0x6c, 0x6d, 0xc7,
0x57, 0x5b, 0x6b, 0x01, 0x88, 0x31, 0xeb, 0x92, 0x28, 0x93, 0x48, 0x3c, 0x23, 0xd9, 0xf8, 0xf4,
0x03, 0x7e, 0xaf, 0xba, 0x46, 0xda, 0x64, 0xf8, 0xab, 0xfa, 0x2e, 0x89, 0xf1, 0xc4, 0xae, 0xb6,
0xb6, 0xb6, 0xd6, 0x55, 0x41, 0x66, 0xbd, 0xa0, 0xb1, 0xb1, 0xa2, 0xbe, 0x88, 0xb0, 0xa3, 0x66,
0x3b, 0x2d, 0xc9, 0xfd, 0x00, 0xcc, 0x98, 0x14, 0xd3, 0x3b, 0x52, 0xc1, 0x60, 0x28, 0xf8, 0x4d,
0x47, 0x47, 0xc7, 0xfe, 0x97, 0x06, 0xa5, 0x57, 0x80, 0x00, 0x9a, 0x9b, 0x9b, 0xd9, 0x94, 0x8e,
0xd1, 0xe0, 0xec, 0x04, 0x20, 0xeb, 0xcf, 0x95, 0xa4, 0xeb, 0x72, 0x25, 0xc0, 0xf9, 0xf6, 0xf6,
0xf6, 0x86, 0xa2, 0x7f, 0x14, 0xde, 0xb2, 0x45, 0x57, 0x35, 0x36, 0x2e, 0x00, 0x8d, 0x29, 0xd4,
0x00, 0x4e, 0x2a, 0x45, 0x26, 0x91, 0x40, 0x2c, 0x8b, 0xd4, 0xc4, 0x04, 0xb9, 0x5c, 0x0e, 0xb3,
0x38, 0x67, 0xe9, 0x3b, 0x74, 0xf0, 0x10, 0x53, 0x17, 0x93, 0x6c, 0xac, 0xa9, 0x22, 0x49, 0x12,
0x15, 0xd2, 0xbb, 0x72, 0x9b, 0xf2, 0xd7, 0x83, 0x13, 0xfe, 0x9f, 0x9a, 0x9a, 0x9a, 0xde, 0x1e,
0x1e, 0x1e, 0x1e, 0x13, 0x60, 0x6f, 0x4f, 0x4f, 0xcf, 0x2f, 0x95, 0x95, 0x95, 0xb1, 0xd5, 0xb2,
0x98, 0xbd, 0x7d, 0x9b, 0xbe, 0xe3, 0xc7, 0xb1, 0xf6, 0xd5, 0x90, 0xdc, 0xbd, 0x95, 0xf2, 0x83,
0xad, 0x28, 0x05, 0xc6, 0xd5, 0xa8, 0xbc, 0x87, 0x72, 0x35, 0x5e, 0xde, 0x45, 0xb9, 0x0a, 0xc7,
0x76, 0x19, 0x50, 0xc3, 0x48, 0x0a, 0xac, 0x34, 0xf8, 0xa7, 0xed, 0x81, 0xfc, 0xc4, 0x7c, 0xc4,
0x75, 0xdd, 0x0e, 0xdf, 0x8b, 0xe4, 0x2a, 0xad, 0xad, 0x45, 0x44, 0x78, 0x70, 0xd0, 0xcf, 0xcf,
0x5f, 0xcd, 0x61, 0xa5, 0xbb, 0x0b, 0x81, 0x8a, 0x6b, 0x53, 0xe8, 0x2f, 0x15, 0xcf, 0xaf, 0xde,
0xb0, 0x4b, 0xec, 0xdf, 0xc8, 0x72, 0xfe, 0x85, 0x6e, 0x60, 0x05, 0x83, 0x94, 0x54, 0x57, 0xbf,
0xb4, 0x4d, 0x88, 0x88, 0x1f, 0xf0, 0xf9, 0xd6, 0x33, 0x39, 0x5a, 0x5b, 0x4b, 0xf5, 0x50, 0x82,
0x77, 0xce, 0x86, 0xb1, 0x2a, 0x37, 0x51, 0x5a, 0xbf, 0x13, 0xed, 0x28, 0x54, 0x5e, 0xa3, 0x1d,
0xb5, 0xd0, 0x76, 0x3c, 0xf2, 0xe2, 0x72, 0x95, 0xe1, 0xc2, 0x3a, 0xdb, 0x95, 0x3f, 0x9c, 0x39,
0xb7, 0x02, 0x38, 0xba, 0x2e, 0x50, 0x69, 0x7d, 0x3d, 0x53, 0x17, 0xae, 0xb2, 0xf1, 0x4e, 0x9a,
0xca, 0x03, 0x65, 0xec, 0x79, 0xeb, 0xcd, 0xa2, 0xc3, 0x90, 0xcd, 0x66, 0xb9, 0xd4, 0x75, 0x89,
0xc4, 0xb6, 0x87, 0xe0, 0x2e, 0x42, 0x1c, 0xeb, 0x66, 0x20, 0xe3, 0x8f, 0x3a, 0x38, 0xef, 0x0d,
0x0e, 0x0e, 0x26, 0xd6, 0x07, 0xaa, 0xab, 0x43, 0x7b, 0x1e, 0x92, 0x4a, 0xe1, 0x8d, 0x8e, 0x12,
0x8b, 0xc5, 0x8a, 0x2c, 0xa8, 0xbf, 0xbf, 0x9f, 0xcc, 0xf6, 0x79, 0x26, 0x9c, 0x47, 0x58, 0x80,
0xe4, 0xe5, 0x5e, 0x78, 0x32, 0x68, 0x0c, 0xe6, 0x83, 0xc1, 0xc1, 0xc1, 0x5b, 0xac, 0xd7, 0xb1,
0xa3, 0xb5, 0xb5, 0x4f, 0xad, 0xf9, 0xfe, 0x7d, 0x8c, 0xd6, 0x85, 0xfe, 0xd0, 0xd0, 0x10, 0x0f,
0x7d, 0x8f, 0xb8, 0x11, 0xba, 0xb9, 0xe0, 0x87, 0x2a, 0x98, 0x2f, 0xbb, 0x17, 0x9e, 0x31, 0xc6,
0x7c, 0xd8, 0xdb, 0xdb, 0x3b, 0x58, 0x74, 0x61, 0xd7, 0x93, 0xd1, 0x52, 0x51, 0x8e, 0x43, 0x76,
0x62, 0xa2, 0x60, 0x41, 0x37, 0x47, 0x6f, 0xf1, 0xeb, 0xe6, 0x85, 0x78, 0x51, 0x89, 0x12, 0xbf,
0xbb, 0x61, 0xce, 0x73, 0xbc, 0xaf, 0x7b, 0x7b, 0x7b, 0xfb, 0x56, 0x3a, 0x83, 0xf2, 0x3c, 0xcf,
0x7b, 0x1e, 0xc8, 0x1f, 0x89, 0x10, 0x8a, 0xc7, 0x9f, 0xf1, 0x3c, 0x11, 0xa1, 0x2a, 0x5a, 0xc9,
0x81, 0x7f, 0xf6, 0x11, 0x26, 0xc4, 0xbe, 0xc9, 0xdd, 0x54, 0xc7, 0x37, 0x8f, 0x5d, 0xb9, 0x72,
0xe5, 0xd2, 0x6a, 0x5e, 0x97, 0xf8, 0xfe, 0xc7, 0xef, 0x2e, 0x4a, 0xc0, 0x73, 0x95, 0x76, 0xd1,
0xcb, 0x64, 0x59, 0x5e, 0xca, 0xea, 0xeb, 0x9f, 0x5a, 0xd1, 0xe8, 0x68, 0xa1, 0x7d, 0xe4, 0xf0,
0x11, 0xea, 0xd2, 0x35, 0xbc, 0x7e, 0x67, 0x2f, 0xaf, 0xed, 0x69, 0xa4, 0xa6, 0xa6, 0xe6, 0xc1,
0x6a, 0xeb, 0x7d, 0xc6, 0x98, 0x39, 0x11, 0xf9, 0x38, 0x5a, 0x1a, 0xd9, 0xf6, 0xc9, 0x99, 0x2f,
0x8e, 0x68, 0x3c, 0x92, 0x8f, 0xa7, 0xc9, 0x65, 0xf3, 0x04, 0x83, 0xc1, 0x22, 0xf9, 0x1e, 0x0f,
0x0c, 0x00, 0x70, 0xbf, 0xab, 0x8b, 0xb9, 0xf1, 0xf1, 0x05, 0xbb, 0xd2, 0x9a, 0xad, 0xc0, 0x06,
0xa5, 0xd8, 0xd9, 0x1c, 0x65, 0x72, 0x0d, 0x55, 0x7c, 0x8b, 0x5a, 0x27, 0x45, 0xe4, 0xb8, 0x6d,
0xfb, 0x2e, 0x7c, 0x7a, 0xe6, 0xcb, 0x43, 0xaf, 0x36, 0xec, 0xe5, 0xfa, 0x8d, 0x6b, 0x6b, 0x1e,
0x88, 0xd4, 0xc8, 0x08, 0xa9, 0x91, 0x91, 0x67, 0x82, 0xe5, 0x5a, 0x5a, 0xd6, 0x94, 0xdf, 0xb7,
0xec, 0x6d, 0x19, 0x17, 0x91, 0x63, 0xb6, 0x6d, 0x5d, 0x38, 0x7b, 0xfa, 0xf3, 0xc6, 0x58, 0xbc,
0x82, 0x99, 0x64, 0x66, 0xe1, 0x85, 0x5d, 0x21, 0xdd, 0x9a, 0x2e, 0xf2, 0x9c, 0xfb, 0xef, 0x5b,
0xf1, 0x90, 0xdd, 0x11, 0x91, 0xf7, 0x1d, 0xd7, 0x3d, 0xff, 0xd1, 0xe9, 0x33, 0x6d, 0xc6, 0x68,
0x11, 0xb1, 0x17, 0x32, 0x5a, 0x76, 0xf2, 0xd6, 0x26, 0x59, 0xeb, 0x03, 0x2d, 0xc2, 0xfe, 0x16,
0x91, 0xa3, 0xae, 0xe7, 0x7d, 0x7b, 0xf2, 0xc4, 0x89, 0x77, 0xf1, 0xec, 0x00, 0x40, 0xa0, 0xac,
0x8c, 0x50, 0x2c, 0xc6, 0xfc, 0x93, 0x27, 0x6b, 0xfb, 0xda, 0x7f, 0x01, 0x2d, 0xc2, 0x26, 0x45,
0xe4, 0x58, 0xf2, 0xd1, 0xf4, 0x67, 0x1d, 0xed, 0x87, 0x3b, 0x2c, 0xcb, 0x12, 0x80, 0xf2, 0x53,
0xa7, 0x7c, 0xe5, 0x9e, 0x27, 0xc6, 0x18, 0xd0, 0x1a, 0x8c, 0x11, 0xb4, 0xc6, 0x18, 0x23, 0xc6,
0x18, 0xc6, 0x3c, 0xcf, 0x1d, 0x1a, 0x1a, 0xea, 0xa7, 0x60, 0x44, 0xcb, 0x36, 0xb1, 0xf4, 0xba,
0x8a, 0x88, 0x05, 0x5b, 0x02, 0xb0, 0x31, 0xe0, 0xf7, 0x97, 0x07, 0x6c, 0x3b, 0x1a, 0x50, 0xca,
0x57, 0x22, 0xe2, 0x6e, 0x10, 0x89, 0xf8, 0x8d, 0x09, 0xfb, 0x45, 0x82, 0x3e, 0xf0, 0x0b, 0x18,
0x40, 0x19, 0x70, 0xb5, 0x31, 0x39, 0xcf, 0x98, 0xac, 0x6b, 0x4c, 0xc6, 0x81, 0x94, 0x6b, 0x0c,
0xb3, 0xb6, 0x4d, 0xda, 0x71, 0x66, 0x1c, 0x98, 0x75, 0x60, 0xca, 0x35, 0xc6, 0x14, 0x65, 0x64,
0xc0, 0x51, 0x90, 0x51, 0x22, 0x96, 0xa7, 0x94, 0x2d, 0xb6, 0x5d, 0x9a, 0xd5, 0x3a, 0xe6, 0x88,
0x84, 0xfd, 0x10, 0xf6, 0x5b, 0x56, 0xc0, 0x36, 0xc6, 0xb2, 0xc1, 0x12, 0x11, 0xa3, 0xb4, 0x76,
0x94, 0x65, 0x05, 0x3d, 0xad, 0x83, 0x9e, 0x65, 0x05, 0x5c, 0xa5, 0x02, 0xae, 0x65, 0x65, 0x5c,
0xc7, 0x99, 0xf5, 0x20, 0xab, 0x60, 0x4a, 0x2d, 0x25, 0xf2, 0x2f, 0x3d, 0x42, 0x3c, 0x7a, 0x6e,
0xc3, 0x99, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE export_dsn_xpm[1] = {{ png, sizeof( png ), "export_dsn_xpm" }};
//EOF
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
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, 0x05, 0x8b, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x95, 0x0b, 0x4c, 0x53,
0x67, 0x14, 0xc7, 0xef, 0x94, 0x3e, 0x88, 0xd9, 0xe2, 0x16, 0xdc, 0x88, 0x31, 0x2e, 0x4e, 0xdd,
0xc4, 0x29, 0x2a, 0xa0, 0xb4, 0x84, 0x41, 0x79, 0x64, 0x33, 0x6c, 0x43, 0xb6, 0xa9, 0xd3, 0xf8,
0x8a, 0xba, 0x4a, 0x8b, 0x80, 0x8a, 0x28, 0x2a, 0x26, 0x2c, 0xe2, 0x63, 0xe8, 0x1c, 0x73, 0x09,
0x4e, 0xb1, 0x04, 0xc4, 0x8a, 0x3c, 0x95, 0x67, 0x41, 0xb0, 0x48, 0x01, 0x79, 0x16, 0x0a, 0x22,
0x20, 0x03, 0x84, 0x31, 0xde, 0x2f, 0x23, 0x3a, 0x71, 0x4b, 0xdc, 0x7f, 0xe7, 0xbb, 0x02, 0x3a,
0x2d, 0xba, 0x99, 0xd9, 0xe4, 0x24, 0x5f, 0xef, 0x6d, 0xcf, 0xef, 0x3c, 0xfe, 0xe7, 0x7c, 0x1c,
0xc7, 0x71, 0x13, 0xc9, 0x66, 0x90, 0xcd, 0xfc, 0x9f, 0xcc, 0x1c, 0x00, 0xf7, 0xb4, 0xb1, 0xcf,
0x5c, 0xb5, 0x5a, 0x5d, 0xa7, 0xd1, 0x68, 0x3a, 0x5f, 0xd6, 0x32, 0x32, 0x32, 0x3a, 0x13, 0x12,
0x12, 0xba, 0xd9, 0xd9, 0xd7, 0xd7, 0x57, 0x4d, 0x3e, 0xc5, 0xc6, 0x40, 0xf3, 0x72, 0x73, 0x73,
0x07, 0xaa, 0xab, 0xab, 0x61, 0xcc, 0xd2, 0x93, 0x93, 0x71, 0xf6, 0xcc, 0x19, 0x24, 0xc4, 0xc4,
0x18, 0x7d, 0x6f, 0x30, 0x18, 0x10, 0x12, 0x12, 0x02, 0xcf, 0x9d, 0x0a, 0x50, 0xc0, 0x08, 0x0e,
0x0e, 0x4e, 0x23, 0x9f, 0xa6, 0xff, 0x19, 0x94, 0x70, 0xfe, 0x3c, 0x1a, 0x1a, 0x1a, 0x70, 0x29,
0x3e, 0x1e, 0x55, 0x55, 0x55, 0xcf, 0xbc, 0x0f, 0x0d, 0x0d, 0xc5, 0xc6, 0x48, 0x4f, 0xd8, 0x9d,
0x72, 0x86, 0x22, 0x40, 0x09, 0x1f, 0x1f, 0x9f, 0x92, 0x17, 0x82, 0xf2, 0x72, 0x73, 0xa1, 0x3a,
0x79, 0x12, 0x25, 0xc5, 0xc5, 0xbc, 0x93, 0xca, 0x8a, 0x0a, 0xa4, 0x26, 0x25, 0xa1, 0xa9, 0xa9,
0x09, 0xf9, 0x57, 0xaf, 0x22, 0x3f, 0x2f, 0x8f, 0x7f, 0x5e, 0x5a, 0x52, 0x82, 0x0b, 0x67, 0xcf,
0x42, 0x93, 0x96, 0x86, 0x6d, 0x47, 0xfc, 0x60, 0x19, 0x6d, 0x87, 0x05, 0x61, 0x12, 0x38, 0x1e,
0xff, 0x18, 0x9f, 0xaf, 0x74, 0x1f, 0xb4, 0xb7, 0xb7, 0x77, 0x1d, 0x17, 0xa4, 0x23, 0x47, 0xac,
0x3c, 0xe5, 0xe5, 0xe5, 0xbc, 0x93, 0xa8, 0xf0, 0x70, 0x3e, 0x8b, 0x86, 0xfa, 0x7a, 0x74, 0x76,
0x76, 0xa2, 0x8b, 0x4c, 0x9b, 0x95, 0x85, 0x98, 0xa8, 0x28, 0x68, 0x52, 0x52, 0xd0, 0xdf, 0xd7,
0x87, 0x42, 0x02, 0x7f, 0x77, 0xe8, 0x10, 0x36, 0x45, 0x2a, 0x79, 0xd0, 0xc2, 0x23, 0x12, 0xd8,
0xed, 0x73, 0xfc, 0xdd, 0x79, 0xa9, 0xb3, 0xc1, 0xc9, 0xc9, 0xc9, 0xda, 0x28, 0x48, 0x4f, 0x00,
0xe6, 0x84, 0x95, 0xa7, 0xae, 0xae, 0x0e, 0xcd, 0xcd, 0xcd, 0x68, 0x6b, 0x6b, 0x43, 0x4f, 0x4f,
0x0f, 0x6e, 0xdf, 0xbe, 0x8d, 0xfb, 0xf7, 0xef, 0xf3, 0x76, 0xef, 0xde, 0x3d, 0xfe, 0xfb, 0xc0,
0xc0, 0x00, 0x32, 0x53, 0x53, 0xf9, 0x2c, 0x83, 0xbe, 0x0d, 0xc2, 0x57, 0xaa, 0xd5, 0x3c, 0xc8,
0x6a, 0x9f, 0x04, 0x36, 0x5e, 0x92, 0x06, 0x99, 0x8b, 0x53, 0x8d, 0x83, 0x83, 0x83, 0x85, 0xd1,
0xd2, 0x65, 0xa6, 0xa7, 0x23, 0x4f, 0xab, 0xc5, 0xad, 0x5b, 0xb7, 0xd0, 0xd1, 0xd1, 0x81, 0x3e,
0x8a, 0x7a, 0x68, 0x68, 0x08, 0x0f, 0x1e, 0x3c, 0xe0, 0x01, 0xdd, 0xdd, 0xdd, 0x3c, 0xbc, 0xa5,
0xa5, 0x05, 0x65, 0xac, 0x7c, 0xe7, 0xce, 0xa1, 0xb0, 0xb0, 0x10, 0x59, 0x94, 0xa9, 0x72, 0xbb,
0x17, 0x5c, 0x7e, 0x70, 0xe3, 0x41, 0xd6, 0xde, 0x12, 0x2c, 0x59, 0x27, 0xa9, 0x72, 0x90, 0x39,
0x34, 0x2c, 0x5a, 0xb4, 0xe8, 0xdd, 0x67, 0x40, 0xf1, 0xd4, 0xf8, 0xfa, 0xda, 0x5a, 0x74, 0x75,
0x75, 0x61, 0x70, 0x70, 0x10, 0x77, 0x09, 0x72, 0xbd, 0xb2, 0x12, 0x39, 0x1a, 0x0d, 0xb4, 0xd5,
0x57, 0x10, 0x5a, 0x16, 0x86, 0x83, 0xd9, 0x21, 0x08, 0x4a, 0x39, 0x88, 0xc0, 0xd8, 0x20, 0x6c,
0x3e, 0x2a, 0xc7, 0xb6, 0xb0, 0x9d, 0xf0, 0x3e, 0xbe, 0x0d, 0xca, 0xc3, 0xde, 0xd8, 0x7c, 0xcc,
0x73, 0x0c, 0xb4, 0x78, 0x83, 0x04, 0x12, 0x0f, 0x69, 0xa9, 0xb5, 0xb5, 0xf5, 0x0d, 0x4b, 0x4b,
0xcb, 0xb7, 0xb9, 0x69, 0xe6, 0xe6, 0x4b, 0x62, 0xd5, 0xea, 0xbb, 0xac, 0x3f, 0x89, 0x04, 0x62,
0x59, 0xdc, 0xb9, 0x73, 0x87, 0xcf, 0x42, 0x7b, 0xf9, 0x32, 0x74, 0x24, 0x10, 0x16, 0xc4, 0xb1,
0xe6, 0x9f, 0x30, 0xeb, 0xae, 0x14, 0xef, 0x77, 0x4a, 0xf1, 0xc1, 0x4d, 0x29, 0x2c, 0xca, 0xa5,
0x98, 0xab, 0x95, 0x62, 0x5e, 0xb2, 0x14, 0xf3, 0xa3, 0xa5, 0x63, 0x3d, 0x7a, 0x12, 0xb4, 0xe4,
0x0b, 0x82, 0x39, 0x4b, 0x0a, 0xac, 0xac, 0xac, 0x34, 0xdc, 0x72, 0x37, 0x37, 0xc5, 0xd5, 0x9c,
0x1c, 0xfc, 0xda, 0xda, 0xca, 0x67, 0xc1, 0x4a, 0x34, 0x3c, 0x3c, 0x8c, 0xbe, 0xde, 0x5e, 0x24,
0x93, 0x18, 0x46, 0x65, 0x7c, 0xa2, 0xfd, 0xf4, 0x4b, 0x81, 0x6c, 0x5d, 0x6c, 0x4b, 0x28, 0xab,
0x6c, 0x6e, 0x85, 0xbb, 0xbb, 0xb2, 0x80, 0x14, 0xc7, 0xea, 0xcf, 0x00, 0xac, 0xe1, 0xac, 0x2f,
0xdd, 0xa4, 0xb2, 0x8b, 0x71, 0x71, 0x63, 0xa0, 0xdc, 0x5f, 0xf2, 0xb0, 0x2b, 0x27, 0x10, 0xfe,
0x19, 0xfb, 0xe0, 0x97, 0xbc, 0x17, 0xbe, 0x31, 0xfe, 0xf0, 0x8a, 0xd8, 0x8e, 0xcd, 0x27, 0x14,
0xd8, 0x70, 0x78, 0x13, 0xd6, 0xec, 0x5f, 0x8b, 0x4d, 0xc7, 0xb7, 0xfc, 0x03, 0x64, 0xeb, 0x21,
0x31, 0x10, 0xe4, 0x26, 0xd9, 0x74, 0xce, 0xcc, 0xcc, 0xcc, 0x3a, 0x31, 0x2e, 0x6e, 0x88, 0x49,
0x39, 0xe3, 0xd2, 0x25, 0xbe, 0x6c, 0x2c, 0xb3, 0xfe, 0xfe, 0x7e, 0xe4, 0x64, 0x66, 0x82, 0xc9,
0x9e, 0x81, 0x8a, 0xaf, 0x5d, 0xe3, 0x55, 0x99, 0x47, 0x2a, 0x4b, 0x27, 0xd1, 0x24, 0xd1, 0x7c,
0x85, 0x87, 0x85, 0xe1, 0x3c, 0x09, 0x22, 0xf6, 0xc2, 0x05, 0x28, 0x7c, 0x94, 0xf8, 0xe4, 0x47,
0xf7, 0xc7, 0x62, 0x58, 0x2f, 0xa9, 0x23, 0x31, 0x34, 0x12, 0x64, 0xce, 0x33, 0x62, 0x48, 0xa4,
0x3e, 0xfd, 0x46, 0xaa, 0xea, 0xa5, 0xb2, 0xb1, 0xd9, 0x69, 0x6f, 0x6f, 0x47, 0x39, 0x0d, 0x6f,
0x26, 0xcd, 0x8d, 0x8e, 0xd4, 0xc8, 0x06, 0x58, 0xa7, 0xd3, 0x21, 0x3b, 0x3b, 0x9b, 0xb7, 0x08,
0x1a, 0x6e, 0xb6, 0x82, 0x0e, 0xd1, 0x2c, 0x7d, 0xad, 0x5a, 0xf7, 0xb8, 0x74, 0x5b, 0x25, 0x2d,
0x32, 0x57, 0x59, 0xad, 0x4c, 0x26, 0xb3, 0x31, 0x2a, 0x6f, 0x2d, 0xf5, 0xaa, 0xa8, 0xa0, 0x80,
0x97, 0x36, 0x93, 0x71, 0x63, 0x63, 0x23, 0x6a, 0x6a, 0x6a, 0x50, 0x41, 0x80, 0x6b, 0x94, 0x11,
0xfd, 0x0e, 0x99, 0x94, 0x65, 0x32, 0xed, 0xbf, 0xcb, 0x24, 0x14, 0xb6, 0x45, 0x54, 0x2a, 0x15,
0xe4, 0xaa, 0xad, 0x63, 0x3d, 0x92, 0x06, 0x3a, 0x0c, 0xcb, 0x96, 0x3a, 0x55, 0x12, 0x44, 0x66,
0x74, 0x60, 0x59, 0xb4, 0xf1, 0xb4, 0x14, 0x19, 0xa4, 0x95, 0x84, 0xc1, 0xd6, 0x0e, 0xbf, 0x6e,
0x4a, 0x4b, 0x91, 0x9f, 0x9f, 0x8f, 0x1c, 0x0a, 0x82, 0x95, 0x8c, 0xcd, 0x0c, 0x3b, 0x33, 0x50,
0x16, 0xc9, 0xfe, 0x9b, 0x40, 0xf9, 0xd8, 0x0a, 0xb2, 0xff, 0xde, 0x15, 0x9f, 0xad, 0x76, 0x1f,
0xa0, 0x41, 0xfd, 0xd2, 0xd8, 0x0a, 0xb2, 0xa0, 0x32, 0xf4, 0x5c, 0xa1, 0x52, 0xb0, 0x79, 0x61,
0x59, 0x5c, 0x8c, 0x8d, 0x7d, 0xb4, 0x82, 0x12, 0x12, 0xa0, 0xa3, 0x9e, 0x30, 0xe7, 0x74, 0x05,
0x20, 0x91, 0x9e, 0x47, 0x9e, 0x3e, 0xcd, 0x5b, 0x1a, 0xcb, 0x8a, 0x9e, 0x05, 0xec, 0xde, 0x85,
0x75, 0xd1, 0x72, 0xd8, 0xfe, 0xec, 0x08, 0xcf, 0xbd, 0x0a, 0x28, 0x14, 0x8a, 0xca, 0xf1, 0x96,
0xea, 0x24, 0xb9, 0x62, 0x63, 0xc4, 0xf5, 0xfa, 0x8a, 0x3f, 0x35, 0xe9, 0xa9, 0x88, 0x3c, 0x75,
0x0a, 0xc5, 0x45, 0x45, 0x7c, 0x36, 0x65, 0x94, 0x0d, 0x73, 0xca, 0x32, 0x49, 0xa3, 0x75, 0xc3,
0xc0, 0xa3, 0x2a, 0x64, 0x5b, 0x84, 0x0d, 0xb8, 0x5e, 0xaf, 0xc7, 0x81, 0xe0, 0x03, 0x50, 0xec,
0xf1, 0xc2, 0x19, 0xba, 0x4e, 0xc6, 0xbd, 0x26, 0x46, 0x68, 0x66, 0x3b, 0x76, 0x79, 0x67, 0xf7,
0xf4, 0x76, 0xa3, 0xab, 0xb7, 0x1d, 0x35, 0x37, 0x08, 0x52, 0x56, 0xc6, 0x3b, 0x8c, 0x22, 0x10,
0x53, 0x5a, 0x12, 0x49, 0x7d, 0x34, 0x00, 0x63, 0x77, 0x92, 0x96, 0xc4, 0xc2, 0xce, 0xcf, 0x05,
0x8d, 0xc0, 0xa6, 0xf9, 0xef, 0xd9, 0x5e, 0xc4, 0x96, 0xe5, 0xc3, 0x87, 0x0f, 0x51, 0x69, 0xd0,
0x3f, 0xba, 0xf8, 0x48, 0x71, 0xea, 0x88, 0x08, 0x44, 0x53, 0xb4, 0xe3, 0xdd, 0x59, 0x4f, 0xda,
0x0b, 0x41, 0x23, 0xb0, 0xd9, 0x01, 0x81, 0x7e, 0x06, 0x06, 0x6b, 0x6d, 0x6f, 0x32, 0x7a, 0xd1,
0xfd, 0x2f, 0xa0, 0x11, 0xd8, 0x7b, 0x3b, 0x76, 0xfb, 0xe4, 0x77, 0x74, 0xb7, 0xfd, 0x65, 0x30,
0x54, 0xbe, 0x3a, 0xd0, 0x08, 0xcc, 0xdc, 0xdb, 0x4f, 0x99, 0x52, 0x55, 0xab, 0xff, 0xe3, 0x95,
0x82, 0x46, 0x60, 0x93, 0x57, 0xad, 0x59, 0x79, 0x34, 0x3c, 0x3c, 0x5c, 0x4f, 0x43, 0x59, 0xf1,
0x6f, 0xcd, 0xc3, 0xc3, 0x63, 0x3f, 0xfd, 0xd7, 0xe4, 0x79, 0x62, 0x98, 0xc0, 0x71, 0x53, 0xc5,
0x1c, 0xb7, 0xf0, 0x0d, 0x81, 0xc0, 0xd1, 0x4c, 0x2c, 0xfe, 0x74, 0xaa, 0x40, 0xb0, 0x6c, 0x96,
0x50, 0xe8, 0xb6, 0x58, 0x24, 0x5a, 0x61, 0x27, 0x14, 0xae, 0x77, 0x14, 0x89, 0xe4, 0x2e, 0x22,
0x91, 0x97, 0xab, 0x48, 0xa4, 0x24, 0xdb, 0x42, 0xe7, 0x8d, 0x4e, 0x42, 0xe1, 0xaa, 0x8f, 0x04,
0x02, 0x77, 0x89, 0x89, 0x89, 0xb3, 0x95, 0x89, 0x89, 0xcd, 0xfc, 0x89, 0x13, 0x6d, 0xa6, 0x0b,
0x85, 0x36, 0x6f, 0x72, 0xdc, 0xac, 0x49, 0x1c, 0x37, 0x45, 0xc0, 0x1c, 0x3f, 0x0d, 0x7a, 0x8d,
0x54, 0x2e, 0x60, 0x3f, 0x10, 0x0a, 0xad, 0x26, 0x0b, 0x04, 0xce, 0x53, 0xc4, 0xe2, 0x65, 0x53,
0x85, 0xc2, 0xb5, 0xd3, 0xc5, 0x62, 0xf9, 0x4c, 0x91, 0xc8, 0x77, 0x8e, 0xa9, 0xa9, 0xff, 0x87,
0x62, 0xf1, 0x6e, 0x4b, 0xb1, 0x78, 0xcf, 0x02, 0x53, 0xd3, 0x80, 0x79, 0x22, 0xd1, 0x0e, 0x0b,
0xb1, 0x58, 0x31, 0x5b, 0x28, 0xdc, 0x30, 0x43, 0x24, 0x5a, 0x3e, 0xcd, 0xc4, 0x64, 0xe9, 0x3b,
0x02, 0x81, 0xfd, 0x5b, 0x1c, 0x37, 0xff, 0xf5, 0x47, 0x41, 0x73, 0x13, 0x46, 0xfd, 0xff, 0x0d,
0xa9, 0xc4, 0xb0, 0x00, 0xe5, 0x33, 0xac, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE export_idf_xpm[1] = {{ png, sizeof( png ), "export_idf_xpm" }};
//EOF
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -40,20 +40,16 @@
#include <wx/process.h>
// Fail build if wxWidgets printing was not configured.
#if !wxUSE_PRINTING_ARCHITECTURE && !SWIG
# error "You must use '--enable-printarch' in your wx library configuration."
#endif
// Show warning if wxWidgets Gnome or GTK printing was not configured.
// Since wxWidgets 3.0, this is no more needed (build in printing works!)
#if defined( __WXGTK__ )
# if !wxUSE_LIBGNOMEPRINT && !wxUSE_GTKPRINT && !SWIG
# warning "You must use '--with-gnomeprint' or '--with-gtkprint' in your wx library configuration for full print capabilities."
# endif
#if !wxCHECK_VERSION( 3, 0, 0 )
# if !wxUSE_LIBGNOMEPRINT && !wxUSE_GTKPRINT && !SWIG
# warning "You must use '--with-gnomeprint' or '--with-gtkprint' in your wx library configuration for full print capabilities."
# endif
#endif
#endif
/**
* Global variables definitions.
*
......
......@@ -337,6 +337,10 @@ void CVPCB_MAINFRAME::OnCloseWindow( wxCloseEvent& Event )
m_DisplayFootprintFrame->Close( true );
m_modified = false;
// hide main frame, which also forces saving curr pos and size in config
Show( false );
Destroy();
return;
}
......
......@@ -503,8 +503,11 @@ void SCH_EDIT_FRAME::OnCloseWindow( wxCloseEvent& aEvent )
g_RootSheet->GetScreen()->Clear();
/* all sub sheets are deleted, only the main sheet is usable */
// all sub sheets are deleted, only the main sheet is usable
m_CurrentSheet->Clear();
// hide main frame, which also forces saving curr pos and size in config
Show( false );
Destroy();
}
......
......@@ -200,7 +200,7 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( SCH_BASE_FRAME* aParent, CMP_LIBRARY* aLibrary,
// Manage the draw panel
m_auimgr.AddPane( m_canvas,
wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).Centre() );
wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );
// Manage the message panel
m_auimgr.AddPane( m_messagePanel,
......
......@@ -177,6 +177,9 @@ GERBVIEW_FRAME::~GERBVIEW_FRAME()
void GERBVIEW_FRAME::OnCloseWindow( wxCloseEvent& Event )
{
// hide main frame, which also forces saving curr pos and size in config
Show( false );
Destroy();
}
......
......@@ -163,6 +163,8 @@ EXTERN_BITMAP( ercerr_xpm )
EXTERN_BITMAP( ercwarn_xpm )
EXTERN_BITMAP( erc_green_xpm )
EXTERN_BITMAP( exit_xpm )
EXTERN_BITMAP( export_dsn_xpm )
EXTERN_BITMAP( export_idf_xpm )
EXTERN_BITMAP( export_footprint_names_xpm )
EXTERN_BITMAP( export_module_xpm )
EXTERN_BITMAP( export_options_pad_xpm )
......
......@@ -174,6 +174,8 @@ void KICAD_MANAGER_FRAME::OnCloseWindow( wxCloseEvent& Event )
}
m_LeftWin->Show( false );
// hide main frame, which also forces saving curr pos and size in config
Show( false );
Destroy();
}
......
......@@ -33,17 +33,17 @@ void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )
switch( event.GetId() )
{
case ID_FOOTPRINT_WIZARD_NEXT:
m_PageList->SetSelection( m_PageList->GetSelection() + 1, true );
m_pageList->SetSelection( m_pageList->GetSelection() + 1, true );
ClickOnPageList( event );
break;
case ID_FOOTPRINT_WIZARD_PREVIOUS:
page = m_PageList->GetSelection() - 1;
page = m_pageList->GetSelection() - 1;
if( page<0 )
if( page < 0 )
page = 0;
m_PageList->SetSelection( page, true );
m_pageList->SetSelection( page, true );
ClickOnPageList( event );
break;
......@@ -195,7 +195,7 @@ void FOOTPRINT_WIZARD_FRAME::SelectCurrentWizard( wxCommandEvent& event )
*/
void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
{
int page = m_PageList->GetSelection();
int page = m_pageList->GetSelection();
FOOTPRINT_WIZARD* footprintWizard = GetMyWizard();
......@@ -205,13 +205,13 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
if( page<0 )
return;
int n = m_ParameterGrid->GetNumberRows();
int n = m_parameterGrid->GetNumberRows();
wxArrayString arr;
wxArrayString ptList = footprintWizard->GetParameterTypes( page );
for( int i = 0; i<n; i++ )
{
wxString value = m_ParameterGrid->GetCellValue( i, 1 );
wxString value = m_parameterGrid->GetCellValue( i, 1 );
// if this parameter is expected to be an internal
// unit convert it back from the user format
......
This diff is collapsed.
......@@ -47,17 +47,13 @@ class FOOTPRINT_EDIT_FRAME;
class FOOTPRINT_WIZARD_FRAME : public PCB_BASE_FRAME
{
private:
wxSashLayoutWindow* m_PageListWindow; // < List of libraries (for selection )
wxListBox* m_PageList; // < The list of pages
wxSize m_PageListSize; // < size of the window
wxSashLayoutWindow* m_ParameterGridWindow; // < List of components in the selected library
wxGrid* m_ParameterGrid; // < The list of parameters
wxSize m_ParameterGridSize; // < size of the window
wxListBox* m_pageList; // < The list of pages
int m_pageListWidth; // < width of the window
wxGrid* m_parameterGrid; // < The list of parameters
int m_parameterGridWidth; // < size of the grid
// Flags
wxSemaphore* m_Semaphore; // < != NULL if the frame must emulate a modal dialog
wxSemaphore* m_semaphore; // < != NULL if the frame must emulate a modal dialog
wxString m_configPath; // < subpath for configuration
bool m_exportRequest; // < true if the current footprint should be exported
......
......@@ -190,7 +190,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA,
_( "&Specctra DSN" ),
_( "Export the current board to a \"Specctra DSN\" file" ),
KiBitmap( export_xpm ) );
KiBitmap( export_dsn_xpm ) );
// GenCAD
AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT,
......@@ -206,7 +206,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
// IDF3
AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_IDF3,
_( "I&DFv3 Export" ), _( "IDFv3 board and component export" ),
KiBitmap( export_xpm ) );
KiBitmap( export_idf_xpm ) );
AddMenuItem( filesMenu, submenuexport,
ID_GEN_EXPORT_FILE, _( "E&xport" ),
......
......@@ -140,17 +140,11 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( PCB_BASE_FRAME* aParent,
m_HotkeysZoomAndGridList = g_Module_Viewer_Hokeys_Descr;
wxSize minsize(100,-1);
m_libList = new wxListBox( this, ID_MODVIEW_LIB_LIST,
wxDefaultPosition, minsize, 0, NULL, wxLB_HSCROLL );
m_libList->SetMinSize( minsize );
wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL );
m_footprintList = new wxListBox( this, ID_MODVIEW_FOOTPRINT_LIST,
wxDefaultPosition, minsize, 0, NULL, wxLB_HSCROLL );
m_footprintList->SetMinSize( minsize );
wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL );
m_semaphore = aSemaphore;
m_selectedFootprintName.Empty();
......@@ -193,6 +187,8 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( PCB_BASE_FRAME* aParent,
m_auimgr.SetManagedWindow( this );
wxSize minsize(100,-1); // Min size of list boxes
// Main toolbar is initially docked at the top of the main window and dockable on any side.
// The close button is disable because the footprint viewer has no main menu to re-enable it.
// The tool bar will only be dockable on the top or bottom of the main frame window. This is
......@@ -213,16 +209,16 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( PCB_BASE_FRAME* aParent,
// Manage the list of libraries, left pane.
m_auimgr.AddPane( m_libList,
wxAuiPaneInfo( info ).Name( wxT( "m_libList" ) )
.Left().Row( 1 ) );
.Left().Row( 1 ).MinSize( minsize ) );
// Manage the list of footprints, center pane.
m_auimgr.AddPane( m_footprintList,
wxAuiPaneInfo( info ).Name( wxT( "m_footprintList" ) )
.Left().Row( 2 ) );
.Left().Row( 2 ).MinSize( minsize ) );
// Manage the draw panel, right pane.
m_auimgr.AddPane( m_canvas,
wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).Centre().Row( 1 ).CloseButton( false ) );
wxAuiPaneInfo().Name( wxT( "DrawFrame" ) ).CentrePane() );
// Manage the message panel, bottom pane.
m_auimgr.AddPane( m_messagePanel,
......
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