diff --git a/bitmaps_png/cpp_26/library_browse.cpp b/bitmaps_png/cpp_26/library_browse.cpp index 8a766655d4..faa9a2c633 100644 --- a/bitmaps_png/cpp_26/library_browse.cpp +++ b/bitmaps_png/cpp_26/library_browse.cpp @@ -6,62 +6,100 @@ #include static const unsigned char png[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x03, 0x40, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0xd6, 0x7b, 0x48, 0x53, - 0x51, 0x1c, 0x07, 0xf0, 0xe3, 0xdc, 0x76, 0xa7, 0xcb, 0x96, 0xcf, 0x0d, 0x2c, 0x8a, 0x35, 0xdc, - 0xdc, 0x9d, 0xee, 0x21, 0x49, 0x50, 0xa3, 0xe8, 0x6d, 0xa5, 0x69, 0xf8, 0x22, 0xd3, 0x96, 0x6e, - 0xda, 0xb4, 0xdc, 0x23, 0x30, 0xff, 0x48, 0x58, 0x2f, 0xd3, 0x3f, 0xb4, 0x3f, 0x0a, 0xc5, 0x22, - 0x4b, 0x4a, 0xff, 0x11, 0x2a, 0xcb, 0x1e, 0xff, 0x14, 0x92, 0x29, 0x14, 0x05, 0x86, 0x25, 0x41, - 0x62, 0xbe, 0x50, 0x7c, 0xcc, 0x2d, 0xb2, 0xd0, 0x60, 0xfe, 0xba, 0x67, 0x63, 0x6b, 0x75, 0x8d, - 0xa4, 0xee, 0x1f, 0xd1, 0x19, 0x5f, 0x06, 0xe3, 0x72, 0x3f, 0x9c, 0xdf, 0x39, 0xe7, 0x77, 0x86, - 0xd0, 0x7f, 0x3b, 0xf6, 0x08, 0xb9, 0x8a, 0xec, 0x70, 0xde, 0xb9, 0x03, 0x7e, 0x49, 0x0f, 0x27, - 0x8a, 0x23, 0xa5, 0x41, 0xa6, 0x9f, 0x13, 0x21, 0xe5, 0xe7, 0xfc, 0x39, 0x14, 0xc9, 0x3b, 0x54, - 0xb3, 0x8c, 0xb3, 0xf0, 0x80, 0xcb, 0x02, 0x6f, 0x72, 0xc3, 0x88, 0xa1, 0x28, 0x25, 0xff, 0xf3, - 0x9a, 0x33, 0xd1, 0xe0, 0xcb, 0xe9, 0x68, 0x10, 0x6a, 0x96, 0x8d, 0xfd, 0x15, 0xd4, 0xc2, 0x0b, - 0x5c, 0x18, 0x46, 0x08, 0xbc, 0xa1, 0xa0, 0x0f, 0xa2, 0xc4, 0x90, 0x19, 0xd9, 0x33, 0x19, 0xf8, - 0xf2, 0x54, 0x46, 0x87, 0xc4, 0x85, 0x02, 0x14, 0x5b, 0x90, 0xca, 0x92, 0x17, 0x1e, 0x5f, 0x32, - 0x34, 0xb6, 0x76, 0x2d, 0x38, 0xcc, 0x66, 0x1a, 0x74, 0xf2, 0xfd, 0x49, 0xc8, 0xed, 0xcd, 0xfd, - 0x0e, 0xc9, 0xf5, 0x5a, 0x36, 0x59, 0x52, 0xc5, 0x55, 0x99, 0xfa, 0xb8, 0x6a, 0xcb, 0xcc, 0xaa, - 0x94, 0x86, 0x29, 0x8e, 0xb2, 0xf4, 0x13, 0x8a, 0xcf, 0xe5, 0x2f, 0x09, 0x1a, 0x27, 0x49, 0xf8, - 0x58, 0x55, 0x45, 0x83, 0x6a, 0x07, 0x6b, 0xc1, 0xd8, 0x67, 0xf4, 0x41, 0xec, 0xf8, 0xa3, 0xa3, - 0x8a, 0x82, 0x76, 0x57, 0x52, 0xf5, 0x04, 0x64, 0x34, 0x80, 0x3b, 0x2b, 0xf7, 0xd6, 0x39, 0x50, - 0x8c, 0x21, 0x89, 0x51, 0x88, 0xab, 0x36, 0x37, 0xad, 0x3f, 0xfe, 0xc2, 0x87, 0xe0, 0x24, 0x9a, - 0xba, 0x17, 0x08, 0xb5, 0xa9, 0x9e, 0x51, 0x08, 0x49, 0xf5, 0xfb, 0x56, 0xa7, 0x5e, 0x71, 0x62, - 0xe0, 0xc8, 0x4d, 0x80, 0xfc, 0x26, 0x80, 0xe4, 0x0b, 0x4e, 0x20, 0xd4, 0xe6, 0x21, 0x86, 0xa1, - 0xfc, 0x10, 0x42, 0x63, 0x71, 0x43, 0x75, 0x1d, 0x00, 0xd7, 0xba, 0x3c, 0xb3, 0x0a, 0x5e, 0x57, - 0xe6, 0x40, 0xa4, 0x4e, 0xc4, 0x1c, 0x44, 0x0d, 0x0a, 0x7a, 0x87, 0xd7, 0xa8, 0x88, 0x9a, 0xd1, - 0xcb, 0x41, 0x0f, 0x24, 0xce, 0xba, 0x31, 0x8b, 0xe4, 0x86, 0x1c, 0x46, 0x21, 0xb6, 0xb2, 0xb4, - 0x5a, 0x5d, 0xfc, 0xc4, 0x85, 0x81, 0xfe, 0x49, 0x80, 0xec, 0x2b, 0x00, 0x1b, 0xcb, 0x5f, 0x03, - 0xa1, 0xb1, 0xde, 0x66, 0x14, 0xc2, 0x5b, 0x5c, 0xb8, 0xa3, 0xd6, 0x8e, 0xa1, 0x87, 0x6f, 0x00, - 0x2a, 0xda, 0x00, 0xd2, 0x2e, 0xcd, 0x01, 0x47, 0x75, 0x6c, 0xfa, 0xb7, 0xd0, 0x48, 0x70, 0x30, - 0x8c, 0x89, 0xc5, 0x4b, 0x83, 0x36, 0xdb, 0xd8, 0x1c, 0xe5, 0x31, 0x67, 0x7a, 0xbd, 0x0b, 0xaa, - 0x1f, 0x01, 0xb4, 0xbe, 0xf2, 0x94, 0x4f, 0xb0, 0xd1, 0x66, 0x47, 0x31, 0x85, 0xb2, 0x3f, 0xea, - 0x0c, 0xca, 0x6e, 0x25, 0x28, 0xba, 0x14, 0xb4, 0xce, 0xc0, 0xd3, 0x58, 0xbb, 0xb6, 0x9e, 0x1a, - 0x80, 0xbc, 0x46, 0x80, 0xb7, 0x63, 0x1e, 0x48, 0xae, 0xbb, 0x33, 0xc7, 0x22, 0x8d, 0x66, 0x46, - 0x5b, 0x10, 0xf5, 0x42, 0x2b, 0x79, 0xf8, 0xee, 0x3c, 0x06, 0x5a, 0x9e, 0x03, 0x64, 0x52, 0xdf, - 0x5b, 0x6c, 0xfd, 0xc0, 0x4b, 0xb0, 0x76, 0x32, 0xdb, 0xeb, 0xe4, 0x06, 0x72, 0x85, 0xf6, 0x94, - 0xdd, 0xff, 0xe0, 0xe2, 0x52, 0xe2, 0x92, 0xa2, 0x84, 0x42, 0x0e, 0xa3, 0x4d, 0x95, 0xa3, 0x2a, - 0x9d, 0xc6, 0x9b, 0xc0, 0x1f, 0x13, 0x6e, 0xaf, 0xb1, 0x23, 0x69, 0xc1, 0x06, 0x46, 0xa1, 0x20, - 0x8d, 0xb5, 0x4d, 0x5b, 0xde, 0xeb, 0x06, 0x6c, 0xf7, 0x00, 0x8a, 0x9b, 0x01, 0xd4, 0xc5, 0x8f, - 0x5d, 0x5c, 0x65, 0xe9, 0x79, 0x1a, 0x74, 0xd5, 0x56, 0x7e, 0xab, 0x25, 0x88, 0x0d, 0x13, 0x5a, - 0x2d, 0xcc, 0x18, 0x8d, 0x30, 0x1c, 0x10, 0xe0, 0x83, 0xc8, 0x2e, 0x12, 0x2e, 0x0e, 0x5d, 0x74, - 0x77, 0xf0, 0x45, 0xaf, 0x09, 0x52, 0x9f, 0x27, 0xc9, 0x6e, 0x9e, 0x3d, 0x7b, 0x1f, 0xdc, 0x63, - 0x7a, 0x16, 0x60, 0x57, 0xd5, 0x38, 0x75, 0x9e, 0x2c, 0x7d, 0x34, 0xe8, 0xfa, 0xd9, 0x8a, 0x76, - 0x0c, 0x7d, 0xed, 0xed, 0x75, 0x3f, 0x8c, 0xcf, 0x93, 0x17, 0x4a, 0xef, 0x49, 0x77, 0xff, 0xe6, - 0xa2, 0x3e, 0x71, 0x9d, 0x71, 0x8b, 0x40, 0x3a, 0x11, 0x3f, 0xf1, 0xc4, 0x8c, 0xb5, 0x15, 0xe0, - 0xcb, 0x3c, 0x40, 0xcf, 0x88, 0xa7, 0x7c, 0x84, 0xda, 0xea, 0x44, 0x92, 0x9c, 0xe5, 0x3f, 0x3c, - 0x9b, 0x2c, 0xe2, 0xeb, 0x70, 0xe9, 0x26, 0x77, 0xee, 0x04, 0x47, 0x59, 0x19, 0x0c, 0xb3, 0x58, - 0x3f, 0xcc, 0xa8, 0x71, 0xb4, 0x11, 0x2a, 0x07, 0x2a, 0x17, 0x9f, 0x11, 0x35, 0xa8, 0x7b, 0x69, - 0x04, 0x37, 0xd5, 0xac, 0xcb, 0xdf, 0xd7, 0x69, 0x55, 0x4a, 0xbd, 0x13, 0x49, 0x0d, 0x29, 0xcc, - 0xdd, 0xb0, 0xb8, 0xef, 0xa9, 0x2c, 0x97, 0x13, 0x4a, 0x3a, 0x16, 0xf0, 0x5a, 0x49, 0xb2, 0x9a, - 0x67, 0xf9, 0x54, 0x73, 0xc5, 0x38, 0x52, 0x14, 0xed, 0xa7, 0x41, 0xba, 0x30, 0xc2, 0x69, 0x0a, - 0x25, 0xc6, 0xbd, 0xc9, 0x8c, 0x20, 0x06, 0xa2, 0x62, 0xf9, 0xf3, 0xa2, 0x4d, 0x82, 0x29, 0xff, - 0x08, 0x95, 0xfc, 0x41, 0x5a, 0xed, 0x63, 0xf5, 0xbb, 0x03, 0xe3, 0x4a, 0x1c, 0x78, 0x63, 0x50, - 0x57, 0xc8, 0xc1, 0x5f, 0x76, 0xf0, 0x24, 0x09, 0x22, 0xd2, 0xa2, 0x43, 0xc2, 0xfd, 0xb3, 0x2d, - 0x14, 0x09, 0xa2, 0x65, 0x21, 0xe1, 0x3f, 0x27, 0x54, 0x1c, 0x2a, 0xa0, 0xbf, 0x21, 0x23, 0xf0, - 0x9f, 0xf8, 0x3b, 0xf7, 0x0d, 0xab, 0x1e, 0x04, 0x90, 0x4c, 0x9c, 0x2f, 0x52, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x05, 0xa0, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0xd6, 0x79, 0x50, 0x13, + 0x57, 0x00, 0x06, 0xf0, 0x8c, 0x80, 0xd0, 0x81, 0xd6, 0xd6, 0xb1, 0x5a, 0x47, 0x91, 0x96, 0xe9, + 0x28, 0x87, 0x16, 0x25, 0x41, 0x2e, 0x11, 0x51, 0x0e, 0x11, 0x39, 0x14, 0x89, 0x4a, 0xe5, 0x28, + 0xa0, 0xa8, 0x08, 0x82, 0x60, 0x08, 0x21, 0xa5, 0x34, 0x58, 0x8b, 0xe0, 0x85, 0xa0, 0x80, 0x4a, + 0xad, 0x05, 0xca, 0x25, 0x72, 0x4d, 0x05, 0x3c, 0x51, 0x29, 0x8d, 0xe1, 0x8e, 0x5c, 0x52, 0x01, + 0x01, 0x15, 0x82, 0x84, 0x80, 0x25, 0x20, 0x47, 0xf3, 0x75, 0xb3, 0x0a, 0x45, 0x9c, 0x11, 0xda, + 0xfa, 0x57, 0xdf, 0xcc, 0x37, 0xb3, 0x9b, 0xdd, 0xb7, 0xbf, 0xbc, 0x73, 0x97, 0x42, 0xf9, 0xdf, + 0x96, 0xe0, 0x45, 0x8a, 0x2e, 0x1c, 0x65, 0xc5, 0x8b, 0x13, 0xb3, 0x57, 0xed, 0x83, 0x7d, 0x1a, + 0x76, 0x73, 0x8e, 0x6a, 0xda, 0xcf, 0x3d, 0x3e, 0x31, 0x6a, 0x96, 0x73, 0xac, 0xff, 0x35, 0x44, + 0x3c, 0x38, 0xff, 0xa6, 0xa2, 0x2c, 0x4a, 0xe5, 0x65, 0xc8, 0x5c, 0x55, 0x92, 0x43, 0x88, 0xd6, + 0x7c, 0x9e, 0x86, 0xe7, 0xfc, 0x7e, 0xf5, 0x73, 0xaa, 0x18, 0xcf, 0x21, 0x65, 0x68, 0xd0, 0xe7, + 0x25, 0xfd, 0x27, 0x88, 0x2f, 0x37, 0x03, 0x6d, 0x14, 0x0a, 0x99, 0xf2, 0x99, 0x32, 0x88, 0xdd, + 0x6a, 0x3e, 0xac, 0x1e, 0xb8, 0x50, 0xa4, 0x56, 0xac, 0x86, 0xf1, 0x24, 0xaa, 0xbe, 0x0e, 0x85, + 0x86, 0xce, 0xa0, 0x98, 0xa7, 0x53, 0x65, 0xd7, 0x67, 0xb2, 0x65, 0x2c, 0x2f, 0xbb, 0x4d, 0x1b, + 0x12, 0xba, 0xbb, 0x43, 0xb0, 0x66, 0x0d, 0x09, 0x9d, 0xb4, 0xd2, 0xef, 0x22, 0xa1, 0x22, 0x35, + 0xc4, 0x16, 0xc5, 0x62, 0x45, 0xf4, 0x0a, 0x68, 0x86, 0x2e, 0x81, 0xfa, 0xc6, 0x25, 0x85, 0x32, + 0x16, 0x97, 0x76, 0x2a, 0x58, 0xe5, 0x5e, 0x95, 0xb3, 0xcc, 0x12, 0xcd, 0xa6, 0xdf, 0xe8, 0x56, + 0xf7, 0xe6, 0x8f, 0xc8, 0x5b, 0xe5, 0x3c, 0x98, 0x36, 0xd4, 0xe3, 0xed, 0x8d, 0x2e, 0x0b, 0x0b, + 0x12, 0x0a, 0x5d, 0xbd, 0xb4, 0x49, 0xcb, 0x4e, 0xe3, 0x05, 0xcd, 0x90, 0x06, 0x2a, 0x95, 0x0a, + 0x3d, 0x43, 0x3d, 0x50, 0x69, 0x54, 0xf2, 0xf8, 0x8b, 0x95, 0xeb, 0x24, 0x06, 0xee, 0x3f, 0x62, + 0xf3, 0x99, 0x11, 0x38, 0xc4, 0x83, 0x0c, 0x01, 0xf5, 0x52, 0xd6, 0x64, 0x7d, 0xf8, 0x8f, 0xa0, + 0xec, 0x59, 0x4a, 0x30, 0xa0, 0x69, 0x0f, 0x6f, 0xb0, 0xb5, 0x94, 0x24, 0xde, 0x4e, 0x42, 0x67, + 0x5f, 0x17, 0x2a, 0xfa, 0xaa, 0x50, 0xd6, 0x51, 0x8e, 0xb2, 0x9a, 0xf2, 0xee, 0xc3, 0x51, 0x89, + 0xc3, 0xfa, 0x06, 0xab, 0x60, 0x64, 0xe7, 0x0d, 0xfb, 0x18, 0x31, 0x09, 0xa9, 0xb8, 0xdd, 0xeb, + 0xa3, 0xac, 0x4b, 0xb3, 0x9b, 0x36, 0x54, 0x63, 0x66, 0x06, 0x93, 0xe5, 0xcb, 0x71, 0xd0, 0xdb, + 0x6b, 0xb0, 0xac, 0xa9, 0x74, 0x34, 0xf9, 0x49, 0x1a, 0xea, 0x44, 0x4d, 0x60, 0xd5, 0x71, 0xe0, + 0x5f, 0xc4, 0xc4, 0x99, 0xcc, 0x73, 0x15, 0xc5, 0xf7, 0x85, 0xbd, 0x45, 0x15, 0x4f, 0x25, 0x16, + 0x56, 0x76, 0xd8, 0xe0, 0xe8, 0x0b, 0x7a, 0xbc, 0x04, 0x7a, 0xec, 0x36, 0x28, 0x58, 0xe5, 0x24, + 0x4e, 0x1b, 0xf2, 0x35, 0x30, 0x80, 0xb3, 0x8d, 0x0d, 0xda, 0x6a, 0xf9, 0x7d, 0xc7, 0xf3, 0x8f, + 0x0e, 0x32, 0xea, 0xbe, 0x06, 0xbf, 0xa7, 0x11, 0xcc, 0x5a, 0x0e, 0xfc, 0x6e, 0x31, 0x11, 0x76, + 0x21, 0x92, 0x7b, 0x9b, 0x2f, 0x1c, 0x3c, 0x9b, 0xff, 0xf4, 0xc5, 0xad, 0xaa, 0x4e, 0xd0, 0x68, + 0x34, 0xb8, 0x84, 0x15, 0xc0, 0x36, 0x7a, 0x08, 0x33, 0x2d, 0xb3, 0x3b, 0xa6, 0x05, 0xfd, 0xee, + 0xe9, 0x09, 0x1d, 0xa2, 0x62, 0x79, 0x4a, 0x0a, 0x78, 0x97, 0xd3, 0x1e, 0xb3, 0xd2, 0x59, 0xe2, + 0x80, 0x5a, 0x36, 0xaa, 0x84, 0x8d, 0x60, 0xdc, 0xe7, 0x60, 0xff, 0x0d, 0x26, 0xbe, 0x4d, 0x88, + 0xe4, 0x3e, 0x11, 0x0e, 0xf7, 0x6f, 0x3f, 0x5c, 0x3e, 0x78, 0xb7, 0x51, 0x82, 0xb0, 0xa3, 0x71, + 0xb0, 0x76, 0xf8, 0x8a, 0xec, 0x3e, 0x25, 0xdb, 0x2b, 0x3d, 0x94, 0xf5, 0x29, 0x9f, 0x4e, 0x09, + 0x65, 0x6c, 0xdb, 0x06, 0xdd, 0x95, 0x2b, 0x21, 0xe2, 0x72, 0x91, 0x1d, 0xce, 0x69, 0x60, 0xa6, + 0x05, 0x89, 0x0f, 0xd4, 0xb0, 0x51, 0xf1, 0xac, 0x11, 0x01, 0x7c, 0x0e, 0xbc, 0xaf, 0x33, 0x11, + 0x72, 0x3e, 0x82, 0x2b, 0x10, 0x8d, 0xf6, 0x3b, 0x47, 0x54, 0xb7, 0x9f, 0xbd, 0x29, 0x46, 0xde, + 0x9d, 0x06, 0xe8, 0xe8, 0xe8, 0x90, 0x63, 0xb5, 0xd8, 0xab, 0x6a, 0x40, 0xc6, 0x2c, 0xc3, 0x63, + 0x4a, 0x28, 0x7e, 0xf3, 0x66, 0xd8, 0x12, 0x93, 0xa1, 0xf7, 0xce, 0x5d, 0x64, 0x70, 0xd8, 0x0d, + 0x8c, 0xd4, 0x20, 0xb1, 0x2f, 0x9f, 0x8d, 0xb2, 0xae, 0x46, 0x1c, 0xa8, 0xe6, 0xc0, 0xeb, 0x6a, + 0x20, 0xd8, 0xf1, 0x11, 0xdc, 0x8e, 0x9e, 0xd1, 0x7e, 0xbf, 0xb8, 0xfa, 0x5c, 0xf6, 0xcf, 0x9d, + 0x7f, 0x16, 0x55, 0x75, 0x91, 0x33, 0xd1, 0xe1, 0x58, 0x2b, 0x8c, 0xc3, 0x04, 0x50, 0xd8, 0x98, + 0x53, 0x30, 0x25, 0x94, 0xa0, 0xa2, 0x82, 0x55, 0xba, 0x7a, 0xe8, 0x2d, 0xe1, 0x22, 0x2d, 0x94, + 0xdd, 0x10, 0x90, 0x1c, 0x24, 0xf6, 0xa9, 0x66, 0x83, 0x2b, 0xa8, 0xc7, 0xfe, 0xca, 0x50, 0xec, + 0x29, 0x0c, 0x44, 0x50, 0x5c, 0x04, 0xf7, 0x49, 0xf7, 0x48, 0x7f, 0x54, 0x66, 0xdb, 0x61, 0xe6, + 0x85, 0xa6, 0x81, 0x02, 0x6e, 0x3b, 0x09, 0xb1, 0xd3, 0x85, 0xc4, 0x74, 0x1f, 0x85, 0xdc, 0xfa, + 0xac, 0x5e, 0x72, 0x21, 0xbf, 0x0d, 0xba, 0xae, 0xa8, 0x48, 0x56, 0x6a, 0x2e, 0x28, 0x44, 0x7e, + 0xec, 0x99, 0x16, 0xbf, 0xa4, 0x20, 0xf1, 0xbe, 0xca, 0x60, 0xec, 0xad, 0x08, 0xc6, 0xee, 0xf2, + 0x60, 0x78, 0x16, 0x30, 0x10, 0x78, 0x3a, 0x9c, 0xdb, 0xfe, 0x6c, 0xa4, 0x3f, 0xbf, 0x5c, 0xec, + 0x19, 0x9b, 0xd7, 0x3a, 0x14, 0xfd, 0x53, 0x21, 0x56, 0x99, 0x58, 0x22, 0xab, 0x52, 0x42, 0x8e, + 0xd3, 0x6c, 0xfa, 0x75, 0x21, 0xc5, 0xf4, 0xd2, 0x8a, 0xb7, 0x42, 0xad, 0xc4, 0xf6, 0x63, 0xbd, + 0x6c, 0x19, 0x4e, 0xf8, 0x07, 0xa0, 0x91, 0xc7, 0x13, 0xfa, 0x25, 0xb1, 0xc4, 0x63, 0xc8, 0xae, + 0x32, 0x16, 0x76, 0x5e, 0x61, 0x20, 0x20, 0x26, 0x9c, 0xdb, 0xda, 0x35, 0xd2, 0x5f, 0x52, 0x3f, + 0xc8, 0xfc, 0xad, 0xb6, 0xbb, 0x6f, 0xad, 0xb9, 0x35, 0xcc, 0x3d, 0xa2, 0x10, 0x73, 0xeb, 0xe5, + 0xc2, 0x5d, 0xe6, 0x57, 0x3f, 0x22, 0x6b, 0x91, 0xc9, 0x9a, 0x72, 0xaf, 0xcb, 0x9c, 0x35, 0x0b, + 0x34, 0xa2, 0x55, 0xb9, 0xa9, 0xa9, 0x7f, 0x5c, 0xbb, 0x5f, 0x34, 0xec, 0x5f, 0x75, 0x08, 0xbb, + 0x4a, 0x59, 0xf0, 0xe0, 0xb1, 0xe0, 0xfe, 0x0b, 0x03, 0x7e, 0xd1, 0xe1, 0xdc, 0x16, 0xc1, 0x30, + 0xbf, 0xbb, 0x77, 0xb8, 0xc4, 0xdb, 0x2f, 0x48, 0xa4, 0xad, 0xbb, 0x5a, 0x62, 0x7f, 0xaa, 0x6f, + 0x7c, 0x87, 0x30, 0x3b, 0x22, 0x22, 0xd6, 0x53, 0x6e, 0xd9, 0xb4, 0x36, 0x55, 0xce, 0xc2, 0x05, + 0x64, 0x17, 0x7e, 0x7f, 0x3a, 0x62, 0xb4, 0xb8, 0xa3, 0x14, 0xd9, 0x8f, 0xaf, 0xe1, 0x87, 0xe6, + 0x4c, 0x5c, 0xe4, 0x67, 0xa2, 0xa4, 0xa6, 0xea, 0xe9, 0xc3, 0x56, 0x41, 0xd9, 0x4e, 0x4f, 0xaf, + 0x76, 0xe9, 0x3d, 0xd4, 0x95, 0x86, 0x92, 0xc0, 0x84, 0x3a, 0x1c, 0xbb, 0x06, 0x30, 0x2f, 0x83, + 0x58, 0xbc, 0x80, 0xdc, 0x86, 0xec, 0x3e, 0x8a, 0x7e, 0xfa, 0x7b, 0x6f, 0x40, 0x87, 0x3e, 0x9b, + 0x75, 0x75, 0xf2, 0xee, 0xed, 0xa8, 0xae, 0x5c, 0x4b, 0xd5, 0xd7, 0x96, 0xe8, 0x19, 0xea, 0xc3, + 0xeb, 0x1b, 0x1f, 0x62, 0xfd, 0x84, 0x83, 0x7d, 0x8a, 0x83, 0x2f, 0x5d, 0x9c, 0x06, 0xa4, 0x00, + 0x8d, 0xa6, 0xc3, 0x33, 0x35, 0x35, 0x3d, 0x41, 0x25, 0xd6, 0x1d, 0x71, 0x0c, 0x3d, 0x03, 0x23, + 0x70, 0xa2, 0x52, 0x70, 0x9c, 0x00, 0x95, 0x5d, 0x8b, 0x7b, 0x28, 0x66, 0x19, 0xeb, 0xde, 0x80, + 0x2e, 0xd2, 0xd7, 0xf7, 0x4b, 0x21, 0xd1, 0xc1, 0x83, 0xe8, 0x76, 0x74, 0x24, 0x21, 0x86, 0xaa, + 0xd2, 0x4d, 0xb5, 0x00, 0xe5, 0x5e, 0xa3, 0x18, 0x23, 0x78, 0x30, 0x3d, 0xb0, 0xd6, 0x65, 0x2d, + 0x56, 0x38, 0x68, 0x41, 0x6b, 0xb5, 0x46, 0x3d, 0x01, 0x99, 0x48, 0xeb, 0x01, 0xd0, 0x59, 0xbb, + 0x61, 0xcb, 0x73, 0xb2, 0x65, 0xaf, 0x12, 0x7e, 0xe2, 0x2c, 0x7c, 0x2e, 0x74, 0x4a, 0x94, 0x6c, + 0x72, 0xa2, 0x5f, 0x43, 0x88, 0x9b, 0x17, 0x25, 0x3b, 0xd9, 0xa1, 0x6e, 0xc1, 0x27, 0x90, 0x96, + 0xd1, 0xce, 0xce, 0x71, 0x48, 0xfa, 0x9a, 0x88, 0x6c, 0x89, 0x24, 0x7f, 0xe7, 0xf5, 0xf2, 0xc8, + 0xf7, 0x91, 0xae, 0xeb, 0xe2, 0x2c, 0xe2, 0x94, 0x45, 0x44, 0x9d, 0x88, 0xe6, 0x4e, 0x9f, 0x90, + 0x5f, 0x27, 0x42, 0xd2, 0xb8, 0xfa, 0x9f, 0x84, 0xd3, 0x91, 0x52, 0x21, 0x71, 0x5d, 0x6e, 0x22, + 0xa4, 0x92, 0xbc, 0xc3, 0x56, 0x22, 0x6d, 0x51, 0x37, 0x9d, 0x0e, 0x81, 0x89, 0xc9, 0x6b, 0x90, + 0xfe, 0x3d, 0x7d, 0x9c, 0x7f, 0x7c, 0x1e, 0xf4, 0x6a, 0x3a, 0x09, 0xed, 0x09, 0xdf, 0x21, 0xc0, + 0xcb, 0x52, 0x27, 0x7d, 0xd0, 0x83, 0x56, 0x91, 0x8b, 0xe5, 0x36, 0xdf, 0x91, 0xc9, 0x98, 0xb5, + 0x4b, 0x10, 0xea, 0x9a, 0x45, 0xce, 0xc4, 0x3d, 0xf2, 0xe3, 0xd8, 0x31, 0x6d, 0x55, 0xde, 0xe4, + 0x31, 0x1a, 0x83, 0x26, 0xbf, 0x61, 0xdd, 0xc2, 0xb6, 0x34, 0xbf, 0x82, 0x0a, 0x5f, 0xfd, 0x51, + 0x79, 0xa7, 0x88, 0xd2, 0x8e, 0xad, 0xbb, 0xc3, 0x30, 0x19, 0x73, 0x76, 0xf3, 0x2c, 0x26, 0xae, + 0xff, 0x3d, 0x56, 0x21, 0x8b, 0x94, 0x2e, 0x71, 0x16, 0x2a, 0x3e, 0xfb, 0x6e, 0x81, 0x62, 0xa7, + 0x34, 0x1c, 0x65, 0xa5, 0x6e, 0xff, 0xcf, 0xdf, 0xbf, 0xa2, 0x6e, 0xf3, 0xf1, 0x80, 0xa6, 0xc3, + 0xbc, 0x9e, 0xb1, 0x68, 0x6c, 0x9a, 0xfb, 0x7c, 0xa9, 0xfd, 0xbc, 0x04, 0xa2, 0xb2, 0x01, 0x11, + 0x85, 0xb1, 0xfa, 0x1f, 0x6d, 0xca, 0x8b, 0x70, 0x8e, 0x28, 0x6b, 0xa1, 0xbb, 0x1e, 0x78, 0x38, + 0x09, 0x93, 0x3c, 0x7a, 0xf4, 0x68, 0xdf, 0x3b, 0xfd, 0x92, 0x92, 0x76, 0x23, 0x11, 0x2b, 0x2f, + 0x2f, 0xaf, 0xbc, 0x31, 0xc8, 0xd8, 0xd8, 0xb8, 0x6b, 0x68, 0x68, 0x68, 0xfb, 0x3b, 0xff, 0x6c, + 0x23, 0x20, 0x59, 0x22, 0xe6, 0x71, 0x71, 0x71, 0x27, 0x19, 0x0c, 0x46, 0x6a, 0x65, 0x65, 0xa5, + 0xaf, 0x74, 0xb2, 0xfd, 0x05, 0xab, 0xa6, 0xfb, 0xb3, 0x81, 0xb6, 0xf0, 0x0e, 0x00, 0x00, 0x00, + 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE library_browse_xpm[1] = {{ png, sizeof( png ), "library_browse_xpm" }}; diff --git a/pcbnew/dialogs/dialog_exchange_modules.cpp b/pcbnew/dialogs/dialog_exchange_modules.cpp index a1a47db8fe..150da70c46 100644 --- a/pcbnew/dialogs/dialog_exchange_modules.cpp +++ b/pcbnew/dialogs/dialog_exchange_modules.cpp @@ -63,6 +63,11 @@ DIALOG_EXCHANGE_MODULE::DIALOG_EXCHANGE_MODULE( PCB_EDIT_FRAME* parent, MODULE* m_updateMode = updateMode; init( m_updateMode ); + + // DIALOG_SHIM needs a unique hash_key because classname is not sufficient + // because the update and change versions of this dialog have different controls. + m_hash_key = TO_UTF8( GetTitle() ); + GetSizer()->Fit( this ); GetSizer()->SetSizeHints( this ); Center(); @@ -80,11 +85,9 @@ void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) { SetFocus(); - // fetch title and mode strings out of the dialog (so they can be easily localized) - wxString title = updateMode ? m_updateModeTitle->GetLabel() : m_exchangeModeTitle->GetLabel(); - wxString verb = updateMode ? m_updateModeVerb->GetLabel() : m_exchangeModeVerb->GetLabel(); + wxString title = updateMode ? _( "Update Footprints from Library" ) : _( "Change Footprints" ); + wxString verb = updateMode ? _( "Update" ) : _( "Change" ); wxString label; - m_localizationSizer->Show( false ); SetTitle( title ); @@ -97,7 +100,7 @@ void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) } else { - m_allSizer->Show( false ); + m_upperSizer->FindItem( m_matchAll )->Show( false ); if( m_currentModule ) m_newID->AppendText( FROM_UTF8( m_currentModule->GetFPID().Format().c_str() ) ); @@ -106,24 +109,26 @@ void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) if( m_currentModule ) { - m_specifiedRefSizer->Show( false ); + m_upperSizer->FindItem( m_matchSpecifiedRef )->Show( false ); + m_upperSizer->FindItem( m_specifiedRef )->Show( false ); label.Printf( m_matchCurrentRef->GetLabel(), verb, m_currentModule->GetReference() ); m_matchCurrentRef->SetLabel( label ); - m_specifiedValueSizer->Show( false ); + m_upperSizer->FindItem( m_matchSpecifiedValue )->Show( false ); + m_upperSizer->FindItem( m_specifiedValue )->Show( false ); label.Printf( m_matchCurrentValue->GetLabel(), verb, m_currentModule->GetValue() ); m_matchCurrentValue->SetLabel( label ); } else { - m_currentRefSizer->Show( false ); + m_upperSizer->FindItem( m_matchCurrentRef )->Show( false ); label.Printf( m_matchSpecifiedRef->GetLabel(), verb ); m_matchSpecifiedRef->SetLabel( label ); - m_currentValueSizer->Show( false ); + m_upperSizer->FindItem( m_matchCurrentValue )->Show( false ); label.Printf( m_matchSpecifiedValue->GetLabel(), verb ); m_matchSpecifiedValue->SetLabel( label ); @@ -131,10 +136,14 @@ void DIALOG_EXCHANGE_MODULE::init( bool updateMode ) label.Printf( m_matchSpecifiedID->GetLabel(), verb ); m_matchSpecifiedID->SetLabel( label ); + if( m_currentModule ) m_specifiedID->AppendText( FROM_UTF8( m_currentModule->GetFPID().Format().c_str() ) ); m_specifiedIDBrowseButton->SetBitmap( KiBitmap( library_browse_xpm ) ); + m_upperSizer->SetEmptyCellSize( wxSize( 0, 0 ) ); + m_upperSizer->RecalcSizes(); + // initialize match-mode wxCommandEvent event; switch( getMatchMode() ) @@ -228,7 +237,7 @@ wxRadioButton* DIALOG_EXCHANGE_MODULE::getRadioButtonForMode() } -void DIALOG_EXCHANGE_MODULE::updateMatchModeRadioButtons() +void DIALOG_EXCHANGE_MODULE::updateMatchModeRadioButtons( wxUpdateUIEvent& ) { wxRadioButton* button = getRadioButtonForMode(); @@ -244,14 +253,12 @@ void DIALOG_EXCHANGE_MODULE::updateMatchModeRadioButtons() void DIALOG_EXCHANGE_MODULE::OnMatchAllClicked( wxCommandEvent& event ) { setMatchMode( wxID_MATCH_FP_ALL ); - updateMatchModeRadioButtons(); m_matchAll->SetFocus(); } void DIALOG_EXCHANGE_MODULE::OnMatchRefClicked( wxCommandEvent& event ) { setMatchMode( wxID_MATCH_FP_REF ); - updateMatchModeRadioButtons(); if( m_specifiedRef->IsShown() && event.GetEventObject() != m_specifiedRef ) m_specifiedRef->SetFocus(); @@ -261,7 +268,6 @@ void DIALOG_EXCHANGE_MODULE::OnMatchRefClicked( wxCommandEvent& event ) void DIALOG_EXCHANGE_MODULE::OnMatchValueClicked( wxCommandEvent& event ) { setMatchMode( wxID_MATCH_FP_VAL ); - updateMatchModeRadioButtons(); if( m_specifiedValue->IsShown() && event.GetEventObject() != m_specifiedValue ) m_specifiedValue->SetFocus(); @@ -271,7 +277,6 @@ void DIALOG_EXCHANGE_MODULE::OnMatchValueClicked( wxCommandEvent& event ) void DIALOG_EXCHANGE_MODULE::OnMatchIDClicked( wxCommandEvent& event ) { setMatchMode( wxID_MATCH_FP_ID ); - updateMatchModeRadioButtons(); if( m_specifiedID->IsShown() && event.GetEventObject() != m_specifiedID ) m_specifiedID->SetFocus(); diff --git a/pcbnew/dialogs/dialog_exchange_modules.h b/pcbnew/dialogs/dialog_exchange_modules.h index 0836617645..b187db0d02 100644 --- a/pcbnew/dialogs/dialog_exchange_modules.h +++ b/pcbnew/dialogs/dialog_exchange_modules.h @@ -48,6 +48,7 @@ public: ~DIALOG_EXCHANGE_MODULE() { }; private: + void updateMatchModeRadioButtons( wxUpdateUIEvent& event ) override; void OnMatchAllClicked( wxCommandEvent& event ) override; void OnMatchRefClicked( wxCommandEvent& event ) override; void OnMatchValueClicked( wxCommandEvent& event ) override; @@ -63,7 +64,6 @@ private: void setMatchMode( int aMatchMode ); wxRadioButton* getRadioButtonForMode(); - void updateMatchModeRadioButtons(); bool isMatch( MODULE* ); bool changeCurrentFootprint(); diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.cpp b/pcbnew/dialogs/dialog_exchange_modules_base.cpp index 9aa99d1a3a..3d647416e3 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_modules_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "wx_html_report_panel.h" @@ -15,147 +15,108 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); + m_mainSizer = new wxBoxSizer( wxVERTICAL ); - m_localizationSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_updateModeTitle = new wxStaticText( this, wxID_ANY, _("Update Footprints from Library"), wxDefaultPosition, wxDefaultSize, 0 ); - m_updateModeTitle->Wrap( -1 ); - m_localizationSizer->Add( m_updateModeTitle, 0, wxALL, 5 ); - - m_exchangeModeTitle = new wxStaticText( this, wxID_ANY, _("Change Footprints"), wxDefaultPosition, wxDefaultSize, 0 ); - m_exchangeModeTitle->Wrap( -1 ); - m_localizationSizer->Add( m_exchangeModeTitle, 0, wxALL, 5 ); - - m_updateModeVerb = new wxStaticText( this, wxID_ANY, _("Update"), wxDefaultPosition, wxDefaultSize, 0 ); - m_updateModeVerb->Wrap( -1 ); - m_localizationSizer->Add( m_updateModeVerb, 0, wxALL, 5 ); - - m_exchangeModeVerb = new wxStaticText( this, wxID_ANY, _("Change"), wxDefaultPosition, wxDefaultSize, 0 ); - m_exchangeModeVerb->Wrap( -1 ); - m_localizationSizer->Add( m_exchangeModeVerb, 0, wxALL, 5 ); - - - mainSizer->Add( m_localizationSizer, 0, 0, 5 ); - - wxBoxSizer* bUpperSizer; - bUpperSizer = new wxBoxSizer( wxVERTICAL ); - - m_allSizer = new wxBoxSizer( wxHORIZONTAL ); + m_upperSizer = new wxGridBagSizer( 0, 0 ); + m_upperSizer->SetFlexibleDirection( wxBOTH ); + m_upperSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_matchAll = new wxRadioButton( this, wxID_MATCH_FP_ALL, _("%s all footprints on board"), wxDefaultPosition, wxDefaultSize, 0 ); m_matchAll->SetValue( true ); m_matchAll->SetMinSize( wxSize( -1,26 ) ); - m_allSizer->Add( m_matchAll, 0, wxALL, 2 ); - - - bUpperSizer->Add( m_allSizer, 29, wxEXPAND, 5 ); - - m_currentRefSizer = new wxBoxSizer( wxHORIZONTAL ); + m_upperSizer->Add( m_matchAll, wxGBPosition( 0, 0 ), wxGBSpan( 1, 2 ), wxLEFT|wxRIGHT|wxEXPAND, 5 ); m_matchCurrentRef = new wxRadioButton( this, wxID_MATCH_FP_REF, _("%s current footprint (%s)"), wxDefaultPosition, wxDefaultSize, 0 ); m_matchCurrentRef->SetMinSize( wxSize( -1,26 ) ); - m_currentRefSizer->Add( m_matchCurrentRef, 0, wxALL, 2 ); - - - bUpperSizer->Add( m_currentRefSizer, 31, wxEXPAND, 5 ); - - m_specifiedRefSizer = new wxBoxSizer( wxHORIZONTAL ); + m_upperSizer->Add( m_matchCurrentRef, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxLEFT|wxRIGHT|wxEXPAND, 5 ); m_matchSpecifiedRef = new wxRadioButton( this, wxID_MATCH_FP_REF, _("%s footprint with reference:"), wxDefaultPosition, wxDefaultSize, 0 ); m_matchSpecifiedRef->SetMinSize( wxSize( -1,26 ) ); - m_specifiedRefSizer->Add( m_matchSpecifiedRef, 0, wxALL, 2 ); + m_upperSizer->Add( m_matchSpecifiedRef, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); m_specifiedRef = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_specifiedRefSizer->Add( m_specifiedRef, 1, wxALL, 3 ); - - - bUpperSizer->Add( m_specifiedRefSizer, 0, wxEXPAND, 5 ); - - m_currentValueSizer = new wxBoxSizer( wxHORIZONTAL ); + m_upperSizer->Add( m_specifiedRef, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxTOP|wxEXPAND, 5 ); m_matchCurrentValue = new wxRadioButton( this, wxID_MATCH_FP_VAL, _("%s footprints with matching value (%s)"), wxDefaultPosition, wxDefaultSize, 0 ); m_matchCurrentValue->SetMinSize( wxSize( -1,26 ) ); - m_currentValueSizer->Add( m_matchCurrentValue, 0, wxALL, 2 ); - - - bUpperSizer->Add( m_currentValueSizer, 31, wxEXPAND, 5 ); - - m_specifiedValueSizer = new wxBoxSizer( wxHORIZONTAL ); + m_upperSizer->Add( m_matchCurrentValue, wxGBPosition( 3, 0 ), wxGBSpan( 1, 2 ), wxLEFT|wxRIGHT|wxEXPAND, 5 ); m_matchSpecifiedValue = new wxRadioButton( this, wxID_MATCH_FP_VAL, _("%s footprints with value:"), wxDefaultPosition, wxDefaultSize, 0 ); m_matchSpecifiedValue->SetMinSize( wxSize( -1,26 ) ); - m_specifiedValueSizer->Add( m_matchSpecifiedValue, 0, wxALL, 2 ); + m_upperSizer->Add( m_matchSpecifiedValue, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); m_specifiedValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_specifiedValueSizer->Add( m_specifiedValue, 1, wxALL, 3 ); - - - bUpperSizer->Add( m_specifiedValueSizer, 31, wxEXPAND, 5 ); - - m_specifiedIDSizer = new wxBoxSizer( wxVERTICAL ); + m_upperSizer->Add( m_specifiedValue, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxRIGHT, 5 ); m_matchSpecifiedID = new wxRadioButton( this, wxID_MATCH_FP_ID, _("%s footprints with identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_specifiedIDSizer->Add( m_matchSpecifiedID, 0, wxALL, 2 ); + m_upperSizer->Add( m_matchSpecifiedID, wxGBPosition( 5, 0 ), wxGBSpan( 1, 2 ), wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); - wxBoxSizer* specifiedIDSizer; - specifiedIDSizer = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizer1; + fgSizer1 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer1->AddGrowableCol( 0 ); + fgSizer1->SetFlexibleDirection( wxBOTH ); + fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_specifiedID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - specifiedIDSizer->Add( m_specifiedID, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 ); + m_specifiedID->SetMinSize( wxSize( 500,22 ) ); + + fgSizer1->Add( m_specifiedID, 0, wxALL|wxEXPAND, 3 ); m_specifiedIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - specifiedIDSizer->Add( m_specifiedIDBrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 ); + fgSizer1->Add( m_specifiedIDBrowseButton, 0, wxALL, 0 ); - m_specifiedIDSizer->Add( specifiedIDSizer, 0, wxALIGN_TOP|wxEXPAND, 0 ); + m_upperSizer->Add( fgSizer1, wxGBPosition( 6, 0 ), wxGBSpan( 1, 2 ), wxEXPAND, 0 ); - bUpperSizer->Add( m_specifiedIDSizer, 45, wxEXPAND, 5 ); + m_upperSizer->AddGrowableCol( 1 ); - - mainSizer->Add( bUpperSizer, 0, wxALL|wxEXPAND, 5 ); + m_mainSizer->Add( m_upperSizer, 0, wxALL|wxEXPAND, 5 ); m_middleSizer = new wxBoxSizer( wxVERTICAL ); wxStaticLine* staticline1; staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_middleSizer->Add( staticline1, 0, wxEXPAND | wxALL, 0 ); + m_middleSizer->Add( staticline1, 0, wxBOTTOM|wxEXPAND, 2 ); wxStaticText* newIdLabel; newIdLabel = new wxStaticText( this, wxID_ANY, _("New footprint identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); newIdLabel->Wrap( -1 ); - m_middleSizer->Add( newIdLabel, 0, wxALL, 2 ); + m_middleSizer->Add( newIdLabel, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 5 ); - wxBoxSizer* newIDSizer; - newIDSizer = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizer2; + fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer2->AddGrowableCol( 0 ); + fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_newID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - newIDSizer->Add( m_newID, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 ); + m_newID->SetMinSize( wxSize( 500,22 ) ); + + fgSizer2->Add( m_newID, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); m_newIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - newIDSizer->Add( m_newIDBrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 ); + fgSizer2->Add( m_newIDBrowseButton, 0, wxALL, 0 ); - m_middleSizer->Add( newIDSizer, 0, wxEXPAND, 0 ); + m_middleSizer->Add( fgSizer2, 0, wxEXPAND, 0 ); - mainSizer->Add( m_middleSizer, 0, wxALL|wxEXPAND, 5 ); + m_mainSizer->Add( m_middleSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessageWindow->SetMinSize( wxSize( -1,300 ) ); - mainSizer->Add( m_MessageWindow, 1, wxALL|wxEXPAND, 5 ); + m_mainSizer->Add( m_MessageWindow, 5, wxALL|wxEXPAND, 5 ); wxStaticLine* staticline2; staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( staticline2, 0, wxEXPAND | wxALL, 5 ); + m_mainSizer->Add( staticline2, 0, wxEXPAND | wxALL, 5 ); wxBoxSizer* bottomSizer; bottomSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -181,13 +142,15 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi bottomSizer->Add( m_closeButton, 0, wxALL, 5 ); - mainSizer->Add( bottomSizer, 0, wxEXPAND, 5 ); + m_mainSizer->Add( bottomSizer, 0, wxEXPAND, 5 ); - this->SetSizer( mainSizer ); + this->SetSizer( m_mainSizer ); this->Layout(); + m_mainSizer->Fit( this ); // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_MODULE_BASE::updateMatchModeRadioButtons ) ); m_matchAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchAllClicked ), NULL, this ); m_matchCurrentRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); m_matchSpecifiedRef->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); @@ -198,8 +161,6 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); m_specifiedValue->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); m_matchSpecifiedID->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedID->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedID->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); m_specifiedIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); m_newIDBrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); m_exportButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::RebuildCmpList ), NULL, this ); @@ -210,6 +171,7 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi DIALOG_EXCHANGE_MODULE_BASE::~DIALOG_EXCHANGE_MODULE_BASE() { // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_MODULE_BASE::updateMatchModeRadioButtons ) ); m_matchAll->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchAllClicked ), NULL, this ); m_matchCurrentRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); m_matchSpecifiedRef->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchRefClicked ), NULL, this ); @@ -220,8 +182,6 @@ DIALOG_EXCHANGE_MODULE_BASE::~DIALOG_EXCHANGE_MODULE_BASE() m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); m_specifiedValue->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchValueClicked ), NULL, this ); m_matchSpecifiedID->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedID->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); - m_specifiedID->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchIDClicked ), NULL, this ); m_specifiedIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); m_newIDBrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::ViewAndSelectFootprint ), NULL, this ); m_exportButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::RebuildCmpList ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.fbp b/pcbnew/dialogs/dialog_exchange_modules_base.fbp index 84adc7fb31..1a3348e46c 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_modules_base.fbp @@ -44,10 +44,10 @@ DIALOG_EXCHANGE_MODULE_BASE - 550,523 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - dummy + %s @@ -87,664 +87,785 @@ - + updateMatchModeRadioButtons - mainSizer + m_mainSizer wxVERTICAL - none - - 5 - - 0 - - - m_localizationSizer - wxHORIZONTAL - protected - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update Footprints from Library - - 0 - - - 0 - - 1 - m_updateModeTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Change Footprints - - 0 - - - 0 - - 1 - m_exchangeModeTitle - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update - - 0 - - - 0 - - 1 - m_updateModeVerb - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Change - - 0 - - - 0 - - 1 - m_exchangeModeVerb - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - + protected 5 wxALL|wxEXPAND 0 - + + + wxBOTH + 1 + + 0 - bUpperSizer - wxVERTICAL - none - + m_upperSizer + wxFLEX_GROWMODE_SPECIFIED + protected + 0 + 5 - wxEXPAND - 29 - - - m_allSizer - wxHORIZONTAL + 2 + 0 + wxLEFT|wxRIGHT|wxEXPAND + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_ALL + %s all footprints on board + + 0 + + + 0 + -1,26 + 1 + m_matchAll + 1 + + protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_ALL - %s all footprints on board - - 0 - - - 0 - -1,26 - 1 - m_matchAll - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - - - - - - - - - - - - - - - OnMatchAllClicked - - - - - - - - + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + + + + + + + + + + + + + + + OnMatchAllClicked + + + + + + - + 5 - wxEXPAND - 31 - - - m_currentRefSizer - wxHORIZONTAL + 2 + 0 + wxLEFT|wxRIGHT|wxEXPAND + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_REF + %s current footprint (%s) + + 0 + + + 0 + -1,26 + 1 + m_matchCurrentRef + 1 + + protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_REF - %s current footprint (%s) - - 0 - - - 0 - -1,26 - 1 - m_matchCurrentRef - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - OnMatchRefClicked - - - - - - - - + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnMatchRefClicked + + + + + + - + 5 - wxEXPAND - 0 - - - m_specifiedRefSizer - wxHORIZONTAL + 1 + 0 + wxALL|wxEXPAND + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_REF + %s footprint with reference: + + 0 + + + 0 + -1,26 + 1 + m_matchSpecifiedRef + 1 + + protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_REF - %s footprint with reference: - - 0 - - - 0 - -1,26 - 1 - m_matchSpecifiedRef - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - OnMatchRefClicked - - - - - - - - - + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnMatchRefClicked + + + + + + + + + + 5 + 1 + 1 + wxBOTTOM|wxRIGHT|wxTOP|wxEXPAND + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + + 0 + -1,-1 + 1 + m_specifiedRef + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnMatchRefClicked + OnMatchRefClicked + + + + + + + 5 + 2 + 0 + wxLEFT|wxRIGHT|wxEXPAND + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_VAL + %s footprints with matching value (%s) + + 0 + + + 0 + -1,26 + 1 + m_matchCurrentValue + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnMatchValueClicked + + + + + + + + + + 5 + 1 + 0 + wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND + 4 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_VAL + %s footprints with value: + + 0 + + + 0 + -1,26 + 1 + m_matchSpecifiedValue + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnMatchValueClicked + + + + + + + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxRIGHT + 4 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + -1,-1 + 1 + m_specifiedValue + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnMatchValueClicked + OnMatchValueClicked + + + + + + + 5 + 2 + 0 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND + 5 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_MATCH_FP_ID + %s footprints with identifier: + + 0 + + + 0 + -1,-1 + 1 + m_matchSpecifiedID + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnMatchIDClicked + + + + + + + + + + 0 + 2 + 0 + wxEXPAND + 6 + 1 + + 2 + wxBOTH + 0 + + 0 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + 3 - wxALL - 1 - + wxALL|wxEXPAND + 0 + 1 1 1 @@ -774,13 +895,13 @@ wxID_ANY 0 - -1,-1 + 0 - -1,-1 + 500,22 1 - m_specifiedRef + m_specifiedID 1 @@ -824,594 +945,104 @@ - OnMatchRefClicked - OnMatchRefClicked + + - - - - 5 - wxEXPAND - 31 - - - m_currentValueSizer - wxHORIZONTAL - protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_VAL - %s footprints with matching value (%s) - - 0 - - - 0 - -1,26 - 1 - m_matchCurrentValue - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - OnMatchValueClicked - - - - - - - - - - - - 5 - wxEXPAND - 31 - - - m_specifiedValueSizer - wxHORIZONTAL - protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_VAL - %s footprints with value: - - 0 - - - 0 - -1,26 - 1 - m_matchSpecifiedValue - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - OnMatchValueClicked - - - - - - - - - - 3 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - -1,-1 - 1 - m_specifiedValue - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnMatchValueClicked - OnMatchValueClicked - - - - - - - - - 5 - wxEXPAND - 45 - - - m_specifiedIDSizer - wxVERTICAL - protected - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_MATCH_FP_ID - %s footprints with identifier: - - 0 - - - 0 - -1,-1 - 1 - m_matchSpecifiedID - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - OnMatchIDClicked - - - - - - - - 0 - wxALIGN_TOP|wxEXPAND + wxALL 0 - + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + Browse Library + + 0 + + + 0 - specifiedIDSizer - wxHORIZONTAL - none - - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - -1,-1 - 1 - m_specifiedID - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnMatchIDClicked - OnMatchIDClicked - - - - - - - 0 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - m_specifiedIDBrowseButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - ViewAndSelectFootprint - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_specifiedIDBrowseButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + ViewAndSelectFootprint + + + + + + + + + + + + + + + + + + + + + + + @@ -1420,7 +1051,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 0 @@ -1428,8 +1059,8 @@ wxVERTICAL protected - 0 - wxEXPAND | wxALL + 2 + wxBOTTOM|wxEXPAND 0 1 @@ -1509,8 +1140,8 @@ - 2 - wxALL + 5 + wxLEFT|wxRIGHT|wxTOP|wxEXPAND 0 1 @@ -1595,15 +1226,22 @@ 0 wxEXPAND 0 - + + 2 + wxBOTH + 0 + + 0 - newIDSizer - wxHORIZONTAL + fgSizer2 + wxFLEX_GROWMODE_SPECIFIED none + 0 + 0 - 2 - wxALIGN_CENTER_VERTICAL|wxALL - 1 + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 1 1 @@ -1638,7 +1276,7 @@ 0 - -1,-1 + 500,22 1 m_newID 1 @@ -1693,7 +1331,7 @@ 0 - wxALL|wxALIGN_CENTER_VERTICAL + wxALL 0 1 @@ -1791,7 +1429,7 @@ 5 wxALL|wxEXPAND - 1 + 5 1 1 diff --git a/pcbnew/dialogs/dialog_exchange_modules_base.h b/pcbnew/dialogs/dialog_exchange_modules_base.h index dd2595fa1f..d5ac9c4f09 100644 --- a/pcbnew/dialogs/dialog_exchange_modules_base.h +++ b/pcbnew/dialogs/dialog_exchange_modules_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_EXCHANGE_MODULES_BASE_H__ @@ -11,25 +11,25 @@ #include #include #include -class DIALOG_SHIM; class WX_HTML_REPORT_PANEL; #include "dialog_shim.h" #include -#include +#include #include #include #include #include -#include -#include #include #include #include #include #include #include +#include +#include #include +#include #include #include @@ -50,24 +50,15 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM wxButton* m_closeButton; protected: - wxBoxSizer* m_localizationSizer; - wxStaticText* m_updateModeTitle; - wxStaticText* m_exchangeModeTitle; - wxStaticText* m_updateModeVerb; - wxStaticText* m_exchangeModeVerb; - wxBoxSizer* m_allSizer; + wxBoxSizer* m_mainSizer; + wxGridBagSizer* m_upperSizer; wxRadioButton* m_matchAll; - wxBoxSizer* m_currentRefSizer; wxRadioButton* m_matchCurrentRef; - wxBoxSizer* m_specifiedRefSizer; wxRadioButton* m_matchSpecifiedRef; wxTextCtrl* m_specifiedRef; - wxBoxSizer* m_currentValueSizer; wxRadioButton* m_matchCurrentValue; - wxBoxSizer* m_specifiedValueSizer; wxRadioButton* m_matchSpecifiedValue; wxTextCtrl* m_specifiedValue; - wxBoxSizer* m_specifiedIDSizer; wxRadioButton* m_matchSpecifiedID; wxTextCtrl* m_specifiedID; wxBitmapButton* m_specifiedIDBrowseButton; @@ -78,6 +69,7 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM wxButton* m_exportButton; // Virtual event handlers, overide them in your derived class + virtual void updateMatchModeRadioButtons( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnMatchAllClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnMatchRefClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnMatchValueClicked( wxCommandEvent& event ) { event.Skip(); } @@ -90,7 +82,7 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM public: - DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,523 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXCHANGE_MODULE_BASE(); };