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

Minor fixes. Remove unused icon. Add 3 new icons. Change one icon (3 icons are...

Minor fixes. Remove unused icon. Add 3 new icons. Change one icon (3 icons are from Konstantin Baranowskiy)
parent 7e249c75
......@@ -253,11 +253,9 @@ set( BMAPS_MID
gbr_select_mode2
gerber_file
gerber_recent_files
gerber_open_dcode_file
gerbview_show_negative_objects
gerbview_drill_file
gerbview_clear_layers
gerber_open_dcode_file
gerbview_open_recent_drill_files
general_deletions
general_ratsnest
......@@ -457,6 +455,8 @@ set( BMAPS_MID
reload
reset_text
resize_sheet
rescue_pcbnew
revert_pcbnew
right
rotate_field
rotate_glabel
......@@ -551,6 +551,7 @@ set( BMAPS_BIG
libedit_icon
viewlibs_icon
icon_pagelayout_editor
wizard_add_fplib_icon
)
......
This diff is collapsed.
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x04, 0x74, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xa5, 0x96, 0xc9, 0x4f, 0x54,
0x79, 0x10, 0xc7, 0x5b, 0x83, 0x89, 0x89, 0x27, 0x33, 0x9e, 0x3c, 0xc9, 0xdd, 0xab, 0x81, 0x39,
0xc1, 0x1c, 0x8d, 0xf0, 0x0f, 0x68, 0xe2, 0x61, 0xe2, 0x1c, 0x8d, 0x89, 0x98, 0x78, 0x11, 0x48,
0xc0, 0x80, 0xcc, 0x0c, 0x08, 0x28, 0x04, 0xc4, 0xb0, 0x2a, 0x4b, 0x83, 0x44, 0x22, 0xcb, 0x98,
0x09, 0xcb, 0x00, 0x42, 0x06, 0xe6, 0x02, 0x63, 0xd8, 0xf7, 0x1d, 0x1a, 0x9a, 0x7d, 0xa7, 0xa9,
0xa9, 0xcf, 0x8f, 0xee, 0xe7, 0xa3, 0x97, 0xc4, 0x64, 0x2a, 0xa9, 0xf4, 0x7b, 0xfd, 0xde, 0xfb,
0x7d, 0x7e, 0x55, 0xf5, 0xad, 0x7a, 0xcf, 0xe1, 0x70, 0x38, 0x6e, 0xa8, 0x47, 0xa9, 0x47, 0xff,
0x0f, 0x8f, 0x54, 0xbf, 0xa2, 0x7e, 0x51, 0x44, 0x1c, 0xc1, 0x1c, 0x8b, 0x9a, 0x99, 0x99, 0x91,
0xc9, 0xc9, 0x49, 0x99, 0x9d, 0x9d, 0x95, 0xb9, 0xb9, 0x39, 0x99, 0x9f, 0x9f, 0x97, 0x85, 0x85,
0x05, 0xe3, 0x8b, 0x8b, 0x8b, 0xb2, 0xb4, 0xb4, 0x24, 0xcb, 0xcb, 0xcb, 0xc6, 0x57, 0x56, 0x56,
0xc4, 0xe5, 0x72, 0x19, 0x5f, 0x5d, 0x5d, 0x35, 0xde, 0xd1, 0xd1, 0xb1, 0x91, 0x94, 0x94, 0x54,
0xa9, 0x6b, 0xfd, 0xa8, 0x7e, 0x29, 0x14, 0x28, 0x1a, 0x48, 0x45, 0x45, 0x85, 0x4c, 0x4d, 0x4d,
0x59, 0x90, 0xee, 0xee, 0x6e, 0x19, 0x1d, 0x1d, 0xb5, 0x20, 0x6c, 0x42, 0x17, 0x3c, 0x07, 0xe8,
0xe9, 0xe9, 0x91, 0xb5, 0xb5, 0x35, 0x69, 0x69, 0x69, 0x91, 0xe9, 0xe9, 0x69, 0xe9, 0xeb, 0xeb,
0x73, 0x87, 0x87, 0x87, 0xff, 0x4c, 0x74, 0x41, 0x41, 0x2c, 0x62, 0x87, 0xe0, 0x40, 0x2a, 0x2b,
0x2b, 0x65, 0x6c, 0x6c, 0xcc, 0x8a, 0xa4, 0xb9, 0xb9, 0x59, 0x5a, 0x5b, 0x5b, 0x0d, 0x04, 0x40,
0x55, 0x55, 0x95, 0xb8, 0xdd, 0x6e, 0xe9, 0xed, 0xed, 0x95, 0xce, 0xce, 0x4e, 0xf3, 0xfc, 0xf8,
0xf8, 0xf8, 0x61, 0x4c, 0x4c, 0x4c, 0xa2, 0xae, 0xfb, 0x43, 0x00, 0x88, 0x74, 0xb1, 0x23, 0x00,
0x0d, 0x0d, 0x0d, 0x56, 0x24, 0x40, 0x80, 0xe9, 0xc3, 0x56, 0x24, 0x9c, 0x03, 0x01, 0x00, 0x68,
0x7d, 0x7d, 0xdd, 0x3c, 0xcb, 0xff, 0x5c, 0x27, 0xd5, 0x7a, 0xee, 0xf1, 0xc2, 0xae, 0x9c, 0x03,
0x71, 0xa3, 0xd3, 0xe9, 0x34, 0x0f, 0x14, 0x16, 0x16, 0x4a, 0x49, 0x49, 0x89, 0x15, 0x09, 0x10,
0x16, 0xf4, 0xa5, 0xcb, 0x17, 0x05, 0x00, 0x8e, 0x37, 0x36, 0x36, 0xcc, 0xe2, 0x39, 0x39, 0x39,
0xb2, 0xbd, 0xbd, 0x6d, 0xae, 0x71, 0x3e, 0x31, 0x31, 0x71, 0xe8, 0x4d, 0xe3, 0x25, 0x0b, 0x44,
0x24, 0x40, 0xb8, 0xa1, 0xb8, 0xb8, 0x58, 0xf2, 0xf3, 0xf3, 0x8d, 0x37, 0x35, 0x36, 0x4a, 0x59,
0x6e, 0xae, 0xbc, 0x88, 0x8f, 0x97, 0xf4, 0xa4, 0x24, 0x73, 0x9c, 0xf3, 0xfa, 0x35, 0xb5, 0xb0,
0x22, 0xda, 0xdc, 0xdc, 0x34, 0x69, 0x4d, 0x48, 0x48, 0x90, 0xc3, 0xc3, 0x43, 0x03, 0x63, 0x43,
0xa4, 0xb1, 0xbf, 0xbf, 0xdf, 0xed, 0x15, 0xc8, 0x45, 0x03, 0x02, 0x80, 0xf2, 0x48, 0x57, 0x41,
0x41, 0x81, 0xfc, 0x9a, 0x98, 0x28, 0x1f, 0x32, 0x32, 0x64, 0xac, 0xac, 0x4c, 0xb6, 0xb4, 0xd0,
0x1e, 0xbd, 0xee, 0xba, 0x76, 0x4d, 0xfe, 0xbd, 0x79, 0x53, 0x3e, 0xdf, 0xbe, 0x2d, 0xf9, 0x8f,
0x1f, 0x4b, 0x41, 0x66, 0xa6, 0x94, 0x71, 0x7d, 0x6b, 0xcb, 0x40, 0xe3, 0xe2, 0xe2, 0xcc, 0x26,
0xeb, 0xea, 0xea, 0xa4, 0xbc, 0xbc, 0xdc, 0x08, 0x84, 0xba, 0xa7, 0xa4, 0xa4, 0x54, 0x7a, 0xa5,
0xef, 0x88, 0x06, 0x52, 0x5d, 0x5d, 0x2d, 0x7f, 0x68, 0x04, 0x19, 0xcf, 0x9f, 0x8b, 0xeb, 0xd3,
0x27, 0x09, 0x30, 0x87, 0xe3, 0x9b, 0x5f, 0xb8, 0x20, 0xbd, 0x91, 0x91, 0x92, 0xfa, 0xec, 0x99,
0xfc, 0xa5, 0xe2, 0x20, 0x0a, 0x54, 0x4b, 0xed, 0xa8, 0x65, 0x5e, 0x5e, 0x1e, 0x00, 0xc9, 0xd4,
0xcd, 0x74, 0x75, 0x75, 0x6d, 0x28, 0x23, 0xc2, 0x80, 0x88, 0xe4, 0x73, 0x53, 0x93, 0x7c, 0x7c,
0xf5, 0x4a, 0x3c, 0x9a, 0xc6, 0xa0, 0x66, 0x07, 0x79, 0xdd, 0x7d, 0xf5, 0xaa, 0xe4, 0x69, 0x74,
0xed, 0x6d, 0x6d, 0x26, 0x8d, 0x7b, 0x7b, 0x7b, 0xc6, 0xa9, 0x31, 0xa9, 0xe7, 0x97, 0x74, 0x7a,
0x9b, 0xda, 0x11, 0x3d, 0x32, 0x32, 0x22, 0x59, 0xa9, 0xa9, 0xa1, 0x21, 0x21, 0x40, 0x3e, 0x18,
0xa9, 0xce, 0xd5, 0xfa, 0x51, 0x97, 0xfd, 0xfd, 0xfd, 0x73, 0xa0, 0xa3, 0xa3, 0xa3, 0x33, 0x50,
0x58, 0x58, 0xd8, 0x4f, 0xf9, 0x5a, 0x8f, 0xa0, 0xe9, 0x52, 0x3b, 0xfa, 0xfa, 0x55, 0x56, 0x6a,
0x6b, 0xa5, 0xe7, 0xd6, 0x2d, 0x59, 0xb8, 0x7e, 0x3d, 0x28, 0x8c, 0x34, 0x02, 0x1b, 0x1e, 0x1e,
0x96, 0x83, 0x83, 0x03, 0x0b, 0x54, 0x5a, 0x5a, 0x2a, 0xc7, 0xc7, 0xc7, 0x67, 0xa0, 0xd8, 0xd8,
0xd8, 0x27, 0x1f, 0xb3, 0xb3, 0x03, 0x09, 0x2a, 0xdb, 0xbf, 0x75, 0x97, 0xe9, 0xc9, 0xc9, 0x92,
0x9b, 0x9e, 0x2e, 0x15, 0x2a, 0x7b, 0x8e, 0x9d, 0xf7, 0xee, 0xc9, 0xc1, 0xe5, 0xcb, 0x01, 0x35,
0xcb, 0x7d, 0xf4, 0xc8, 0xa8, 0x91, 0x54, 0xd9, 0x41, 0x27, 0x27, 0x27, 0x67, 0xa0, 0x5f, 0x1e,
0x3c, 0x78, 0x8b, 0xba, 0xfc, 0xad, 0x5b, 0x65, 0x5c, 0xf5, 0xee, 0x9d, 0x91, 0x2a, 0x12, 0x46,
0x5d, 0xf4, 0x8e, 0xf3, 0xfd, 0x7b, 0xf9, 0x70, 0xff, 0x7e, 0x40, 0x54, 0x7f, 0xde, 0xb9, 0x23,
0xad, 0xaa, 0x34, 0x40, 0x00, 0x02, 0x40, 0xf1, 0x0f, 0x1f, 0xfe, 0x83, 0x84, 0xfd, 0xd3, 0xf5,
0x42, 0xfb, 0x02, 0x15, 0xf9, 0x20, 0x28, 0x6b, 0x67, 0x67, 0xc7, 0x34, 0x28, 0xca, 0xf4, 0x4f,
0x23, 0xd2, 0x2f, 0xd7, 0xc5, 0xa9, 0x89, 0x1d, 0xe4, 0xf1, 0x78, 0xce, 0x40, 0xc9, 0x4f, 0x9f,
0x6e, 0xd1, 0x27, 0x76, 0xa3, 0x26, 0x99, 0x2a, 0x0e, 0x7f, 0x08, 0xbe, 0xbb, 0xbb, 0x2b, 0x35,
0x9a, 0x01, 0x6a, 0x66, 0x07, 0xd1, 0x67, 0x19, 0x9a, 0x5a, 0x6a, 0x62, 0x07, 0x9d, 0x9e, 0x9e,
0x7e, 0x03, 0x71, 0x93, 0xfd, 0x21, 0x16, 0x01, 0x04, 0x84, 0xae, 0x6f, 0xd4, 0xfe, 0xf2, 0x8d,
0x20, 0x8e, 0x9d, 0x5a, 0x03, 0x36, 0x63, 0x37, 0x36, 0xcb, 0xf4, 0x20, 0x55, 0x76, 0xd0, 0x99,
0x60, 0xbd, 0xa9, 0x23, 0x6c, 0x3b, 0x88, 0xb4, 0x90, 0x3a, 0x6a, 0x32, 0x38, 0x38, 0x68, 0x1e,
0x1a, 0x1a, 0x1a, 0x32, 0xaa, 0xa2, 0x19, 0x7f, 0xd7, 0x05, 0x49, 0xaf, 0xdd, 0x48, 0x7f, 0x91,
0x8a, 0x8a, 0x54, 0x05, 0x05, 0x21, 0x06, 0x0a, 0xe9, 0x5f, 0xdc, 0xaa, 0xbb, 0x77, 0x4d, 0xe1,
0x19, 0x23, 0x8c, 0x25, 0x26, 0x3c, 0xaf, 0x93, 0xdf, 0xb4, 0xe3, 0x51, 0xa3, 0xbf, 0x8d, 0xea,
0xa2, 0xcc, 0xc6, 0x90, 0x20, 0xe4, 0xcd, 0xec, 0x42, 0xa2, 0x76, 0x10, 0x12, 0x46, 0x5d, 0x14,
0x3e, 0x3b, 0x2d, 0xcd, 0xd4, 0x85, 0x63, 0xd4, 0x88, 0xf4, 0xfd, 0xcd, 0xcc, 0x46, 0x9d, 0xf8,
0xd4, 0x24, 0x28, 0x88, 0x86, 0x7d, 0xf3, 0xf2, 0xa5, 0xf4, 0x44, 0x44, 0x04, 0x6d, 0x46, 0xd2,
0x48, 0xcd, 0xa8, 0x89, 0x7f, 0xba, 0x7c, 0x46, 0xb3, 0x23, 0x04, 0xa2, 0xc1, 0x82, 0x82, 0x7c,
0x43, 0x95, 0xce, 0x66, 0x9c, 0x84, 0x1a, 0x35, 0xa1, 0x8c, 0xb1, 0x95, 0xad, 0xc2, 0x61, 0xa8,
0x52, 0x53, 0xac, 0xbd, 0xbd, 0x5d, 0x8a, 0x8a, 0x8a, 0x02, 0x41, 0xa8, 0xab, 0x55, 0x5f, 0xd3,
0x0c, 0xc8, 0x90, 0xb0, 0x10, 0x90, 0xda, 0xac, 0x2c, 0xe9, 0xfe, 0xf2, 0xc5, 0x40, 0x6a, 0x6a,
0x6a, 0x2c, 0x58, 0x9b, 0x0e, 0x5a, 0x60, 0xe7, 0x40, 0xbc, 0x4f, 0xea, 0xeb, 0xeb, 0x0d, 0x2c,
0x4d, 0xd5, 0x66, 0xd2, 0xe8, 0x57, 0xb3, 0x60, 0xe9, 0x22, 0x92, 0x1a, 0x7d, 0x33, 0x33, 0x48,
0x31, 0x20, 0x03, 0x03, 0x03, 0xd6, 0x3d, 0xf4, 0xa1, 0x1d, 0x14, 0xe5, 0xeb, 0x78, 0x9a, 0x91,
0x09, 0xfc, 0x56, 0x77, 0xf9, 0x46, 0x5f, 0x64, 0xa8, 0x11, 0xe9, 0xd3, 0x67, 0xf4, 0x09, 0x12,
0x66, 0x5c, 0xd5, 0xa9, 0x8c, 0x0b, 0xf5, 0x95, 0x42, 0x5f, 0x7d, 0x8f, 0x79, 0xbf, 0x1b, 0x03,
0x3f, 0x20, 0x11, 0x08, 0x6a, 0x44, 0xfa, 0xf4, 0x19, 0x4d, 0x8d, 0x73, 0xcc, 0x7f, 0x5c, 0xe3,
0x9e, 0xef, 0xfc, 0xb8, 0x64, 0xed, 0x1b, 0xff, 0x01, 0xc2, 0xf6, 0x5d, 0x89, 0x10, 0x37, 0x07,
0x7a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE rescue_pcbnew_xpm[1] = {{ png, sizeof( png ), "rescue_pcbnew_xpm" }};
//EOF
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x05, 0x4f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6b, 0x4c, 0x9b,
0x65, 0x14, 0xc7, 0x2b, 0x66, 0x26, 0x3a, 0x3f, 0x18, 0x17, 0xcd, 0x62, 0x9c, 0x0e, 0x8d, 0xcb,
0xe2, 0x34, 0x46, 0x67, 0xdc, 0x66, 0x1c, 0xb0, 0xa8, 0x5b, 0x54, 0x96, 0xcd, 0xa9, 0x91, 0xa8,
0x31, 0x66, 0x9f, 0x8c, 0xf1, 0xf2, 0x61, 0x9a, 0xf8, 0x45, 0x66, 0xe6, 0x5c, 0x4c, 0xfc, 0x32,
0x3f, 0xa0, 0x30, 0xee, 0x53, 0x36, 0xe8, 0xca, 0xb8, 0x0c, 0xe6, 0xd8, 0x05, 0xba, 0x76, 0x03,
0x06, 0x43, 0x46, 0x81, 0x16, 0x4a, 0x0b, 0xa5, 0x40, 0x29, 0x97, 0xb6, 0x50, 0x2e, 0x1d, 0xa3,
0xdd, 0xdf, 0xe7, 0x7f, 0xe8, 0x35, 0xc2, 0xfc, 0xa0, 0x4f, 0x72, 0xf2, 0xbe, 0xcf, 0xfb, 0xbe,
0xcf, 0xf3, 0x7b, 0xce, 0x39, 0xff, 0x73, 0x5a, 0x8d, 0x46, 0xa3, 0x59, 0xaf, 0x2c, 0x55, 0x59,
0xda, 0x7f, 0xb0, 0xad, 0xca, 0x56, 0x2b, 0x4b, 0x02, 0xa0, 0x59, 0xce, 0x38, 0x52, 0x9d, 0x4e,
0x27, 0x06, 0x06, 0x06, 0x30, 0x34, 0x34, 0x84, 0xe1, 0xe1, 0x61, 0x8c, 0x8c, 0x8c, 0xc0, 0xe5,
0x72, 0x89, 0x8d, 0x8e, 0x8e, 0xc2, 0xed, 0x76, 0x63, 0x6c, 0x6c, 0x4c, 0x6c, 0x7c, 0x7c, 0x1c,
0x13, 0x13, 0x13, 0x62, 0x93, 0x93, 0x93, 0x62, 0x46, 0xa3, 0x71, 0xea, 0xd0, 0xa1, 0x43, 0xa5,
0x6a, 0xaf, 0x6d, 0xca, 0x56, 0xad, 0x04, 0x4a, 0x23, 0xe4, 0xe4, 0xc9, 0x93, 0x70, 0x38, 0x1c,
0x51, 0x48, 0x53, 0x53, 0x13, 0xfa, 0xfa, 0xfa, 0xa2, 0x10, 0x1e, 0xc2, 0x68, 0x34, 0x24, 0x00,
0x5a, 0x5a, 0x5a, 0xe0, 0xf1, 0x78, 0x50, 0x5f, 0x5f, 0x8f, 0xc1, 0xc1, 0x41, 0x74, 0x74, 0x74,
0x78, 0x93, 0x93, 0x93, 0xf7, 0xd3, 0xbb, 0x65, 0x41, 0xdc, 0x24, 0x1e, 0x42, 0x23, 0xa4, 0xb4,
0xb4, 0x14, 0x36, 0x9b, 0x6d, 0xc9, 0x9b, 0xd1, 0x41, 0x18, 0x4a, 0x76, 0xa2, 0xa1, 0xa1, 0x41,
0x20, 0x04, 0x94, 0x95, 0x95, 0xc1, 0xeb, 0xf5, 0xa2, 0xb5, 0xb5, 0x15, 0x57, 0xae, 0x5c, 0x91,
0xf5, 0x76, 0xbb, 0x7d, 0x21, 0x3d, 0x3d, 0xfd, 0xa0, 0xda, 0x77, 0xcd, 0x3f, 0x40, 0x0c, 0x17,
0x4f, 0x44, 0x40, 0x6d, 0x6d, 0x6d, 0xd4, 0x13, 0x42, 0x08, 0xeb, 0xb3, 0xb4, 0xe0, 0x86, 0x6e,
0x0b, 0x5a, 0xff, 0x78, 0x5c, 0xe6, 0x84, 0x10, 0x40, 0x90, 0xcf, 0xe7, 0x93, 0xb5, 0x7c, 0xce,
0x03, 0x30, 0xd4, 0x6a, 0x1e, 0x0a, 0xc3, 0x56, 0x27, 0x80, 0xf8, 0xa1, 0x56, 0xab, 0x95, 0x05,
0x05, 0x05, 0x05, 0x28, 0x2e, 0x2e, 0x8e, 0x7a, 0xd2, 0x6b, 0x3a, 0x8f, 0x96, 0x92, 0x4d, 0xf0,
0xbb, 0x2a, 0xd0, 0x59, 0x95, 0x1a, 0xf5, 0x82, 0x00, 0xde, 0x4f, 0x4d, 0x4d, 0xc9, 0xe6, 0x59,
0x59, 0x59, 0x98, 0x99, 0x99, 0x91, 0x77, 0x9c, 0xf7, 0xf7, 0xf7, 0x2f, 0x84, 0xc3, 0xb8, 0x2a,
0x0a, 0xa2, 0x27, 0x84, 0xf0, 0x83, 0xa2, 0xa2, 0x22, 0xe4, 0xe4, 0xe4, 0xe0, 0xf8, 0xf1, 0xe3,
0x18, 0xec, 0xae, 0x42, 0xc7, 0xe9, 0xad, 0x98, 0x1b, 0xd7, 0x22, 0x38, 0xa3, 0x43, 0x67, 0x65,
0x4a, 0xd4, 0x8b, 0x08, 0x68, 0x7a, 0x7a, 0x5a, 0x04, 0x92, 0x99, 0x99, 0x89, 0x85, 0x85, 0x05,
0x81, 0xd1, 0x33, 0x86, 0xd1, 0x64, 0x32, 0x79, 0xc3, 0x02, 0x49, 0x12, 0x10, 0x01, 0x54, 0x1e,
0xc3, 0x15, 0x01, 0x95, 0xe7, 0x7f, 0x0a, 0x73, 0xed, 0x1b, 0x08, 0x4c, 0xea, 0x10, 0x9a, 0x29,
0x40, 0xd0, 0xaf, 0x85, 0xa9, 0x72, 0x3b, 0x2e, 0x14, 0xbd, 0x0e, 0x5b, 0xd3, 0x8f, 0x18, 0xb5,
0x5f, 0x12, 0x90, 0xdf, 0xef, 0x17, 0x2f, 0x0e, 0x1c, 0x38, 0x20, 0x6b, 0xab, 0xaa, 0xaa, 0x70,
0xe2, 0xc4, 0x09, 0x11, 0x08, 0xf3, 0x7e, 0xe4, 0xc8, 0x91, 0xd2, 0xb0, 0xf4, 0x35, 0x69, 0x84,
0x9c, 0x3a, 0x75, 0x4a, 0xa4, 0xcd, 0x8f, 0x2b, 0xb2, 0xf7, 0xc0, 0x7a, 0xe9, 0x63, 0x2c, 0xf8,
0x96, 0x20, 0x62, 0xfe, 0x02, 0xcc, 0x8f, 0xfd, 0x0e, 0xbf, 0xf3, 0x57, 0x4c, 0xf4, 0x1e, 0x56,
0xef, 0x33, 0x60, 0x2c, 0xde, 0x04, 0x97, 0xf5, 0x8c, 0x78, 0x41, 0xd5, 0x32, 0x77, 0x54, 0x65,
0x76, 0x76, 0x36, 0x01, 0x38, 0x7a, 0xf4, 0x28, 0x1a, 0x1b, 0x1b, 0xa7, 0x14, 0x63, 0x8b, 0x80,
0xe8, 0x09, 0x21, 0x63, 0x6e, 0x17, 0xce, 0xe5, 0xa5, 0xc0, 0x71, 0xed, 0x1b, 0x2c, 0x4e, 0x6b,
0x63, 0x10, 0x01, 0xe5, 0x22, 0x34, 0xfd, 0x0b, 0x42, 0x53, 0x3f, 0x21, 0xe4, 0xcb, 0x44, 0xd0,
0xfb, 0x1d, 0xa6, 0x1d, 0x87, 0xd1, 0x73, 0xee, 0x2d, 0xf4, 0x37, 0x1f, 0x14, 0xef, 0xe6, 0xe7,
0xe7, 0xc5, 0x98, 0x63, 0x46, 0x85, 0x57, 0x86, 0x33, 0x5c, 0xd4, 0x9a, 0x34, 0x26, 0x9d, 0x31,
0xed, 0xbe, 0xf4, 0xb9, 0x3a, 0xe9, 0x07, 0x08, 0x8c, 0x7e, 0x8d, 0xc0, 0xc8, 0xbb, 0x08, 0x0c,
0xef, 0xc6, 0xfc, 0xd0, 0x2e, 0xcc, 0x3b, 0xd3, 0x94, 0xed, 0x50, 0xf3, 0x74, 0xf5, 0x7c, 0x9f,
0xb2, 0xf7, 0xe4, 0xca, 0x77, 0xb3, 0xce, 0x0c, 0xf4, 0x5e, 0xd8, 0x83, 0xea, 0x63, 0x3b, 0x65,
0x8f, 0x40, 0x20, 0x90, 0x00, 0xba, 0x75, 0xeb, 0x56, 0x0c, 0xc4, 0x0f, 0xca, 0xcb, 0xcb, 0x31,
0xec, 0xb4, 0x42, 0x9f, 0xf7, 0x14, 0x06, 0x1a, 0x33, 0xe0, 0xb5, 0x3c, 0x04, 0x6f, 0xf7, 0xdd,
0x77, 0xb0, 0x7b, 0xe0, 0xeb, 0x59, 0x03, 0x9f, 0xe5, 0x01, 0x78, 0x7b, 0x36, 0x89, 0x68, 0xcc,
0x6d, 0xa7, 0x71, 0xf3, 0xe6, 0xcd, 0x28, 0x88, 0x82, 0x5a, 0x5c, 0x5c, 0x8c, 0x81, 0xa8, 0x1a,
0x2a, 0x8f, 0x6a, 0x29, 0x2e, 0xca, 0xc3, 0xf9, 0x63, 0xcf, 0xc0, 0x76, 0xf9, 0x1d, 0x78, 0xcc,
0x8f, 0xc0, 0xd3, 0xa5, 0x89, 0xda, 0x64, 0xf7, 0x06, 0xb5, 0xf9, 0xc3, 0xea, 0x3e, 0x29, 0xee,
0xf9, 0x5d, 0x72, 0x75, 0x77, 0xbc, 0xad, 0x6a, 0xed, 0x05, 0x09, 0x55, 0x3c, 0x28, 0x18, 0x0c,
0xc6, 0x40, 0x4c, 0x20, 0x95, 0xc7, 0x64, 0x2e, 0xa9, 0xee, 0x37, 0xd4, 0xe5, 0x6d, 0x83, 0xad,
0x7e, 0xaf, 0x82, 0x3d, 0xb9, 0xb4, 0xa1, 0x39, 0x19, 0x9d, 0xd5, 0xaf, 0x2a, 0x89, 0xbf, 0x02,
0xbb, 0xfe, 0x7d, 0x38, 0xaf, 0x65, 0x28, 0xf0, 0xba, 0x28, 0xd0, 0xdb, 0xf3, 0xa8, 0x02, 0x6d,
0xc6, 0x9c, 0xdf, 0x2d, 0x80, 0x65, 0x41, 0x84, 0x54, 0x54, 0x54, 0x48, 0x81, 0x46, 0xe4, 0xcd,
0x53, 0xf5, 0xea, 0x3f, 0x43, 0x4f, 0xdd, 0x2e, 0x4c, 0x9a, 0x9f, 0x85, 0xc7, 0xb2, 0x11, 0xed,
0x65, 0x4f, 0xc3, 0xef, 0x73, 0x61, 0xdc, 0xa1, 0x47, 0x6f, 0xfd, 0x7e, 0x58, 0x2f, 0xee, 0x56,
0xb0, 0x8d, 0x61, 0x58, 0x12, 0x6c, 0x0d, 0xfb, 0x30, 0xe9, 0xa8, 0x4b, 0x00, 0x85, 0x42, 0xa1,
0x18, 0x88, 0x9e, 0x10, 0xc2, 0x7a, 0x88, 0x4f, 0x24, 0x8b, 0xd1, 0xde, 0xfc, 0x3d, 0xba, 0xce,
0xa4, 0xc0, 0xdb, 0xf7, 0x91, 0x80, 0xe6, 0xe6, 0xe6, 0x44, 0x59, 0x4c, 0x7a, 0x9f, 0xe1, 0x4b,
0xe5, 0xd9, 0x87, 0x51, 0xaf, 0xec, 0x97, 0xf7, 0x62, 0xcc, 0x5a, 0x96, 0x00, 0xba, 0x7d, 0xfb,
0x76, 0x0c, 0x44, 0x00, 0x41, 0xac, 0xf6, 0x78, 0x10, 0x8b, 0x91, 0xf9, 0xbb, 0x50, 0xf6, 0x15,
0x4c, 0xa7, 0x37, 0xe3, 0x7a, 0xc9, 0x13, 0x38, 0x7b, 0xf6, 0xac, 0x7c, 0xc7, 0x35, 0x17, 0x75,
0xdf, 0xaa, 0x30, 0xee, 0x84, 0x47, 0x09, 0xc3, 0x6b, 0xbe, 0x17, 0xe6, 0x9a, 0x1d, 0x98, 0xf5,
0xf4, 0x24, 0x80, 0xb0, 0xd4, 0x7f, 0x62, 0xf2, 0xae, 0xac, 0xac, 0x94, 0x62, 0x8b, 0x07, 0xb1,
0x10, 0x2d, 0x16, 0x8b, 0xcc, 0x4d, 0xc6, 0x2c, 0x34, 0xe6, 0x3d, 0x28, 0xf7, 0x56, 0xab, 0x55,
0xec, 0xcf, 0x9c, 0x2d, 0x70, 0x5c, 0x7d, 0x53, 0xbc, 0x99, 0xe8, 0x7c, 0x5e, 0x35, 0xdd, 0xc7,
0x54, 0xa8, 0x82, 0x2b, 0x83, 0x78, 0x42, 0x42, 0x18, 0xaa, 0x78, 0xd0, 0xec, 0xec, 0xac, 0xfc,
0x0e, 0xe5, 0xe6, 0xe6, 0x4a, 0x41, 0x0f, 0x98, 0xeb, 0xe4, 0x7e, 0xa9, 0xe6, 0xbe, 0x40, 0x57,
0xed, 0x76, 0xe5, 0x0d, 0xcb, 0xe0, 0x3e, 0x74, 0xd7, 0xbc, 0x0c, 0x6b, 0xf3, 0xcf, 0x92, 0x93,
0x15, 0x41, 0xec, 0xc0, 0x94, 0xf6, 0x72, 0x20, 0xe6, 0x84, 0x55, 0xcf, 0x9c, 0xd0, 0xd8, 0xe5,
0x47, 0xba, 0x72, 0xd1, 0x55, 0xf5, 0x22, 0x26, 0xba, 0xd6, 0x2a, 0xd0, 0xfd, 0x18, 0x30, 0xa4,
0xc0, 0x50, 0xb8, 0x41, 0xbc, 0x61, 0x4e, 0x56, 0x04, 0x11, 0x52, 0x5d, 0x5d, 0x1d, 0x95, 0x77,
0x7e, 0x7e, 0xbe, 0x34, 0xc5, 0x48, 0xe2, 0xd9, 0x07, 0x09, 0x61, 0x31, 0xf2, 0xbe, 0xad, 0x64,
0x1d, 0xdc, 0x37, 0x9e, 0x53, 0xe1, 0x5a, 0xa7, 0x1a, 0xef, 0x4b, 0xca, 0x9b, 0xd7, 0x50, 0xae,
0x2d, 0x16, 0x08, 0xc7, 0x8a, 0x20, 0x26, 0x9d, 0x10, 0xe6, 0x84, 0xb1, 0x37, 0x9b, 0xcd, 0x51,
0x08, 0xfb, 0xa0, 0x4e, 0xa7, 0x13, 0x08, 0x8b, 0x91, 0xa0, 0xbe, 0x86, 0x4f, 0xd0, 0xa1, 0x7b,
0x06, 0xcd, 0x45, 0x6b, 0xe1, 0xbc, 0xfe, 0x83, 0x02, 0x84, 0xa4, 0xb3, 0x30, 0x05, 0x1c, 0x06,
0x83, 0x01, 0x85, 0x85, 0x85, 0xcb, 0x83, 0xa8, 0xa2, 0x48, 0xa8, 0xe2, 0x21, 0xdc, 0x98, 0x62,
0x21, 0x84, 0x7d, 0x8b, 0x73, 0xb6, 0x15, 0xff, 0xf8, 0x5f, 0x68, 0xba, 0xaa, 0x67, 0x77, 0x16,
0x4f, 0x08, 0xe1, 0x81, 0x22, 0x30, 0xbd, 0x5e, 0x2f, 0xb0, 0x04, 0x10, 0x21, 0x35, 0x35, 0x35,
0xf2, 0x6b, 0xd9, 0xde, 0xde, 0x2e, 0x79, 0xe0, 0x86, 0x5c, 0x18, 0x0f, 0x21, 0xa0, 0xb3, 0xb3,
0x53, 0xaa, 0x9d, 0x49, 0x27, 0xa0, 0xad, 0xad, 0x4d, 0xc2, 0xca, 0x41, 0x08, 0xa3, 0x11, 0x19,
0xcc, 0x79, 0x3c, 0x28, 0x95, 0x9e, 0x10, 0x12, 0x5f, 0x8c, 0x0c, 0x55, 0x24, 0x5c, 0x11, 0x08,
0x2d, 0x1e, 0x12, 0xc9, 0xc9, 0xbf, 0x8d, 0xf0, 0xff, 0xc6, 0xff, 0xe5, 0x0f, 0xe4, 0x9d, 0x8c,
0x7b, 0xaf, 0xff, 0x1b, 0x47, 0x57, 0x8d, 0x83, 0x7a, 0x4f, 0x71, 0x3e, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE revert_pcbnew_xpm[1] = {{ png, sizeof( png ), "revert_pcbnew_xpm" }};
//EOF
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="26"
width="26"
version="1.1"
viewBox="0 0 26 26"
id="svg2"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="gerber_open_dcode_file.svg">
<metadata
id="metadata41">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="849"
id="namedview39"
showgrid="true"
inkscape:snap-grids="false"
inkscape:snap-to-guides="false"
inkscape:zoom="23.730769"
inkscape:cx="11.025982"
inkscape:cy="9.6288493"
inkscape:window-x="0"
inkscape:window-y="29"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid2998"
empspacing="1"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<defs
id="defs4">
<radialGradient
id="a"
gradientUnits="userSpaceOnUse"
cy="9.3410997"
cx="38.659"
r="8.3416996">
<stop
stop-color="#fff"
offset="0"
id="stop7" />
<stop
stop-color="#fefede"
stop-opacity=".91837"
offset=".25"
id="stop9" />
<stop
stop-color="#f5f328"
offset=".5"
id="stop11" />
<stop
stop-color="#f5f32d"
stop-opacity=".12234"
offset="1"
id="stop13" />
</radialGradient>
</defs>
<g
transform="matrix(0.5260448,0,0,0.50312091,-0.15999664,-0.35963976)"
id="g15"
style="stroke:#000000;stroke-width:0.75">
<polygon
points="49.423,27.934 25.213,42.458 1.018,26.902 25.224,12.379 "
id="polygon17"
style="fill:#bcbec0" />
<polygon
points="49.241,24.649 25.036,39.169 0.837,23.615 25.042,9.094 "
id="polygon19"
style="fill:#808284" />
<polygon
points="49.423,20.714 25.213,35.238 1.018,19.684 25.224,5.16 "
id="polygon21"
style="fill:#0071bc" />
<polygon
points="25.217,30.787 1.018,15.232 25.224,0.711 49.423,16.266 "
id="polygon23"
style="fill:#008fd4"
transform="matrix(1.0001441,0,0,0.98075002,-0.00363311,0.59636678)" />
</g>
<g
transform="matrix(0.52181772,0,0,0.61984761,3.0209882,-16.160143)"
id="g31">
<rect
height="15.76275"
width="44.454456"
y="52.359386"
x="-5.4629998"
id="rect33"
style="fill:#ffffff;fill-rule:evenodd" />
<g
transform="scale(0.87703798,1.1402015)"
style="font-size:61.8630867px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;font-family:Sans"
id="text35">
<path
d="m 5.9902763,58.527214 c -0.8031356,0.390408 -1.6369333,0.683213 -2.5013955,0.878417 -0.8644828,0.195203 -1.7568416,0.292805 -2.67707886,0.292805 -2.08031894,0 -3.72839394,-0.580033 -4.94423004,-1.740101 -1.2158414,-1.165642 -1.8237608,-2.744002 -1.8237599,-4.735083 -9e-7,-2.013379 0.619073,-3.597315 1.8572234,-4.751815 1.2381451,-1.154478 2.9336266,-1.731723 5.08644984,-1.731736 0.83100126,1.3e-5 1.62575826,0.07809 2.38427336,0.234245 0.764072,0.156175 1.4835362,0.387631 2.1583948,0.694367 l 0,2.585054 C 4.8329858,49.857392 4.1386192,49.561798 3.4470514,49.366585 2.7610404,49.171392 2.072251,49.07379 1.3806812,49.073779 c -1.28277386,1.1e-5 -2.27273432,0.359743 -2.9698843,1.079198 -0.6915833,0.713896 -1.0373723,1.73732 -1.0373681,3.070275 -4.2e-6,1.321812 0.3346303,2.342448 1.0039046,3.061909 0.66926382,0.719467 1.62018358,1.079199 2.8527621,1.079197 0.3346265,2e-6 0.6441634,-0.01952 0.9286117,-0.05856 0.2900076,-0.04462 0.5493494,-0.111543 0.7780261,-0.200781 l 0,-2.426103 -1.96597981,0 0,-2.158395 5.01952281,0 0,6.006696"
style="font-size:17.1333046px;font-weight:bold;letter-spacing:0.05271786px;fill:#4d4d4d"
id="path3001"
inkscape:connector-curvature="0" />
<path
d="m 8.8706587,46.96558 8.6921403,0 0,2.434468 -5.47128,0 0,2.325713 5.145011,0 0,2.434468 -5.145011,0 0,2.861128 5.655329,0 0,2.434469 -8.8761893,0 0,-12.490246"
style="font-size:17.1333046px;font-weight:bold;letter-spacing:0.05271786px;fill:#4d4d4d"
id="path3003"
inkscape:connector-curvature="0" />
<path
d="m 25.211729,52.503787 c 0.67484,7e-6 1.157271,-0.125481 1.447295,-0.376465 0.295587,-0.250968 0.443384,-0.663684 0.443392,-1.238148 -8e-6,-0.568871 -0.147805,-0.976009 -0.443392,-1.221418 C 26.369,49.422367 25.886569,49.299668 25.211729,49.299658 l -1.355271,0 0,3.204129 1.355271,0 m -1.355271,2.225321 0,4.726718 -3.220861,0 0,-12.490246 4.919132,0 c 1.64528,1.2e-5 2.849965,0.276086 3.614057,0.828221 0.769649,0.552159 1.154479,1.424997 1.15449,2.618518 -1.1e-5,0.825441 -0.200792,1.503076 -0.602343,2.032907 -0.395994,0.529845 -0.995548,0.920252 -1.798662,1.171222 0.440593,0.100396 0.833789,0.329063 1.179588,0.686001 0.351356,0.351371 0.705511,0.886787 1.062466,1.606247 l 1.748467,3.54713 -3.430008,0 -1.522588,-3.103738 C 26.65344,55.72744 26.341114,55.300781 26.023218,55.072109 25.710886,54.843447 25.292593,54.729113 24.768338,54.729108 l -0.91188,0"
style="font-size:17.1333046px;font-weight:bold;letter-spacing:0.05271786px;fill:#4d4d4d"
id="path3005"
inkscape:connector-curvature="0" />
<path
d="m 38.875718,51.801053 c 0.507522,8e-6 0.892352,-0.111537 1.15449,-0.334634 0.262123,-0.223082 0.393188,-0.552139 0.393196,-0.987173 -8e-6,-0.429439 -0.131073,-0.755708 -0.393196,-0.978807 -0.262138,-0.228657 -0.646968,-0.342991 -1.15449,-0.343001 l -1.781931,0 0,2.643615 1.781931,0 m 0.108756,5.462915 c 0.646953,2e-6 1.132173,-0.136641 1.455662,-0.409928 0.329049,-0.273282 0.493577,-0.685998 0.493586,-1.238149 -9e-6,-0.540989 -0.161749,-0.945339 -0.485221,-1.213052 -0.323488,-0.273279 -0.811496,-0.409922 -1.464027,-0.409927 l -1.890687,0 0,3.271056 1.890687,0 m 2.994982,-4.492473 c 0.691568,0.200787 1.226984,0.571674 1.606247,1.11266 0.379241,0.540999 0.568868,1.20469 0.56888,1.991078 -1.2e-5,1.204688 -0.407151,2.102624 -1.221418,2.69381 -0.814288,0.591189 -2.052435,0.886783 -3.714447,0.886783 l -5.345791,0 0,-12.490246 4.835473,0 c 1.734516,1.2e-5 2.989396,0.262143 3.764642,0.786392 0.780804,0.524272 1.171211,1.363647 1.171222,2.518127 -1.1e-5,0.607929 -0.142231,1.126612 -0.426659,1.556052 -0.28445,0.423878 -0.697166,0.738992 -1.238149,0.945344"
style="font-size:17.1333046px;font-weight:bold;letter-spacing:0.05271786px;fill:#4d4d4d"
id="path3007"
inkscape:connector-curvature="0" />
<path
d="m 47.152087,56.218234 3.011714,0 0,3.237592 -3.011714,0 0,-3.237592"
style="font-size:17.1333046px;font-weight:bold;letter-spacing:0.05271786px;fill:#4d4d4d"
id="path3009"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
......@@ -14,7 +14,7 @@
width="26"
height="26"
id="svg2"
inkscape:version="0.48.3.1 r9886"
inkscape:version="0.48.4 r9939"
sodipodi:docname="library_table.svg">
<metadata
id="metadata166">
......@@ -37,15 +37,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="849"
inkscape:window-width="1920"
inkscape:window-height="1033"
id="namedview164"
showgrid="true"
inkscape:zoom="13.906433"
inkscape:cx="-4.4802673"
inkscape:cy="18.405854"
inkscape:window-x="0"
inkscape:window-y="29"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:snap-to-guides="false"
......@@ -554,16 +554,9 @@
id="path95"
inkscape:connector-curvature="0" />
</g>
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="rect3143"
width="16.179562"
height="13.087469"
x="9.8515558"
y="8.6698914" />
<g
id="g4431"
transform="matrix(0.4598514,0,0,0.4598514,-17.774359,-2.6879261)">
transform="matrix(0.55787064,0,0,0.54301839,-27.23632,-8.0655491)">
<path
inkscape:connector-curvature="0"
style="color:#000000;fill:url(#linearGradient4444);stroke:#676b6a;stroke-width:0.8774851;stroke-opacity:1"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -200,6 +200,7 @@ set( COMMON_SRCS
systemdirsappend.cpp
trigo.cpp
utf8.cpp
validators.cpp
wildcards_and_files_ext.cpp
worksheet.cpp
wxwineda.cpp
......
......@@ -153,15 +153,11 @@ bool DSNLEXER::SyncLineReaderWith( DSNLEXER& aLexer )
{
// Synchronize the pointers handling the data read by the LINE_READER
// only if aLexer shares the same LINE_READER, because only in this case
// the char buffer can be common
// the char buffer is be common
if( reader != aLexer.reader )
return false;
// Be sure the char buffer is common
if( reader->Line() != aLexer.reader->Line() )
return false;
// We can synchronize the pointers which handle the data currently read
start = aLexer.start;
next = aLexer.next;
......
......@@ -35,14 +35,40 @@ FILE_NAME_CHAR_VALIDATOR::FILE_NAME_CHAR_VALIDATOR( wxString* aValue ) :
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
{
// The Windows (DOS) file system forbidden characters already include the forbidden
// file name characters for both Posix and OSX systems. The characters \/*?|"<> are
// file name characters for both Posix and OSX systems. The characters \/:*?|"<> are
// illegal and filtered by the validator.
wxString illegalChars = GetIllegalFileNameWxChars();
wxString illegalChars = wxFileName::GetForbiddenChars( wxPATH_DOS );
wxTextValidator nameValidator( wxFILTER_EXCLUDE_CHAR_LIST );
wxArrayString illegalCharList;
for( unsigned i = 0; i < illegalChars.size(); i++ )
illegalCharList.Add( wxString( illegalChars[i] ) );
SetExcludes( illegalCharList );
}
FILE_NAME_WITH_PATH_CHAR_VALIDATOR::FILE_NAME_WITH_PATH_CHAR_VALIDATOR( wxString* aValue ) :
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
{
// The Windows (DOS) file system forbidden characters already include the forbidden
// file name characters for both Posix and OSX systems. The characters *?|"<> are
// illegal and filtered by the validator, but /\: are valid (\ and : only on Windows.
wxString illegalChars = wxFileName::GetForbiddenChars(wxPATH_DOS );
wxTextValidator nameValidator( wxFILTER_EXCLUDE_CHAR_LIST );
wxArrayString illegalCharList;
for( unsigned i = 0; i < illegalChars.size(); i++ )
{
if( illegalChars[i] == '/' )
continue;
#if defined (__WINDOWS__)
if( illegalChars[i] == '\\' || illegalChars[i] == ':' )
continue;
#endif
illegalCharList.Add( wxString( illegalChars[i] ) );
}
SetExcludes( illegalCharList );
}
......@@ -208,7 +208,6 @@ EXTERN_BITMAP( gerbview_drill_file_xpm )
EXTERN_BITMAP( gerber_file_xpm )
EXTERN_BITMAP( gerber_recent_files_xpm )
EXTERN_BITMAP( gerbview_clear_layers_xpm )
EXTERN_BITMAP( gerber_open_dcode_file_xpm )
EXTERN_BITMAP( gerbview_open_recent_drill_files_xpm )
EXTERN_BITMAP( gerbview_show_negative_objects_xpm );
EXTERN_BITMAP( general_deletions_xpm )
......@@ -446,6 +445,8 @@ EXTERN_BITMAP( reload_xpm )
EXTERN_BITMAP( repaint_xpm )
EXTERN_BITMAP( reset_text_xpm )
EXTERN_BITMAP( resize_sheet_xpm )
EXTERN_BITMAP( rescue_pcbnew_xpm )
EXTERN_BITMAP( revert_pcbnew_xpm )
EXTERN_BITMAP( right_xpm )
EXTERN_BITMAP( rotate_field_xpm )
EXTERN_BITMAP( rotate_glabel_xpm )
......@@ -512,6 +513,7 @@ EXTERN_BITMAP( width_track_via_xpm )
EXTERN_BITMAP( width_track_xpm )
EXTERN_BITMAP( width_vias_xpm )
EXTERN_BITMAP( window_close_xpm )
EXTERN_BITMAP( wizard_add_fplib_icon_xpm )
EXTERN_BITMAP( zip_tool_xpm )
EXTERN_BITMAP( zip_xpm )
EXTERN_BITMAP( zone_duplicate_xpm )
......
......@@ -35,25 +35,12 @@
* This class provides a custom wxValidator object for limiting the allowable characters when
* defining footprint names. Since the introduction of the PRETTY footprint library format,
* footprint names cannot have any characters that would prevent file creation on any platform.
* The characters \/:*?|"<> are illegal and filtered by the validator.
*/
class FILE_NAME_CHAR_VALIDATOR : public wxTextValidator
{
public:
FILE_NAME_CHAR_VALIDATOR( wxString* aValue = NULL ) :
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
{
// The Windows (DOS) file system forbidden characters already include the forbidden
// file name characters for both Posix and OSX systems. The characters \/:*?|"<> are
// illegal and filtered by the validator.
wxString illegalChars = wxFileName::GetForbiddenChars( wxPATH_DOS );
wxTextValidator nameValidator( wxFILTER_EXCLUDE_CHAR_LIST );
wxArrayString illegalCharList;
for( unsigned i = 0; i < illegalChars.size(); i++ )
illegalCharList.Add( wxString( illegalChars[i] ) );
SetExcludes( illegalCharList );
}
FILE_NAME_CHAR_VALIDATOR( wxString* aValue = NULL );
};
/**
......@@ -61,32 +48,11 @@ public:
*
* This class provides a custom wxValidator object for limiting the allowable characters when
* defining file names with path, for instance in schematic sheet file names.
* The characters *?|"<> are illegal and filtered by the validator,
* but /\: are valid (\ and : only on Windows.)
*/
class FILE_NAME_WITH_PATH_CHAR_VALIDATOR : public wxTextValidator
{
public:
FILE_NAME_WITH_PATH_CHAR_VALIDATOR( wxString* aValue = NULL ) :
wxTextValidator( wxFILTER_EXCLUDE_CHAR_LIST, aValue )
{
// The Windows (DOS) file system forbidden characters already include the forbidden
// file name characters for both Posix and OSX systems. The characters *?|"<> are
// illegal and filtered by the validator, but /\: are valid (\ and : only on Windows.
wxString illegalChars = wxFileName::GetForbiddenChars(wxPATH_DOS );
wxTextValidator nameValidator( wxFILTER_EXCLUDE_CHAR_LIST );
wxArrayString illegalCharList;
for( unsigned i = 0; i < illegalChars.size(); i++ )
{
if( illegalChars[i] == '/' )
continue;
#if defined (__WINDOWS__)
if( illegalChars[i] == '\\' || illegalChars[i] == ':' )
continue;
#endif
illegalCharList.Add( wxString( illegalChars[i] ) );
}
SetExcludes( illegalCharList );
}
FILE_NAME_WITH_PATH_CHAR_VALIDATOR( wxString* aValue = NULL );
};
......@@ -34,12 +34,12 @@
#include <project.h>
DIALOG_SELECT_PRETTY_LIB::DIALOG_SELECT_PRETTY_LIB( wxWindow* parent ) :
DIALOG_SELECT_PRETTY_LIB_BASE( parent )
DIALOG_SELECT_PRETTY_LIB::DIALOG_SELECT_PRETTY_LIB( wxWindow* parent,
const wxString& aDefaultPath ) :
DIALOG_SELECT_PRETTY_LIB_BASE( parent )
{
wxString pro_dir = wxPathOnly( Prj().GetProjectFullName() );
m_dirCtrl->SetPath( pro_dir );
if( !aDefaultPath.IsEmpty() )
m_dirCtrl->SetPath( aDefaultPath );
}
......
......@@ -39,7 +39,8 @@
class DIALOG_SELECT_PRETTY_LIB : public DIALOG_SELECT_PRETTY_LIB_BASE
{
public:
DIALOG_SELECT_PRETTY_LIB( wxWindow* parent );
DIALOG_SELECT_PRETTY_LIB( wxWindow* parent,
const wxString& aDefaultPath );
~DIALOG_SELECT_PRETTY_LIB() {};
const wxString GetPath() { return m_libName->GetValue(); }
......
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -27,12 +27,17 @@ DIALOG_SELECT_PRETTY_LIB_BASE::DIALOG_SELECT_PRETTY_LIB_BASE( wxWindow* parent,
m_dirCtrl->ShowHidden( false );
bSizerMain->Add( m_dirCtrl, 1, wxEXPAND | wxALL, 5 );
m_SizerNewLibName = new wxBoxSizer( wxVERTICAL );
m_staticTextDirname = new wxStaticText( this, wxID_ANY, _("Library (.pretty folder)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextDirname->Wrap( -1 );
bSizerMain->Add( m_staticTextDirname, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_SizerNewLibName->Add( m_staticTextDirname, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_libName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
bSizerMain->Add( m_libName, 0, wxALL|wxEXPAND, 5 );
m_SizerNewLibName->Add( m_libName, 0, wxALL|wxEXPAND, 5 );
bSizerMain->Add( m_SizerNewLibName, 0, wxEXPAND, 5 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
......
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -22,8 +22,8 @@ class DIALOG_SHIM;
#include <wx/settings.h>
#include <wx/dirctrl.h>
#include <wx/textctrl.h>
#include <wx/statline.h>
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/button.h>
#include <wx/dialog.h>
......@@ -40,6 +40,7 @@ class DIALOG_SELECT_PRETTY_LIB_BASE : public DIALOG_SHIM
protected:
wxStaticText* m_staticText;
wxGenericDirCtrl* m_dirCtrl;
wxBoxSizer* m_SizerNewLibName;
wxStaticText* m_staticTextDirname;
wxTextCtrl* m_libName;
wxStaticLine* m_staticline1;
......
......@@ -230,8 +230,12 @@ void FP_CACHE::Save()
if( fn.FileExists() && !it->second->IsModified() )
continue;
wxString tempFileName = fn.CreateTempFileName( fn.GetPath() );
wxString tempFileName =
#ifdef USE_TMP_FILE
fn.CreateTempFileName( fn.GetPath() );
#else
fn.GetFullPath();
#endif
// Allow file output stream to go out of scope to close the file stream before
// renaming the file.
{
......@@ -244,6 +248,7 @@ void FP_CACHE::Save()
m_owner->Format( (BOARD_ITEM*) it->second->GetModule() );
}
#ifdef USE_TMP_FILE
wxRemove( fn.GetFullPath() ); // it is not an error if this does not exist
// Even on linux you can see an _intermittent_ error when calling wxRename(),
......@@ -259,7 +264,7 @@ void FP_CACHE::Save()
);
THROW_IO_ERROR( msg );
}
#endif
it->second->UpdateModificationTime();
m_mod_time = GetLibModificationTime();
}
......
......@@ -402,9 +402,11 @@ wxString FOOTPRINT_EDIT_FRAME::CreateNewLibrary()
// prompt user for libPath
// wxDirDialog dlg( this, FMT_CREATE_LIB, fn.GetPath(), wxDD_DEFAULT_STYLE );
DIALOG_SELECT_PRETTY_LIB dlg( this );
if( dlg.ShowModal() == wxID_CANCEL )
wxString initialPath = wxPathOnly( Prj().GetProjectFullName() );
DIALOG_SELECT_PRETTY_LIB dlg( this, initialPath );
if( dlg.ShowModal() != wxID_OK )
return wxEmptyString;
fn = dlg.GetPath();
......
......@@ -521,6 +521,9 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
if( !dstLibPath )
return; // user aborted in CreateNewLibrary()
wxBusyCursor dummy;
wxString msg;
IO_MGR::PCB_FILE_T dstType = IO_MGR::GuessPluginTypeFromLibPath( dstLibPath );
IO_MGR::PCB_FILE_T curType = IO_MGR::GuessPluginTypeFromLibPath( curLibPath );
......@@ -530,11 +533,16 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
PLUGIN::RELEASER dst( IO_MGR::PluginFind( dstType ) );
wxArrayString mods = cur->FootprintEnumerate( curLibPath );
for( unsigned i = 0; i < mods.size(); ++i )
{
std::auto_ptr<MODULE> m( cur->FootprintLoad( curLibPath, mods[i] ) );
dst->FootprintSave( dstLibPath, m.get() );
msg = wxString::Format( _( "Footprint '%s' saved" ),
GetChars( mods[i] ) );
SetStatusText( msg );
// m is deleted here by auto_ptr.
}
}
......@@ -544,9 +552,11 @@ void FOOTPRINT_EDIT_FRAME::OnSaveLibraryAs( wxCommandEvent& aEvent )
return;
}
wxString msg = wxString::Format(
msg = wxString::Format(
_( "Footprint library '%s' saved as '%s'." ),
GetChars( curLibPath ), GetChars( dstLibPath ) );
DisplayInfoMessage( this, msg );
SetStatusText( wxEmptyString );
}
......@@ -123,12 +123,12 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( filesMenu, ID_MENU_READ_BOARD_BACKUP_FILE,
_( "Revert to Last" ),
_( "Clear board and get previous backup version of board" ),
KiBitmap( help_xpm ) );
KiBitmap( revert_pcbnew_xpm ) );
AddMenuItem( filesMenu, ID_MENU_RECOVER_BOARD_AUTOSAVE,
_( "Rescue" ),
_( "Clear board and get last rescue file automatically saved by Pcbnew" ),
KiBitmap( help_xpm ) );
KiBitmap( rescue_pcbnew_xpm ) );
filesMenu->AppendSeparator();
//----- Fabrication Outputs submenu -----------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment