From ba038ac50714f79b46719d482c7aa2661f6c825a Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 4 Mar 2016 19:48:08 +0100 Subject: [PATCH] Pcbnew, File menu: break Open (board) into 2 menu items: Open (only for Kicad board files) and Import (only for non Kicad board files) --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/import_brd_file.cpp | 100 ++++++++ bitmaps_png/cpp_26/open_brd_file.cpp | 162 ++++++------ bitmaps_png/sources/import_brd_file.svg | 317 ++++++++++++++++++++++++ bitmaps_png/sources/open_brd_file.svg | 116 ++++----- include/bitmaps.h | 1 + pcbnew/files.cpp | 95 ++++--- pcbnew/menubar_pcbframe.cpp | 24 +- pcbnew/pcbframe.cpp | 1 + pcbnew/pcbnew_id.h | 1 + 10 files changed, 609 insertions(+), 209 deletions(-) create mode 100644 bitmaps_png/cpp_26/import_brd_file.cpp create mode 100644 bitmaps_png/sources/import_brd_file.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 6ff0471005..6d66372bbc 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -293,6 +293,7 @@ set( BMAPS_MID icon_txt import3d image + import_brd_file import_cmp_from_lib import_footprint_names import_hierarchical_label diff --git a/bitmaps_png/cpp_26/import_brd_file.cpp b/bitmaps_png/cpp_26/import_brd_file.cpp new file mode 100644 index 0000000000..7614e77488 --- /dev/null +++ b/bitmaps_png/cpp_26/import_brd_file.cpp @@ -0,0 +1,100 @@ + +/* 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, 0x34, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5b, 0x6c, 0x54, + 0x45, 0x18, 0xc7, 0x7f, 0x33, 0xbb, 0x6c, 0x2b, 0xdb, 0xed, 0xb6, 0x05, 0x8e, 0x6b, 0x4b, 0xb9, + 0xb4, 0x6c, 0xab, 0x84, 0x98, 0xfa, 0x46, 0x0c, 0x10, 0x63, 0x4a, 0xb8, 0xc6, 0xe8, 0x83, 0x45, + 0xdb, 0x92, 0xa0, 0xc6, 0x20, 0x90, 0x98, 0x20, 0x5a, 0xfa, 0x86, 0x10, 0x1f, 0x0c, 0xc5, 0x80, + 0x31, 0x02, 0x2a, 0x91, 0xb4, 0x95, 0xc4, 0x07, 0xa3, 0x25, 0xc1, 0x28, 0x0f, 0xa4, 0x18, 0x8d, + 0x31, 0x11, 0x2c, 0xa1, 0x24, 0xf6, 0xbe, 0x02, 0x65, 0x29, 0xd7, 0xf6, 0x08, 0x15, 0xce, 0x6d, + 0xc6, 0x87, 0xdd, 0x3d, 0xbb, 0x5b, 0x2e, 0x86, 0x07, 0x27, 0xe7, 0xcb, 0xf9, 0xce, 0x99, 0x99, + 0xef, 0xff, 0xfd, 0xbf, 0xf9, 0xcf, 0x99, 0x23, 0x80, 0x79, 0xc0, 0x6c, 0xfe, 0xdf, 0x96, 0x08, + 0x02, 0xf1, 0xe3, 0xc7, 0x8f, 0x7f, 0x38, 0x67, 0xce, 0xdc, 0x87, 0x83, 0x89, 0xcc, 0x4d, 0x90, + 0xbe, 0x40, 0x88, 0x9c, 0x2e, 0x91, 0x33, 0x26, 0xdb, 0xfe, 0xe8, 0xe9, 0x19, 0x58, 0xd7, 0xd0, + 0xd0, 0x22, 0x01, 0xe2, 0xf1, 0x9a, 0x05, 0xd3, 0xc3, 0x61, 0x63, 0x7a, 0x38, 0x6c, 0x8c, 0x8e, + 0x8e, 0x1a, 0x5d, 0x47, 0xbb, 0x8c, 0xcc, 0x73, 0xb8, 0x28, 0x6c, 0x74, 0x74, 0xb4, 0x1b, 0x96, + 0x65, 0x1b, 0x91, 0x48, 0xb1, 0x11, 0x29, 0x2e, 0x36, 0x8a, 0x8b, 0xa3, 0x46, 0x47, 0x67, 0xa7, + 0x11, 0x8d, 0x46, 0x53, 0x56, 0x52, 0x62, 0xdc, 0x9e, 0x9c, 0x34, 0x8e, 0x1c, 0x39, 0x62, 0x94, + 0x94, 0x94, 0x18, 0x25, 0xa5, 0xa5, 0xbe, 0xd5, 0xd5, 0xd5, 0x55, 0x01, 0xc8, 0xa9, 0x89, 0xd7, + 0xd4, 0xd6, 0x22, 0x84, 0xe0, 0xc0, 0x81, 0xfd, 0x68, 0xad, 0x11, 0x42, 0xb2, 0x72, 0xd5, 0x6a, + 0xda, 0x76, 0xef, 0xc6, 0x75, 0x5d, 0xa4, 0x94, 0x48, 0x29, 0xf8, 0x2b, 0x91, 0x48, 0xfb, 0x92, + 0x0b, 0x17, 0x2e, 0xf0, 0xd1, 0x9e, 0x36, 0xd6, 0xad, 0x5b, 0x87, 0x94, 0x92, 0xc4, 0xc8, 0x08, + 0xcd, 0xcd, 0xcd, 0x48, 0x29, 0x11, 0x69, 0xd6, 0x79, 0x40, 0xa7, 0x4e, 0xfd, 0x8e, 0xd6, 0x9a, + 0xc6, 0xc6, 0x26, 0xa2, 0xd1, 0x28, 0x07, 0x0f, 0x1e, 0x20, 0xc5, 0x38, 0x4e, 0x7d, 0x7d, 0x3d, + 0x87, 0x0f, 0x7f, 0x89, 0x94, 0xc2, 0x0f, 0x20, 0x45, 0xca, 0xff, 0x78, 0xdf, 0x3e, 0xb6, 0x6f, + 0xdf, 0x4e, 0x2c, 0x16, 0x23, 0x31, 0x32, 0xc2, 0xda, 0xb5, 0x6b, 0x39, 0x7d, 0xea, 0xd4, 0x7d, + 0x81, 0x34, 0xc0, 0x1b, 0xaf, 0xbf, 0x4e, 0x4b, 0xcb, 0x7b, 0x00, 0xac, 0x5f, 0xbf, 0x9e, 0xc2, + 0xc2, 0x42, 0x3a, 0x3a, 0xda, 0x91, 0x52, 0xb0, 0x7a, 0xcd, 0x6a, 0x06, 0x07, 0x06, 0x7c, 0x16, + 0x00, 0x22, 0xc7, 0xaf, 0x9c, 0x33, 0x07, 0x29, 0x04, 0x0d, 0x0d, 0x0d, 0x5c, 0xbd, 0x7a, 0x95, + 0x50, 0x28, 0x94, 0x02, 0x4a, 0x03, 0xe4, 0x31, 0x2a, 0x2c, 0x7c, 0x8c, 0xef, 0x8f, 0x1d, 0xa3, + 0xb5, 0x75, 0x3b, 0x52, 0x06, 0xd8, 0xb8, 0x71, 0x23, 0xe7, 0x7a, 0x7b, 0xfd, 0xe0, 0xbe, 0x65, + 0xb2, 0x4c, 0xfb, 0x22, 0xcd, 0x4c, 0x48, 0x89, 0x6d, 0xdb, 0xa9, 0x24, 0x72, 0x18, 0x03, 0x04, + 0x33, 0x20, 0x52, 0x0a, 0x84, 0x80, 0xc9, 0xc9, 0x49, 0x4e, 0x9c, 0x38, 0x91, 0x7e, 0x16, 0x04, + 0x02, 0x01, 0x3f, 0x58, 0x26, 0x40, 0xc6, 0x72, 0xdf, 0x4b, 0x21, 0x7c, 0x15, 0x66, 0x63, 0x4a, + 0x5f, 0x84, 0xc1, 0xec, 0xe4, 0x2c, 0x39, 0x29, 0x52, 0x99, 0x4f, 0x4c, 0x4c, 0x70, 0x69, 0xc6, + 0x71, 0x06, 0x46, 0x7b, 0x79, 0xbc, 0x78, 0x2e, 0xa6, 0x69, 0x62, 0x9a, 0x26, 0x00, 0x13, 0x13, + 0x13, 0x98, 0xa6, 0x89, 0xce, 0xf1, 0x4b, 0xcb, 0xca, 0xee, 0x01, 0xca, 0x24, 0x12, 0xcc, 0x08, + 0x5f, 0xca, 0x6c, 0x36, 0xa9, 0xe4, 0x04, 0xc3, 0xc3, 0xc3, 0x10, 0xbe, 0xcb, 0x27, 0xbf, 0xbe, + 0xc6, 0xb2, 0x99, 0x1b, 0x49, 0x26, 0x93, 0x0c, 0x0f, 0x0d, 0x01, 0x90, 0x4c, 0x26, 0x19, 0x1c, + 0x1a, 0x42, 0x64, 0xfc, 0xc1, 0x41, 0x16, 0x2f, 0x5e, 0x7c, 0x3f, 0x46, 0x59, 0x20, 0x41, 0xba, + 0x04, 0x39, 0xd4, 0xa5, 0x10, 0x44, 0x22, 0x11, 0x04, 0xa0, 0xca, 0xae, 0xf2, 0xeb, 0xed, 0xfd, + 0x84, 0x2a, 0x43, 0x14, 0xa5, 0xdf, 0x01, 0x44, 0x8a, 0x8a, 0xfc, 0x8c, 0x23, 0x91, 0x48, 0x5e, + 0xe0, 0xdc, 0x32, 0x67, 0x81, 0xa4, 0x60, 0x60, 0xec, 0x34, 0xb1, 0xa5, 0xb7, 0x28, 0xfe, 0x27, + 0xc0, 0xf4, 0xe9, 0xb7, 0xf8, 0xac, 0xbb, 0x05, 0x00, 0xa3, 0xa2, 0x0c, 0xc4, 0x35, 0xc4, 0xcc, + 0x09, 0x9e, 0x7c, 0x25, 0x4a, 0xc2, 0xf9, 0x99, 0x17, 0x9e, 0xd9, 0x44, 0x7b, 0x7b, 0x3b, 0xd5, + 0xd5, 0xd5, 0x08, 0x21, 0xe8, 0xec, 0xec, 0xf4, 0xfd, 0xa9, 0x40, 0x79, 0x62, 0x10, 0xc0, 0xb9, + 0x8b, 0xbf, 0x30, 0xfb, 0x79, 0x0b, 0x21, 0x02, 0x80, 0xc5, 0x6f, 0x37, 0x3b, 0x53, 0x03, 0xc2, + 0x82, 0x10, 0x01, 0x00, 0x02, 0x33, 0x6f, 0xd1, 0xfd, 0xf7, 0x1e, 0x2e, 0x9f, 0x1c, 0x62, 0xd3, + 0xf3, 0x7b, 0xfd, 0x35, 0x88, 0xc7, 0xe3, 0x79, 0xc1, 0xa7, 0x82, 0x64, 0xe5, 0x3d, 0x25, 0x93, + 0xdc, 0xa6, 0x75, 0xc6, 0x34, 0x5a, 0x81, 0x2c, 0xb2, 0xe8, 0x2f, 0xf8, 0x96, 0x3d, 0x3f, 0xbe, + 0x86, 0xa7, 0xdc, 0x7c, 0x15, 0x3e, 0xb8, 0x74, 0x3a, 0xab, 0xbf, 0x07, 0x60, 0x69, 0x05, 0x4a, + 0x69, 0x94, 0xa7, 0xf1, 0x5c, 0x8d, 0x6b, 0x2b, 0x08, 0xda, 0x24, 0x0a, 0x7f, 0xa0, 0xe5, 0xeb, + 0x15, 0x8c, 0x5e, 0x3e, 0x4f, 0x6b, 0x6b, 0x2b, 0xe3, 0xe3, 0xe3, 0xf7, 0x94, 0x0e, 0x40, 0x29, + 0x95, 0xcf, 0x48, 0x3c, 0x80, 0x95, 0xf2, 0x34, 0xca, 0x4d, 0x81, 0x78, 0xb6, 0xc2, 0xb5, 0x35, + 0x8e, 0xa5, 0x40, 0x68, 0xcc, 0xd2, 0x33, 0x7c, 0xf0, 0xdd, 0xab, 0x74, 0x77, 0x77, 0xd3, 0xdf, + 0xdf, 0xff, 0x40, 0x90, 0x2c, 0x90, 0xd6, 0x88, 0x87, 0x9c, 0x10, 0xca, 0xd5, 0x78, 0x8e, 0xc6, + 0x75, 0x14, 0xae, 0xa5, 0x70, 0xee, 0x2a, 0x6c, 0x4b, 0x11, 0x18, 0x9b, 0xcb, 0x4b, 0x4f, 0xbf, + 0x0b, 0x40, 0x38, 0x1c, 0xce, 0x0b, 0xac, 0xb5, 0x46, 0x29, 0x85, 0xd6, 0x3a, 0x77, 0x1f, 0x89, + 0x87, 0x1e, 0x45, 0x9e, 0xab, 0x41, 0x28, 0xd0, 0x12, 0xe5, 0x29, 0x10, 0x60, 0x9e, 0x2b, 0xe2, + 0x8b, 0xb7, 0x8f, 0x52, 0x5e, 0x36, 0x9f, 0xaf, 0xe2, 0xdf, 0xb1, 0x68, 0xd1, 0xa2, 0xd4, 0x3a, + 0xa6, 0x03, 0x03, 0x78, 0x9e, 0xe7, 0x83, 0x07, 0xb3, 0x6b, 0xf4, 0x1f, 0x60, 0x8e, 0x06, 0xad, + 0x10, 0x8e, 0x60, 0x5e, 0x60, 0x29, 0x05, 0x97, 0x66, 0x51, 0x31, 0xa3, 0x0a, 0xa5, 0x14, 0x05, + 0x05, 0x05, 0x79, 0x00, 0x99, 0xe6, 0xba, 0xee, 0x94, 0x35, 0x92, 0x92, 0xd2, 0xb0, 0xc1, 0xcd, + 0xbe, 0x20, 0x63, 0x67, 0x15, 0x37, 0xff, 0x0c, 0xf2, 0x44, 0xa0, 0x8e, 0xf2, 0x60, 0x1d, 0xee, + 0xad, 0x50, 0x76, 0xe2, 0x5d, 0xcd, 0x3c, 0xf1, 0x1c, 0xbb, 0x5e, 0xfe, 0x06, 0xa9, 0x42, 0x7e, + 0x69, 0x3c, 0xcf, 0xe3, 0xca, 0x95, 0x2b, 0xb8, 0xae, 0x4b, 0x2c, 0x16, 0xa3, 0xbc, 0xbc, 0x9c, + 0x58, 0x2c, 0x86, 0xeb, 0xba, 0x78, 0x9e, 0xe7, 0xcf, 0x5f, 0x9e, 0x4c, 0x26, 0x27, 0x4c, 0xd3, + 0xd4, 0x15, 0x15, 0x15, 0x1a, 0xd0, 0x55, 0x55, 0x55, 0xfa, 0xce, 0x9d, 0x3b, 0xda, 0xb2, 0x2c, + 0xbd, 0xf2, 0xfd, 0x99, 0xfa, 0x85, 0xcf, 0x43, 0xfa, 0xc5, 0x83, 0xc5, 0x7a, 0xcd, 0x3b, 0x35, + 0xda, 0x75, 0x1d, 0xad, 0x94, 0xd2, 0x1b, 0x36, 0x6c, 0xd0, 0x8e, 0xe3, 0x68, 0xdb, 0xb6, 0x75, + 0x6f, 0x6f, 0xaf, 0x6e, 0x6a, 0x6a, 0xd2, 0x63, 0x63, 0x63, 0xda, 0x34, 0x4d, 0x3d, 0x3e, 0x3e, + 0xae, 0x6f, 0xdc, 0xb8, 0xa1, 0xaf, 0x5d, 0xbb, 0xa6, 0xfb, 0xfa, 0xfa, 0x92, 0xc0, 0x62, 0x99, + 0xfb, 0x81, 0x8b, 0xc5, 0x62, 0x54, 0x55, 0x57, 0xd3, 0xd5, 0xd5, 0x85, 0x10, 0x82, 0x8b, 0x17, + 0x2f, 0x02, 0x10, 0x52, 0x51, 0xea, 0x2b, 0xdf, 0x64, 0xd6, 0xcd, 0x67, 0x91, 0x32, 0x80, 0xd6, + 0xda, 0x2f, 0x8b, 0xd6, 0x9a, 0xea, 0xea, 0x6a, 0x1a, 0x1b, 0x1b, 0xd9, 0xb9, 0x73, 0x27, 0x8e, + 0xe3, 0xe0, 0x79, 0x1e, 0xb6, 0xed, 0x60, 0x59, 0x96, 0xcf, 0x28, 0x6f, 0x87, 0x9d, 0xfc, 0xe9, + 0x27, 0x7a, 0xcf, 0x9e, 0x65, 0x41, 0x3c, 0xce, 0xc8, 0xc8, 0x08, 0xbb, 0x76, 0xed, 0x22, 0x1a, + 0x2e, 0x65, 0xc5, 0xfc, 0x4d, 0x6c, 0x5a, 0xb9, 0x3b, 0xaf, 0xfe, 0xf5, 0xf5, 0xf5, 0x6c, 0xdb, + 0xb6, 0x8d, 0xeb, 0xd7, 0xaf, 0xa3, 0x94, 0x62, 0xc9, 0x92, 0x25, 0xd4, 0xd6, 0xd6, 0xb2, 0x79, + 0xf3, 0x66, 0xb6, 0x6c, 0xd9, 0xc2, 0xbe, 0x7d, 0x7b, 0xb1, 0x2c, 0x0b, 0xc7, 0xf1, 0xf2, 0x55, + 0x27, 0x80, 0xb6, 0xb6, 0x36, 0x86, 0x06, 0x07, 0x53, 0x1d, 0xd3, 0xa6, 0xb1, 0x63, 0xc7, 0x0e, + 0xc6, 0xd5, 0x79, 0xea, 0xe6, 0x2f, 0x03, 0x60, 0xe1, 0xc2, 0x85, 0xbe, 0xb2, 0x9a, 0x9a, 0x9a, + 0xa8, 0xa9, 0xa9, 0xe1, 0xd0, 0xa1, 0x43, 0x6c, 0xdd, 0xba, 0x15, 0xa5, 0x14, 0xcd, 0xcd, 0xcd, + 0x34, 0x34, 0x34, 0x60, 0x3b, 0x0e, 0x8e, 0xed, 0x60, 0xd9, 0x36, 0x9e, 0xe7, 0xf8, 0x7f, 0x46, + 0xcb, 0x7b, 0x7a, 0x7a, 0x3e, 0x9d, 0x5d, 0x59, 0xf9, 0x84, 0x98, 0x72, 0xb0, 0x4d, 0xfd, 0x76, + 0xe5, 0xee, 0x91, 0x8c, 0xe5, 0x0a, 0x42, 0x29, 0x85, 0xe7, 0x79, 0x38, 0x8e, 0x87, 0xe7, 0xb9, + 0x78, 0x9e, 0x4b, 0x22, 0x91, 0x18, 0x5e, 0xb5, 0x6a, 0xd5, 0x5b, 0x02, 0x78, 0x0a, 0x58, 0xf0, + 0x88, 0x3f, 0x84, 0x85, 0x8f, 0x38, 0xfe, 0xcc, 0xbf, 0xf3, 0x32, 0x5a, 0xf5, 0x20, 0x76, 0xd9, + 0x02, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE import_brd_file_xpm[1] = {{ png, sizeof( png ), "import_brd_file_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/open_brd_file.cpp b/bitmaps_png/cpp_26/open_brd_file.cpp index d402d55a4c..4666516ee6 100644 --- a/bitmaps_png/cpp_26/open_brd_file.cpp +++ b/bitmaps_png/cpp_26/open_brd_file.cpp @@ -8,85 +8,89 @@ 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, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x49, 0x4f, 0x5d, - 0x75, 0x18, 0x87, 0x31, 0x6a, 0xe2, 0xc2, 0x98, 0xe8, 0x86, 0x8d, 0x89, 0x71, 0xa3, 0x18, 0x1a, - 0x59, 0x6a, 0x5c, 0xba, 0xe0, 0xdb, 0x98, 0x7e, 0x08, 0x16, 0x5d, 0xb0, 0x64, 0x86, 0x96, 0x05, - 0x94, 0x36, 0x1d, 0x80, 0x96, 0x99, 0x36, 0x05, 0x0a, 0x65, 0x86, 0x32, 0xcf, 0x73, 0x69, 0x65, - 0x86, 0x0b, 0x1c, 0xc6, 0x0b, 0xbc, 0xfe, 0x9e, 0x57, 0xcf, 0xe5, 0x5c, 0x5b, 0x63, 0x62, 0xe2, - 0x49, 0xde, 0x1c, 0xee, 0xff, 0x9c, 0xfb, 0x7b, 0xde, 0xf9, 0x92, 0x92, 0x92, 0x92, 0xf2, 0x45, - 0x5a, 0x5a, 0xda, 0x77, 0x19, 0x19, 0x19, 0x37, 0xfe, 0x0f, 0x4b, 0x4f, 0x4f, 0xff, 0x41, 0x8c, - 0x2f, 0x65, 0x29, 0xe9, 0xbf, 0xaf, 0xad, 0xc5, 0x36, 0xb7, 0xb6, 0x6c, 0x6b, 0x7b, 0xdb, 0xb6, - 0x77, 0x76, 0x6c, 0x71, 0x69, 0xc9, 0x76, 0xf7, 0xf6, 0x6c, 0x2f, 0x16, 0xb3, 0x2d, 0x9d, 0x2f, - 0x2e, 0x2e, 0x5a, 0x6c, 0x7f, 0x3f, 0x61, 0x73, 0xf3, 0xf3, 0x76, 0x70, 0x78, 0xe8, 0xb6, 0xba, - 0xba, 0x6a, 0x87, 0x41, 0x60, 0x83, 0xaf, 0x5f, 0x5b, 0x4d, 0x6d, 0xad, 0xad, 0xbe, 0x7d, 0xeb, - 0x9f, 0x03, 0x99, 0xdf, 0x8f, 0x8e, 0xe2, 0x62, 0xfc, 0x04, 0xe8, 0xc7, 0xb5, 0xb5, 0xb5, 0x60, - 0x71, 0x69, 0xd9, 0xd6, 0x37, 0x36, 0xdd, 0x9e, 0x3c, 0x7d, 0x6a, 0x23, 0xa3, 0xa3, 0x0e, 0xdd, - 0xd8, 0xd4, 0xe7, 0x27, 0x4f, 0x6c, 0x6a, 0x7a, 0xda, 0xc1, 0x38, 0xc0, 0xf3, 0xf5, 0xf5, 0x75, - 0xdb, 0x17, 0xf4, 0xa9, 0xfe, 0xde, 0x3f, 0x38, 0xb0, 0x87, 0x0f, 0x1f, 0x5a, 0x5e, 0x5e, 0x9e, - 0x03, 0x43, 0x27, 0x30, 0x81, 0x2e, 0xc5, 0xf8, 0xc5, 0x41, 0xeb, 0x1b, 0x1b, 0xc1, 0xca, 0x9b, - 0x37, 0xb6, 0xb4, 0xbc, 0x6c, 0x43, 0xc3, 0xc3, 0x46, 0x74, 0x2e, 0x3e, 0x35, 0xe5, 0xc2, 0x3b, - 0xbb, 0xbb, 0x56, 0x5f, 0x5f, 0xef, 0x91, 0x22, 0xfe, 0xa2, 0xa5, 0xc5, 0xe4, 0x9c, 0x0b, 0xd5, - 0xd4, 0xd4, 0xd8, 0xa1, 0xee, 0x8f, 0x1e, 0x3d, 0xb2, 0xfc, 0xfc, 0x7c, 0x1b, 0x1a, 0x1a, 0xf2, - 0x68, 0x42, 0x3b, 0x8a, 0x82, 0x36, 0x04, 0xea, 0xed, 0xeb, 0xb3, 0xb1, 0xf1, 0x71, 0x2b, 0x2c, - 0x2c, 0x74, 0x20, 0x69, 0xc4, 0xf3, 0xb9, 0xb9, 0x39, 0x4f, 0x17, 0x11, 0x8e, 0xca, 0x10, 0x6f, - 0x6d, 0x6d, 0x55, 0xe4, 0x1b, 0x2e, 0x54, 0x5b, 0x57, 0x87, 0x98, 0x3d, 0x7e, 0xfc, 0xd8, 0x0a, - 0x0a, 0x0a, 0x6c, 0x58, 0x8e, 0x1e, 0x1d, 0x1f, 0x27, 0xec, 0xf8, 0xe4, 0xe4, 0x1a, 0xb4, 0xb9, - 0xb9, 0x19, 0x90, 0xa6, 0x49, 0x45, 0x90, 0x93, 0x93, 0x63, 0xe5, 0x77, 0xef, 0x7a, 0x54, 0x6f, - 0xdf, 0xbd, 0x73, 0xef, 0x0f, 0x94, 0x9a, 0xd1, 0xb1, 0x31, 0x1b, 0x93, 0x21, 0xde, 0xda, 0xd6, - 0x66, 0x72, 0xce, 0x85, 0xea, 0x04, 0x3a, 0xd6, 0xbd, 0xb2, 0xb2, 0xd2, 0x9d, 0x1c, 0x19, 0x19, - 0xb1, 0x93, 0x93, 0x93, 0xa8, 0x45, 0x40, 0x5b, 0x5b, 0x01, 0x29, 0xa3, 0x0e, 0x39, 0xb9, 0xb9, - 0x96, 0x2b, 0x7b, 0xf9, 0xf2, 0xa5, 0xa9, 0x49, 0xac, 0x45, 0xde, 0x53, 0x54, 0x20, 0xe3, 0x8a, - 0x18, 0x71, 0x9e, 0xe1, 0x08, 0x42, 0xa4, 0xf4, 0xf4, 0xf4, 0xd4, 0xaa, 0xaa, 0xaa, 0xac, 0xa8, - 0xa8, 0xc8, 0xa3, 0x3e, 0x3d, 0x3b, 0xb3, 0x33, 0x19, 0x77, 0x3d, 0xbb, 0x06, 0xa9, 0xb3, 0x02, - 0xea, 0x30, 0x2d, 0x10, 0x90, 0x5c, 0x15, 0x15, 0x31, 0x0a, 0x4e, 0x9a, 0x54, 0x50, 0x1b, 0x9f, - 0x98, 0xb0, 0x09, 0x19, 0xe2, 0xed, 0xed, 0xed, 0xb6, 0xad, 0xd4, 0x02, 0x68, 0x6c, 0x6c, 0x74, - 0xd1, 0xea, 0xea, 0x6a, 0x2b, 0x2e, 0x2e, 0x76, 0x67, 0xce, 0xcf, 0xcf, 0xa3, 0x16, 0x01, 0x6d, - 0x6f, 0x07, 0x0b, 0x6a, 0xe1, 0xe9, 0x99, 0x19, 0x87, 0xe4, 0xa9, 0xa8, 0x80, 0x48, 0x4f, 0x9b, - 0xd2, 0x44, 0x6a, 0x26, 0x27, 0x27, 0xdd, 0x10, 0xef, 0xe8, 0xe8, 0xb0, 0x1d, 0xa5, 0x1a, 0x21, - 0x40, 0xdc, 0x01, 0x95, 0x94, 0x94, 0xb8, 0x33, 0xf1, 0x78, 0x3c, 0x61, 0x49, 0x20, 0xd5, 0x27, - 0x98, 0x90, 0x08, 0x20, 0x20, 0x74, 0x4f, 0xc7, 0xab, 0x57, 0x0e, 0x02, 0x48, 0x14, 0x74, 0x20, - 0x11, 0xe3, 0xfd, 0x2b, 0x3d, 0xdb, 0x55, 0x06, 0x10, 0x6a, 0x6a, 0x6a, 0xf2, 0x7b, 0x43, 0x43, - 0x43, 0x12, 0xe8, 0xe2, 0xe2, 0xe2, 0x7d, 0x90, 0xbc, 0x0b, 0x68, 0xe3, 0x59, 0x75, 0x18, 0x90, - 0x7c, 0x75, 0x4f, 0x67, 0x57, 0x97, 0xd7, 0x81, 0x88, 0x88, 0x82, 0x68, 0x00, 0xe1, 0x3d, 0x11, - 0xed, 0xe9, 0x7d, 0x84, 0x88, 0x08, 0x51, 0x3a, 0x2f, 0x04, 0xf1, 0x39, 0x34, 0xbd, 0x93, 0x0c, - 0x1a, 0x18, 0x18, 0xf0, 0x89, 0x07, 0x42, 0x9b, 0x76, 0x75, 0x77, 0x5b, 0xbf, 0xce, 0x00, 0x13, - 0x05, 0x83, 0x49, 0xe1, 0x11, 0xe7, 0x79, 0xd8, 0x81, 0xb7, 0x6e, 0xdd, 0xf2, 0xe8, 0x2e, 0x2f, - 0x2f, 0xed, 0xf6, 0xed, 0xdb, 0xee, 0x10, 0x7f, 0x87, 0x26, 0xd8, 0x35, 0x48, 0x2f, 0x06, 0x0c, - 0xdd, 0xbc, 0x40, 0x88, 0x14, 0xa8, 0x4d, 0x7b, 0x7a, 0x7a, 0x6c, 0x60, 0x70, 0xd0, 0xca, 0xcb, - 0xcb, 0x3d, 0x8a, 0xe6, 0xe6, 0x66, 0x7b, 0xfe, 0xfc, 0xb9, 0x83, 0x2a, 0x2a, 0x2a, 0xbc, 0xbb, - 0x18, 0x5e, 0xc4, 0x19, 0xde, 0x10, 0x44, 0x8a, 0xaf, 0xae, 0xae, 0x12, 0xf6, 0x1e, 0x68, 0x76, - 0x76, 0xd6, 0x16, 0x16, 0x16, 0x1c, 0xc4, 0x3c, 0xf4, 0xf6, 0xf6, 0xba, 0xa7, 0x9c, 0x21, 0x8e, - 0x18, 0x5d, 0x48, 0x3a, 0x38, 0x63, 0xb6, 0x10, 0x47, 0x98, 0xe7, 0x88, 0xfe, 0x3b, 0x68, 0x6f, - 0x2f, 0x60, 0x66, 0x58, 0x9e, 0x40, 0x98, 0x87, 0x3e, 0x6d, 0x0a, 0x22, 0x09, 0xbb, 0x27, 0xcc, - 0x79, 0x34, 0x2d, 0x51, 0x41, 0xae, 0x3b, 0x77, 0xee, 0x78, 0x1d, 0xa3, 0xe7, 0x7a, 0xef, 0x1a, - 0xa4, 0xc2, 0x06, 0x74, 0x18, 0xbb, 0x0c, 0x08, 0x46, 0xcd, 0xfe, 0x09, 0xf2, 0x77, 0x00, 0x17, - 0xe7, 0xd1, 0xae, 0x0b, 0x9d, 0x4c, 0xea, 0x3a, 0x40, 0xaf, 0xb5, 0x75, 0x89, 0x08, 0x08, 0x83, - 0x37, 0xa8, 0xfa, 0xd0, 0x04, 0xd4, 0x01, 0x08, 0xb3, 0x44, 0x9b, 0x23, 0x4e, 0x13, 0x20, 0xcc, - 0x15, 0xd3, 0x46, 0x47, 0x90, 0x77, 0xc9, 0x06, 0xbb, 0x2e, 0xba, 0x54, 0xf5, 0xbd, 0x64, 0x90, - 0x96, 0x9f, 0x2d, 0x6b, 0x99, 0x86, 0x20, 0xc0, 0xec, 0xad, 0x07, 0x0f, 0x1e, 0x38, 0xa8, 0x45, - 0x3b, 0x8f, 0x99, 0x02, 0xc4, 0xd9, 0x8c, 0x66, 0x8e, 0x06, 0xe2, 0x5d, 0xea, 0xc7, 0xdf, 0x6c, - 0x15, 0x52, 0xce, 0x30, 0x87, 0x26, 0x47, 0x2f, 0xc4, 0xf8, 0xf9, 0x4f, 0x50, 0x2c, 0x16, 0xd0, - 0x96, 0x51, 0x10, 0xeb, 0x1e, 0x18, 0xe9, 0xc0, 0x7b, 0x06, 0x92, 0x99, 0x01, 0x54, 0x5a, 0x5a, - 0xea, 0x9e, 0x13, 0x4d, 0x76, 0x76, 0xb6, 0xd7, 0x05, 0xd1, 0xce, 0xce, 0x4e, 0xdf, 0xf6, 0x2b, - 0x2b, 0x2b, 0x6e, 0x4b, 0x2a, 0x85, 0x96, 0xed, 0x0b, 0x31, 0xbe, 0x71, 0x90, 0xbe, 0xe0, 0xed, - 0xbd, 0xac, 0x87, 0x40, 0xe8, 0x1e, 0xa2, 0xa1, 0x6e, 0x00, 0x00, 0xf1, 0x19, 0xe3, 0xe2, 0x8c, - 0x67, 0xa4, 0xb3, 0x5b, 0xf3, 0x46, 0x84, 0x6c, 0x88, 0x67, 0xcf, 0x9e, 0xf9, 0x1c, 0x01, 0x60, - 0xe7, 0x49, 0xab, 0x49, 0xfa, 0xdf, 0xca, 0x3e, 0x4d, 0x80, 0xf8, 0x49, 0x7e, 0xa3, 0x1f, 0xbf, - 0xb2, 0xb2, 0x32, 0x5f, 0x9a, 0xe4, 0x1c, 0x8f, 0xbb, 0xb4, 0x21, 0x00, 0x31, 0x63, 0x18, 0x17, - 0x67, 0x2c, 0x55, 0x9c, 0x23, 0x12, 0xc4, 0xef, 0xdd, 0xbf, 0xef, 0xcf, 0x38, 0xc7, 0xa1, 0xac, - 0xac, 0xac, 0x7b, 0x7f, 0x45, 0xf2, 0x89, 0x8e, 0x53, 0x12, 0x20, 0xc2, 0xa7, 0xd8, 0x14, 0x3f, - 0xec, 0x36, 0xd2, 0xc3, 0x5c, 0x84, 0x20, 0xe6, 0x87, 0xd4, 0x21, 0xdc, 0xdf, 0xdf, 0xef, 0x8e, - 0xe8, 0xb7, 0xcc, 0xcf, 0x59, 0x4b, 0x44, 0xa9, 0x26, 0xba, 0xba, 0x79, 0xf3, 0x66, 0xbe, 0x74, - 0xbf, 0x0e, 0x21, 0x49, 0x20, 0x3a, 0x84, 0x28, 0x80, 0x91, 0x12, 0x06, 0x16, 0x50, 0xd8, 0xd2, - 0x51, 0x10, 0xad, 0x4b, 0xd1, 0xf9, 0x09, 0x21, 0x0b, 0x44, 0x40, 0x5b, 0x2b, 0x8d, 0xf1, 0xcc, - 0xcc, 0xcc, 0xdf, 0xa4, 0x99, 0x2a, 0xfb, 0x38, 0x84, 0x24, 0x81, 0x78, 0x19, 0x10, 0xf3, 0x43, - 0x87, 0x11, 0x61, 0x74, 0x76, 0x58, 0x9a, 0x38, 0x10, 0x82, 0xf8, 0xcc, 0x08, 0xf0, 0xf3, 0xc0, - 0xff, 0x0d, 0x5a, 0x51, 0xfb, 0xa9, 0xa9, 0xa9, 0xbf, 0x4a, 0xef, 0x73, 0xd9, 0x47, 0x51, 0x48, - 0x08, 0xba, 0xa1, 0xf6, 0x5c, 0x93, 0x48, 0x5c, 0xd1, 0xc4, 0xb5, 0xa9, 0x13, 0x26, 0x70, 0x5c, - 0xa2, 0x09, 0xe3, 0xe2, 0xce, 0x33, 0x65, 0x20, 0xae, 0x34, 0xc7, 0x55, 0x93, 0xb8, 0x20, 0xbd, - 0xd2, 0xf9, 0x5e, 0xf6, 0xd9, 0x87, 0x20, 0x21, 0x88, 0x7f, 0xee, 0xd2, 0x65, 0x19, 0xff, 0xd1, - 0xf8, 0xee, 0x57, 0xd1, 0x7a, 0x7c, 0xc8, 0xfe, 0x00, 0x0a, 0x0d, 0x10, 0x76, 0xc6, 0x00, 0x96, - 0x87, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0x0d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x59, 0x48, 0x24, + 0x57, 0x14, 0x86, 0x3b, 0x98, 0x40, 0x1e, 0x82, 0x10, 0x49, 0x10, 0x87, 0x11, 0x09, 0x82, 0x4b, + 0x64, 0x32, 0xea, 0x8c, 0x0b, 0xc1, 0x5d, 0x41, 0x50, 0x11, 0x77, 0x41, 0x41, 0x5f, 0x04, 0x71, + 0x18, 0x90, 0x08, 0xbe, 0xf9, 0xe0, 0x8b, 0x3b, 0x88, 0x62, 0xdc, 0x41, 0x50, 0x44, 0x50, 0x5f, + 0x7c, 0x90, 0x3c, 0xc4, 0x5d, 0x51, 0x33, 0xe0, 0x42, 0x04, 0xf7, 0x3d, 0x2e, 0xd3, 0x6a, 0xdb, + 0x6e, 0xe5, 0xd2, 0x6e, 0x27, 0xe7, 0x3f, 0x76, 0x95, 0x4b, 0xc6, 0x24, 0x04, 0x52, 0xf0, 0x53, + 0xb7, 0xba, 0xea, 0x9e, 0xef, 0x9e, 0xe5, 0x9e, 0xdb, 0x3a, 0x9d, 0x4e, 0x67, 0x19, 0x11, 0x11, + 0xf1, 0x3a, 0x26, 0x26, 0xc6, 0xe3, 0x7f, 0x92, 0x3b, 0x33, 0xbe, 0x66, 0xe9, 0x5e, 0x7d, 0xd4, + 0xeb, 0x8f, 0xf4, 0x3b, 0xbb, 0xb4, 0xb3, 0xbb, 0x47, 0xbb, 0x7b, 0x06, 0xda, 0x33, 0x18, 0xc8, + 0xb0, 0xbf, 0x4f, 0xfb, 0x46, 0x23, 0x19, 0x0f, 0x0e, 0xe8, 0x40, 0xd5, 0xe1, 0xa1, 0xe8, 0xf0, + 0xe8, 0x48, 0x74, 0x04, 0x1d, 0x1f, 0x8b, 0x8e, 0xcd, 0xfa, 0x63, 0x63, 0x43, 0xe6, 0x1e, 0x9f, + 0x9c, 0x88, 0x4e, 0x4e, 0x4e, 0xae, 0x99, 0xe1, 0x09, 0xd0, 0x6b, 0x06, 0x29, 0xf3, 0xf3, 0xf3, + 0xa4, 0xdf, 0xd9, 0x61, 0xd8, 0x2e, 0xc3, 0xf6, 0xe8, 0xa7, 0xac, 0x2c, 0x1a, 0x1b, 0x1b, 0x93, + 0x49, 0x78, 0x8e, 0x8b, 0x8b, 0xa3, 0xdf, 0xa7, 0xa6, 0x34, 0x58, 0xc6, 0xbb, 0x77, 0x34, 0x32, + 0x32, 0x22, 0xb0, 0xf2, 0xf2, 0x72, 0x19, 0x37, 0x36, 0x35, 0x91, 0x95, 0x95, 0x15, 0xf9, 0xfb, + 0xfb, 0x6b, 0x60, 0x06, 0xdd, 0x30, 0xe3, 0x47, 0x01, 0x31, 0x40, 0x59, 0x59, 0x59, 0x11, 0x4f, + 0xa0, 0xcd, 0xad, 0x2d, 0x5a, 0x5a, 0x5e, 0xa6, 0x90, 0x90, 0x10, 0xfa, 0xed, 0xc3, 0x07, 0xf1, + 0x66, 0x66, 0x76, 0x96, 0x02, 0x02, 0x02, 0xe4, 0x19, 0xc6, 0x7f, 0xed, 0xea, 0xa2, 0xfc, 0xfc, + 0x7c, 0x59, 0x75, 0x5e, 0x5e, 0x1e, 0xf5, 0xf4, 0xf4, 0x50, 0x55, 0x55, 0x15, 0xb1, 0x3d, 0x7a, + 0xf3, 0xe6, 0x0d, 0x9d, 0x28, 0x8a, 0x48, 0x51, 0x94, 0x7b, 0x10, 0x7b, 0xa1, 0xf4, 0xf4, 0xf6, + 0xca, 0xca, 0xe1, 0x81, 0x83, 0x83, 0x03, 0xad, 0xad, 0xad, 0xd1, 0xc2, 0xe2, 0x22, 0x05, 0x33, + 0x6c, 0x62, 0x72, 0x52, 0x8c, 0x2f, 0x2e, 0x2d, 0x89, 0x67, 0x30, 0xde, 0xdd, 0xdd, 0x4d, 0xf9, + 0x05, 0x05, 0x30, 0x24, 0x40, 0xcc, 0xaf, 0xae, 0xae, 0xd6, 0x40, 0xa7, 0xa7, 0xa7, 0xaa, 0xee, + 0x41, 0x0c, 0x50, 0x54, 0x08, 0xf2, 0x62, 0x6f, 0x6f, 0x2f, 0xab, 0xdf, 0xe7, 0xe7, 0x59, 0xf6, + 0x24, 0x34, 0x34, 0x54, 0x8c, 0x03, 0xc6, 0xc9, 0x15, 0xe3, 0xf0, 0xa0, 0x80, 0x41, 0xa7, 0x67, + 0x67, 0x72, 0xef, 0xeb, 0xeb, 0xa3, 0x9a, 0x9a, 0x9a, 0x3b, 0xd0, 0xdb, 0xb7, 0x74, 0x76, 0x7e, + 0x7e, 0xa7, 0xb3, 0xb3, 0x7b, 0xd0, 0x1e, 0x83, 0x86, 0x87, 0x87, 0xb5, 0xe4, 0x3b, 0x3a, 0x3a, + 0x92, 0x85, 0x85, 0x05, 0xa5, 0xa4, 0xa4, 0x48, 0x9c, 0xa3, 0xa2, 0xa2, 0x24, 0x0c, 0x18, 0xc7, + 0xc6, 0xc6, 0x8a, 0xf1, 0x5e, 0xf6, 0xa0, 0xb0, 0xa8, 0x88, 0xce, 0xd9, 0x58, 0x61, 0x61, 0x21, + 0x0d, 0x0c, 0x0c, 0x50, 0x6d, 0x6d, 0xad, 0x80, 0xde, 0x32, 0xe8, 0xe2, 0xe2, 0x42, 0xc4, 0xef, + 0x1f, 0x80, 0x0c, 0x06, 0x05, 0x45, 0x60, 0x34, 0x57, 0x16, 0x40, 0x98, 0xe0, 0xe3, 0xe3, 0x23, + 0x00, 0x80, 0x10, 0x06, 0x8c, 0x01, 0x82, 0xf1, 0xbe, 0xfe, 0x7e, 0x2a, 0x62, 0x10, 0x8c, 0xe1, + 0x0e, 0x50, 0x5d, 0x5d, 0x9d, 0x06, 0xba, 0xbc, 0xbc, 0x14, 0x99, 0x4c, 0xa6, 0x7b, 0x90, 0x81, + 0x41, 0x33, 0x33, 0x33, 0x77, 0xe5, 0xca, 0x72, 0x72, 0x72, 0xba, 0x03, 0xf9, 0xfa, 0x92, 0xc2, + 0x80, 0xe8, 0xe8, 0x68, 0x84, 0x40, 0x60, 0xc8, 0x11, 0x8c, 0xf7, 0x33, 0xa8, 0xb8, 0xb8, 0x58, + 0x8c, 0x01, 0x34, 0x38, 0x38, 0xf8, 0x2f, 0x40, 0xfb, 0xfb, 0xca, 0xf8, 0xf8, 0x38, 0x1d, 0xb2, + 0x37, 0x08, 0x8f, 0x0a, 0xf2, 0x65, 0x10, 0x00, 0x00, 0x9d, 0xdf, 0xc5, 0x5b, 0x40, 0x30, 0x00, + 0x0f, 0x54, 0x10, 0xee, 0x43, 0x43, 0x43, 0x54, 0x5f, 0x5f, 0xaf, 0x81, 0xae, 0xae, 0xae, 0x44, + 0x8f, 0x40, 0x9c, 0x74, 0x85, 0xbd, 0x52, 0xeb, 0x5e, 0x03, 0xf9, 0xf9, 0xf9, 0x09, 0x00, 0x05, + 0xc0, 0x13, 0x64, 0xfc, 0x10, 0x54, 0x52, 0x52, 0x22, 0xc6, 0x54, 0xd0, 0xf4, 0xf4, 0x34, 0xd9, + 0xd8, 0xd8, 0x08, 0xe8, 0xfa, 0xfa, 0x5a, 0xc4, 0xdf, 0x3e, 0x00, 0x19, 0x8d, 0x4a, 0x2f, 0x57, + 0x0d, 0x20, 0xa8, 0x28, 0x15, 0x84, 0x8d, 0x07, 0x2f, 0x5c, 0x5c, 0x5c, 0x64, 0x11, 0x9b, 0x9b, + 0x9b, 0xe4, 0xea, 0xea, 0x2a, 0xc6, 0xb1, 0xfa, 0xd4, 0xd4, 0x54, 0x31, 0x86, 0xa2, 0x69, 0x68, + 0x68, 0x90, 0xb1, 0xb7, 0xb7, 0xf7, 0xf3, 0x20, 0x2e, 0x02, 0xe5, 0xd8, 0x0c, 0x41, 0x1e, 0x1e, + 0x82, 0x16, 0x16, 0x16, 0x64, 0x8c, 0x15, 0x37, 0x37, 0x37, 0xcb, 0x18, 0xa0, 0x77, 0xdc, 0x19, + 0xdc, 0xdc, 0xdc, 0xc4, 0x18, 0xe0, 0xef, 0xdf, 0xbf, 0xa7, 0x9b, 0x9b, 0x1b, 0x0d, 0x84, 0x31, + 0xc4, 0xdf, 0xde, 0x83, 0x78, 0xe7, 0x4b, 0x8e, 0x90, 0x78, 0x78, 0xa0, 0x82, 0xb0, 0x97, 0xb8, + 0xf4, 0xe9, 0xc5, 0x8b, 0x17, 0xb4, 0xc4, 0x9b, 0x15, 0xe1, 0xc2, 0x3b, 0x18, 0x2f, 0x2d, 0x2d, + 0xa5, 0xe4, 0xe4, 0x64, 0x31, 0x96, 0x94, 0x94, 0x44, 0x65, 0x65, 0x65, 0x74, 0x7b, 0x7b, 0xab, + 0x81, 0x30, 0x86, 0xfe, 0x02, 0x42, 0x0b, 0x82, 0x37, 0xd8, 0x64, 0xce, 0xce, 0xce, 0x02, 0x0a, + 0x0c, 0x0c, 0x94, 0x7c, 0xa8, 0x89, 0x55, 0xc3, 0xa1, 0xae, 0x16, 0x52, 0x0d, 0xaa, 0xfa, 0x7b, + 0xd0, 0xe1, 0xa1, 0xb2, 0xbd, 0xbd, 0x2d, 0xde, 0x9c, 0x3f, 0x01, 0x3d, 0x07, 0x79, 0x0a, 0x30, + 0x87, 0x49, 0x03, 0x7d, 0xb2, 0xbc, 0xb9, 0xac, 0x15, 0x6c, 0x40, 0x78, 0x84, 0x3d, 0xa2, 0x82, + 0x82, 0x82, 0x82, 0xfe, 0x11, 0xa2, 0x02, 0x50, 0x95, 0x58, 0xa8, 0xa7, 0xa7, 0x27, 0xb9, 0xbb, + 0xbb, 0x6b, 0x85, 0xf5, 0xa8, 0xd7, 0x01, 0x04, 0x08, 0xbc, 0x79, 0x0a, 0xc2, 0xe4, 0xb4, 0xb4, + 0x34, 0xe9, 0xe0, 0xab, 0xab, 0xab, 0x94, 0xc5, 0xc7, 0x07, 0x00, 0x5d, 0xdc, 0xbd, 0x2b, 0x2b, + 0x2b, 0x65, 0xd5, 0x38, 0x26, 0x3a, 0x3b, 0x3b, 0x65, 0x1f, 0x7a, 0x78, 0x78, 0x48, 0x91, 0x60, + 0xbb, 0xa0, 0x57, 0x72, 0xb5, 0xe2, 0x3c, 0xf2, 0xd6, 0x40, 0xa3, 0xa3, 0xa3, 0x02, 0xc2, 0xca, + 0x54, 0x50, 0x70, 0x70, 0xb0, 0x14, 0x01, 0xc6, 0xe8, 0x85, 0x2d, 0x2d, 0x2d, 0x32, 0x06, 0x28, + 0x33, 0x33, 0x93, 0xbc, 0xbc, 0xbc, 0x24, 0x0a, 0x08, 0x55, 0x46, 0x46, 0x06, 0x6d, 0x6f, 0x7f, + 0x94, 0xcd, 0x1d, 0x16, 0x16, 0xc6, 0xdd, 0x7f, 0x9d, 0x38, 0xef, 0xb7, 0xad, 0xad, 0xad, 0x5d, + 0x3c, 0xc7, 0xee, 0x0e, 0x74, 0x74, 0xa4, 0x18, 0xb9, 0xa1, 0xc2, 0x9b, 0xa7, 0x20, 0xb4, 0x24, + 0x6b, 0x6b, 0x6b, 0xda, 0xe2, 0x33, 0x0a, 0x07, 0xa1, 0xad, 0xad, 0xad, 0x84, 0x2b, 0x37, 0x37, + 0x57, 0x7b, 0x9f, 0x90, 0x90, 0x20, 0xb9, 0x19, 0xe1, 0xc5, 0xa2, 0x7a, 0xb1, 0x71, 0xa7, 0xf8, + 0x90, 0x64, 0x8f, 0x7f, 0x61, 0x3b, 0xdf, 0xb1, 0xbe, 0x10, 0x10, 0x7f, 0xac, 0x2c, 0xf2, 0xd9, + 0x03, 0x10, 0x42, 0x01, 0x90, 0xa5, 0xa5, 0x25, 0xa5, 0xa7, 0xa7, 0x4b, 0x6e, 0xd0, 0x48, 0x61, + 0x1c, 0x63, 0x18, 0xc5, 0x1d, 0xbd, 0x0e, 0xe7, 0x10, 0xc2, 0xb3, 0xc1, 0xc7, 0x37, 0x3a, 0x38, + 0x2e, 0x6c, 0x87, 0x49, 0x3e, 0xbf, 0x78, 0x21, 0x8d, 0x6c, 0xfb, 0x25, 0xeb, 0x73, 0x9d, 0xf9, + 0x12, 0xd0, 0xc4, 0xc4, 0x84, 0x06, 0x8a, 0x8f, 0x8f, 0xd7, 0x76, 0x3a, 0x12, 0x1d, 0x1e, 0x1e, + 0xfe, 0x08, 0x84, 0xdf, 0x70, 0xfe, 0xe4, 0xe4, 0xe4, 0xd0, 0x2e, 0x77, 0xfd, 0xe5, 0xe5, 0x15, + 0x39, 0xca, 0xf5, 0x7a, 0x3d, 0x3c, 0xba, 0xe5, 0x30, 0xfe, 0xfc, 0x14, 0xa2, 0x81, 0x10, 0x02, + 0x84, 0x4d, 0x2d, 0x4b, 0xb5, 0x92, 0xe0, 0x55, 0x13, 0xff, 0x17, 0x40, 0x5e, 0x00, 0xc2, 0x22, + 0xf0, 0x1e, 0xc5, 0x91, 0x98, 0x98, 0x48, 0x8d, 0x8d, 0x8d, 0x72, 0xcc, 0xcf, 0xcd, 0xcd, 0x11, + 0xe7, 0xd9, 0xc4, 0x05, 0x94, 0xc1, 0x36, 0xbf, 0x65, 0x59, 0xe8, 0x9e, 0x5c, 0x02, 0x42, 0x9b, + 0x57, 0x3d, 0x6a, 0x6f, 0x6f, 0xa7, 0xec, 0xec, 0x6c, 0x8a, 0x8c, 0x8c, 0xa4, 0x8e, 0x8e, 0x0e, + 0xad, 0xa4, 0x01, 0x42, 0x37, 0xc0, 0x37, 0x28, 0x5d, 0x84, 0x09, 0x7d, 0xae, 0xa2, 0xa2, 0x02, + 0xa1, 0x34, 0xda, 0xd9, 0xd9, 0x05, 0xb2, 0xbd, 0xaf, 0x58, 0x9f, 0xe9, 0x3e, 0x71, 0xbd, 0xe2, + 0xcd, 0xba, 0xc9, 0xd5, 0x63, 0xe2, 0x52, 0x36, 0x71, 0xe5, 0x99, 0xf8, 0xd9, 0xc4, 0x09, 0xbd, + 0x5c, 0x5f, 0x5f, 0xbf, 0x64, 0xb8, 0xe9, 0xe1, 0xc5, 0xe5, 0x2a, 0xdf, 0xf0, 0x3e, 0x31, 0xb1, + 0x57, 0x26, 0x0e, 0xd7, 0x45, 0x5b, 0x5b, 0xdb, 0x24, 0xdb, 0x71, 0x66, 0x7d, 0xf9, 0x1c, 0x44, + 0x67, 0xfe, 0x73, 0xf7, 0x3d, 0xeb, 0x87, 0xff, 0x28, 0xcc, 0xfd, 0xc6, 0x9c, 0x8f, 0x67, 0x21, + 0x7f, 0x02, 0x01, 0x57, 0xe8, 0x29, 0x88, 0xd9, 0x44, 0x86, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, + 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE open_brd_file_xpm[1] = {{ png, sizeof( png ), "open_brd_file_xpm" }}; diff --git a/bitmaps_png/sources/import_brd_file.svg b/bitmaps_png/sources/import_brd_file.svg new file mode 100644 index 0000000000..1a0cb7316a --- /dev/null +++ b/bitmaps_png/sources/import_brd_file.svg @@ -0,0 +1,317 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/open_brd_file.svg b/bitmaps_png/sources/open_brd_file.svg index b735dc23b9..13cac6f28b 100644 --- a/bitmaps_png/sources/open_brd_file.svg +++ b/bitmaps_png/sources/open_brd_file.svg @@ -12,7 +12,7 @@ width="48" version="1.0" id="svg2" - inkscape:version="0.47 r22583" + inkscape:version="0.91 r13725" sodipodi:docname="open_brd_file.svg"> @@ -35,15 +35,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1280" - inkscape:window-height="949" + inkscape:window-width="1920" + inkscape:window-height="1033" id="namedview356" showgrid="true" inkscape:zoom="8.146395" - inkscape:cx="35.0565" - inkscape:cy="37.424768" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:cx="3.4244188" + inkscape:cy="12.383015" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:snap-grids="false" @@ -900,7 +900,6 @@ cx="10" r="2" id="circle229" - d="m 12,110 c 0,1.10457 -0.895431,2 -2,2 -1.1045695,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954305,-2 2,-2 1.104569,0 2,0.89543 2,2 z" sodipodi:cx="10" sodipodi:cy="110" sodipodi:rx="2" @@ -911,7 +910,6 @@ cx="10" r="1.556" id="circle231" - d="m 11.556,110 c 0,0.85936 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.69664 -1.556,-1.556 0,-0.85936 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.69664 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="110" sodipodi:rx="1.556" @@ -926,7 +924,6 @@ cx="10" r="2" id="circle235" - d="m 12,102 c 0,1.10457 -0.895431,2 -2,2 -1.1045695,0 -2,-0.89543 -2,-2 0,-1.10457 0.8954305,-2 2,-2 1.104569,0 2,0.89543 2,2 z" sodipodi:cx="10" sodipodi:cy="102" sodipodi:rx="2" @@ -937,7 +934,6 @@ cx="10" r="1.556" id="circle237" - d="m 11.556,102 c 0,0.85936 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.69664 -1.556,-1.556 0,-0.85936 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.69664 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="102" sodipodi:rx="1.556" @@ -952,7 +948,6 @@ cx="10" r="2" id="circle241" - d="m 12,94 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="94" sodipodi:rx="2" @@ -963,7 +958,6 @@ cx="10" r="1.556" id="circle243" - d="m 11.556,94 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="94" sodipodi:rx="1.556" @@ -978,7 +972,6 @@ cx="10" r="2" id="circle247" - d="m 12,86 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="86" sodipodi:rx="2" @@ -989,7 +982,6 @@ cx="10" r="1.556" id="circle249" - d="m 11.556,86 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="86" sodipodi:rx="1.556" @@ -1004,7 +996,6 @@ cx="10" r="2" id="circle253" - d="m 12,78 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="78" sodipodi:rx="2" @@ -1015,7 +1006,6 @@ cx="10" r="1.556" id="circle255" - d="m 11.556,78 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="78" sodipodi:rx="1.556" @@ -1030,7 +1020,6 @@ cx="10" r="2" id="circle259" - d="m 12,70 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="70" sodipodi:rx="2" @@ -1041,7 +1030,6 @@ cx="10" r="1.556" id="circle261" - d="m 11.556,70 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="70" sodipodi:rx="1.556" @@ -1056,7 +1044,6 @@ cx="10" r="2" id="circle265" - d="m 12,62 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="62" sodipodi:rx="2" @@ -1067,7 +1054,6 @@ cx="10" r="1.556" id="circle267" - d="m 11.556,62 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="62" sodipodi:rx="1.556" @@ -1082,7 +1068,6 @@ cx="10" r="2" id="circle271" - d="m 12,54 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="54" sodipodi:rx="2" @@ -1093,7 +1078,6 @@ cx="10" r="1.556" id="circle273" - d="m 11.556,54 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="54" sodipodi:rx="1.556" @@ -1108,7 +1092,6 @@ cx="10" r="2" id="circle277" - d="m 12,46 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="46" sodipodi:rx="2" @@ -1119,7 +1102,6 @@ cx="10" r="1.556" id="circle279" - d="m 11.556,46 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="46" sodipodi:rx="1.556" @@ -1134,7 +1116,6 @@ cx="10" r="2" id="circle283" - d="m 12,38 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="38" sodipodi:rx="2" @@ -1145,7 +1126,6 @@ cx="10" r="1.556" id="circle285" - d="m 11.556,38 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="38" sodipodi:rx="1.556" @@ -1160,7 +1140,6 @@ cx="10" r="2" id="circle289" - d="m 12,30 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="30" sodipodi:rx="2" @@ -1171,7 +1150,6 @@ cx="10" r="1.556" id="circle291" - d="m 11.556,30 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="30" sodipodi:rx="1.556" @@ -1186,7 +1164,6 @@ cx="10" r="2" id="circle295" - d="m 12,22 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="22" sodipodi:rx="2" @@ -1197,7 +1174,6 @@ cx="10" r="1.556" id="circle297" - d="m 11.556,22 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="22" sodipodi:rx="1.556" @@ -1212,7 +1188,6 @@ cx="10" r="2" id="circle301" - d="m 12,14 c 0,1.104569 -0.895431,2 -2,2 -1.1045695,0 -2,-0.895431 -2,-2 0,-1.104569 0.8954305,-2 2,-2 1.104569,0 2,0.895431 2,2 z" sodipodi:cx="10" sodipodi:cy="14" sodipodi:rx="2" @@ -1223,7 +1198,6 @@ cx="10" r="1.556" id="circle303" - d="m 11.556,14 c 0,0.859355 -0.696645,1.556 -1.556,1.556 -0.8593551,0 -1.556,-0.696645 -1.556,-1.556 0,-0.859355 0.6966449,-1.556 1.556,-1.556 0.859355,0 1.556,0.696645 1.556,1.556 z" sodipodi:cx="10" sodipodi:cy="14" sodipodi:rx="1.556" @@ -1232,118 +1206,118 @@ + id="g4339" + transform="translate(59.167276,4.1314472e-8)"> diff --git a/include/bitmaps.h b/include/bitmaps.h index cce4b0784f..d2dc47d753 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -259,6 +259,7 @@ EXTERN_BITMAP( icon_bitmap2component_xpm ) EXTERN_BITMAP( icon_pcbcalculator_xpm ) EXTERN_BITMAP( icon_pagelayout_editor_xpm ) EXTERN_BITMAP( image_xpm ) +EXTERN_BITMAP( import_brd_file_xpm ) EXTERN_BITMAP( import_cmp_from_lib_xpm ) EXTERN_BITMAP( import_footprint_names_xpm ) EXTERN_BITMAP( import_hierarchical_label_xpm ) diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 4ee4a9cbe2..379a1a25d9 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -72,11 +72,11 @@ static const wxChar autosavePrefix[] = wxT( "_autosave-" ); * @param aCtl is where to put the OpenProjectFiles() control bits. * * @param aFileName on entry is a probable choice, on return is the chosen filename. - * @param aKicadFilesOnly true to list kiacad pcb files plugins only, false to list all plugins. + * @param aKicadFilesOnly true to list kiacad pcb files plugins only, false to list import plugins. * * @return bool - true if chosen, else false if user aborted. */ -bool AskLoadBoardFileName( wxWindow* aParent, int* aCtl, wxString* aFileName, bool aKicadFilesOnly = false ) +bool AskLoadBoardFileName( wxWindow* aParent, int* aCtl, wxString* aFileName, bool aKicadFilesOnly ) { // This is a subset of all PLUGINs which are trusted to be able to // load a BOARD. User may occasionally use the wrong plugin to load a @@ -88,23 +88,34 @@ bool AskLoadBoardFileName( wxWindow* aParent, int* aCtl, wxString* aFileName, bo IO_MGR::PCB_FILE_T pluginType; } loaders[] = { - { PcbFileWildcard, IO_MGR::KICAD }, - { LegacyPcbFileWildcard, IO_MGR::LEGACY }, - { EaglePcbFileWildcard, IO_MGR::EAGLE }, - { PCadPcbFileWildcard, IO_MGR::PCAD }, + { PcbFileWildcard, IO_MGR::KICAD }, // Current Kicad board files + { LegacyPcbFileWildcard, IO_MGR::LEGACY }, // Old Kicad board files + { EaglePcbFileWildcard, IO_MGR::EAGLE }, // Import board files + { PCadPcbFileWildcard, IO_MGR::PCAD }, // Import board files }; wxFileName fileName( *aFileName ); wxString fileFilters; - unsigned pluginsCount = aKicadFilesOnly ? 2 : DIM( loaders ); - - for( unsigned i=0; i < pluginsCount; ++i ) + if( aKicadFilesOnly ) { - if( i > 0 ) - fileFilters += wxChar( '|' ); + for( unsigned ii = 0; ii < 2; ++ii ) + { + if( !fileFilters.IsEmpty() ) + fileFilters += wxChar( '|' ); - fileFilters += wxGetTranslation( loaders[i].filter ); + fileFilters += wxGetTranslation( loaders[ii].filter ); + } + } + else + { + for( unsigned ii = 2; ii < DIM( loaders ); ++ii ) + { + if( !fileFilters.IsEmpty() ) + fileFilters += wxChar( '|' ); + + fileFilters += wxGetTranslation( loaders[ii].filter ); + } } wxString path; @@ -121,19 +132,18 @@ bool AskLoadBoardFileName( wxWindow* aParent, int* aCtl, wxString* aFileName, bo // leave name empty } - wxFileDialog dlg( aParent, _( "Open Board File" ), path, name, fileFilters, + wxFileDialog dlg( aParent, + aKicadFilesOnly ? _( "Open Board File" ) : _( "Import Non Kicad Board File" ), + path, name, fileFilters, wxFD_OPEN | wxFD_FILE_MUST_EXIST ); - if( dlg.ShowModal() != wxID_CANCEL ) + if( dlg.ShowModal() == wxID_OK ) { - int chosenFilter = dlg.GetFilterIndex(); - - // if Eagle, tell OpenProjectFiles() to use Eagle plugin. It's the only special - // case because of the duplicate use of the *.brd file extension. Other cases - // are clear because of unique file extensions. - *aCtl = chosenFilter == 2 ? KICTL_EAGLE_BRD : 0; + // For import option, if Eagle (*.brd files), tell OpenProjectFiles() to use Eagle plugin. + // It's the only special case because of the duplicate use of the *.brd file extension. + // Other cases are clear because of unique file extensions. + *aCtl = aKicadFilesOnly ? 0 : KICTL_EAGLE_BRD; *aFileName = dlg.GetPath(); - return true; } else @@ -163,11 +173,7 @@ bool AskSaveBoardFileName( wxWindow* aParent, wxString* aFileName ) fn.GetPath(), fn.GetFullName(), wildcard, - wxFD_SAVE - /* wxFileDialog is not equipped to handle multiple wildcards and - wxFD_OVERWRITE_PROMPT both together. - | wxFD_OVERWRITE_PROMPT - */ + wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); if( dlg.ShowModal() != wxID_OK ) @@ -178,23 +184,6 @@ bool AskSaveBoardFileName( wxWindow* aParent, wxString* aFileName ) // always enforce filename extension, user may not have entered it. fn.SetExt( KiCadPcbFileExtension ); - // Since the file overwrite test was removed from wxFileDialog because it doesn't work - // when multiple wildcards are defined, we have to check it ourselves to prevent an - // existing board file from silently being over written. - if( fn.FileExists() ) - { - wxString ask = wxString::Format( _( - "The file '%s' already exists.\n\n" - "Do you want to overwrite it?" ), - GetChars( fn.GetFullPath() ) - ); - - if( !IsOK( aParent, ask ) ) - { - return false; - } - } - *aFileName = fn.GetFullPath(); return true; @@ -213,7 +202,7 @@ void PCB_EDIT_FRAME::OnFileHistory( wxCommandEvent& event ) if( !wxFileName::IsFileReadable( fn ) ) { - if( !AskLoadBoardFileName( this, &open_ctl, &fn ) ) + if( !AskLoadBoardFileName( this, &open_ctl, &fn, true ) ) return; } @@ -243,12 +232,22 @@ void PCB_EDIT_FRAME::Files_io_from_id( int id ) { case ID_LOAD_FILE: { - // LoadOnePcbFile( GetBoard()->GetFileName(), append=false, aForceFileDialog=true ); - - int open_ctl; + int open_ctl = 0; wxString fileName = Prj().AbsolutePath( GetBoard()->GetFileName() ); - if( !AskLoadBoardFileName( this, &open_ctl, &fileName ) ) + if( !AskLoadBoardFileName( this, &open_ctl, &fileName, true ) ) + return; + + OpenProjectFiles( std::vector( 1, fileName ), open_ctl ); + } + break; + + case ID_IMPORT_NON_KICAD_BOARD: + { + int open_ctl = 1; + wxString fileName;// = Prj().AbsolutePath( GetBoard()->GetFileName() ); + + if( !AskLoadBoardFileName( this, &open_ctl, &fileName, false ) ) return; OpenProjectFiles( std::vector( 1, fileName ), open_ctl ); diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 99b9b71fae..1f03c0d3e7 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -43,7 +43,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() { wxString text; wxMenuBar* menuBar = GetMenuBar(); - wxMenuItem * menutitem; wxFileHistory& fhist = Kiface().GetFileHistory(); @@ -65,11 +64,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() if( Kiface().IsSingle() ) // not when under a project mgr { AddMenuItem( filesMenu, ID_NEW_BOARD, - _( "&New" ), + _( "&New Board" ), _( "Clear current board and initialize a new one" ), KiBitmap( new_pcb_xpm ) ); - text = AddHotkeyName( _( "&Open" ), m_hotkeysDescrList, HK_LOAD_BOARD ); + text = AddHotkeyName( _( "&Open Board" ), m_hotkeysDescrList, HK_LOAD_BOARD ); AddMenuItem( filesMenu, ID_LOAD_FILE, text, _( "Delete current board and load new board" ), KiBitmap( open_brd_file_xpm ) ); @@ -94,16 +93,19 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() -1, _( "Open &Recent" ), _( "Open a recent opened board" ), KiBitmap( open_project_xpm ) ); + AddMenuItem( filesMenu, ID_APPEND_FILE, + _( "&Append Board" ), + _( "Append another Pcbnew board to the current loaded board. Available only when Pcbnew runs in stand alone mode" ), + KiBitmap( import_xpm ) ); + + filesMenu->AppendSeparator(); + + AddMenuItem( filesMenu, ID_IMPORT_NON_KICAD_BOARD, + _( "Import Non Kicad Board File" ), + _( "Load a non KiCad board file and convert it to a .kicad_pcb file" ), + KiBitmap( import_brd_file_xpm ) ); } - menutitem = AddMenuItem( filesMenu, ID_APPEND_FILE, - _( "&Append Board" ), - _( "Append another Pcbnew board to the current loaded board. Available only when Pcbnew runs in stand alone mode" ), - KiBitmap( import_xpm ) ); - if( ! Kiface().IsSingle() ) // disable when under a project mgr - menutitem->Enable( false ); - - filesMenu->AppendSeparator(); text = AddHotkeyName( _( "&Save" ), m_hotkeysDescrList, HK_SAVE_BOARD ); diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp index a824faf7f9..959e90dd76 100644 --- a/pcbnew/pcbframe.cpp +++ b/pcbnew/pcbframe.cpp @@ -113,6 +113,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME ) EVT_MENU( ID_APPEND_FILE, PCB_EDIT_FRAME::Files_io ) EVT_MENU( ID_SAVE_BOARD_AS, PCB_EDIT_FRAME::Files_io ) EVT_MENU( ID_COPY_BOARD_AS, PCB_EDIT_FRAME::Files_io ) + EVT_MENU( ID_IMPORT_NON_KICAD_BOARD, PCB_EDIT_FRAME::Files_io ) EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, PCB_EDIT_FRAME::OnFileHistory ) EVT_MENU( ID_GEN_PLOT, PCB_EDIT_FRAME::ToPlotter ) diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h index 38628965b6..fe7df117dd 100644 --- a/pcbnew/pcbnew_id.h +++ b/pcbnew/pcbnew_id.h @@ -22,6 +22,7 @@ enum pcbnew_ids ID_READ_NETLIST, ID_SET_RELATIVE_OFFSET, ID_COPY_BOARD_AS, + ID_IMPORT_NON_KICAD_BOARD, // Right vertical tool bar command IDs. ID_PCB_HIGHLIGHT_BUTT,