From ce6b907fe3d2ad3b70b39ec0905ba6c1dbe8e732 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 29 Jan 2014 18:01:42 +0100 Subject: [PATCH] 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 --- 3d-viewer/3d_frame.cpp | 3 + bitmaps_png/CMakeLists.txt | 2 + bitmaps_png/cpp_26/export_dsn.cpp | 90 +++ bitmaps_png/cpp_26/export_idf.cpp | 106 +++ bitmaps_png/cpp_26/module_library_list.cpp | 116 ++- bitmaps_png/sources/export_dsn.svg | 722 +++++++++++++++++++ bitmaps_png/sources/export_idf.svg | 774 +++++++++++++++++++++ common/common.cpp | 16 +- cvpcb/cvframe.cpp | 4 + eeschema/schframe.cpp | 5 +- eeschema/viewlib_frame.cpp | 2 +- gerbview/gerbview_frame.cpp | 3 + include/bitmaps.h | 2 + kicad/mainframe.cpp | 2 + pcbnew/footprint_wizard.cpp | 14 +- pcbnew/footprint_wizard_frame.cpp | 236 ++----- pcbnew/footprint_wizard_frame.h | 14 +- pcbnew/menubar_pcbframe.cpp | 4 +- pcbnew/modview_frame.cpp | 18 +- 19 files changed, 1854 insertions(+), 279 deletions(-) create mode 100644 bitmaps_png/cpp_26/export_dsn.cpp create mode 100644 bitmaps_png/cpp_26/export_idf.cpp create mode 100644 bitmaps_png/sources/export_dsn.svg create mode 100644 bitmaps_png/sources/export_idf.svg diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index e523d4118f..45865bba5b 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -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; diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 3999822f4e..00c247d0db 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -234,6 +234,8 @@ set( BMAPS_MID ercwarn erc exit + export_dsn + export_idf export_footprint_names export_module export_options_pad diff --git a/bitmaps_png/cpp_26/export_dsn.cpp b/bitmaps_png/cpp_26/export_dsn.cpp new file mode 100644 index 0000000000..909d74358a --- /dev/null +++ b/bitmaps_png/cpp_26/export_dsn.cpp @@ -0,0 +1,90 @@ + +/* 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, 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 diff --git a/bitmaps_png/cpp_26/export_idf.cpp b/bitmaps_png/cpp_26/export_idf.cpp new file mode 100644 index 0000000000..d92cb9028d --- /dev/null +++ b/bitmaps_png/cpp_26/export_idf.cpp @@ -0,0 +1,106 @@ + +/* 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, 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 diff --git a/bitmaps_png/cpp_26/module_library_list.cpp b/bitmaps_png/cpp_26/module_library_list.cpp index b4e6d3613c..e89adb5dec 100644 --- a/bitmaps_png/cpp_26/module_library_list.cpp +++ b/bitmaps_png/cpp_26/module_library_list.cpp @@ -6,76 +6,52 @@ #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, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x03, 0xd2, 0x49, - 0x44, 0x41, 0x54, 0x48, 0x89, 0xbd, 0x96, 0x5d, 0x48, 0x5b, 0x67, 0x18, 0xc7, 0x7f, 0xe7, 0x23, - 0x59, 0xac, 0x4e, 0x4f, 0xac, 0x46, 0x11, 0xa9, 0xab, 0x8d, 0xd2, 0xb1, 0xd1, 0x3b, 0xc7, 0x7a, - 0xb1, 0x3a, 0xb5, 0x89, 0x66, 0xcd, 0x56, 0x99, 0x05, 0xe9, 0x10, 0xec, 0xcd, 0xae, 0xa4, 0x20, - 0x82, 0xd7, 0xcd, 0x95, 0x17, 0xdd, 0xc5, 0x7a, 0xd1, 0x1b, 0x19, 0x42, 0x07, 0x19, 0x63, 0x5e, - 0x18, 0xd3, 0xe9, 0x9c, 0x69, 0xbb, 0xd4, 0x8e, 0xa2, 0xb8, 0x0d, 0xc3, 0xb4, 0x91, 0x96, 0x39, - 0x1b, 0x2b, 0x82, 0x2c, 0xad, 0xd6, 0x99, 0x35, 0xc6, 0xe4, 0x9c, 0x5d, 0xd8, 0x9c, 0x26, 0x26, - 0xa9, 0x1f, 0x17, 0xfd, 0x43, 0xe0, 0x7d, 0xce, 0xef, 0x79, 0xde, 0x7f, 0xde, 0xf7, 0x9c, 0xf3, - 0xbc, 0x47, 0xd0, 0x34, 0x8d, 0x37, 0x21, 0x39, 0x35, 0xf8, 0xdc, 0x69, 0x7f, 0xb4, 0xa5, 0x8a, - 0xc7, 0x93, 0xb1, 0x41, 0x50, 0x57, 0x86, 0x47, 0x7d, 0x55, 0x00, 0x6d, 0x4e, 0xdb, 0x6c, 0x4c, - 0x15, 0xad, 0x3a, 0x13, 0xb5, 0x27, 0x43, 0x23, 0xbe, 0x5a, 0x80, 0xd6, 0x73, 0xf6, 0xd0, 0xb6, - 0x26, 0x56, 0x64, 0xab, 0xcb, 0x6a, 0xb4, 0xa5, 0x8a, 0xc7, 0x07, 0xdf, 0xbf, 0x23, 0x1b, 0x04, - 0x15, 0x80, 0xf3, 0x7f, 0xda, 0x8f, 0x25, 0x59, 0x54, 0x95, 0x4e, 0xba, 0xdf, 0xf3, 0xcb, 0x46, - 0x61, 0x67, 0x07, 0x2e, 0xcc, 0x36, 0xd5, 0xbc, 0xaa, 0x93, 0x8e, 0x79, 0x4f, 0xf9, 0xf4, 0x79, - 0x52, 0xeb, 0xb2, 0x1a, 0x01, 0xdc, 0x5e, 0x7f, 0x87, 0xe1, 0x35, 0x2b, 0x9f, 0x16, 0xff, 0x9d, - 0xb1, 0xfc, 0x89, 0x8d, 0x2a, 0xbc, 0xcf, 0x4e, 0x70, 0xbe, 0xf8, 0xaf, 0x0c, 0x36, 0xb2, 0x6e, - 0x65, 0xe8, 0x9f, 0x13, 0xb4, 0x96, 0x64, 0xd6, 0x01, 0x08, 0x9a, 0xa6, 0xd1, 0xd6, 0xd6, 0x36, - 0x1b, 0x8d, 0x46, 0x4f, 0xa2, 0x25, 0xe4, 0xd2, 0x23, 0x22, 0x8d, 0x36, 0x07, 0x23, 0x63, 0x63, - 0xfc, 0xbb, 0xa5, 0x21, 0x8a, 0x62, 0x1c, 0x00, 0x2d, 0x21, 0x2b, 0x26, 0x11, 0x9b, 0xad, 0x99, - 0x5b, 0xb7, 0xc6, 0x79, 0xf6, 0xe2, 0x15, 0x53, 0x55, 0x55, 0x3e, 0x7a, 0x44, 0xa0, 0xb1, 0xc9, - 0xce, 0x9d, 0xdb, 0x3e, 0x9d, 0xc9, 0xb2, 0x1c, 0xde, 0xd8, 0xd8, 0x38, 0xee, 0xf7, 0xfb, 0xa3, - 0x22, 0x40, 0x2c, 0x16, 0xb3, 0xba, 0xdd, 0x6e, 0x59, 0x12, 0x25, 0xda, 0x4b, 0xe6, 0xb9, 0xff, - 0xcb, 0x28, 0x9d, 0xe5, 0x8f, 0x00, 0xf0, 0x78, 0x3c, 0xb2, 0xc7, 0xe3, 0x91, 0x25, 0x51, 0xe2, - 0x62, 0xe9, 0x43, 0x26, 0xef, 0x8e, 0xf1, 0x85, 0xe5, 0x61, 0x1a, 0x03, 0xb8, 0x64, 0x79, 0xc0, - 0xcc, 0xaf, 0x63, 0x74, 0x5a, 0x82, 0x3a, 0x03, 0xcc, 0x8a, 0xa2, 0x98, 0xd2, 0xb6, 0xce, 0x68, - 0x34, 0x02, 0xd0, 0x54, 0xb4, 0x84, 0xc3, 0xfc, 0x18, 0x80, 0xeb, 0xa1, 0x1a, 0xfd, 0x3a, 0x80, - 0x5d, 0x79, 0x8c, 0xf3, 0xe5, 0x96, 0x5e, 0x0f, 0xd5, 0xa6, 0xb1, 0xb3, 0xca, 0x12, 0x67, 0x95, - 0x25, 0x00, 0xbe, 0x0e, 0xbd, 0x9b, 0xc6, 0x32, 0xee, 0x51, 0x69, 0x71, 0x11, 0x17, 0x1e, 0x34, - 0xeb, 0x71, 0x89, 0x52, 0xb0, 0x2f, 0x56, 0xa2, 0xbc, 0xcd, 0x67, 0xb3, 0x8e, 0xac, 0x6c, 0xb7, - 0x91, 0x10, 0x0c, 0x06, 0xf9, 0xe6, 0x86, 0x9b, 0x78, 0x3c, 0xae, 0x43, 0x49, 0x92, 0xf4, 0xf1, - 0xeb, 0xd8, 0x0d, 0xf7, 0xf7, 0x24, 0x12, 0x89, 0xac, 0x2c, 0x29, 0x11, 0x40, 0xd3, 0x34, 0xa1, - 0xbf, 0xbf, 0x9f, 0x81, 0x81, 0x01, 0x8c, 0x46, 0xa3, 0xfe, 0x4b, 0x2d, 0x10, 0x45, 0x31, 0x27, - 0x93, 0x24, 0x29, 0x27, 0x4b, 0x5b, 0x91, 0x20, 0x08, 0xaa, 0xcb, 0xe5, 0xa2, 0xab, 0xab, 0x8b, - 0x8e, 0x8e, 0x0e, 0xf2, 0xf2, 0xf2, 0x32, 0x12, 0x77, 0xab, 0xbb, 0xbb, 0x9b, 0xb9, 0xb9, 0xb9, - 0xd7, 0xe6, 0x6c, 0x6f, 0x6f, 0xbf, 0x05, 0xdc, 0x04, 0xce, 0xe8, 0xf7, 0x68, 0x7a, 0x7a, 0x9a, - 0x8a, 0x8a, 0x0a, 0x4c, 0x26, 0xd3, 0x9e, 0x26, 0xb1, 0x58, 0x8c, 0x99, 0x99, 0x19, 0x7a, 0x7b, - 0x7b, 0xa9, 0xab, 0xab, 0xcb, 0x99, 0x17, 0x08, 0x04, 0xe8, 0xeb, 0xeb, 0xfb, 0xa8, 0xa1, 0xa1, - 0xc1, 0x24, 0x03, 0xa8, 0xaa, 0x2a, 0x4d, 0x4e, 0x4e, 0xd2, 0xd3, 0xd3, 0x83, 0x20, 0x08, 0x7b, - 0x1a, 0x25, 0xa5, 0x28, 0x0a, 0x65, 0x65, 0x65, 0x39, 0xb9, 0xd9, 0x6c, 0xd6, 0xc7, 0x32, 0x80, - 0x28, 0x8a, 0x09, 0x97, 0xcb, 0x65, 0xc8, 0xcf, 0xcf, 0xdf, 0xb7, 0x49, 0xaa, 0xae, 0xde, 0xbf, - 0x4a, 0x9e, 0x21, 0x8f, 0xcb, 0x1f, 0x5c, 0xce, 0x99, 0x93, 0xf6, 0x78, 0x7f, 0x79, 0xa9, 0x83, - 0xe5, 0xd5, 0xa7, 0x7a, 0x6c, 0x29, 0x2e, 0xe4, 0xdb, 0xef, 0x7e, 0xd0, 0xd9, 0x6a, 0x78, 0x2d, - 0xeb, 0x24, 0x43, 0xf3, 0x43, 0x28, 0x26, 0x65, 0xff, 0x46, 0xab, 0xe1, 0x35, 0xbc, 0xa7, 0x7c, - 0x18, 0xc5, 0x9d, 0xa6, 0xea, 0x08, 0xb4, 0xe8, 0x6c, 0x79, 0xf5, 0x29, 0xc9, 0xc6, 0x19, 0x49, - 0xc8, 0xb4, 0xfe, 0xf6, 0x61, 0xce, 0x49, 0xf7, 0x34, 0x02, 0xf0, 0xae, 0xd5, 0xe0, 0x0d, 0x57, - 0x67, 0x6d, 0x8e, 0x37, 0xd7, 0x6a, 0x18, 0x0e, 0x57, 0xe3, 0x3c, 0xba, 0x78, 0x20, 0x13, 0xdd, - 0xc8, 0x60, 0x30, 0xac, 0xb4, 0xb7, 0xb7, 0x57, 0x69, 0x6a, 0x42, 0xf2, 0x86, 0xab, 0xb1, 0x35, - 0xb7, 0xe0, 0x19, 0xff, 0x19, 0xd0, 0x70, 0x3a, 0x9d, 0xc9, 0x37, 0x51, 0xf2, 0x84, 0xab, 0xb1, - 0xd9, 0x9a, 0xf9, 0xd1, 0x37, 0x0e, 0x44, 0x0e, 0x64, 0x24, 0x02, 0xc8, 0xb2, 0x5c, 0x1b, 0x89, - 0x44, 0x0a, 0x80, 0x78, 0x87, 0x25, 0xc8, 0xef, 0x77, 0x47, 0xf5, 0xe6, 0x18, 0x89, 0x44, 0x0a, - 0x5e, 0x32, 0x3a, 0x2d, 0x41, 0xfe, 0xb8, 0xf7, 0x13, 0x17, 0x2d, 0xf3, 0x87, 0x5b, 0xd1, 0xe0, - 0xe0, 0x60, 0x02, 0x48, 0x9c, 0xfb, 0xa4, 0x85, 0xc6, 0xa2, 0x27, 0xb4, 0x98, 0x43, 0xc0, 0x4e, - 0x73, 0xf4, 0xfb, 0xfd, 0x51, 0x00, 0x87, 0xc3, 0x81, 0xdd, 0x1c, 0xc2, 0x6e, 0x0e, 0xb1, 0x19, - 0x97, 0xf9, 0x8a, 0xf4, 0xb3, 0xed, 0xf9, 0xd6, 0x73, 0xa6, 0x96, 0xa7, 0x00, 0xa8, 0x2c, 0xac, - 0xa4, 0xb2, 0xb0, 0x32, 0xd3, 0x28, 0x29, 0x83, 0xa0, 0xae, 0xa4, 0x9e, 0x8e, 0x46, 0x31, 0xb1, - 0x9a, 0x3a, 0x76, 0x04, 0x5a, 0x52, 0x5e, 0x9a, 0xff, 0xd2, 0x26, 0x9a, 0x5a, 0x9e, 0xe2, 0xf4, - 0xc0, 0x69, 0x00, 0xae, 0xd4, 0x5f, 0xc1, 0xf5, 0xb1, 0x2b, 0xb7, 0xd1, 0xee, 0x73, 0x3e, 0x55, - 0xde, 0x51, 0x5f, 0x79, 0x72, 0xdc, 0xd0, 0xd0, 0x60, 0x02, 0x5e, 0x24, 0xe3, 0x6b, 0x2d, 0xd7, - 0x58, 0x8f, 0xae, 0xeb, 0xb9, 0xd6, 0x62, 0x2b, 0xbb, 0x95, 0xf1, 0xd4, 0x1d, 0x44, 0x8b, 0x8b, - 0x8b, 0x14, 0x14, 0x14, 0x60, 0xc2, 0x44, 0x39, 0xfa, 0xff, 0x60, 0x73, 0x73, 0x93, 0xc0, 0x52, - 0x80, 0x85, 0x85, 0x05, 0xfd, 0x9a, 0x70, 0xd8, 0xcf, 0xad, 0xfa, 0xfa, 0x7a, 0x1f, 0x70, 0x66, - 0x1f, 0xa9, 0xf7, 0x26, 0x26, 0x26, 0xec, 0x87, 0x36, 0x3a, 0xa8, 0xc4, 0x37, 0xe2, 0x02, 0xfc, - 0x0f, 0xfd, 0x66, 0x6b, 0x49, 0xc9, 0xd5, 0xed, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82 + 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, 0x02, 0x9a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xcf, 0x6f, 0x12, + 0x41, 0x14, 0xc7, 0x89, 0xd6, 0xc6, 0xa3, 0x7f, 0x81, 0x36, 0xb5, 0xfe, 0xf8, 0x0f, 0xda, 0x13, + 0x21, 0x41, 0x0a, 0xbb, 0x8b, 0x14, 0x50, 0x9a, 0x5a, 0xd4, 0x1a, 0x69, 0x17, 0x0e, 0x26, 0x1c, + 0xa4, 0x8d, 0xb7, 0x7a, 0xed, 0x49, 0x25, 0xd1, 0x34, 0xa8, 0x51, 0x31, 0xc1, 0xc4, 0x86, 0xd4, + 0x04, 0x23, 0xb4, 0x1e, 0x4c, 0xc4, 0xa4, 0x81, 0x0b, 0x87, 0xde, 0x20, 0x1e, 0xcc, 0x1e, 0xe4, + 0x22, 0x89, 0x91, 0x50, 0x50, 0xe0, 0xb9, 0x6f, 0xdc, 0x99, 0x2c, 0xb0, 0xbb, 0xdd, 0xd0, 0xda, + 0x4d, 0xbe, 0xe1, 0xed, 0x7c, 0xe7, 0xbd, 0x4f, 0x76, 0xd8, 0x79, 0xb3, 0x16, 0x00, 0xb0, 0x1c, + 0x85, 0x7a, 0x6e, 0x7c, 0x82, 0xa3, 0xcc, 0x73, 0xce, 0x3f, 0x54, 0x33, 0xbc, 0xe3, 0x1b, 0xf5, + 0xfc, 0xc2, 0xa5, 0x5d, 0x37, 0x37, 0xbd, 0x47, 0x85, 0x73, 0xa9, 0x87, 0xf3, 0xf4, 0xf2, 0x34, + 0x41, 0x38, 0xa9, 0xbe, 0x3c, 0x02, 0xad, 0x95, 0x63, 0x44, 0x2e, 0x97, 0x0b, 0xd4, 0x5e, 0x2d, + 0x36, 0x0a, 0xf5, 0xe5, 0x13, 0x44, 0x6a, 0x0f, 0x63, 0x9a, 0xd3, 0x9f, 0xa7, 0x0b, 0x7a, 0xb7, + 0x34, 0x01, 0xb7, 0xae, 0xba, 0x20, 0x2d, 0x9e, 0x1f, 0x00, 0x6d, 0x8a, 0xe7, 0x88, 0xb7, 0x29, + 0x4e, 0x0c, 0x80, 0x70, 0x7e, 0xd0, 0xc7, 0xc1, 0xc6, 0xd2, 0x05, 0x7d, 0x90, 0xdf, 0xef, 0xdf, + 0xe5, 0x79, 0x1e, 0x1f, 0x1b, 0x16, 0xae, 0x70, 0xf0, 0x6a, 0x3d, 0x0e, 0x81, 0x19, 0x8e, 0x24, + 0x90, 0x71, 0xc5, 0x9b, 0x97, 0x0b, 0xbd, 0x78, 0xf2, 0x90, 0xfc, 0xaa, 0x3d, 0x8c, 0x83, 0x7e, + 0x0e, 0x9e, 0x3f, 0x7e, 0xd0, 0xe3, 0x79, 0x3c, 0x9e, 0xef, 0x36, 0x9b, 0xed, 0x24, 0x03, 0xb9, + 0xdd, 0xee, 0xbd, 0x5a, 0xad, 0x06, 0x97, 0x05, 0x1e, 0x3e, 0x84, 0xc7, 0x40, 0x9c, 0x75, 0xc2, + 0xfb, 0xf0, 0x59, 0x92, 0xd0, 0x6a, 0xb5, 0x88, 0xd0, 0xcb, 0x88, 0xe3, 0x8a, 0x37, 0xde, 0xe3, + 0x61, 0xfc, 0x31, 0x72, 0x1a, 0xee, 0xcc, 0x4d, 0xc3, 0x56, 0xf8, 0x0c, 0xf3, 0x64, 0x50, 0xd3, + 0xeb, 0xf5, 0x9e, 0xea, 0x01, 0xd5, 0xeb, 0x75, 0x52, 0x0c, 0xd7, 0x18, 0xee, 0x59, 0x88, 0x94, + 0x25, 0x20, 0x97, 0x91, 0x47, 0x62, 0x65, 0x5c, 0xed, 0xe9, 0x82, 0x6e, 0xdf, 0xb8, 0x26, 0x17, + 0xe4, 0x98, 0xae, 0xcf, 0x05, 0x58, 0x31, 0x23, 0x0f, 0x63, 0x2d, 0x4f, 0x0b, 0xd4, 0x2c, 0x16, + 0x8b, 0xd0, 0xe9, 0x74, 0xd8, 0x72, 0xa0, 0xda, 0xed, 0x36, 0x2b, 0x66, 0xe4, 0x61, 0xac, 0xe5, + 0x0d, 0x80, 0x04, 0x41, 0x68, 0x85, 0x42, 0x21, 0x48, 0x24, 0x12, 0x70, 0x98, 0x97, 0xe6, 0xd2, + 0x49, 0x92, 0x84, 0x06, 0x34, 0x1a, 0x0d, 0x53, 0x45, 0xa2, 0xd1, 0x28, 0xd8, 0xed, 0x76, 0x43, + 0x59, 0xad, 0x56, 0xd4, 0xe7, 0x1e, 0x50, 0x3a, 0x9d, 0x86, 0x48, 0x24, 0x02, 0xdd, 0x6e, 0x77, + 0x5f, 0x08, 0x2e, 0x0f, 0x16, 0xc9, 0x64, 0x32, 0x50, 0xad, 0x56, 0x75, 0x95, 0xcb, 0xe5, 0xc8, + 0x3c, 0x7c, 0xc5, 0xff, 0x6d, 0x46, 0x9e, 0xff, 0x1d, 0x8b, 0xc5, 0xa0, 0x5c, 0x2e, 0x9b, 0x7a, + 0x1a, 0x0a, 0xca, 0xe7, 0xf3, 0x86, 0xf3, 0x0a, 0x85, 0x42, 0x2f, 0x88, 0xbe, 0x75, 0x66, 0xaf, + 0x7e, 0xd0, 0xda, 0x97, 0x35, 0x88, 0x17, 0xe2, 0xe6, 0x41, 0x8b, 0x0b, 0x41, 0xb2, 0x07, 0xa8, + 0x6e, 0xce, 0xcf, 0xb2, 0x24, 0xf4, 0x70, 0x2f, 0x51, 0xa9, 0x41, 0x93, 0x4f, 0x27, 0xc1, 0xf9, + 0xda, 0x69, 0x1e, 0xb4, 0xdf, 0xa6, 0xa4, 0x4d, 0xb3, 0x76, 0x77, 0xf4, 0xe0, 0xa0, 0xb7, 0x72, + 0x53, 0xec, 0x6b, 0x8e, 0x0c, 0xb4, 0xa1, 0x78, 0x6f, 0x16, 0x2f, 0x0e, 0x07, 0xf2, 0xf9, 0x7c, + 0x5f, 0xe5, 0xbd, 0xd4, 0xc6, 0xc6, 0x89, 0x85, 0x5e, 0xae, 0x3f, 0x62, 0xcd, 0x11, 0xc7, 0x51, + 0x18, 0xb3, 0xa6, 0xea, 0xe5, 0x86, 0x03, 0x05, 0x02, 0x81, 0xe3, 0x78, 0x83, 0x47, 0x41, 0x56, + 0x6e, 0x8a, 0xea, 0xe6, 0x88, 0xe3, 0x28, 0x8c, 0xb7, 0x14, 0x2f, 0x23, 0x8e, 0x0d, 0x07, 0x52, + 0x9f, 0x39, 0x1a, 0xff, 0x11, 0x3b, 0x73, 0xe8, 0xf8, 0xaf, 0xd8, 0xc8, 0x00, 0x68, 0xea, 0xd9, + 0x14, 0xec, 0x48, 0x3b, 0x44, 0xd2, 0x4f, 0xc9, 0x18, 0x84, 0x47, 0xb0, 0xfa, 0xad, 0xf3, 0xf0, + 0x8e, 0x2a, 0xf5, 0x30, 0x56, 0x7b, 0xfd, 0x20, 0xcb, 0x7d, 0x0b, 0xd3, 0xea, 0xa7, 0x55, 0x63, + 0x90, 0x59, 0x61, 0xa2, 0x1a, 0x84, 0x4f, 0x91, 0xad, 0x64, 0x99, 0x2a, 0x3f, 0x2a, 0x87, 0x0b, + 0x4a, 0x26, 0x93, 0x50, 0x2a, 0x95, 0x74, 0x95, 0x4a, 0xa5, 0x0e, 0x06, 0x42, 0xc9, 0x05, 0xb6, + 0x65, 0x35, 0x4d, 0x68, 0x7b, 0xe0, 0xe3, 0xe4, 0xc8, 0xbe, 0xeb, 0xfe, 0xa7, 0xfe, 0x02, 0x2e, + 0x2c, 0x4b, 0x78, 0x52, 0x7f, 0x8b, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, + 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE module_library_list_xpm[1] = {{ png, sizeof( png ), "module_library_list_xpm" }}; diff --git a/bitmaps_png/sources/export_dsn.svg b/bitmaps_png/sources/export_dsn.svg new file mode 100644 index 0000000000..6401c6a65d --- /dev/null +++ b/bitmaps_png/sources/export_dsn.svg @@ -0,0 +1,722 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/export_idf.svg b/bitmaps_png/sources/export_idf.svg new file mode 100644 index 0000000000..3080ee5f19 --- /dev/null +++ b/bitmaps_png/sources/export_idf.svg @@ -0,0 +1,774 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/common.cpp b/common/common.cpp index ee779e7698..46d2670fb7 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -40,20 +40,16 @@ #include - -// 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. * diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index d984c8bb40..47b3143717 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -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; } diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 72e43f4cc2..e5bbf58089 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -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(); } diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 315c3987f0..c1b421e76e 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -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, diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index 62fdf0c130..31bd8f2352 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -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(); } diff --git a/include/bitmaps.h b/include/bitmaps.h index b040a4cf14..2656cd5d60 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -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 ) diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp index b0934d450a..1150b039f0 100644 --- a/kicad/mainframe.cpp +++ b/kicad/mainframe.cpp @@ -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(); } diff --git a/pcbnew/footprint_wizard.cpp b/pcbnew/footprint_wizard.cpp index cf5ed55307..e82db334fc 100644 --- a/pcbnew/footprint_wizard.cpp +++ b/pcbnew/footprint_wizard.cpp @@ -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; iGetCellValue( 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 diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index 5eb4370ce6..d20c4b228c 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -53,15 +53,12 @@ BEGIN_EVENT_TABLE( FOOTPRINT_WIZARD_FRAME, EDA_DRAW_FRAME ) + // Window events EVT_CLOSE( FOOTPRINT_WIZARD_FRAME::OnCloseWindow ) EVT_SIZE( FOOTPRINT_WIZARD_FRAME::OnSize ) EVT_ACTIVATE( FOOTPRINT_WIZARD_FRAME::OnActivate ) -// Sash drag events -EVT_SASH_DRAGGED( ID_FOOTPRINT_WIZARD_PAGES, FOOTPRINT_WIZARD_FRAME::OnSashDrag ) -EVT_SASH_DRAGGED( ID_FOOTPRINT_WIZARD_PARAMETERS, FOOTPRINT_WIZARD_FRAME::OnSashDrag ) - // Toolbar events EVT_TOOL( ID_FOOTPRINT_WIZARD_SELECT_WIZARD, FOOTPRINT_WIZARD_FRAME::SelectCurrentWizard ) @@ -135,23 +132,16 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, m_showAxis = true; // true to draw axis. // Give an icon -#if 1 - // Disabled for now, it raises an assert error in wxwidgets wxIcon icon; icon.CopyFromBitmap( KiBitmap( module_wizard_xpm) ); SetIcon( icon ); -#endif m_HotkeysZoomAndGridList = g_Module_Viewer_Hokeys_Descr; - m_PageList = NULL; - m_ParameterGrid = NULL; - m_PageListWindow = NULL; - m_ParameterGridWindow = NULL; - m_Semaphore = semaphore; + m_semaphore = semaphore; m_wizardName.Empty(); m_exportRequest = false; - if( m_Semaphore ) + if( m_semaphore ) SetModalMode( true ); SetBoard( new BOARD() ); @@ -159,6 +149,7 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, GetBoard()->SetVisibleAlls(); SetScreen( new PCB_SCREEN( GetPageSizeIU() ) ); GetScreen()->m_Center = true; // Center coordinate origins on screen. + LoadSettings(); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); @@ -167,54 +158,22 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, ReCreateHToolbar(); ReCreateVToolbar(); - wxSize size = GetClientSize(); - size.y -= m_MsgFrameHeight + 2; - - m_PageListSize.y = -1; - - wxPoint win_pos( 0, 0 ); - - // Creates the libraries window display - m_PageListWindow = - new wxSashLayoutWindow( this, ID_FOOTPRINT_WIZARD_PAGES_WINDOW, win_pos, - wxDefaultSize, wxCLIP_CHILDREN | wxSW_3D, - wxT( "PagesWindow" ) ); - m_PageListWindow->SetOrientation( wxLAYOUT_VERTICAL ); - m_PageListWindow->SetAlignment( wxLAYOUT_LEFT ); - m_PageListWindow->SetSashVisible( wxSASH_RIGHT, true ); - m_PageListWindow->SetExtraBorderSize( EXTRA_BORDER_SIZE ); - m_PageList = new wxListBox( m_PageListWindow, ID_FOOTPRINT_WIZARD_PAGE_LIST, - wxPoint( 0, 0 ), wxDefaultSize, + // Creates the parameter pages list + m_pageList = new wxListBox( this, ID_FOOTPRINT_WIZARD_PAGE_LIST, + wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL ); - // Creates the component window display - m_ParameterGridSize.y = size.y; - win_pos.x = m_PageListSize.x; - m_ParameterGridWindow = new wxSashLayoutWindow( this, - ID_FOOTPRINT_WIZARD_PARAMETERS_WINDOW, - win_pos, wxDefaultSize, - wxCLIP_CHILDREN | wxSW_3D, - wxT( "ParameterList" ) ); + // Creates the The list of parameters for the current parameter page + m_parameterGrid = new wxGrid( this, ID_FOOTPRINT_WIZARD_PARAMETER_LIST ); - m_ParameterGridWindow->SetOrientation( wxLAYOUT_VERTICAL ); - - m_ParameterGridWindow->SetSashVisible( wxSASH_RIGHT, true ); - m_ParameterGridWindow->SetExtraBorderSize( EXTRA_BORDER_SIZE ); - m_ParameterGrid = new wxGrid( m_ParameterGridWindow, - ID_FOOTPRINT_WIZARD_PARAMETER_LIST, - wxPoint( 0, 0 ), - wxDefaultSize ); - - m_ParameterGrid->CreateGrid( 1, 3 ); + m_parameterGrid->CreateGrid( 1, 3 ); // Columns - m_ParameterGrid->AutoSizeColumns(); - m_ParameterGrid->SetColLabelValue( 0, _( "Parameter" ) ); - m_ParameterGrid->SetColLabelValue( 1, _( "Value" ) ); - m_ParameterGrid->SetColLabelValue( 2, _( "Units" ) ); - m_ParameterGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); - m_ParameterGrid->AutoSizeColumns(); - + m_parameterGrid->SetColLabelValue( 0, _( "Parameter" ) ); + m_parameterGrid->SetColLabelValue( 1, _( "Value" ) ); + m_parameterGrid->SetColLabelValue( 2, _( "Units" ) ); + m_parameterGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); + m_parameterGrid->AutoSizeColumns(); ReCreatePageList(); @@ -225,12 +184,8 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, m_auimgr.SetManagedWindow( this ); - - EDA_PANEINFO horiz; - horiz.HorizontalToolbarPane(); - - EDA_PANEINFO vert; - vert.VerticalToolbarPane(); + EDA_PANEINFO horiztb; + horiztb.HorizontalToolbarPane(); EDA_PANEINFO info; info.InfoToolbarPane(); @@ -238,42 +193,34 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, EDA_PANEINFO mesg; mesg.MessageToolbarPane(); - // Manage main toolbal - m_auimgr.AddPane( m_mainToolBar, - wxAuiPaneInfo( horiz ).Name( wxT( "m_mainToolBar" ) ).Top().Row( 0 ) ); + m_auimgr.AddPane( m_mainToolBar, wxAuiPaneInfo( horiztb ). + Name( wxT ("m_mainToolBar" ) ).Top().Row( 0 ) ); - wxSize minsize( 60, -1 ); + // Manage the left window (list of parameter pages) + EDA_PANEINFO paneList; + paneList.InfoToolbarPane().Name( wxT( "m_pageList" ) ).Left().Row( 0 ); + m_auimgr.AddPane( m_pageList, wxAuiPaneInfo( paneList ) ); - // Manage the left window (list of pages) - if( m_PageListWindow ) - m_auimgr.AddPane( m_PageListWindow, wxAuiPaneInfo( info ).Name( wxT( "m_PageList" ) ). - Left().Row( 0 ) ); - - // Manage the list of parameters) - m_auimgr.AddPane( m_ParameterGridWindow, - wxAuiPaneInfo( info ).Name( wxT( "m_ParameterGrid" ) ). - Left().Row( 1 ) ); + // Manage the parameters grid editor for the current parameter page + EDA_PANEINFO panePrms; + panePrms.InfoToolbarPane().Name( wxT( "m_parameterGrid" ) ).Left().Row( 1 ); + m_auimgr.AddPane( m_parameterGrid, wxAuiPaneInfo( panePrms ) ); // 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, - wxAuiPaneInfo( mesg ).Name( wxT( "MsgPanel" ) ).Bottom().Layer( 10 ) ); + wxAuiPaneInfo( mesg ).Name( wxT( "MsgPanel" ) ).Bottom().Layer(1) ); - /* Now the minimum windows are fixed, set library list - * and component list of the previous values from last viewlib use - */ - if( m_PageListWindow ) - { - wxAuiPaneInfo& pane = m_auimgr.GetPane( m_PageListWindow ); - pane.MinSize( wxSize( m_PageListSize.x, -1 ) ); - } + // Gives a min size and the last saved size to left windows + m_auimgr.GetPane( m_pageList ).MinSize( wxSize(60, -1 ) ); + m_auimgr.GetPane( m_pageList ).BestSize( wxSize(m_pageListWidth, -1) ); - wxAuiPaneInfo& pane = m_auimgr.GetPane( m_ParameterGridWindow ); - pane.MinSize( wxSize( m_ParameterGridSize.x, -1 ) ); + m_auimgr.GetPane( m_parameterGrid ).MinSize( wxSize( 120, -1 ) ); + m_auimgr.GetPane( m_parameterGrid ).BestSize( wxSize(m_parameterGridWidth, -1) ); m_auimgr.Update(); @@ -284,7 +231,6 @@ FOOTPRINT_WIZARD_FRAME::FOOTPRINT_WIZARD_FRAME( FOOTPRINT_EDIT_FRAME* parent, Zoom_Automatique( false ); #endif - Show( true ); this->SelectFootprintWizard(); @@ -300,19 +246,19 @@ FOOTPRINT_WIZARD_FRAME::~FOOTPRINT_WIZARD_FRAME() /* Function OnCloseWindow * Handles the close event, saving settings an destroying or releasing a semaphore from caller - * */ void FOOTPRINT_WIZARD_FRAME::OnCloseWindow( wxCloseEvent& Event ) { - if( m_Semaphore ) + if( m_semaphore ) { - m_Semaphore->Post(); + m_semaphore->Post(); SetModalMode( false ); // This window will be destroyed by the calling function, // to avoid side effects } else { + Show( false ); Destroy(); } } @@ -325,43 +271,6 @@ void FOOTPRINT_WIZARD_FRAME::ExportSelectedFootprint( wxCommandEvent& aEvent ) } -/* Function OnSashDrag - * handles the horizontal separator (sash) drag, updating the pagelist or parameter list - */ -void FOOTPRINT_WIZARD_FRAME::OnSashDrag( wxSashEvent& event ) -{ - if( event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE ) - return; - - m_PageListSize.y = GetClientSize().y - m_MsgFrameHeight; - m_ParameterGridSize.y = m_PageListSize.y; - - switch( event.GetId() ) - { - case ID_FOOTPRINT_WIZARD_WINDOW: - - if( m_PageListWindow ) - { - wxAuiPaneInfo& pane = m_auimgr.GetPane( m_PageListWindow ); - m_PageListSize.x = event.GetDragRect().width; - pane.MinSize( m_PageListSize ); - m_auimgr.Update(); - } - - break; - - case ID_FOOTPRINT_WIZARD_PARAMETERS_WINDOW: - { - wxAuiPaneInfo& pane = m_auimgr.GetPane( m_ParameterGridWindow ); - m_ParameterGridSize.x = event.GetDragRect().width; - pane.MinSize( m_ParameterGridSize ); - m_auimgr.Update(); - } - break; - } -} - - /* Function OnSize * It handles a dialog resize event, asking for an update * @@ -392,7 +301,7 @@ void FOOTPRINT_WIZARD_FRAME::OnSetRelativeOffset( wxCommandEvent& event ) */ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList() { - if( m_PageList == NULL ) + if( m_pageList == NULL ) return; FOOTPRINT_WIZARD* footprintWizard = GetMyWizard(); @@ -400,17 +309,16 @@ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList() if( !footprintWizard ) return; - - m_PageList->Clear(); + m_pageList->Clear(); int max_page = footprintWizard->GetNumParameterPages(); for( int i = 0; iGetParameterPageName( i ); - m_PageList->Append( name ); + m_pageList->Append( name ); } - m_PageList->SetSelection( 0, true ); + m_pageList->SetSelection( 0, true ); ReCreateParameterList(); ReCreateHToolbar(); @@ -426,7 +334,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreatePageList() void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList() { - if( m_ParameterGrid == NULL ) + if( m_parameterGrid == NULL ) return; FOOTPRINT_WIZARD* footprintWizard = GetMyWizard(); @@ -434,19 +342,19 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList() if( footprintWizard == NULL ) return; - int page = m_PageList->GetSelection(); + int page = m_pageList->GetSelection(); if( page<0 ) return; - m_ParameterGrid->ClearGrid(); + m_parameterGrid->ClearGrid(); // Rows - m_ParameterGrid->AutoSizeRows(); - m_ParameterGrid->EnableDragRowSize( true ); - m_ParameterGrid->SetRowLabelSize( 1 ); - m_ParameterGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); + m_parameterGrid->AutoSizeRows(); + m_parameterGrid->EnableDragRowSize( true ); + m_parameterGrid->SetRowLabelSize( 1 ); + m_parameterGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); // Get the list of names, values, and types wxArrayString fpList = footprintWizard->GetParameterNames( page ); @@ -454,8 +362,8 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList() wxArrayString ptList = footprintWizard->GetParameterTypes( page ); // Dimension the wxGrid - m_ParameterGrid->DeleteRows( 0, m_ParameterGrid->GetNumberRows() ); - m_ParameterGrid->AppendRows( fpList.size() ); + m_parameterGrid->DeleteRows( 0, m_parameterGrid->GetNumberRows() ); + m_parameterGrid->AppendRows( fpList.size() ); wxString name, value, units; for( unsigned int i = 0; iSetCellValue( i, 0, name ); - m_ParameterGrid->SetReadOnly( i, 0 ); + m_parameterGrid->SetCellValue( i, 0, name ); + m_parameterGrid->SetReadOnly( i, 0 ); if( ptList[i]==wxT( "IU" ) ) { @@ -496,18 +404,18 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList() units = wxT( "" ); } - m_ParameterGrid->SetCellValue( i, 1, value ); - m_ParameterGrid->SetCellValue( i, 2, units ); - m_ParameterGrid->SetReadOnly( i, 2 ); + m_parameterGrid->SetCellValue( i, 1, value ); + m_parameterGrid->SetCellValue( i, 2, units ); + m_parameterGrid->SetReadOnly( i, 2 ); } - m_ParameterGrid->AutoSizeColumns(); + m_parameterGrid->AutoSizeColumns(); } void FOOTPRINT_WIZARD_FRAME::ClickOnPageList( wxCommandEvent& event ) { - int ii = m_PageList->GetSelection(); + int ii = m_pageList->GetSelection(); if( ii < 0 ) return; @@ -532,35 +440,27 @@ void FOOTPRINT_WIZARD_FRAME::LoadSettings() cfg = wxGetApp().GetSettings(); - m_PageListSize.x = 150; // default width of libs list - m_ParameterGridSize.x = 350; // default width of component list - - cfg->Read( PARTLIST_WIDTH_KEY, &m_PageListSize.x ); - cfg->Read( PARAMLIST_WIDTH_KEY, &m_ParameterGridSize.x ); + cfg->Read( PARTLIST_WIDTH_KEY, &m_pageListWidth, 100 ); + cfg->Read( PARAMLIST_WIDTH_KEY, &m_parameterGridWidth, 200 ); // Set parameters to a reasonable value. - if( m_PageListSize.x > m_FrameSize.x / 2 ) - m_PageListSize.x = m_FrameSize.x / 2; + if( m_pageListWidth > m_FrameSize.x / 3 ) + m_pageListWidth = m_FrameSize.x / 3; - if( m_ParameterGridSize.x > m_FrameSize.x / 2 ) - m_ParameterGridSize.x = m_FrameSize.x / 2; + if( m_parameterGridWidth > m_FrameSize.x / 2 ) + m_parameterGridWidth = m_FrameSize.x / 2; } void FOOTPRINT_WIZARD_FRAME::SaveSettings() { - wxConfig* cfg; + wxConfig* cfg = wxGetApp().GetSettings();; EDA_DRAW_FRAME::SaveSettings(); - wxConfigPathChanger cpc( wxGetApp().GetSettings(), m_configPath ); - - cfg = wxGetApp().GetSettings(); - - if( m_PageListSize.x ) - cfg->Write( PARTLIST_WIDTH_KEY, m_PageListSize.x ); - - cfg->Write( PARAMLIST_WIDTH_KEY, m_ParameterGridSize.x ); + wxConfigPathChanger cpc( cfg, m_configPath ); + cfg->Write( PARTLIST_WIDTH_KEY, m_pageList->GetSize().x ); + cfg->Write( PARAMLIST_WIDTH_KEY, m_parameterGrid->GetSize().x ); } @@ -772,7 +672,7 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, KiBitmap( zoom_fit_in_page_xpm ), msg ); - if( m_Semaphore ) + if( m_semaphore ) { // The library browser is called from a "load component" command m_mainToolBar->AddSeparator(); diff --git a/pcbnew/footprint_wizard_frame.h b/pcbnew/footprint_wizard_frame.h index f65ee1d62d..653545d698 100644 --- a/pcbnew/footprint_wizard_frame.h +++ b/pcbnew/footprint_wizard_frame.h @@ -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 diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index cddeb1f31d..27dc4e32be 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -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" ), diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp index b54e2b0de3..99677a34ed 100644 --- a/pcbnew/modview_frame.cpp +++ b/pcbnew/modview_frame.cpp @@ -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,