diff --git a/bitmaps_png/cpp_26/find.cpp b/bitmaps_png/cpp_26/find.cpp index 623013654f..d223aedacc 100644 --- a/bitmaps_png/cpp_26/find.cpp +++ b/bitmaps_png/cpp_26/find.cpp @@ -8,89 +8,84 @@ 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, 0x17, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xdf, 0x6f, 0x14, - 0x55, 0x14, 0xc7, 0x3f, 0xf7, 0xce, 0xce, 0xee, 0x4e, 0x77, 0xbb, 0x3b, 0x4a, 0x2b, 0x5d, 0x37, - 0x82, 0xd0, 0x2e, 0x5b, 0xf9, 0xb5, 0x12, 0xe8, 0x83, 0x18, 0xa8, 0xc6, 0x44, 0x94, 0x84, 0xa4, - 0x2f, 0x18, 0x63, 0x24, 0x06, 0x49, 0x34, 0xf2, 0xa2, 0x89, 0xf2, 0xe0, 0x9b, 0x89, 0x7f, 0x00, - 0x09, 0xd1, 0xc4, 0x12, 0xab, 0x31, 0x3c, 0x18, 0x5e, 0x04, 0x2d, 0x18, 0x1e, 0x0c, 0x62, 0xd1, - 0x18, 0x52, 0x13, 0x28, 0x3f, 0x0a, 0xa5, 0x34, 0x50, 0x6a, 0x61, 0xe9, 0x8f, 0xfd, 0x31, 0x65, - 0xa7, 0xdd, 0xdd, 0x99, 0xb9, 0x3e, 0x40, 0x27, 0x5d, 0xba, 0x18, 0x88, 0x89, 0x27, 0x39, 0x99, - 0x3b, 0xb9, 0x77, 0xce, 0xf7, 0x7c, 0xcf, 0xaf, 0xb9, 0x42, 0x29, 0xc5, 0xff, 0x21, 0x01, 0x80, - 0x83, 0x07, 0x0f, 0x7e, 0x2f, 0x84, 0x78, 0x33, 0x10, 0x08, 0xa0, 0x69, 0x1a, 0x4a, 0x29, 0x1c, - 0xc7, 0xc1, 0x75, 0x5d, 0x1c, 0xc7, 0xf1, 0xf5, 0x71, 0xdf, 0xa5, 0x94, 0x5f, 0xf5, 0xf4, 0xf4, - 0x7c, 0x00, 0xc0, 0x81, 0x03, 0x07, 0x62, 0xdd, 0xdd, 0xdd, 0x95, 0x6a, 0xb5, 0xaa, 0x5c, 0xd7, - 0xad, 0xab, 0x8e, 0xe3, 0xf8, 0x5a, 0xad, 0x56, 0x6b, 0xb4, 0x52, 0xa9, 0xf8, 0x5a, 0x2e, 0x97, - 0x7d, 0xb5, 0x2c, 0x4b, 0xed, 0xda, 0xb5, 0xcb, 0x53, 0x4a, 0xa1, 0x94, 0x22, 0xe0, 0xba, 0xae, - 0x94, 0x52, 0x7a, 0x42, 0x08, 0x6e, 0xde, 0xbc, 0x89, 0x10, 0x02, 0x00, 0x21, 0x44, 0xcd, 0xba, - 0xde, 0xf3, 0x61, 0x22, 0xa5, 0xc4, 0x34, 0x4d, 0x94, 0x52, 0xa2, 0x26, 0x74, 0x9e, 0xe7, 0xd5, - 0x35, 0x5e, 0x6f, 0xfd, 0x28, 0x40, 0xf5, 0xf6, 0x03, 0x00, 0xae, 0xeb, 0x02, 0x60, 0x59, 0x16, - 0xf9, 0x7c, 0x9e, 0x65, 0xcb, 0x96, 0x21, 0xa5, 0x64, 0x64, 0x64, 0x84, 0x07, 0x8b, 0xe5, 0xdf, - 0x40, 0x94, 0x52, 0xa4, 0xd3, 0x69, 0xff, 0xcc, 0xc2, 0x6f, 0x17, 0x31, 0x6a, 0x6b, 0x6b, 0x23, - 0x14, 0x0a, 0x61, 0xdb, 0x36, 0xa9, 0x54, 0xea, 0xb1, 0xc2, 0xa7, 0x94, 0x42, 0x4a, 0x89, 0x94, - 0x72, 0x31, 0x50, 0xb1, 0x58, 0xc4, 0x34, 0x4d, 0x00, 0x4c, 0xd3, 0x44, 0x08, 0x41, 0xb9, 0x5c, - 0x46, 0x08, 0xc1, 0xb5, 0x6b, 0xd7, 0xfc, 0xc3, 0x96, 0x65, 0x31, 0x33, 0x33, 0x83, 0x61, 0x18, - 0x98, 0xa6, 0xc9, 0xe4, 0xe4, 0x24, 0xd5, 0x6a, 0x95, 0x4c, 0x26, 0x43, 0x4b, 0x4b, 0x4b, 0x5d, - 0xd6, 0x8b, 0x18, 0xb9, 0xae, 0x8b, 0x52, 0x0a, 0x21, 0x84, 0xbf, 0x29, 0x84, 0x20, 0x95, 0x4a, - 0xe1, 0xba, 0x2e, 0x03, 0x03, 0x03, 0x6c, 0xd8, 0xb0, 0x81, 0x58, 0x2c, 0xce, 0xe8, 0x1d, 0x8b, - 0xdb, 0xd3, 0x77, 0xe9, 0xd8, 0xbc, 0x96, 0x66, 0xd3, 0x60, 0x6c, 0x6c, 0x8c, 0x33, 0x67, 0xce, - 0xb0, 0x69, 0xd3, 0x26, 0x74, 0x5d, 0xf7, 0xed, 0x2c, 0xb4, 0xe5, 0x03, 0x39, 0x8e, 0x53, 0xd7, - 0xa3, 0xa1, 0xa1, 0x21, 0x6c, 0xdb, 0x66, 0xeb, 0xd6, 0x4e, 0xbe, 0x3b, 0x71, 0x91, 0x5f, 0xce, - 0xf6, 0x93, 0x68, 0x8a, 0xf2, 0x74, 0x53, 0x94, 0x1f, 0x7e, 0xbf, 0xc1, 0x64, 0x71, 0x96, 0xf7, - 0xb6, 0xb7, 0xb3, 0x65, 0xcb, 0x16, 0x8e, 0x1f, 0x3f, 0x4e, 0x22, 0x91, 0x60, 0xdd, 0xba, 0x75, - 0xbe, 0x9d, 0xf9, 0x94, 0x2c, 0x2a, 0x86, 0x79, 0x4f, 0xe6, 0x81, 0x4a, 0xa5, 0x12, 0x9d, 0x9d, - 0x2f, 0xf1, 0xe1, 0x17, 0xa7, 0x58, 0xb2, 0xc4, 0xe4, 0x93, 0xb7, 0x5f, 0xa4, 0xe5, 0x09, 0x83, - 0x90, 0xae, 0x11, 0xd2, 0x25, 0xd9, 0xfc, 0x2c, 0x5f, 0xf7, 0x0e, 0x70, 0xf1, 0x7a, 0x8e, 0x77, - 0x5f, 0x7f, 0x8d, 0xd3, 0xa7, 0x4f, 0xa3, 0x69, 0x5a, 0x5d, 0x20, 0x09, 0x50, 0xad, 0x56, 0x6b, - 0x28, 0x0b, 0x21, 0x18, 0x1d, 0x1d, 0x25, 0x93, 0xc9, 0xf0, 0xcd, 0xcf, 0xe7, 0x09, 0x87, 0xc3, - 0x6c, 0x59, 0x9b, 0xa0, 0x41, 0xbf, 0x77, 0xd6, 0x75, 0x1d, 0x3c, 0xcf, 0xe3, 0xa9, 0x58, 0x88, - 0xf7, 0x76, 0xac, 0x65, 0xe0, 0x7a, 0x81, 0xc1, 0xd1, 0x3c, 0x89, 0x44, 0x82, 0xf1, 0xf1, 0x71, - 0xbf, 0x18, 0x6a, 0x80, 0x0a, 0x85, 0x82, 0xcf, 0x68, 0x21, 0xab, 0xc1, 0xc1, 0x41, 0x22, 0x91, - 0x28, 0x27, 0xcf, 0xdd, 0xe1, 0xf9, 0xe7, 0x9e, 0xc1, 0x93, 0x3a, 0x9a, 0xae, 0x23, 0xb5, 0x00, - 0x0a, 0x49, 0xd5, 0x05, 0x57, 0x41, 0x3c, 0x6a, 0xb0, 0x6b, 0x7b, 0x86, 0x6f, 0x4f, 0x5c, 0x26, - 0x99, 0x4c, 0x72, 0xeb, 0xd6, 0xad, 0x87, 0x87, 0xce, 0x71, 0x9c, 0x45, 0x4d, 0x39, 0x31, 0x31, - 0xc1, 0xdf, 0x93, 0x16, 0x8d, 0x0d, 0x01, 0x66, 0x66, 0x66, 0x98, 0xb3, 0x4b, 0x98, 0x86, 0x20, - 0x12, 0xd6, 0xd1, 0x03, 0x92, 0x80, 0x14, 0x68, 0x12, 0x04, 0xd0, 0xf2, 0x84, 0xc1, 0xdd, 0x59, - 0x07, 0x4d, 0xd3, 0xc8, 0xe5, 0x72, 0xbe, 0x9d, 0xba, 0x39, 0x7a, 0x30, 0x74, 0x73, 0x73, 0x73, - 0xdc, 0xc9, 0x95, 0x68, 0x8c, 0x1a, 0xc4, 0x62, 0x31, 0x00, 0xb2, 0x45, 0x87, 0x15, 0x86, 0x81, - 0x12, 0x12, 0x39, 0x0f, 0xa6, 0x09, 0xdc, 0xb2, 0x83, 0xd4, 0x24, 0xe5, 0x4a, 0xc5, 0x6f, 0x0d, - 0xa5, 0x54, 0x7d, 0x46, 0x0f, 0x4a, 0xa5, 0x52, 0x61, 0x79, 0x73, 0x03, 0x77, 0xa6, 0x2c, 0x2c, - 0xcb, 0xba, 0xdf, 0x4b, 0x30, 0x9d, 0x2f, 0xb2, 0xac, 0x39, 0x82, 0x19, 0x09, 0x12, 0xd4, 0x40, - 0xe0, 0x31, 0x95, 0x2f, 0x80, 0xe7, 0x12, 0xd4, 0x75, 0xc2, 0xe1, 0x70, 0xfd, 0x11, 0x54, 0x28, - 0x14, 0xfc, 0x86, 0x5d, 0x98, 0xa7, 0x44, 0x22, 0x81, 0xc4, 0x21, 0xa4, 0x6b, 0x04, 0x82, 0x06, - 0x11, 0x23, 0xe8, 0xef, 0x17, 0x2b, 0x12, 0x47, 0x28, 0xe2, 0x0d, 0x41, 0x1a, 0x42, 0x1a, 0xb9, - 0xf2, 0x2c, 0x6b, 0x57, 0x3c, 0x89, 0x6d, 0xdb, 0x34, 0x37, 0x37, 0x2f, 0x4a, 0x83, 0x5f, 0x75, - 0x8e, 0xe3, 0xd4, 0x84, 0x0e, 0xa0, 0xa3, 0xa3, 0x83, 0xbe, 0xbe, 0x3e, 0xf6, 0xbd, 0x91, 0xa1, - 0xaf, 0x7f, 0x98, 0x7c, 0xa1, 0x88, 0x65, 0xdd, 0x63, 0x97, 0xcb, 0x15, 0x98, 0x98, 0x98, 0xe2, - 0xe6, 0xdf, 0xe3, 0x9c, 0xbf, 0x3c, 0xc2, 0x4f, 0xbf, 0x0d, 0xf1, 0xfe, 0x8e, 0x0c, 0xfd, 0xfd, - 0xfd, 0xac, 0x5e, 0xbd, 0xba, 0x2e, 0x23, 0xbf, 0xbc, 0x01, 0x72, 0xb9, 0x1c, 0x83, 0x83, 0x83, - 0x94, 0xcb, 0x65, 0x5a, 0x5b, 0x5b, 0xb1, 0x6d, 0x9b, 0x78, 0xc8, 0xe5, 0x9d, 0x57, 0x57, 0xf1, - 0xe7, 0xc0, 0x18, 0xd6, 0xac, 0x22, 0x12, 0x6d, 0xa4, 0x31, 0x16, 0x27, 0x1c, 0x89, 0x33, 0x5e, - 0x14, 0x9c, 0xba, 0x30, 0xcd, 0x67, 0xbb, 0x5f, 0xa0, 0x3c, 0x57, 0x42, 0x08, 0xc1, 0xf0, 0xf0, - 0xf0, 0xc3, 0x81, 0xe6, 0x73, 0xa4, 0x69, 0x1a, 0xa9, 0x54, 0x8a, 0x68, 0x34, 0x0a, 0xc0, 0xfa, - 0xf5, 0xeb, 0xd9, 0xbf, 0x7f, 0x3f, 0xc9, 0xc8, 0x2c, 0x5f, 0x7e, 0xf4, 0x32, 0x21, 0x65, 0xd3, - 0x77, 0x66, 0x90, 0xde, 0x5f, 0xcf, 0x73, 0xfa, 0xaf, 0xab, 0x2c, 0x8d, 0x0a, 0x0e, 0x7e, 0xfc, - 0x0a, 0x21, 0x55, 0xe2, 0xea, 0xd5, 0xab, 0xd8, 0xb6, 0x4d, 0x3e, 0x9f, 0xe7, 0xe4, 0xc9, 0x93, - 0x35, 0x85, 0x00, 0x20, 0xba, 0xba, 0xba, 0xcc, 0x78, 0x3c, 0x9e, 0xed, 0xee, 0xee, 0x0e, 0x15, - 0x8b, 0xc5, 0x9a, 0xc9, 0x3b, 0xef, 0xd9, 0xd1, 0xa3, 0x47, 0xc9, 0xe5, 0x72, 0x6c, 0xdb, 0xb6, - 0x8d, 0x64, 0x32, 0x89, 0x61, 0x18, 0x94, 0x4a, 0x25, 0x26, 0x26, 0x26, 0x38, 0x77, 0xee, 0x1c, - 0xae, 0xeb, 0x12, 0x8d, 0x46, 0xb9, 0x70, 0xe1, 0x02, 0xa6, 0x69, 0xd2, 0xda, 0xda, 0x4a, 0xa9, - 0x54, 0xe2, 0xf0, 0xe1, 0xc3, 0x1c, 0x39, 0x72, 0x44, 0xf8, 0x40, 0x91, 0x48, 0x24, 0xdb, 0xd3, - 0xd3, 0x13, 0x2a, 0x16, 0x8b, 0x35, 0x03, 0x51, 0xd3, 0x34, 0x84, 0x10, 0x48, 0x29, 0xc9, 0x66, - 0xb3, 0x5c, 0xba, 0x74, 0x89, 0x91, 0x91, 0x11, 0xa6, 0xa6, 0xa6, 0x48, 0x26, 0x93, 0xb4, 0xb7, - 0xb7, 0xd3, 0xd1, 0xd1, 0xc1, 0xed, 0xdb, 0xb7, 0x39, 0x7b, 0xf6, 0x2c, 0xba, 0xae, 0x33, 0x34, - 0x34, 0x44, 0x28, 0x14, 0x22, 0x9d, 0x4e, 0x73, 0xe3, 0xc6, 0x0d, 0x2a, 0x95, 0x4a, 0xdb, 0xbe, - 0x7d, 0xfb, 0x46, 0xc4, 0xce, 0x9d, 0x3b, 0xe3, 0x4a, 0xa9, 0xc9, 0x43, 0x87, 0x0e, 0xe9, 0x0b, - 0x63, 0xeb, 0x79, 0x9e, 0xcf, 0xee, 0xc1, 0x91, 0x5f, 0x4f, 0xb2, 0xd9, 0x2c, 0x7d, 0x7d, 0x7d, - 0x34, 0x36, 0x36, 0x72, 0xe5, 0xca, 0x15, 0x3c, 0xcf, 0x23, 0x9d, 0x4e, 0x63, 0x59, 0xd6, 0xec, - 0xf4, 0xf4, 0xf4, 0x66, 0x01, 0x3c, 0xd9, 0xd5, 0xd5, 0xf5, 0xa3, 0x10, 0x62, 0xf3, 0xc2, 0x81, - 0xb8, 0x30, 0x74, 0x8f, 0xfa, 0xdb, 0x0e, 0x06, 0x83, 0x6c, 0xdc, 0xb8, 0x51, 0xae, 0x5c, 0xb9, - 0x92, 0xe1, 0xe1, 0x61, 0x9a, 0x9a, 0x9a, 0xe8, 0xec, 0xec, 0xe4, 0xd8, 0xb1, 0x63, 0x7f, 0x08, - 0xc0, 0x04, 0x96, 0xc6, 0x62, 0xb1, 0x67, 0x85, 0x10, 0xd1, 0xf9, 0x26, 0xe6, 0xde, 0x74, 0x79, - 0xec, 0x4b, 0x5f, 0x53, 0x53, 0x93, 0xb1, 0x67, 0xcf, 0x9e, 0x4f, 0xd7, 0xac, 0x59, 0xb3, 0xaa, - 0xbd, 0xbd, 0x9d, 0x58, 0x2c, 0x46, 0x6f, 0x6f, 0xef, 0x80, 0xb8, 0xef, 0xb9, 0x04, 0xc2, 0xf7, - 0x35, 0xf8, 0x1f, 0xef, 0x8a, 0x6a, 0xf9, 0xf2, 0xe5, 0x6a, 0xef, 0xde, 0xbd, 0x9f, 0xb7, 0xb5, - 0xb5, 0xed, 0xae, 0x54, 0x2a, 0x77, 0xc7, 0xc6, 0xc6, 0xde, 0xfa, 0x07, 0x60, 0xff, 0xc9, 0x15, - 0x2a, 0xd2, 0x37, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x04, 0xbb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x4b, 0x6c, 0x1b, + 0x55, 0x14, 0x86, 0xbf, 0x7b, 0x67, 0xfc, 0x4a, 0x1c, 0xdb, 0x72, 0xd3, 0x34, 0x4a, 0xe3, 0x28, + 0xa5, 0xb1, 0xe2, 0x3a, 0x21, 0x88, 0x22, 0x0a, 0x34, 0x52, 0xda, 0xaa, 0xa2, 0x5d, 0x20, 0xd2, + 0xec, 0x40, 0xa2, 0x11, 0x0b, 0x58, 0x50, 0x56, 0xac, 0x91, 0x8a, 0x58, 0x21, 0x58, 0x74, 0xd3, + 0x15, 0xad, 0x94, 0x45, 0x57, 0x45, 0x42, 0x42, 0x65, 0x55, 0xb1, 0xa0, 0x40, 0xc5, 0x06, 0xa5, + 0x4f, 0x35, 0xcd, 0x4b, 0x4e, 0x1f, 0x4e, 0x5b, 0x8b, 0x46, 0x69, 0x1c, 0xb7, 0x71, 0x33, 0x9e, + 0xc7, 0x61, 0x41, 0xc6, 0xb2, 0x63, 0x07, 0xe8, 0x86, 0x2b, 0xfd, 0x9a, 0x3b, 0x9a, 0x3b, 0xf7, + 0x3f, 0xff, 0x39, 0x67, 0xfe, 0x3b, 0x4a, 0x44, 0xf8, 0x3f, 0x86, 0x09, 0x70, 0xf6, 0xec, 0xd9, + 0xf3, 0x4a, 0xa9, 0xf7, 0x4d, 0xd3, 0xc4, 0x30, 0x0c, 0x44, 0x04, 0xc7, 0x71, 0x70, 0x5d, 0x17, + 0xc7, 0x71, 0xaa, 0x78, 0xd1, 0x7b, 0xad, 0xf5, 0xb7, 0x13, 0x13, 0x13, 0x27, 0x00, 0x38, 0x7d, + 0xfa, 0x74, 0xec, 0xcc, 0x99, 0x33, 0x15, 0xdb, 0xb6, 0xc5, 0x75, 0xdd, 0xa6, 0x70, 0x1c, 0xa7, + 0x0a, 0xdb, 0xb6, 0xeb, 0x50, 0xa9, 0x54, 0xaa, 0xb0, 0x2c, 0xab, 0x8a, 0x52, 0xa9, 0x24, 0xe3, + 0xe3, 0xe3, 0x9e, 0x88, 0x20, 0x22, 0x98, 0xae, 0xeb, 0x6a, 0xad, 0xb5, 0xa7, 0x94, 0x22, 0x9f, + 0xcf, 0xa3, 0x94, 0x02, 0x40, 0x29, 0x55, 0x37, 0x6f, 0x76, 0xdd, 0x6a, 0x68, 0xad, 0x49, 0x24, + 0x12, 0x88, 0x88, 0xaa, 0x4b, 0x9d, 0xe7, 0x79, 0x4d, 0x37, 0x6f, 0x36, 0xff, 0x2f, 0x44, 0xcd, + 0x9e, 0x9b, 0x00, 0xae, 0xeb, 0x02, 0x50, 0x2a, 0x95, 0x58, 0x59, 0x59, 0xa1, 0xa7, 0xa7, 0x07, + 0xad, 0x35, 0x0b, 0x0b, 0x0b, 0x6c, 0x6e, 0x96, 0x7f, 0x22, 0x11, 0x11, 0xfa, 0xfb, 0xfb, 0xab, + 0x6b, 0x6a, 0xdf, 0x6d, 0x50, 0xd4, 0xd7, 0xd7, 0x47, 0x28, 0x14, 0xa2, 0x5c, 0x2e, 0x93, 0x4e, + 0xa7, 0x5f, 0x28, 0x7d, 0x22, 0x82, 0xd6, 0x1a, 0xad, 0x75, 0x23, 0xd1, 0xea, 0xea, 0x2a, 0x89, + 0x44, 0x02, 0x80, 0x44, 0x22, 0x81, 0x52, 0x0a, 0xcb, 0xb2, 0x50, 0x4a, 0x91, 0xcb, 0xe5, 0xea, + 0x16, 0x6f, 0xde, 0x5c, 0x44, 0x18, 0x18, 0x18, 0xd8, 0x32, 0x75, 0x0d, 0x8a, 0x5c, 0xd7, 0x45, + 0x44, 0x50, 0x4a, 0x55, 0x1f, 0x2a, 0xa5, 0x48, 0xa7, 0xd3, 0xd5, 0xe8, 0x9a, 0x35, 0x87, 0xaf, + 0x60, 0x33, 0xb9, 0xbf, 0xb6, 0x81, 0xc8, 0x71, 0x9c, 0xa6, 0x11, 0xfd, 0x9b, 0xa2, 0x66, 0x0a, + 0xb3, 0xd9, 0x6c, 0xf5, 0xde, 0x2f, 0x49, 0x43, 0x33, 0xf8, 0x91, 0xf8, 0x1b, 0xf8, 0x85, 0xad, + 0x55, 0x92, 0xcb, 0xe5, 0xb0, 0x6d, 0x9b, 0xb6, 0xb6, 0x36, 0x4c, 0xd3, 0xa4, 0x58, 0x2c, 0xb2, + 0xbe, 0xbe, 0x4e, 0x36, 0x9b, 0x25, 0x14, 0x0a, 0xd5, 0x29, 0x6c, 0x20, 0xb2, 0x6d, 0xbb, 0x4e, + 0xb2, 0xbf, 0xf1, 0xfc, 0xfc, 0x7c, 0x55, 0x91, 0x65, 0x59, 0x88, 0x08, 0x83, 0x43, 0xaf, 0xf0, + 0xd3, 0xd5, 0x87, 0x4c, 0xdd, 0x5c, 0xc2, 0x71, 0x3c, 0xd2, 0xdd, 0x09, 0xde, 0x79, 0xa3, 0x8f, + 0xc5, 0xc5, 0xfb, 0x14, 0x0a, 0x05, 0x46, 0x46, 0x46, 0x30, 0x0c, 0xa3, 0x91, 0xa8, 0x58, 0x2c, + 0x12, 0x8b, 0xc5, 0xea, 0xd2, 0xb1, 0x59, 0x91, 0xe7, 0x79, 0xcc, 0xcc, 0xcc, 0xd0, 0xb2, 0xbd, + 0x97, 0x93, 0xe7, 0xae, 0x71, 0x6c, 0x64, 0x0f, 0x1f, 0x0e, 0xec, 0xc2, 0xb2, 0x3d, 0xee, 0x14, + 0x56, 0xf9, 0xea, 0xbb, 0x9b, 0x1c, 0x7d, 0xb5, 0x93, 0x3d, 0xe9, 0x34, 0x4b, 0x4b, 0x4b, 0x74, + 0x76, 0x76, 0x36, 0x57, 0xe4, 0x38, 0x4e, 0xc3, 0x47, 0x09, 0x30, 0x37, 0x37, 0x87, 0x88, 0xf0, + 0xf8, 0xf1, 0x63, 0x5e, 0x7f, 0x73, 0x98, 0x2f, 0xce, 0x5d, 0xe5, 0xb3, 0xf7, 0xf6, 0xd1, 0xb5, + 0x2d, 0x8a, 0xe3, 0x7a, 0x94, 0x2d, 0x9b, 0x4c, 0x77, 0x8c, 0x64, 0x6c, 0x88, 0xef, 0x7f, 0xbe, + 0x4d, 0x3a, 0xd5, 0xcf, 0xfd, 0x85, 0x5b, 0x74, 0x74, 0x74, 0x6c, 0x5d, 0xa3, 0x66, 0xa9, 0xcb, + 0x64, 0x32, 0x68, 0xad, 0xb1, 0x2c, 0x8b, 0x1f, 0x7e, 0xbf, 0xcb, 0xdb, 0x6f, 0xf5, 0x13, 0x8f, + 0x46, 0x70, 0x3c, 0x01, 0xa5, 0x09, 0x06, 0x02, 0x78, 0x68, 0x44, 0x2a, 0xbc, 0x36, 0xd8, 0xc3, + 0xc4, 0xc5, 0x69, 0x4e, 0x1c, 0xdd, 0xc5, 0xf2, 0xf2, 0x32, 0x91, 0x48, 0xa4, 0xb9, 0xa2, 0x66, + 0x63, 0x7e, 0x7e, 0x1e, 0xdb, 0xb6, 0x31, 0x4d, 0x93, 0x85, 0x47, 0x25, 0x76, 0xf7, 0xec, 0xe0, + 0xe9, 0xb3, 0x32, 0xeb, 0xa6, 0x42, 0x21, 0xb8, 0xae, 0xc7, 0xda, 0xba, 0xcd, 0x83, 0x47, 0x4b, + 0xd8, 0x15, 0xe1, 0xb9, 0xe5, 0x10, 0x0e, 0x87, 0x29, 0x14, 0x0a, 0x74, 0x77, 0x77, 0xd7, 0xfb, + 0x5f, 0xb1, 0x58, 0xac, 0x76, 0xdd, 0xe6, 0x3a, 0x65, 0x32, 0x19, 0x32, 0x99, 0x0c, 0x86, 0x61, + 0x60, 0x1a, 0x0a, 0xcc, 0x20, 0xda, 0x0c, 0x12, 0x0c, 0x86, 0x88, 0x44, 0x22, 0x44, 0x5a, 0x5a, + 0xc0, 0x0c, 0x93, 0xda, 0xd9, 0x49, 0x57, 0xe7, 0x76, 0x42, 0xc1, 0x00, 0x96, 0x65, 0xe1, 0x79, + 0x5e, 0x43, 0x19, 0xaa, 0x8a, 0x6a, 0x53, 0xe7, 0x8f, 0xd9, 0xd9, 0x59, 0x3c, 0xcf, 0x63, 0x6d, + 0x6d, 0x8d, 0xc1, 0xde, 0x76, 0xae, 0xdc, 0xbe, 0xc7, 0xb3, 0xd5, 0x36, 0xa2, 0x21, 0x8d, 0x16, + 0x07, 0x25, 0x36, 0xcf, 0x6d, 0xc5, 0xba, 0xa3, 0x58, 0x29, 0x7b, 0x84, 0x03, 0x42, 0xb9, 0x5c, + 0x26, 0x99, 0x4c, 0x36, 0x3a, 0xba, 0xdf, 0xde, 0x00, 0x4f, 0x9e, 0x3c, 0x61, 0x7a, 0x7a, 0x1a, + 0xcb, 0xb2, 0xaa, 0x35, 0x1a, 0x1c, 0x1c, 0x44, 0x6b, 0xcd, 0xb1, 0xfd, 0xbb, 0x78, 0xf8, 0xe7, + 0x53, 0x08, 0x44, 0x69, 0x8d, 0x6f, 0x63, 0xfb, 0x8e, 0x9d, 0x74, 0xa5, 0x76, 0xd3, 0xd3, 0xd3, + 0x4b, 0x47, 0x67, 0x17, 0x33, 0xf9, 0xa7, 0x7c, 0x3a, 0x3a, 0xc4, 0xf5, 0xeb, 0xd7, 0x49, 0xa5, + 0x52, 0xcd, 0xdd, 0xdb, 0xaf, 0x91, 0x61, 0x18, 0xa4, 0xd3, 0x69, 0x5a, 0x5b, 0x5b, 0xa9, 0x54, + 0x2a, 0xcc, 0xce, 0xce, 0x22, 0x22, 0x84, 0xc3, 0x61, 0x2e, 0x5f, 0xfe, 0x8d, 0x93, 0xe3, 0x07, + 0xf8, 0xe6, 0xfc, 0x24, 0xd1, 0x48, 0x80, 0x9d, 0xed, 0x61, 0xa2, 0xad, 0x11, 0xd6, 0x2a, 0x26, + 0x53, 0xb9, 0x02, 0x9f, 0xbc, 0x3b, 0x40, 0x40, 0x39, 0x58, 0x96, 0xc5, 0xe4, 0xe4, 0x24, 0xc3, + 0xc3, 0xc3, 0xf5, 0x44, 0xc5, 0x62, 0x91, 0x78, 0x3c, 0x8e, 0x88, 0x10, 0x8f, 0xc7, 0xd1, 0x5a, + 0x57, 0x15, 0xf6, 0xf7, 0xf7, 0x63, 0x18, 0x06, 0x4a, 0x29, 0x8a, 0xc5, 0x22, 0xd7, 0xfe, 0xb8, + 0xcc, 0x97, 0xe3, 0xc3, 0xdc, 0x5b, 0x5a, 0xe7, 0xd6, 0x9d, 0x65, 0xca, 0x65, 0x9b, 0x97, 0x5f, + 0x4a, 0xf0, 0xc1, 0x81, 0x7d, 0x5c, 0xbd, 0x32, 0x89, 0x93, 0x48, 0x10, 0x0a, 0x85, 0xc8, 0xe7, + 0xf3, 0x2c, 0x2e, 0x2e, 0x36, 0xa6, 0xae, 0xb6, 0xeb, 0x6a, 0xbd, 0xad, 0xd6, 0x50, 0x93, 0xc9, + 0x24, 0x87, 0x0f, 0x1f, 0x26, 0x97, 0xcb, 0xf1, 0x60, 0xee, 0x0a, 0xa9, 0xd0, 0x12, 0x43, 0x1d, + 0xcf, 0x59, 0xbe, 0x7b, 0x8d, 0x5f, 0x7f, 0xb9, 0x44, 0xa9, 0x54, 0x22, 0x9f, 0xcf, 0xfb, 0x27, + 0x2b, 0x22, 0x42, 0x7b, 0x7b, 0x3b, 0xa3, 0xa3, 0xa3, 0x2d, 0x00, 0x66, 0x20, 0x10, 0x10, 0xcb, + 0xb2, 0xb4, 0xaf, 0xa8, 0xd6, 0xa7, 0x6a, 0x7d, 0xcb, 0x0f, 0x60, 0xef, 0xde, 0xbd, 0x78, 0x9e, + 0x87, 0xeb, 0xba, 0xd8, 0xb6, 0x5d, 0xb5, 0x1b, 0xa5, 0x14, 0x97, 0x2e, 0xfd, 0x4d, 0xd8, 0xd6, + 0xd6, 0x46, 0xa5, 0x52, 0xe1, 0xe0, 0xc1, 0x83, 0x4c, 0x4d, 0x4d, 0xcd, 0x1f, 0x39, 0x72, 0x64, + 0x9f, 0x02, 0x92, 0x63, 0x63, 0x63, 0x3f, 0x2a, 0xa5, 0xf6, 0xfb, 0x2f, 0xd5, 0xda, 0xbd, 0x3f, + 0xf7, 0x3c, 0xaf, 0xee, 0xea, 0xc3, 0x3f, 0x0e, 0x6a, 0x8f, 0x86, 0x43, 0x87, 0x0e, 0xe9, 0xde, + 0xde, 0x5e, 0x5a, 0x5a, 0x5a, 0x48, 0xa5, 0x52, 0x9c, 0x3a, 0x75, 0xea, 0xa2, 0x09, 0x78, 0x17, + 0x2e, 0x5c, 0xf8, 0x38, 0x16, 0x8b, 0xf5, 0x2a, 0xa5, 0xa2, 0x7e, 0x83, 0x00, 0x0a, 0x10, 0x40, + 0x89, 0x88, 0x29, 0x22, 0x06, 0x60, 0x88, 0x88, 0x21, 0x22, 0xda, 0x9f, 0x6f, 0xa4, 0x5f, 0x01, + 0x9e, 0x52, 0xca, 0x03, 0xec, 0x1b, 0x37, 0x6e, 0xc4, 0x8e, 0x1f, 0x3f, 0xfe, 0xf9, 0xd8, 0xd8, + 0x58, 0x3c, 0x1a, 0x8d, 0x12, 0x0c, 0x06, 0x5d, 0xb5, 0x11, 0x8d, 0x06, 0xc2, 0x1b, 0x08, 0x6e, + 0xf5, 0x73, 0xb3, 0x11, 0x84, 0xb1, 0x01, 0x5d, 0x43, 0xc2, 0x46, 0x50, 0x02, 0xb8, 0xc0, 0x7a, + 0x2a, 0x95, 0xf2, 0xb2, 0xd9, 0xec, 0x47, 0xf1, 0x78, 0x3c, 0xb9, 0xbc, 0xbc, 0xfc, 0xf5, 0x5f, + 0x8c, 0x86, 0xc8, 0x61, 0x09, 0x89, 0x45, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, + 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE find_xpm[1] = {{ png, sizeof( png ), "find_xpm" }}; diff --git a/bitmaps_png/cpp_26/module_pin_filtered_list.cpp b/bitmaps_png/cpp_26/module_pin_filtered_list.cpp index 1e1a96b070..4c2215fcf9 100644 --- a/bitmaps_png/cpp_26/module_pin_filtered_list.cpp +++ b/bitmaps_png/cpp_26/module_pin_filtered_list.cpp @@ -8,58 +8,57 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x03, 0x25, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x56, 0x5d, 0x4f, 0x13, - 0x41, 0x14, 0x25, 0x8a, 0xc4, 0x47, 0x7f, 0x81, 0x12, 0xc4, 0x8f, 0x5f, 0x01, 0x05, 0x4a, 0xdb, - 0xfd, 0xa0, 0xb4, 0x8b, 0xe5, 0xab, 0x95, 0xaa, 0x40, 0x5b, 0x09, 0x49, 0x1f, 0x2c, 0x44, 0x49, - 0x7c, 0x81, 0xe8, 0x0b, 0x0f, 0xa8, 0x01, 0x83, 0x4d, 0x88, 0x20, 0x31, 0x1a, 0x48, 0x83, 0x09, - 0x44, 0x29, 0x12, 0x4c, 0x80, 0x90, 0x08, 0xf8, 0x22, 0x6f, 0x25, 0x3e, 0x28, 0x21, 0x0a, 0x81, - 0x26, 0x84, 0x52, 0x28, 0xb6, 0xbd, 0xce, 0x1d, 0x77, 0x37, 0x5b, 0xba, 0x5b, 0x9a, 0x88, 0x6c, - 0x72, 0xb2, 0x77, 0xe7, 0xcc, 0x9c, 0xb3, 0x73, 0x77, 0xe6, 0xce, 0xe6, 0x00, 0x40, 0xce, 0x69, - 0x20, 0xe5, 0xc1, 0xca, 0x95, 0x87, 0x58, 0xc6, 0xf8, 0x5b, 0x42, 0x25, 0x5b, 0xfe, 0x5d, 0xe2, - 0x04, 0x4e, 0xbf, 0xc2, 0x33, 0x86, 0x7d, 0x09, 0xd8, 0x57, 0xe2, 0xb0, 0x9f, 0xd6, 0x38, 0x55, - 0x23, 0xec, 0x14, 0x69, 0xcb, 0x85, 0x58, 0xfb, 0x19, 0x0a, 0x93, 0xc9, 0x04, 0x4a, 0x2e, 0xec, - 0xcb, 0x83, 0x48, 0xdb, 0x39, 0x0a, 0x25, 0x87, 0xb1, 0x34, 0xe6, 0xe8, 0x38, 0x4d, 0xa3, 0x77, - 0xcd, 0x85, 0x70, 0xeb, 0x86, 0x09, 0x02, 0xae, 0xab, 0x69, 0x46, 0x63, 0xae, 0x2b, 0x94, 0x1b, - 0x73, 0x15, 0xa6, 0x19, 0x61, 0x7f, 0xbb, 0x95, 0x81, 0xd1, 0xe6, 0x6b, 0xda, 0x46, 0x82, 0x20, - 0xac, 0xb0, 0x2c, 0x8b, 0xd3, 0x06, 0x67, 0x15, 0x03, 0x43, 0xfd, 0xcf, 0xc0, 0x56, 0xc9, 0xd0, - 0x01, 0xb4, 0x5d, 0xe4, 0xea, 0x89, 0xd0, 0xcb, 0xe7, 0x4f, 0xe8, 0x5d, 0xc9, 0x61, 0x6c, 0x17, - 0x18, 0x18, 0xe8, 0xeb, 0x49, 0xe1, 0xcc, 0x66, 0xf3, 0x4f, 0x9d, 0x4e, 0x77, 0x5e, 0x36, 0xe2, - 0x79, 0x7e, 0x3f, 0x1c, 0x0e, 0x43, 0x05, 0xc7, 0xc2, 0x7b, 0x77, 0x3e, 0xb8, 0xaa, 0x8d, 0x30, - 0xe1, 0xbe, 0x4c, 0x07, 0xc4, 0x62, 0x31, 0x0a, 0xe4, 0xc6, 0x5d, 0x05, 0x22, 0x57, 0x90, 0xc2, - 0x61, 0xfc, 0xd1, 0x73, 0x11, 0x5a, 0x6b, 0x0d, 0x10, 0x74, 0x5f, 0x92, 0x39, 0x62, 0x74, 0x60, - 0xb1, 0x58, 0x2e, 0xa4, 0x18, 0x45, 0x22, 0x11, 0x2a, 0x86, 0x39, 0x86, 0xfb, 0x39, 0x14, 0x62, - 0x0a, 0xe8, 0x95, 0x89, 0xa3, 0xb1, 0xd8, 0xae, 0xe4, 0x34, 0x8d, 0xee, 0xdc, 0xac, 0x23, 0x82, - 0x8c, 0x0c, 0x47, 0xad, 0x4d, 0x16, 0xcb, 0xc4, 0x61, 0xac, 0xc6, 0xa9, 0x19, 0x1d, 0x2c, 0x2e, - 0x2e, 0x42, 0x22, 0x91, 0x90, 0xd3, 0x81, 0x88, 0xc7, 0xe3, 0xb2, 0x58, 0x26, 0x0e, 0x63, 0x35, - 0x2e, 0xcd, 0x88, 0xe3, 0xb8, 0x58, 0x63, 0x63, 0x23, 0xf8, 0xfd, 0x7e, 0x38, 0xc9, 0x4b, 0x35, - 0x75, 0x6b, 0x6b, 0x6b, 0x48, 0x40, 0x34, 0x1a, 0xcd, 0x4a, 0xc4, 0xeb, 0xf5, 0x42, 0x59, 0x59, - 0x19, 0xae, 0x2e, 0xa8, 0x12, 0x04, 0x1a, 0x57, 0x92, 0xf1, 0x44, 0x98, 0xc6, 0x88, 0xa2, 0xa2, - 0x22, 0xc4, 0x6c, 0x8a, 0x51, 0x20, 0x10, 0x00, 0x8f, 0xc7, 0x03, 0xc9, 0x64, 0xf2, 0x58, 0x13, - 0x4c, 0x8f, 0x28, 0x02, 0x6f, 0x87, 0x87, 0xe1, 0xc7, 0xea, 0x2a, 0x8d, 0xbf, 0x2e, 0x2d, 0xc1, - 0xcc, 0xe4, 0xa4, 0xcc, 0x49, 0xc0, 0x25, 0xfe, 0x77, 0x33, 0xb2, 0xec, 0xa1, 0xcf, 0xe7, 0x83, - 0x50, 0x28, 0x94, 0xd5, 0x6c, 0x94, 0x46, 0x4b, 0xf3, 0xf3, 0xb2, 0x78, 0x64, 0x6b, 0x0b, 0xfc, - 0x7d, 0x7d, 0xda, 0x46, 0xd2, 0xaa, 0xcb, 0xf6, 0x42, 0xa3, 0x87, 0x1d, 0x1d, 0xf0, 0x82, 0x88, - 0xee, 0x6c, 0x6c, 0xc0, 0x97, 0x85, 0x05, 0x18, 0x1a, 0x18, 0x00, 0x92, 0x77, 0x98, 0x9a, 0x98, - 0x00, 0x9e, 0xe3, 0x32, 0x1b, 0x35, 0x39, 0xed, 0x74, 0x0f, 0x48, 0x68, 0xa8, 0xaf, 0x96, 0xc5, - 0x91, 0xc3, 0xbd, 0x24, 0x61, 0x7e, 0x66, 0x86, 0x0a, 0xab, 0xc1, 0x5e, 0x57, 0x97, 0xd9, 0xe8, - 0xb8, 0x4d, 0x29, 0x15, 0xcd, 0xf0, 0xbd, 0x3c, 0x28, 0x2d, 0x2d, 0x85, 0x07, 0xed, 0xed, 0xb2, - 0xf0, 0x2b, 0x32, 0xa3, 0xf0, 0xfa, 0x3a, 0xe8, 0xf5, 0x7a, 0x28, 0x2e, 0x2e, 0x3e, 0xde, 0x68, - 0x84, 0x14, 0xc5, 0x23, 0xc5, 0x51, 0x36, 0x1a, 0x15, 0xb9, 0x37, 0x4d, 0xd7, 0xa9, 0x40, 0x7f, - 0x6f, 0x2f, 0xec, 0x6e, 0x6e, 0xd2, 0x78, 0x76, 0x7a, 0x1a, 0x3e, 0xcf, 0xcd, 0xa5, 0x7d, 0x9f, - 0x14, 0x23, 0xab, 0xd5, 0xfa, 0x8d, 0xec, 0xa5, 0x38, 0x16, 0x4e, 0x14, 0x1a, 0xec, 0x7f, 0x2a, - 0x17, 0x47, 0x6c, 0x47, 0x60, 0x2c, 0x17, 0x55, 0x0b, 0x03, 0x9f, 0x82, 0x41, 0x48, 0x90, 0x97, - 0x4b, 0xee, 0xed, 0xc1, 0xe1, 0xce, 0x0e, 0xbd, 0xe3, 0x33, 0xc6, 0xf5, 0x5a, 0xa9, 0xb3, 0xd9, - 0x6c, 0x67, 0xf1, 0x01, 0x8f, 0x82, 0x0f, 0xa4, 0x28, 0x2a, 0x8b, 0x23, 0xb6, 0x23, 0x30, 0x0e, - 0x8a, 0xdc, 0xb8, 0x2b, 0x1f, 0x1e, 0x75, 0x76, 0x42, 0x74, 0x7b, 0x1b, 0x56, 0x96, 0x97, 0x61, - 0x6c, 0x64, 0x84, 0xa6, 0x10, 0xcd, 0x5f, 0x0f, 0x0e, 0x42, 0x05, 0xcf, 0xab, 0x1b, 0x29, 0xcf, - 0x1c, 0x95, 0x6f, 0x24, 0x9f, 0x39, 0x52, 0xfb, 0xae, 0x2f, 0x17, 0x0c, 0x06, 0x03, 0x24, 0xc8, - 0x2c, 0x1e, 0x77, 0x75, 0x41, 0x6b, 0x4b, 0x0b, 0x35, 0x6a, 0x70, 0x38, 0x32, 0xa7, 0x4e, 0x79, - 0x24, 0x2b, 0x57, 0x9d, 0x99, 0x2d, 0xff, 0x25, 0x71, 0x18, 0x2b, 0xb9, 0xbb, 0x6e, 0x37, 0x15, - 0xbf, 0xed, 0x74, 0x42, 0x4f, 0x77, 0x37, 0x4d, 0x59, 0x49, 0x49, 0x49, 0x76, 0x46, 0xd9, 0x82, - 0xa6, 0xd2, 0x68, 0x04, 0x87, 0xdd, 0x0e, 0x3a, 0xb2, 0xc2, 0x30, 0x55, 0xb5, 0x35, 0x35, 0xaa, - 0x26, 0xff, 0x6c, 0xa4, 0x25, 0x7a, 0xa2, 0x46, 0x08, 0x22, 0x30, 0x45, 0x70, 0x90, 0x05, 0xa6, - 0xd2, 0x7e, 0x4e, 0x4e, 0xed, 0xbf, 0xee, 0x7f, 0xe2, 0x0f, 0xd1, 0x8f, 0xef, 0xbe, 0x17, 0x6f, - 0x07, 0x74, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x03, 0x16, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x56, 0x5d, 0x4b, 0x14, + 0x51, 0x18, 0x96, 0x32, 0xe9, 0xb2, 0x5f, 0x50, 0x62, 0xf6, 0xf1, 0x2b, 0x54, 0x34, 0x75, 0x67, + 0x76, 0xdb, 0xaf, 0x5a, 0x35, 0xad, 0x8c, 0xd4, 0xdd, 0x0d, 0x02, 0x2f, 0x5a, 0xa3, 0x0b, 0x45, + 0x4a, 0xa4, 0x14, 0xa4, 0x12, 0x14, 0x5d, 0x90, 0xca, 0x0b, 0xbf, 0x37, 0x37, 0x15, 0x4b, 0x13, + 0x91, 0x85, 0x04, 0x35, 0x08, 0xdc, 0x2b, 0x57, 0x04, 0xcd, 0x8b, 0x14, 0x74, 0x21, 0x5a, 0x56, + 0xb7, 0x76, 0x7d, 0x9b, 0xf7, 0x6d, 0xe6, 0x30, 0xe3, 0xcc, 0x8e, 0x7b, 0x51, 0xd2, 0xc0, 0xc3, + 0x3e, 0x73, 0x9e, 0x73, 0x9e, 0x67, 0xf6, 0xcc, 0x39, 0xef, 0x99, 0x34, 0x00, 0x48, 0x3b, 0x0e, + 0x28, 0x6e, 0x6c, 0xc6, 0xc2, 0x10, 0xcf, 0x15, 0xff, 0x92, 0x60, 0xe1, 0x0b, 0x37, 0x24, 0xcd, + 0x6e, 0xbc, 0x12, 0x34, 0x71, 0x45, 0x7b, 0x12, 0xb0, 0xaf, 0xa4, 0x61, 0xbf, 0x64, 0xe3, 0x34, + 0x83, 0xb0, 0x53, 0xa4, 0x2e, 0x1d, 0x62, 0x0f, 0x4f, 0x10, 0x0c, 0x06, 0x03, 0xc8, 0xb5, 0xb0, + 0x27, 0x03, 0x22, 0x75, 0xa7, 0x08, 0x72, 0x0d, 0xb9, 0x34, 0xe6, 0xf0, 0xb8, 0xa4, 0x41, 0xfe, + 0x9a, 0x6c, 0xb8, 0x73, 0xdd, 0x00, 0x3e, 0xe7, 0x45, 0x55, 0xd0, 0xa8, 0xf3, 0x02, 0x69, 0xa3, + 0xce, 0x6c, 0x55, 0x10, 0xf6, 0xaf, 0xb0, 0x71, 0x30, 0x5c, 0x73, 0x29, 0x79, 0x90, 0xdd, 0x6e, + 0x0f, 0xf2, 0x3c, 0x8f, 0x7f, 0x1b, 0x2a, 0xaf, 0x71, 0xf0, 0xa6, 0xab, 0x1d, 0x1c, 0x16, 0x8e, + 0x06, 0x50, 0xbb, 0xa8, 0x95, 0x0b, 0x46, 0xaf, 0x3a, 0x5f, 0xd0, 0xaf, 0x5c, 0x43, 0x5e, 0x61, + 0xe7, 0xa0, 0xa7, 0xe3, 0xb9, 0x42, 0x33, 0x9b, 0xcd, 0xdf, 0xf2, 0xf2, 0xf2, 0x4e, 0xb3, 0x20, + 0x93, 0xc9, 0xb4, 0x17, 0x0e, 0x87, 0xe1, 0xaa, 0x91, 0x87, 0x49, 0x57, 0x26, 0x38, 0x4b, 0x8a, + 0x61, 0xc2, 0x75, 0x9e, 0x06, 0xc4, 0x62, 0x31, 0x02, 0x6a, 0xe3, 0xce, 0x2c, 0x51, 0xcb, 0x52, + 0x68, 0xc8, 0x3f, 0xba, 0xcf, 0xc2, 0xfd, 0xb2, 0x22, 0x98, 0x72, 0x9d, 0x63, 0x9a, 0x10, 0xb4, + 0x6f, 0xb5, 0x5a, 0xcf, 0x28, 0x82, 0x22, 0x91, 0x08, 0x99, 0xe1, 0x1c, 0xc3, 0xa3, 0x34, 0x82, + 0x38, 0x05, 0x74, 0xe9, 0x69, 0xc4, 0xc5, 0x76, 0xb9, 0x96, 0x34, 0xe8, 0xee, 0xad, 0x1b, 0x82, + 0x21, 0xc7, 0x70, 0xb3, 0xcc, 0xc1, 0xcc, 0xf4, 0x34, 0xe4, 0x5a, 0x9a, 0x56, 0xd0, 0xfe, 0xe2, + 0xe2, 0x22, 0x24, 0x12, 0x09, 0x36, 0x1d, 0x88, 0x78, 0x3c, 0xce, 0xcc, 0xf4, 0x34, 0xe4, 0x5a, + 0x9a, 0x2a, 0xc8, 0x68, 0x34, 0xc6, 0xaa, 0xaa, 0xaa, 0xc0, 0xeb, 0xf5, 0xc2, 0xdf, 0xbc, 0x34, + 0xa7, 0x6e, 0x73, 0x73, 0x13, 0x05, 0x88, 0x46, 0xa3, 0x29, 0x99, 0xd4, 0xd6, 0xd6, 0x42, 0x41, + 0x41, 0x81, 0x2e, 0x72, 0x72, 0x72, 0x10, 0x01, 0x45, 0x90, 0xcf, 0xe7, 0x03, 0xb7, 0xdb, 0x0d, + 0x07, 0x07, 0x07, 0x47, 0x86, 0xe0, 0xf4, 0x88, 0x26, 0x0c, 0x6f, 0x07, 0x07, 0x61, 0x21, 0x10, + 0x20, 0xde, 0xdf, 0xdb, 0x0b, 0xcb, 0x4b, 0x4b, 0x4c, 0xc3, 0x25, 0xfe, 0x67, 0x33, 0xf2, 0xfc, + 0x4f, 0x8f, 0xc7, 0x03, 0xa1, 0x50, 0x28, 0xa5, 0x7f, 0xa3, 0x15, 0xf4, 0x75, 0x75, 0x15, 0xfa, + 0x84, 0x00, 0xe4, 0x2b, 0xcb, 0xcb, 0xe0, 0x1f, 0x1a, 0x52, 0x07, 0x49, 0xab, 0x2e, 0xd5, 0x4b, + 0x0a, 0x12, 0xc6, 0xc1, 0xe3, 0x86, 0x06, 0x78, 0xda, 0xd4, 0x04, 0xc2, 0x9c, 0x83, 0x6f, 0x60, + 0x00, 0x9e, 0x34, 0x36, 0x42, 0x42, 0xf0, 0x7a, 0x37, 0x32, 0x42, 0x5a, 0x7e, 0x7e, 0xbe, 0x3a, + 0xa8, 0xba, 0xb2, 0x82, 0xf6, 0x80, 0x84, 0xdb, 0xe5, 0x25, 0xcc, 0x1c, 0x35, 0xdc, 0x4b, 0x12, + 0x30, 0xe8, 0x9e, 0xcb, 0x45, 0x01, 0x7a, 0xe0, 0x04, 0x1f, 0x55, 0xd0, 0x51, 0x9b, 0x52, 0x2a, + 0x9a, 0xe1, 0x07, 0x19, 0x14, 0x84, 0x4f, 0x6b, 0xb5, 0x58, 0x60, 0xd2, 0xef, 0x87, 0x8d, 0x95, + 0x15, 0xe2, 0xc3, 0x7d, 0x7d, 0xb0, 0xb5, 0xbe, 0x4e, 0x1c, 0x91, 0x9b, 0x9b, 0xab, 0x1d, 0x34, + 0x24, 0x14, 0xc5, 0x43, 0xc5, 0x91, 0x05, 0x0d, 0x8b, 0x5a, 0x7f, 0xf5, 0x65, 0x0a, 0xe2, 0x38, + 0x0e, 0x6b, 0x1a, 0xac, 0x06, 0x83, 0xf0, 0x61, 0x6c, 0x8c, 0xf8, 0x97, 0x85, 0x05, 0x08, 0xcc, + 0xcc, 0x10, 0xc7, 0x07, 0x51, 0xbc, 0x23, 0x9b, 0xcd, 0xb6, 0x26, 0xec, 0xa5, 0x38, 0x16, 0x4e, + 0x34, 0x7a, 0xdd, 0xf5, 0x92, 0x15, 0x47, 0x6c, 0x47, 0x20, 0x67, 0x45, 0xd5, 0xca, 0x91, 0x41, + 0x64, 0x67, 0x47, 0x77, 0xda, 0x1a, 0xeb, 0xeb, 0x95, 0x41, 0x0e, 0x87, 0xe3, 0x24, 0xde, 0xe0, + 0x51, 0xf0, 0x5e, 0x28, 0x8a, 0xf2, 0xe2, 0x88, 0xed, 0x08, 0xe4, 0x53, 0xa2, 0x36, 0xee, 0xcc, + 0x24, 0x83, 0x67, 0xcd, 0xcd, 0x34, 0x55, 0x68, 0xea, 0xed, 0xe8, 0xa0, 0x55, 0x87, 0xbc, 0xa7, + 0xbb, 0x1b, 0xda, 0x5a, 0x5a, 0xa0, 0xac, 0xb4, 0x54, 0x19, 0x24, 0x3f, 0x73, 0x34, 0xde, 0x11, + 0x3b, 0x73, 0xa4, 0xf6, 0x1f, 0x9e, 0x74, 0xb6, 0x74, 0x3b, 0xdb, 0xdb, 0xe1, 0xfb, 0xf6, 0x36, + 0xbd, 0x8b, 0xb6, 0xd6, 0x56, 0x88, 0xee, 0xee, 0xa2, 0xb1, 0x62, 0xe9, 0xab, 0x82, 0xf0, 0x08, + 0x96, 0xaf, 0x3a, 0x33, 0x5f, 0xb8, 0x25, 0x69, 0xc8, 0xe5, 0x9a, 0x64, 0xf2, 0x69, 0x76, 0x16, + 0xe6, 0xe7, 0xe6, 0x88, 0x4f, 0x4d, 0x4c, 0xc0, 0xe7, 0xf9, 0x79, 0xd5, 0x1e, 0x53, 0x05, 0xa5, + 0x0a, 0x1c, 0x78, 0xd8, 0x4c, 0x0f, 0xff, 0x7f, 0x10, 0x42, 0x30, 0x98, 0x16, 0xb0, 0x9f, 0x02, + 0xa6, 0x55, 0x1f, 0x27, 0xc7, 0xf6, 0x5d, 0xf7, 0x2f, 0xf1, 0x1b, 0x0c, 0xfc, 0xf5, 0xb8, 0xe2, + 0x7e, 0x3a, 0xcb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE module_pin_filtered_list_xpm[1] = {{ png, sizeof( png ), "module_pin_filtered_list_xpm" }}; diff --git a/bitmaps_png/sources/find.svg b/bitmaps_png/sources/find.svg index 09442557d0..47623cf7c1 100644 --- a/bitmaps_png/sources/find.svg +++ b/bitmaps_png/sources/find.svg @@ -13,7 +13,7 @@ inkscape:export-ydpi="90.000000" inkscape:export-xdpi="90.000000" inkscape:export-filename="/home/steven/edit-find-48.png" - sodipodi:docname="find.svg" + sodipodi:docname="find.svg.BASE" inkscape:version="0.48.2 r9819" sodipodi:version="0.32" id="svg249" @@ -59,6 +59,18 @@ offset="1.0000000" style="stop-color:#ffffff;stop-opacity:0.24761905;" /> + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g1772" + transform="matrix(0.39105747,0,0,0.37162201,7.9100602,31.393184)"> + + + + + transform="matrix(1.245743,0,0,1.245743,-3.425346,-6.177033)" /> + rx="3.2112026" + ry="2.837393" + transform="matrix(0.752986,0.658037,-0.648902,0.760872,0,0)" /> + transform="matrix(1.398614,0,0,1.398614,-6.224338,-8.298958)" /> + id="path4462" /> diff --git a/bitmaps_png/sources/module_pin_filtered_list.svg b/bitmaps_png/sources/module_pin_filtered_list.svg index 3558f53c66..2714f24b1d 100644 --- a/bitmaps_png/sources/module_pin_filtered_list.svg +++ b/bitmaps_png/sources/module_pin_filtered_list.svg @@ -22,7 +22,7 @@ image/svg+xml - + @@ -37,15 +37,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1600" - inkscape:window-height="841" + inkscape:window-width="1280" + inkscape:window-height="968" id="namedview52" showgrid="true" inkscape:zoom="25.615385" inkscape:cx="20.436413" inkscape:cy="13" - inkscape:window-x="0" - inkscape:window-y="28" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" inkscape:snap-to-guides="true" @@ -160,14 +160,14 @@ # diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index 052e675c8b..f0cb41d6e7 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -49,6 +49,29 @@ wxPoint DIALOG_PAGES_SETTINGS::s_LastPos( -1, -1 ); wxSize DIALOG_PAGES_SETTINGS::s_LastSize; +// List of page formats. +// should be statically initialized, because we need both +// the translated and the not translated version. +// when displayed in dialog we should explicitely call wxGetTranslation() +// to show the translated version. +const wxString pageFmts[] = +{ + _("A4 210x297mm"), + _("A3 297x420mm"), + _("A2 420x594mm"), + _("A1 594x841mm"), + _("A0 841x1189mm"), + _("A 8.5x11in"), + _("B 11x17in"), + _("C 17x22in"), + _("D 22x34in"), + _("E 34x44in"), + _("USLetter 8.5x11in"), + _("USLegal 8.5x14in"), + _("USLedger 11x17in"), + _("User (Custom)"), + wxT("") // end of list +}; void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event ) { @@ -92,6 +115,18 @@ void DIALOG_PAGES_SETTINGS::initDialog() SetFocus(); + // initalize page format choice box and page format list. + // The first shows translated strings, the second contains not tralated strings + m_paperSizeComboBox->Clear(); + for( unsigned ii = 0; ; ii++ ) + { + if( pageFmts[ii].IsEmpty() ) + break; + m_pageFmt.Add( pageFmts[ii] ); + m_paperSizeComboBox->Append( wxGetTranslation( pageFmts[ii] ) ); + } + + #ifdef EESCHEMA // Init display value for sheet User size wxString format = m_TextSheetCount->GetLabel(); @@ -232,7 +267,10 @@ void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event ) void DIALOG_PAGES_SETTINGS::OnPaperSizeChoice( wxCommandEvent& event ) { - wxString paperType = m_paperSizeComboBox->GetStringSelection(); + int idx = m_paperSizeComboBox->GetSelection(); + if( idx < 0 ) + idx = 0; + const wxString paperType = m_pageFmt[idx]; if( paperType.Contains( PAGE_INFO::Custom ) ) { m_orientationComboBox->Enable( false ); @@ -364,14 +402,15 @@ void DIALOG_PAGES_SETTINGS::OnComment4TextUpdated( wxCommandEvent& event ) void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event ) { - bool retSuccess; + bool retSuccess = false; m_save_flag = true; - // wxFormBuilder must use "A4", "A3", etc for choices, in all languages/translations - const wxString paperType = m_paperSizeComboBox->GetStringSelection(); + int idx = m_paperSizeComboBox->GetSelection(); + if( idx < 0 ) + idx = 0; + const wxString paperType = m_pageFmt[idx]; - // here we assume translators will keep original paper size spellings if( paperType.Contains( PAGE_INFO::Custom ) ) { GetCustomSizeMilsFromDialog(); @@ -506,15 +545,11 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ), void DIALOG_PAGES_SETTINGS::SetCurrentPageSizeSelection( const wxString& aPaperSize ) { - // use wxChoice to store the sheet type in the wxChoice's choice - // i.e. "A4", "A3", etc, anywhere within the text of the label. - // D(printf("m_paperSizeComboBox->GetCount() = %d\n", (int) m_paperSizeComboBox->GetCount() );) - - // search all the child wxRadioButtons for a label containing our paper type - for( unsigned i = 0; i < m_paperSizeComboBox->GetCount(); ++i ) + // search all the not translated label list containing our paper type + for( unsigned i = 0; i < m_pageFmt.GetCount(); ++i ) { // parse each label looking for aPaperSize within it - wxStringTokenizer st( m_paperSizeComboBox->GetString( i ) ); + wxStringTokenizer st( m_pageFmt[i] ); while( st.HasMoreTokens() ) { @@ -609,8 +644,10 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() void DIALOG_PAGES_SETTINGS::GetPageLayoutInfoFromDialog() { - // wxFormBuilder must use "A4", "A3", etc for choices, in all languages/translations - const wxString paperType = m_paperSizeComboBox->GetStringSelection(); + int idx = m_paperSizeComboBox->GetSelection(); + if( idx < 0 ) + idx = 0; + const wxString paperType = m_pageFmt[idx]; // here we assume translators will keep original paper size spellings if( paperType.Contains( PAGE_INFO::Custom ) ) diff --git a/common/dialogs/dialog_page_settings.h b/common/dialogs/dialog_page_settings.h index a397589bc5..64d61caeaa 100644 --- a/common/dialogs/dialog_page_settings.h +++ b/common/dialogs/dialog_page_settings.h @@ -38,6 +38,7 @@ class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE private: EDA_DRAW_FRAME* m_Parent; BASE_SCREEN* m_Screen; + wxArrayString m_pageFmt; /// list of page sizes (not translated) bool m_initialized; bool m_modified; bool m_save_flag; diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp index 776d0d85ef..8999d9ef78 100644 --- a/common/dialogs/dialog_page_settings_base.cpp +++ b/common/dialogs/dialog_page_settings_base.cpp @@ -1,53 +1,53 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 9 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_page_settings_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bUpperSizerH; - bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); - - wxFlexGridSizer* LeftColumnSizer; +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Mar 17 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_page_settings_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bUpperSizerH; + bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); + + wxFlexGridSizer* LeftColumnSizer; LeftColumnSizer = new wxFlexGridSizer( 3, 1, 0, 0 ); - LeftColumnSizer->AddGrowableRow( 0 ); - LeftColumnSizer->AddGrowableRow( 1 ); - LeftColumnSizer->AddGrowableRow( 2 ); - LeftColumnSizer->SetFlexibleDirection( wxBOTH ); - LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + LeftColumnSizer->AddGrowableRow( 0 ); + LeftColumnSizer->AddGrowableRow( 1 ); + LeftColumnSizer->AddGrowableRow( 2 ); + LeftColumnSizer->SetFlexibleDirection( wxBOTH ); + LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxStaticBoxSizer* PaperSizer; PaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper") ), wxVERTICAL ); - + m_staticText5 = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); PaperSizer->Add( m_staticText5, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - wxString m_paperSizeComboBoxChoices[] = { _("A4 210x297mm"), _("A3 297x420mm"), _("A2 420x594mm"), _("A1 594x841mm"), _("A0 841x1189mm"), _("A 8.5x11in"), _("B 11x17in"), _("C 17x22in"), _("D 22x34in"), _("E 34x44in"), _("USLetter 8.5x11in"), _("USLegal 8.5x14in"), _("USLedger 11x17in"), _("User (Custom)") }; - int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString ); + wxString m_paperSizeComboBoxChoices[] = { _("dummy text") }; + int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString ); m_paperSizeComboBox = new wxChoice( this, ID_CHICE_PAGE_SIZE, wxDefaultPosition, wxDefaultSize, m_paperSizeComboBoxNChoices, m_paperSizeComboBoxChoices, 0 ); - m_paperSizeComboBox->SetSelection( 0 ); + m_paperSizeComboBox->SetSelection( 0 ); PaperSizer->Add( m_paperSizeComboBox, 0, wxALL|wxEXPAND, 5 ); - + m_staticText6 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); PaperSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") }; - int m_orientationComboBoxNChoices = sizeof( m_orientationComboBoxChoices ) / sizeof( wxString ); + + wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") }; + int m_orientationComboBoxNChoices = sizeof( m_orientationComboBoxChoices ) / sizeof( wxString ); m_orientationComboBox = new wxChoice( this, ID_CHOICE_PAGE_ORIENTATION, wxDefaultPosition, wxDefaultSize, m_orientationComboBoxNChoices, m_orientationComboBoxChoices, 0 ); - m_orientationComboBox->SetSelection( 0 ); + m_orientationComboBox->SetSelection( 0 ); PaperSizer->Add( m_orientationComboBox, 0, wxEXPAND|wxALL, 5 ); @@ -85,224 +85,225 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind CustomPaperSizer->Add( CustomPaperHeight, 0, wxEXPAND, 5 ); - - + + CustomPaperSizer->Add( 5, 50, 0, 0, 5 ); - - + + PaperSizer->Add( CustomPaperSizer, 1, wxEXPAND, 5 ); - - + + LeftColumnSizer->Add( PaperSizer, 1, wxALL, 5 ); - + wxStaticBoxSizer* PageLayoutExampleSizer; PageLayoutExampleSizer = new wxStaticBoxSizer( new wxStaticBox( this, ID_PAGE_LAYOUT_EXAMPLE_SIZER, _("Layout Preview") ), wxVERTICAL ); - + PageLayoutExampleSizer->SetMinSize( wxSize( 240,-1 ) ); m_PageLayoutExampleBitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER ); m_PageLayoutExampleBitmap->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - + PageLayoutExampleSizer->Add( m_PageLayoutExampleBitmap, 0, wxALIGN_CENTER|wxALL, 5 ); - - + + LeftColumnSizer->Add( PageLayoutExampleSizer, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - + LeftColumnSizer->Add( 0, 1, 1, wxEXPAND, 5 ); bUpperSizerH->Add( LeftColumnSizer, 0, wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* RightColumnSizer; - RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); - RightColumnSizer->AddGrowableCol( 0 ); - RightColumnSizer->AddGrowableRow( 0 ); - RightColumnSizer->AddGrowableRow( 1 ); - RightColumnSizer->AddGrowableRow( 2 ); - RightColumnSizer->AddGrowableRow( 3 ); - RightColumnSizer->AddGrowableRow( 4 ); - RightColumnSizer->AddGrowableRow( 5 ); - RightColumnSizer->AddGrowableRow( 6 ); - RightColumnSizer->AddGrowableRow( 7 ); - RightColumnSizer->SetFlexibleDirection( wxBOTH ); - RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + + wxFlexGridSizer* RightColumnSizer; + RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); + RightColumnSizer->AddGrowableCol( 0 ); + RightColumnSizer->AddGrowableRow( 0 ); + RightColumnSizer->AddGrowableRow( 1 ); + RightColumnSizer->AddGrowableRow( 2 ); + RightColumnSizer->AddGrowableRow( 3 ); + RightColumnSizer->AddGrowableRow( 4 ); + RightColumnSizer->AddGrowableRow( 5 ); + RightColumnSizer->AddGrowableRow( 6 ); + RightColumnSizer->AddGrowableRow( 7 ); + RightColumnSizer->SetFlexibleDirection( wxBOTH ); + RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxStaticBoxSizer* BasicInscriptionsSizer; BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Basic Inscriptions") ), wxVERTICAL ); BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) ); - wxBoxSizer* SheetInfoSizer; - SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextSheetCount->Wrap( -1 ); - SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); - - - SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); - - m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextSheetNumber->Wrap( -1 ); - SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); - + wxBoxSizer* SheetInfoSizer; + SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetCount->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); + + + SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); + + m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetNumber->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( SheetInfoSizer, 0, 0, 5 ); - - wxStaticBoxSizer* RevisionSizer; + + wxStaticBoxSizer* RevisionSizer; RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision") ), wxHORIZONTAL ); - - m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextRevision->SetMinSize( wxSize( 100,-1 ) ); - - RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_RevisionExport = new wxCheckBox( this, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_TextRevision->SetMinSize( wxSize( 100,-1 ) ); + + RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_RevisionExport = new wxCheckBox( this, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); RevisionSizer->Add( m_RevisionExport, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + BasicInscriptionsSizer->Add( RevisionSizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* TitleSizer; + + wxStaticBoxSizer* TitleSizer; TitleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title") ), wxHORIZONTAL ); - - m_TextTitle = new wxTextCtrl( this, ID_TEXTCTRL_TITLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextTitle = new wxTextCtrl( this, ID_TEXTCTRL_TITLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextTitle->SetMinSize( wxSize( 360,-1 ) ); - - TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - TitleSizer->Add( m_TitleExport, 0, wxALL, 5 ); - + + TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + TitleSizer->Add( m_TitleExport, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* CompanySizer; + + wxStaticBoxSizer* CompanySizer; CompanySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Company") ), wxHORIZONTAL ); - - m_TextCompany = new wxTextCtrl( this, ID_TEXTCTRL_COMPANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextCompany = new wxTextCtrl( this, ID_TEXTCTRL_COMPANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextCompany->SetMinSize( wxSize( 360,-1 ) ); - - CompanySizer->Add( m_TextCompany, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_CompanyExport = new wxCheckBox( this, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - CompanySizer->Add( m_CompanyExport, 0, wxALL, 5 ); - + + CompanySizer->Add( m_TextCompany, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_CompanyExport = new wxCheckBox( this, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + CompanySizer->Add( m_CompanyExport, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment1Sizer; + + wxStaticBoxSizer* Comment1Sizer; Comment1Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment1") ), wxHORIZONTAL ); - - m_TextComment1 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextComment1 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextComment1->SetMinSize( wxSize( 360,-1 ) ); - - Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment1Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment1Sizer->Add( m_Comment1Export, 0, wxALL, 5 ); - + + Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment1Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + Comment1Sizer->Add( m_Comment1Export, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment2Sizer; + + wxStaticBoxSizer* Comment2Sizer; Comment2Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment2") ), wxHORIZONTAL ); - - m_TextComment2 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextComment2 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextComment2->SetMinSize( wxSize( 360,-1 ) ); - - Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment2Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment2Sizer->Add( m_Comment2Export, 0, wxALL, 5 ); - + + Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment2Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + Comment2Sizer->Add( m_Comment2Export, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment3Sizer; + + wxStaticBoxSizer* Comment3Sizer; Comment3Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment3") ), wxHORIZONTAL ); - - m_TextComment3 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextComment3 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextComment3->SetMinSize( wxSize( 360,-1 ) ); - - Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment3Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment3Sizer->Add( m_Comment3Export, 0, wxALL, 5 ); - + + Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment3Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + Comment3Sizer->Add( m_Comment3Export, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment4Sizer; + + wxStaticBoxSizer* Comment4Sizer; Comment4Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment4") ), wxHORIZONTAL ); - - m_TextComment4 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + + m_TextComment4 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextComment4->SetMinSize( wxSize( 360,-1 ) ); - - Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment4Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment4Sizer->Add( m_Comment4Export, 0, wxALL, 5 ); - + + Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + m_Comment4Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); + Comment4Sizer->Add( m_Comment4Export, 0, wxALL, 5 ); + BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 ); RightColumnSizer->Add( BasicInscriptionsSizer, 1, wxALL|wxEXPAND, 5 ); - - bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); + + bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); bMainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); m_paperSizeComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); m_orientationComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); m_TextUserSizeX->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeXTextUpdated ), NULL, this ); m_TextUserSizeY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this ); m_TextRevision->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnRevisionTextUpdated ), NULL, this ); m_TextTitle->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTitleTextUpdated ), NULL, this ); - m_TitleExport->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); + m_TitleExport->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); m_TextCompany->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCompanyTextUpdated ), NULL, this ); m_TextComment1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); m_TextComment2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); m_TextComment3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); m_TextComment4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); -} - -DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); +} + +DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() +{ + // Disconnect Events + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); m_paperSizeComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); m_orientationComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); m_TextUserSizeX->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeXTextUpdated ), NULL, this ); m_TextUserSizeY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this ); m_TextRevision->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnRevisionTextUpdated ), NULL, this ); m_TextTitle->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTitleTextUpdated ), NULL, this ); - m_TitleExport->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); + m_TitleExport->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this ); m_TextCompany->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCompanyTextUpdated ), NULL, this ); m_TextComment1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); m_TextComment2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); m_TextComment3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); m_TextComment4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); - -} + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); + +} diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index 4ff5659e2b..4e009d05ef 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -1,517 +1,517 @@ - - + + - - - C++ - 1 - source_name + + + C++ + 1 + source_name 0 - 0 - res - UTF-8 - connect - dialog_page_settings_base - 1000 - none - 1 - dialog_page_settings_base - - . - - 1 + 0 + res + UTF-8 + connect + dialog_page_settings_base + 1000 + none + 1 + dialog_page_settings_base + + . + + 1 1 - 1 - 0 - 0 - - 1 - 1 - 1 - 1 + 1 + 0 + 0 + + 1 + 1 + 1 + 1 - 0 - + 0 + - - - - 1 - - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - impl_virtual - - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - DIALOG_PAGES_SETTINGS_BASE - 1 - - - 1 - - Resizable - 1 + + + + 1 + + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + impl_virtual + + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + DIALOG_PAGES_SETTINGS_BASE + 1 + + + 1 + + Resizable + 1 748,495 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - Page Settings - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + Page Settings + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + -1,-1 - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bUpperSizerH - wxHORIZONTAL - none - - 5 + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizerH + wxHORIZONTAL + none + + 5 wxALL|wxEXPAND - 0 - - 1 - wxBOTH - - 0,1,2 - 0 - - LeftColumnSizer - wxFLEX_GROWMODE_SPECIFIED - none + 0 + + 1 + wxBOTH + + 0,1,2 + 0 + + LeftColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none 3 - 0 - - 5 + 0 + + 5 wxALL 1 - - wxID_ANY + + wxID_ANY Paper - + PaperSizer - wxVERTICAL - none - - - 5 + wxVERTICAL + none + + + 5 wxTOP|wxRIGHT|wxLEFT - 0 + 0 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY Size: - - 0 - - - 0 - - 1 + + 0 + + + 0 + + 1 m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - + 1 + + + protected + 1 + + Resizable + 1 + - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "A4 210x297mm" "A3 297x420mm" "A2 420x594mm" "A1 594x841mm" "A0 841x1189mm" "A 8.5x11in" "B 11x17in" "C 17x22in" "D 22x34in" "E 34x44in" "USLetter 8.5x11in" "USLegal 8.5x14in" "USLedger 11x17in" "User (Custom)" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHICE_PAGE_SIZE - - 0 - - - 0 - - 1 - m_paperSizeComboBox - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPaperSizeChoice - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Orientation: - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - "Landscape" "Portrait" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHOICE_PAGE_ORIENTATION - - 0 - - - 0 - - 1 - m_orientationComboBox - 1 - - - protected - 1 - - Resizable + + + + 1 + 0 + "dummy text" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHICE_PAGE_SIZE + + 0 + + + 0 + + 1 + m_paperSizeComboBox + 1 + + + protected + 1 + + Resizable 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPaperSizeChoice + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Orientation: + + 0 + + + 0 + + 1 + m_staticText6 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Landscape" "Portrait" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHOICE_PAGE_ORIENTATION + + 0 + + + 0 + + 1 + m_orientationComboBox + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnPageOrientationChoice - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + 5 @@ -520,12 +520,12 @@ 10 protected 0 - - - - 5 + + + + 5 wxEXPAND - 1 + 1 wxID_ANY Custom Size @@ -551,102 +551,102 @@ wxID_ANY Width: - + CustomPaperWidth - wxVERTICAL - none + wxVERTICAL + none - - 5 + + 5 wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND - 0 + 0 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 ID_TEXTCTRL_USER_PAGE_SIZE_X - - 0 - + + 0 + 6 - - 0 - - 1 + + 0 + + 1 m_TextUserSizeX - 1 - - - protected - 1 - - Resizable - 1 - + 1 + + + protected + 1 + + Resizable + 1 + wxTE_LEFT - - 0 + + 0 Custom paper width. - - wxFILTER_NONE + + wxFILTER_NONE wxTextValidator - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeXTextUpdated - - - + + + @@ -671,99 +671,99 @@ wxVERTICAL none - - 5 - wxALIGN_TOP|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 + + 5 + wxALIGN_TOP|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_USER_PAGE_SIZE_Y - - 0 - + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_USER_PAGE_SIZE_Y + + 0 + 6 - - 0 - - 1 - m_TextUserSizeY - 1 - - - protected - 1 - - Resizable - 1 - + + 0 + + 1 + m_TextUserSizeY + 1 + + + protected + 1 + + Resizable + 1 + wxTE_LEFT - - 0 + + 0 Custom paper height. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeYTextUpdated - - - - - - - - + + + + + + + + 5 @@ -885,30 +885,30 @@ 1 protected 0 - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - wxBOTH - 0 - 0,1,2,3,4,5,6,7 - 0 - - RightColumnSizer - wxFLEX_GROWMODE_SPECIFIED - none - 8 - 0 - - 5 + + + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + wxBOTH + 0 + 0,1,2,3,4,5,6,7 + 0 + + RightColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none + 8 + 0 + + 5 wxALL|wxEXPAND - 1 + 1 wxID_ANY Basic Inscriptions @@ -921,1581 +921,1581 @@ 5 0 - - - SheetInfoSizer - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + SheetInfoSizer + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Number of sheets: %d - - 0 - - - 0 - - 1 - m_TextSheetCount - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 5 - protected - 5 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Number of sheets: %d + + 0 + + + 0 + + 1 + m_TextSheetCount + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 5 + protected + 5 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Sheet number: %d - - 0 - - - 0 - - 1 - m_TextSheetNumber - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Sheet number: %d + + 0 + + + 0 + + 1 + m_TextSheetNumber + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Revision - - RevisionSizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_REVISION - - 0 - - 0 - - 0 - 100,-1 - 1 - m_TextRevision - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRevisionTextUpdated - - - - - - - - 5 + + RevisionSizer + wxHORIZONTAL + none + + + 5 wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_REVISION - Export to other sheets - - 0 - - - 0 - - 1 - m_RevisionExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_REVISION + + 0 + + 0 + + 0 + 100,-1 + 1 + m_TextRevision + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnRevisionTextUpdated + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_REVISION + Export to other sheets + + 0 + + + 0 + + 1 + m_RevisionExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Title - - TitleSizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + TitleSizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_TITLE - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_TITLE + + 0 + + 0 + + 0 360,-1 - 1 - m_TextTitle - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextTitle + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTitleTextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Export to other sheets - - 0 - - - 0 - - 1 - m_TitleExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnCheckboxTitleClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Export to other sheets + + 0 + + + 0 + + 1 + m_TitleExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnCheckboxTitleClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Company - - CompanySizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + CompanySizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMPANY - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMPANY + + 0 + + 0 + + 0 360,-1 - 1 - m_TextCompany - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextCompany + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnCompanyTextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMPANY - Export to other sheets - - 0 - - - 0 - - 1 - m_CompanyExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMPANY + Export to other sheets + + 0 + + + 0 + + 1 + m_CompanyExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Comment1 - - Comment1Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + Comment1Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT1 - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT1 + + 0 + + 0 + + 0 360,-1 - 1 - m_TextComment1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextComment1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment1TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT1 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment1Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT1 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment1Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Comment2 - - Comment2Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + Comment2Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT2 - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT2 + + 0 + + 0 + + 0 360,-1 - 1 - m_TextComment2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextComment2 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment2TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT2 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment2Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT2 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment2Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Comment3 - - Comment3Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + Comment3Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT3 - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT3 + + 0 + + 0 + + 0 360,-1 - 1 - m_TextComment3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextComment3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment3TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT3 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment3Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT3 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment3Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY Comment4 - - Comment4Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 + + Comment4Sizer + wxHORIZONTAL + none + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT4 - - 0 - - 0 - - 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT4 + + 0 + + 0 + + 0 360,-1 - 1 - m_TextComment4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_TextComment4 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment4TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 - + - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT4 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment4Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT4 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment4Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - 5 + + 5 wxALIGN_RIGHT|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - OnCancelClick - - - - OnOkClick - - - - - - - - + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelClick + + + + OnOkClick + + + + + + + + diff --git a/common/dialogs/dialog_page_settings_base.h b/common/dialogs/dialog_page_settings_base.h index a5299e8c2c..26a05da85d 100644 --- a/common/dialogs/dialog_page_settings_base.h +++ b/common/dialogs/dialog_page_settings_base.h @@ -1,37 +1,37 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 9 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Mar 17 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + #ifndef __DIALOG_PAGE_SETTINGS_BASE_H__ #define __DIALOG_PAGE_SETTINGS_BASE_H__ - + #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + #define ID_CHICE_PAGE_SIZE 1000 #define ID_CHOICE_PAGE_ORIENTATION 1001 #define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002 @@ -50,65 +50,65 @@ #define ID_CHECKBOX_COMMENT3 1015 #define ID_TEXTCTRL_COMMENT4 1016 #define ID_CHECKBOX_COMMENT4 1017 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_PAGES_SETTINGS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_PAGES_SETTINGS_BASE : public wxDialog -{ - private: - - protected: + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_PAGES_SETTINGS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_PAGES_SETTINGS_BASE : public wxDialog +{ + private: + + protected: wxStaticText* m_staticText5; - wxChoice* m_paperSizeComboBox; + wxChoice* m_paperSizeComboBox; wxStaticText* m_staticText6; - wxChoice* m_orientationComboBox; - wxTextCtrl* m_TextUserSizeX; - wxTextCtrl* m_TextUserSizeY; + wxChoice* m_orientationComboBox; + wxTextCtrl* m_TextUserSizeX; + wxTextCtrl* m_TextUserSizeY; wxStaticBitmap* m_PageLayoutExampleBitmap; - wxStaticText* m_TextSheetCount; - wxStaticText* m_TextSheetNumber; - wxTextCtrl* m_TextRevision; - wxCheckBox* m_RevisionExport; - wxTextCtrl* m_TextTitle; - wxCheckBox* m_TitleExport; - wxTextCtrl* m_TextCompany; - wxCheckBox* m_CompanyExport; - wxTextCtrl* m_TextComment1; - wxCheckBox* m_Comment1Export; - wxTextCtrl* m_TextComment2; - wxCheckBox* m_Comment2Export; - wxTextCtrl* m_TextComment3; - wxCheckBox* m_Comment3Export; - wxTextCtrl* m_TextComment4; - wxCheckBox* m_Comment4Export; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } + wxStaticText* m_TextSheetCount; + wxStaticText* m_TextSheetNumber; + wxTextCtrl* m_TextRevision; + wxCheckBox* m_RevisionExport; + wxTextCtrl* m_TextTitle; + wxCheckBox* m_TitleExport; + wxTextCtrl* m_TextCompany; + wxCheckBox* m_CompanyExport; + wxTextCtrl* m_TextComment1; + wxCheckBox* m_Comment1Export; + wxTextCtrl* m_TextComment2; + wxCheckBox* m_Comment2Export; + wxTextCtrl* m_TextComment3; + wxCheckBox* m_Comment3Export; + wxTextCtrl* m_TextComment4; + wxCheckBox* m_Comment4Export; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } virtual void OnPaperSizeChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnPageOrientationChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnRevisionTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnTitleTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCheckboxTitleClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCheckboxTitleClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCompanyTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment1TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Page Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 748,495 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_PAGES_SETTINGS_BASE(); - -}; - + ~DIALOG_PAGES_SETTINGS_BASE(); + +}; + #endif //__DIALOG_PAGE_SETTINGS_BASE_H__ diff --git a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp index 7ecf136108..67141c91dc 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_pin_base.fbp @@ -1,2383 +1,2383 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_lib_edit_pin_base - 1000 - none - 1 - dialog_lib_edit_pin - - . - - 1 - 1 - 1 - 1 - 0 - - 1 - 1 - 1 - 1 - - 0 - - - - - - - 1 - wxBOTH - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - impl_virtual - - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - DIALOG_LIB_EDIT_PIN_BASE - 1 - - - 1 - - Resizable - 1 - -1,-1 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Pin Properties - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - OnCloseDialog - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bUpperSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bLeftSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 2 - wxBOTH - 1 - - 0 - - fgSizerPins - wxFLEX_GROWMODE_ALL - none - 5 - 0 - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pin &name: - - 0 - - - 0 - - 1 - m_staticTextPinName - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_TEXTPINNAME - - 0 - - 0 - - 0 - - 1 - m_textPinName - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPropertiesChange - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICTEXTPADNAME - Pin n&umber: - - 0 - - - 0 - - 1 - m_staticTextPadName - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Pin number: 1 to 4 ASCII letters and/or digits - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_TEXTPADNAME - - 0 - - 0 - - 0 - - 1 - m_textPadName - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PROCESS_TAB - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPropertiesChange - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Orientation: - - 0 - - - 0 - - 1 - m_staticTextOrient - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceOrientation - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - wxBitmapComboBox; wx/bmpcbox.h - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Electrical type: - - 0 - - - 0 - - 1 - m_staticTextEType - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Used by the ERC. - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceElectricalType - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - wxBitmapComboBox; wx/bmpcbox.h - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Graphic &Style: - - 0 - - - 0 - - 1 - m_staticTextGstyle - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceStyle - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - wxBitmapComboBox; wx/bmpcbox.h - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 12 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - - boarderSizer - wxVERTICAL - none - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Sharing - - sbSizerPinSharing - wxVERTICAL - none - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Shared by all &parts in component - - 0 - - - 0 - - 1 - m_checkApplyToAllParts - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Shared by all body &styles (DeMorgan) - - 0 - - - 0 - - 1 - m_checkApplyToAllConversions - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Schematic Properties - - sbSizerSchematicProperties - wxVERTICAL - none - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Visible - - 0 - - - 0 - - 1 - m_checkShow - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPropertiesChange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxRIGHT - 1 - - - bRightSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 3 - wxBOTH - 1 - - 0 - - fgSizerTextsSizes - wxFLEX_GROWMODE_ALL - none - 3 - 0 - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICTEXTNAMESIZE - N&ame text size: - - 0 - - - 0 - - 1 - m_staticTextNameSize - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_TEXTPINNAMETEXTSIZE - - 0 - - 0 - - 0 - - 1 - m_textPinNameTextSize - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPropertiesChange - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICNAMETEXTSIZEUNITS - units - - 0 - - - 0 - -1,-1 - 1 - m_staticNameTextSizeUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICTEXTPADNAMESIZE - Number te&xt size: - - 0 - - - 0 - - 1 - m_staticTextPadNameSize - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_TEXTPADNAMETEXTSIZE - - 0 - - 0 - - 0 - - 1 - m_textPadNameTextSize - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPropertiesChange - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICNUMBERTEXTSIZEUNITS - units - - 0 - - - 0 - - 1 - m_staticNumberTextSizeUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICTEXTPINLEN - &Length: - - 0 - - - 0 - - 1 - m_staticTextPinLen - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_TEXTLENGTH - - 0 - - 0 - - 0 - - 1 - m_textLength - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPropertiesChange - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_M_STATICLENGTHUNITS - units - - 0 - - - 0 - - 1 - m_staticLengthUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND | wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 150,150 - 1 - m_panelShowPin - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - OnPaintShowPanel - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_RIGHT - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizerButtons - protected - - OnCancelButtonClick - - - - OnOKButtonClick - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_lib_edit_pin_base + 1000 + none + 1 + dialog_lib_edit_pin + + . + + 1 + 1 + 1 + 1 + 0 + + 1 + 1 + 1 + 1 + + 0 + + + + + + + 1 + wxBOTH + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + impl_virtual + + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + DIALOG_LIB_EDIT_PIN_BASE + 1 + + + 1 + + Resizable + 1 + -1,-1 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Pin Properties + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + OnCloseDialog + + + + + + + + + + + + + + + + + + + + + + + + + + + + + mainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + + bLeftSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 2 + wxBOTH + 1 + + 0 + + fgSizerPins + wxFLEX_GROWMODE_ALL + none + 5 + 0 + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Pin &name: + + 0 + + + 0 + + 1 + m_staticTextPinName + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_TEXTPINNAME + + 0 + + 0 + + 0 + + 1 + m_textPinName + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPropertiesChange + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICTEXTPADNAME + Pin n&umber: + + 0 + + + 0 + + 1 + m_staticTextPadName + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Pin number: 1 to 4 ASCII letters and/or digits + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_TEXTPADNAME + + 0 + + 0 + + 0 + + 1 + m_textPadName + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PROCESS_TAB + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPropertiesChange + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Orientation: + + 0 + + + 0 + + 1 + m_staticTextOrient + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceOrientation + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + wxBitmapComboBox; wx/bmpcbox.h + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Electrical type: + + 0 + + + 0 + + 1 + m_staticTextEType + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Used by the ERC. + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceElectricalType + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + wxBitmapComboBox; wx/bmpcbox.h + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Graphic &Style: + + 0 + + + 0 + + 1 + m_staticTextGstyle + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceStyle + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + wxBitmapComboBox; wx/bmpcbox.h + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 12 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + + boarderSizer + wxVERTICAL + none + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Sharing + + sbSizerPinSharing + wxVERTICAL + none + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Shared by all &parts in component + + 0 + + + 0 + + 1 + m_checkApplyToAllParts + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Shared by all body &styles (DeMorgan) + + 0 + + + 0 + + 1 + m_checkApplyToAllConversions + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Schematic Properties + + sbSizerSchematicProperties + wxVERTICAL + none + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Visible + + 0 + + + 0 + + 1 + m_checkShow + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPropertiesChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxRIGHT + 1 + + + bRightSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 3 + wxBOTH + 1 + + 0 + + fgSizerTextsSizes + wxFLEX_GROWMODE_ALL + none + 3 + 0 + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICTEXTNAMESIZE + N&ame text size: + + 0 + + + 0 + + 1 + m_staticTextNameSize + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_TEXTPINNAMETEXTSIZE + + 0 + + 0 + + 0 + + 1 + m_textPinNameTextSize + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPropertiesChange + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICNAMETEXTSIZEUNITS + units + + 0 + + + 0 + -1,-1 + 1 + m_staticNameTextSizeUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICTEXTPADNAMESIZE + Number te&xt size: + + 0 + + + 0 + + 1 + m_staticTextPadNameSize + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_TEXTPADNAMETEXTSIZE + + 0 + + 0 + + 0 + + 1 + m_textPadNameTextSize + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPropertiesChange + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICNUMBERTEXTSIZEUNITS + units + + 0 + + + 0 + + 1 + m_staticNumberTextSizeUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICTEXTPINLEN + &Length: + + 0 + + + 0 + + 1 + m_staticTextPinLen + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxBOTTOM|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_TEXTLENGTH + + 0 + + 0 + + 0 + + 1 + m_textLength + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPropertiesChange + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_M_STATICLENGTHUNITS + units + + 0 + + + 0 + + 1 + m_staticLengthUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 150,150 + 1 + m_panelShowPin + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER|wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + OnPaintShowPanel + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_RIGHT + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizerButtons + protected + + OnCancelButtonClick + + + + OnOKButtonClick + + + + + + + + diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp index 70b8cd660d..adb0857483 100644 --- a/eeschema/load_one_schematic_file.cpp +++ b/eeschema/load_one_schematic_file.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2004 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2004 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr * Copyright (C) 2008 Wayne Stambaugh * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. * @@ -305,7 +305,7 @@ bool ReadSchemaDescr( LINE_READER* aLine, wxString& aMsgDiag, SCH_SCREEN* aScree if( !pageInfo.SetType( pagename ) ) { aMsgDiag.Printf( _( "Eeschema file dimension definition error \ -line %d, \aAbort reading file.\n" ), +line %d,\nAbort reading file.\n" ), aLine->LineNumber() ); aMsgDiag << FROM_UTF8( line ); }