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

Fix issues about translations:

Eeschema: one string with a bad char (\a, not useable in internationalized strings).
Dialog_page_settings: use not translated strings in code, so strings can be freely translated for the UI.
(Initial code was not working with existing translations)
Update 2 icons.
parent 45445dd8
...@@ -8,89 +8,84 @@ ...@@ -8,89 +8,84 @@
static const unsigned char png[] = { static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 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, 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, 0xce, 0x00, 0x00, 0x04, 0xbb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x4b, 0x6c, 0x1b,
0x55, 0x14, 0xc7, 0x3f, 0xf7, 0xce, 0xce, 0xee, 0x4e, 0x77, 0xbb, 0x3b, 0x4a, 0x2b, 0x5d, 0x37, 0x55, 0x14, 0x86, 0xbf, 0x7b, 0x67, 0xfc, 0x4a, 0x1c, 0xdb, 0x72, 0xd3, 0x34, 0x4a, 0xe3, 0x28,
0x82, 0xd0, 0x2e, 0x5b, 0xf9, 0xb5, 0x12, 0xe8, 0x83, 0x18, 0xa8, 0xc6, 0x44, 0x94, 0x84, 0xa4, 0xa5, 0xb1, 0xe2, 0x3a, 0x21, 0x88, 0x22, 0x0a, 0x34, 0x52, 0xda, 0xaa, 0xa2, 0x5d, 0x20, 0xd2,
0x2f, 0x18, 0x63, 0x24, 0x06, 0x49, 0x34, 0xf2, 0xa2, 0x89, 0xf2, 0xe0, 0x9b, 0x89, 0x7f, 0x00, 0xec, 0x40, 0xa2, 0x11, 0x0b, 0x58, 0x50, 0x56, 0xac, 0x91, 0x8a, 0x58, 0x21, 0x58, 0x74, 0xd3,
0x09, 0xd1, 0xc4, 0x12, 0xab, 0x31, 0x3c, 0x18, 0x5e, 0x04, 0x2d, 0x18, 0x1e, 0x0c, 0x62, 0xd1, 0x15, 0xad, 0x94, 0x45, 0x57, 0x45, 0x42, 0x42, 0x65, 0x55, 0xb1, 0xa0, 0x40, 0xc5, 0x06, 0xa5,
0x18, 0x52, 0x13, 0x28, 0x3f, 0x0a, 0xa5, 0x34, 0x50, 0x6a, 0x61, 0xe9, 0x8f, 0xfd, 0x31, 0x65, 0x4f, 0x35, 0xcd, 0x4b, 0x4e, 0x1f, 0x4e, 0x5b, 0x8b, 0x46, 0x69, 0x1c, 0xb7, 0x71, 0x33, 0x9e,
0xa7, 0xdd, 0xdd, 0x99, 0xb9, 0x3e, 0x40, 0x27, 0x5d, 0xba, 0x18, 0x88, 0x89, 0x27, 0x39, 0x99, 0xc7, 0x61, 0x41, 0xc6, 0xb2, 0x63, 0x07, 0xe8, 0x86, 0x2b, 0xfd, 0x9a, 0x3b, 0x9a, 0x3b, 0xf7,
0x3b, 0xb9, 0x77, 0xce, 0xf7, 0x7c, 0xcf, 0xaf, 0xb9, 0x42, 0x29, 0xc5, 0xff, 0x21, 0x01, 0x80, 0x3f, 0xff, 0x39, 0x67, 0xfe, 0x3b, 0x4a, 0x44, 0xf8, 0x3f, 0x86, 0x09, 0x70, 0xf6, 0xec, 0xd9,
0x83, 0x07, 0x0f, 0x7e, 0x2f, 0x84, 0x78, 0x33, 0x10, 0x08, 0xa0, 0x69, 0x1a, 0x4a, 0x29, 0x1c, 0xf3, 0x4a, 0xa9, 0xf7, 0x4d, 0xd3, 0xc4, 0x30, 0x0c, 0x44, 0x04, 0xc7, 0x71, 0x70, 0x5d, 0x17,
0xc7, 0xc1, 0x75, 0x5d, 0x1c, 0xc7, 0xf1, 0xf5, 0x71, 0xdf, 0xa5, 0x94, 0x5f, 0xf5, 0xf4, 0xf4, 0xc7, 0x71, 0xaa, 0x78, 0xd1, 0x7b, 0xad, 0xf5, 0xb7, 0x13, 0x13, 0x13, 0x27, 0x00, 0x38, 0x7d,
0x7c, 0x00, 0xc0, 0x81, 0x03, 0x07, 0x62, 0xdd, 0xdd, 0xdd, 0x95, 0x6a, 0xb5, 0xaa, 0x5c, 0xd7, 0xfa, 0x74, 0xec, 0xcc, 0x99, 0x33, 0x15, 0xdb, 0xb6, 0xc5, 0x75, 0xdd, 0xa6, 0x70, 0x1c, 0xa7,
0xad, 0xab, 0x8e, 0xe3, 0xf8, 0x5a, 0xad, 0x56, 0x6b, 0xb4, 0x52, 0xa9, 0xf8, 0x5a, 0x2e, 0x97, 0x0a, 0xdb, 0xb6, 0xeb, 0x50, 0xa9, 0x54, 0xaa, 0xb0, 0x2c, 0xab, 0x8a, 0x52, 0xa9, 0x24, 0xe3,
0x7d, 0xb5, 0x2c, 0x4b, 0xed, 0xda, 0xb5, 0xcb, 0x53, 0x4a, 0xa1, 0x94, 0x22, 0xe0, 0xba, 0xae, 0xe3, 0xe3, 0x9e, 0x88, 0x20, 0x22, 0x98, 0xae, 0xeb, 0x6a, 0xad, 0xb5, 0xa7, 0x94, 0x22, 0x9f,
0x94, 0x52, 0x7a, 0x42, 0x08, 0x6e, 0xde, 0xbc, 0x89, 0x10, 0x02, 0x00, 0x21, 0x44, 0xcd, 0xba, 0xcf, 0xa3, 0x94, 0x02, 0x40, 0x29, 0x55, 0x37, 0x6f, 0x76, 0xdd, 0x6a, 0x68, 0xad, 0x49, 0x24,
0xde, 0xf3, 0x61, 0x22, 0xa5, 0xc4, 0x34, 0x4d, 0x94, 0x52, 0xa2, 0x26, 0x74, 0x9e, 0xe7, 0xd5, 0x12, 0x88, 0x88, 0xaa, 0x4b, 0x9d, 0xe7, 0x79, 0x4d, 0x37, 0x6f, 0x36, 0xff, 0x2f, 0x44, 0xcd,
0x35, 0x5e, 0x6f, 0xfd, 0x28, 0x40, 0xf5, 0xf6, 0x03, 0x00, 0xae, 0xeb, 0x02, 0x60, 0x59, 0x16, 0x9e, 0x9b, 0x00, 0xae, 0xeb, 0x02, 0x50, 0x2a, 0x95, 0x58, 0x59, 0x59, 0xa1, 0xa7, 0xa7, 0x07,
0xf9, 0x7c, 0x9e, 0x65, 0xcb, 0x96, 0x21, 0xa5, 0x64, 0x64, 0x64, 0x84, 0x07, 0x8b, 0xe5, 0xdf, 0xad, 0x35, 0x0b, 0x0b, 0x0b, 0x6c, 0x6e, 0x96, 0x7f, 0x22, 0x11, 0x11, 0xfa, 0xfb, 0xfb, 0xab,
0x40, 0x94, 0x52, 0xa4, 0xd3, 0x69, 0xff, 0xcc, 0xc2, 0x6f, 0x17, 0x31, 0x6a, 0x6b, 0x6b, 0x23, 0x6b, 0x6a, 0xdf, 0x6d, 0x50, 0xd4, 0xd7, 0xd7, 0x47, 0x28, 0x14, 0xa2, 0x5c, 0x2e, 0x93, 0x4e,
0x14, 0x0a, 0x61, 0xdb, 0x36, 0xa9, 0x54, 0xea, 0xb1, 0xc2, 0xa7, 0x94, 0x42, 0x4a, 0x89, 0x94, 0xa7, 0x5f, 0x28, 0x7d, 0x22, 0x82, 0xd6, 0x1a, 0xad, 0x75, 0x23, 0xd1, 0xea, 0xea, 0x2a, 0x89,
0x72, 0x31, 0x50, 0xb1, 0x58, 0xc4, 0x34, 0x4d, 0x00, 0x4c, 0xd3, 0x44, 0x08, 0x41, 0xb9, 0x5c, 0x44, 0x02, 0x80, 0x44, 0x22, 0x81, 0x52, 0x0a, 0xcb, 0xb2, 0x50, 0x4a, 0x91, 0xcb, 0xe5, 0xea,
0x46, 0x08, 0xc1, 0xb5, 0x6b, 0xd7, 0xfc, 0xc3, 0x96, 0x65, 0x31, 0x33, 0x33, 0x83, 0x61, 0x18, 0x16, 0x6f, 0xde, 0x5c, 0x44, 0x18, 0x18, 0x18, 0xd8, 0x32, 0x75, 0x0d, 0x8a, 0x5c, 0xd7, 0x45,
0x98, 0xa6, 0xc9, 0xe4, 0xe4, 0x24, 0xd5, 0x6a, 0x95, 0x4c, 0x26, 0x43, 0x4b, 0x4b, 0x4b, 0x5d, 0x44, 0x50, 0x4a, 0x55, 0x1f, 0x2a, 0xa5, 0x48, 0xa7, 0xd3, 0xd5, 0xe8, 0x9a, 0x35, 0x87, 0xaf,
0xd6, 0x8b, 0x18, 0xb9, 0xae, 0x8b, 0x52, 0x0a, 0x21, 0x84, 0xbf, 0x29, 0x84, 0x20, 0x95, 0x4a, 0x60, 0x33, 0xb9, 0xbf, 0xb6, 0x81, 0xc8, 0x71, 0x9c, 0xa6, 0x11, 0xfd, 0x9b, 0xa2, 0x66, 0x0a,
0xe1, 0xba, 0x2e, 0x03, 0x03, 0x03, 0x6c, 0xd8, 0xb0, 0x81, 0x58, 0x2c, 0xce, 0xe8, 0x1d, 0x8b, 0xb3, 0xd9, 0x6c, 0xf5, 0xde, 0x2f, 0x49, 0x43, 0x33, 0xf8, 0x91, 0xf8, 0x1b, 0xf8, 0x85, 0xad,
0xdb, 0xd3, 0x77, 0xe9, 0xd8, 0xbc, 0x96, 0x66, 0xd3, 0x60, 0x6c, 0x6c, 0x8c, 0x33, 0x67, 0xce, 0x55, 0x92, 0xcb, 0xe5, 0xb0, 0x6d, 0x9b, 0xb6, 0xb6, 0x36, 0x4c, 0xd3, 0xa4, 0x58, 0x2c, 0xb2,
0xb0, 0x69, 0xd3, 0x26, 0x74, 0x5d, 0xf7, 0xed, 0x2c, 0xb4, 0xe5, 0x03, 0x39, 0x8e, 0x53, 0xd7, 0xbe, 0xbe, 0x4e, 0x36, 0x9b, 0x25, 0x14, 0x0a, 0xd5, 0x29, 0x6c, 0x20, 0xb2, 0x6d, 0xbb, 0x4e,
0xa3, 0xa1, 0xa1, 0x21, 0x6c, 0xdb, 0x66, 0xeb, 0xd6, 0x4e, 0xbe, 0x3b, 0x71, 0x91, 0x5f, 0xce, 0xb2, 0xbf, 0xf1, 0xfc, 0xfc, 0x7c, 0x55, 0x91, 0x65, 0x59, 0x88, 0x08, 0x83, 0x43, 0xaf, 0xf0,
0xf6, 0x93, 0x68, 0x8a, 0xf2, 0x74, 0x53, 0x94, 0x1f, 0x7e, 0xbf, 0xc1, 0x64, 0x71, 0x96, 0xf7, 0xd3, 0xd5, 0x87, 0x4c, 0xdd, 0x5c, 0xc2, 0x71, 0x3c, 0xd2, 0xdd, 0x09, 0xde, 0x79, 0xa3, 0x8f,
0xb6, 0xb7, 0xb3, 0x65, 0xcb, 0x16, 0x8e, 0x1f, 0x3f, 0x4e, 0x22, 0x91, 0x60, 0xdd, 0xba, 0x75, 0xc5, 0xc5, 0xfb, 0x14, 0x0a, 0x05, 0x46, 0x46, 0x46, 0x30, 0x0c, 0xa3, 0x91, 0xa8, 0x58, 0x2c,
0xbe, 0x9d, 0xf9, 0x94, 0x2c, 0x2a, 0x86, 0x79, 0x4f, 0xe6, 0x81, 0x4a, 0xa5, 0x12, 0x9d, 0x9d, 0x12, 0x8b, 0xc5, 0xea, 0xd2, 0xb1, 0x59, 0x91, 0xe7, 0x79, 0xcc, 0xcc, 0xcc, 0xd0, 0xb2, 0xbd,
0x2f, 0xf1, 0xe1, 0x17, 0xa7, 0x58, 0xb2, 0xc4, 0xe4, 0x93, 0xb7, 0x5f, 0xa4, 0xe5, 0x09, 0x83, 0x97, 0x93, 0xe7, 0xae, 0x71, 0x6c, 0x64, 0x0f, 0x1f, 0x0e, 0xec, 0xc2, 0xb2, 0x3d, 0xee, 0x14,
0x90, 0xae, 0x11, 0xd2, 0x25, 0xd9, 0xfc, 0x2c, 0x5f, 0xf7, 0x0e, 0x70, 0xf1, 0x7a, 0x8e, 0x77, 0x56, 0xf9, 0xea, 0xbb, 0x9b, 0x1c, 0x7d, 0xb5, 0x93, 0x3d, 0xe9, 0x34, 0x4b, 0x4b, 0x4b, 0x74,
0x5f, 0x7f, 0x8d, 0xd3, 0xa7, 0x4f, 0xa3, 0x69, 0x5a, 0x5d, 0x20, 0x09, 0x50, 0xad, 0x56, 0x6b, 0x76, 0x76, 0x36, 0x57, 0xe4, 0x38, 0x4e, 0xc3, 0x47, 0x09, 0x30, 0x37, 0x37, 0x87, 0x88, 0xf0,
0x28, 0x0b, 0x21, 0x18, 0x1d, 0x1d, 0x25, 0x93, 0xc9, 0xf0, 0xcd, 0xcf, 0xe7, 0x09, 0x87, 0xc3, 0xf8, 0xf1, 0x63, 0x5e, 0x7f, 0x73, 0x98, 0x2f, 0xce, 0x5d, 0xe5, 0xb3, 0xf7, 0xf6, 0xd1, 0xb5,
0x6c, 0x59, 0x9b, 0xa0, 0x41, 0xbf, 0x77, 0xd6, 0x75, 0x1d, 0x3c, 0xcf, 0xe3, 0xa9, 0x58, 0x88, 0x2d, 0x8a, 0xe3, 0x7a, 0x94, 0x2d, 0x9b, 0x4c, 0x77, 0x8c, 0x64, 0x6c, 0x88, 0xef, 0x7f, 0xbe,
0xf7, 0x76, 0xac, 0x65, 0xe0, 0x7a, 0x81, 0xc1, 0xd1, 0x3c, 0x89, 0x44, 0x82, 0xf1, 0xf1, 0x71, 0x4d, 0x3a, 0xd5, 0xcf, 0xfd, 0x85, 0x5b, 0x74, 0x74, 0x74, 0x6c, 0x5d, 0xa3, 0x66, 0xa9, 0xcb,
0xbf, 0x18, 0x6a, 0x80, 0x0a, 0x85, 0x82, 0xcf, 0x68, 0x21, 0xab, 0xc1, 0xc1, 0x41, 0x22, 0x91, 0x64, 0x32, 0x68, 0xad, 0xb1, 0x2c, 0x8b, 0x1f, 0x7e, 0xbf, 0xcb, 0xdb, 0x6f, 0xf5, 0x13, 0x8f,
0x28, 0x27, 0xcf, 0xdd, 0xe1, 0xf9, 0xe7, 0x9e, 0xc1, 0x93, 0x3a, 0x9a, 0xae, 0x23, 0xb5, 0x00, 0x46, 0x70, 0x3c, 0x01, 0xa5, 0x09, 0x06, 0x02, 0x78, 0x68, 0x44, 0x2a, 0xbc, 0x36, 0xd8, 0xc3,
0x0a, 0x49, 0xd5, 0x05, 0x57, 0x41, 0x3c, 0x6a, 0xb0, 0x6b, 0x7b, 0x86, 0x6f, 0x4f, 0x5c, 0x26, 0xc4, 0xc5, 0x69, 0x4e, 0x1c, 0xdd, 0xc5, 0xf2, 0xf2, 0x32, 0x91, 0x48, 0xa4, 0xb9, 0xa2, 0x66,
0x99, 0x4c, 0x72, 0xeb, 0xd6, 0xad, 0x87, 0x87, 0xce, 0x71, 0x9c, 0x45, 0x4d, 0x39, 0x31, 0x31, 0x63, 0x7e, 0x7e, 0x1e, 0xdb, 0xb6, 0x31, 0x4d, 0x93, 0x85, 0x47, 0x25, 0x76, 0xf7, 0xec, 0xe0,
0xc1, 0xdf, 0x93, 0x16, 0x8d, 0x0d, 0x01, 0x66, 0x66, 0x66, 0x98, 0xb3, 0x4b, 0x98, 0x86, 0x20, 0xe9, 0xb3, 0x32, 0xeb, 0xa6, 0x42, 0x21, 0xb8, 0xae, 0xc7, 0xda, 0xba, 0xcd, 0x83, 0x47, 0x4b,
0x12, 0xd6, 0xd1, 0x03, 0x92, 0x80, 0x14, 0x68, 0x12, 0x04, 0xd0, 0xf2, 0x84, 0xc1, 0xdd, 0x59, 0xd8, 0x15, 0xe1, 0xb9, 0xe5, 0x10, 0x0e, 0x87, 0x29, 0x14, 0x0a, 0x74, 0x77, 0x77, 0xd7, 0xfb,
0x07, 0x4d, 0xd3, 0xc8, 0xe5, 0x72, 0xbe, 0x9d, 0xba, 0x39, 0x7a, 0x30, 0x74, 0x73, 0x73, 0x73, 0x5f, 0xb1, 0x58, 0xac, 0x76, 0xdd, 0xe6, 0x3a, 0x65, 0x32, 0x19, 0x32, 0x99, 0x0c, 0x86, 0x61,
0xdc, 0xc9, 0x95, 0x68, 0x8c, 0x1a, 0xc4, 0x62, 0x31, 0x00, 0xb2, 0x45, 0x87, 0x15, 0x86, 0x81, 0x60, 0x1a, 0x0a, 0xcc, 0x20, 0xda, 0x0c, 0x12, 0x0c, 0x86, 0x88, 0x44, 0x22, 0x44, 0x5a, 0x5a,
0x12, 0x12, 0x39, 0x0f, 0xa6, 0x09, 0xdc, 0xb2, 0x83, 0xd4, 0x24, 0xe5, 0x4a, 0xc5, 0x6f, 0x0d, 0xc0, 0x0c, 0x93, 0xda, 0xd9, 0x49, 0x57, 0xe7, 0x76, 0x42, 0xc1, 0x00, 0x96, 0x65, 0xe1, 0x79,
0xa5, 0x54, 0x7d, 0x46, 0x0f, 0x4a, 0xa5, 0x52, 0x61, 0x79, 0x73, 0x03, 0x77, 0xa6, 0x2c, 0x2c, 0x5e, 0x43, 0x19, 0xaa, 0x8a, 0x6a, 0x53, 0xe7, 0x8f, 0xd9, 0xd9, 0x59, 0x3c, 0xcf, 0x63, 0x6d,
0xcb, 0xba, 0xdf, 0x4b, 0x30, 0x9d, 0x2f, 0xb2, 0xac, 0x39, 0x82, 0x19, 0x09, 0x12, 0xd4, 0x40, 0x6d, 0x8d, 0xc1, 0xde, 0x76, 0xae, 0xdc, 0xbe, 0xc7, 0xb3, 0xd5, 0x36, 0xa2, 0x21, 0x8d, 0x16,
0xe0, 0x31, 0x95, 0x2f, 0x80, 0xe7, 0x12, 0xd4, 0x75, 0xc2, 0xe1, 0x70, 0xfd, 0x11, 0x54, 0x28, 0x07, 0x25, 0x36, 0xcf, 0x6d, 0xc5, 0xba, 0xa3, 0x58, 0x29, 0x7b, 0x84, 0x03, 0x42, 0xb9, 0x5c,
0x14, 0xfc, 0x86, 0x5d, 0x98, 0xa7, 0x44, 0x22, 0x81, 0xc4, 0x21, 0xa4, 0x6b, 0x04, 0x82, 0x06, 0x26, 0x99, 0x4c, 0x36, 0x3a, 0xba, 0xdf, 0xde, 0x00, 0x4f, 0x9e, 0x3c, 0x61, 0x7a, 0x7a, 0x1a,
0x11, 0x23, 0xe8, 0xef, 0x17, 0x2b, 0x12, 0x47, 0x28, 0xe2, 0x0d, 0x41, 0x1a, 0x42, 0x1a, 0xb9, 0xcb, 0xb2, 0xaa, 0x35, 0x1a, 0x1c, 0x1c, 0x44, 0x6b, 0xcd, 0xb1, 0xfd, 0xbb, 0x78, 0xf8, 0xe7,
0xf2, 0x2c, 0x6b, 0x57, 0x3c, 0x89, 0x6d, 0xdb, 0x34, 0x37, 0x37, 0x2f, 0x4a, 0x83, 0x5f, 0x75, 0x53, 0x08, 0x44, 0x69, 0x8d, 0x6f, 0x63, 0xfb, 0x8e, 0x9d, 0x74, 0xa5, 0x76, 0xd3, 0xd3, 0xd3,
0x8e, 0xe3, 0xd4, 0x84, 0x0e, 0xa0, 0xa3, 0xa3, 0x83, 0xbe, 0xbe, 0x3e, 0xf6, 0xbd, 0x91, 0xa1, 0x4b, 0x47, 0x67, 0x17, 0x33, 0xf9, 0xa7, 0x7c, 0x3a, 0x3a, 0xc4, 0xf5, 0xeb, 0xd7, 0x49, 0xa5,
0xaf, 0x7f, 0x98, 0x7c, 0xa1, 0x88, 0x65, 0xdd, 0x63, 0x97, 0xcb, 0x15, 0x98, 0x98, 0x98, 0xe2, 0x52, 0xcd, 0xdd, 0xdb, 0xaf, 0x91, 0x61, 0x18, 0xa4, 0xd3, 0x69, 0x5a, 0x5b, 0x5b, 0xa9, 0x54,
0xe6, 0xdf, 0xe3, 0x9c, 0xbf, 0x3c, 0xc2, 0x4f, 0xbf, 0x0d, 0xf1, 0xfe, 0x8e, 0x0c, 0xfd, 0xfd, 0x2a, 0xcc, 0xce, 0xce, 0x22, 0x22, 0x84, 0xc3, 0x61, 0x2e, 0x5f, 0xfe, 0x8d, 0x93, 0xe3, 0x07,
0xfd, 0xac, 0x5e, 0xbd, 0xba, 0x2e, 0x23, 0xbf, 0xbc, 0x01, 0x72, 0xb9, 0x1c, 0x83, 0x83, 0x83, 0xf8, 0xe6, 0xfc, 0x24, 0xd1, 0x48, 0x80, 0x9d, 0xed, 0x61, 0xa2, 0xad, 0x11, 0xd6, 0x2a, 0x26,
0x94, 0xcb, 0x65, 0x5a, 0x5b, 0x5b, 0xb1, 0x6d, 0x9b, 0x78, 0xc8, 0xe5, 0x9d, 0x57, 0x57, 0xf1, 0x53, 0xb9, 0x02, 0x9f, 0xbc, 0x3b, 0x40, 0x40, 0x39, 0x58, 0x96, 0xc5, 0xe4, 0xe4, 0x24, 0xc3,
0xe7, 0xc0, 0x18, 0xd6, 0xac, 0x22, 0x12, 0x6d, 0xa4, 0x31, 0x16, 0x27, 0x1c, 0x89, 0x33, 0x5e, 0xc3, 0xc3, 0xf5, 0x44, 0xc5, 0x62, 0x91, 0x78, 0x3c, 0x8e, 0x88, 0x10, 0x8f, 0xc7, 0xd1, 0x5a,
0x14, 0x9c, 0xba, 0x30, 0xcd, 0x67, 0xbb, 0x5f, 0xa0, 0x3c, 0x57, 0x42, 0x08, 0xc1, 0xf0, 0xf0, 0x57, 0x15, 0xf6, 0xf7, 0xf7, 0x63, 0x18, 0x06, 0x4a, 0x29, 0x8a, 0xc5, 0x22, 0xd7, 0xfe, 0xb8,
0xf0, 0xc3, 0x81, 0xe6, 0x73, 0xa4, 0x69, 0x1a, 0xa9, 0x54, 0x8a, 0x68, 0x34, 0x0a, 0xc0, 0xfa, 0xcc, 0x97, 0xe3, 0xc3, 0xdc, 0x5b, 0x5a, 0xe7, 0xd6, 0x9d, 0x65, 0xca, 0x65, 0x9b, 0x97, 0x5f,
0xf5, 0xeb, 0xd9, 0xbf, 0x7f, 0x3f, 0xc9, 0xc8, 0x2c, 0x5f, 0x7e, 0xf4, 0x32, 0x21, 0x65, 0xd3, 0x4a, 0xf0, 0xc1, 0x81, 0x7d, 0x5c, 0xbd, 0x32, 0x89, 0x93, 0x48, 0x10, 0x0a, 0x85, 0xc8, 0xe7,
0x77, 0x66, 0x90, 0xde, 0x5f, 0xcf, 0x73, 0xfa, 0xaf, 0xab, 0x2c, 0x8d, 0x0a, 0x0e, 0x7e, 0xfc, 0xf3, 0x2c, 0x2e, 0x2e, 0x36, 0xa6, 0xae, 0xb6, 0xeb, 0x6a, 0xbd, 0xad, 0xd6, 0x50, 0x93, 0xc9,
0x0a, 0x21, 0x55, 0xe2, 0xea, 0xd5, 0xab, 0xd8, 0xb6, 0x4d, 0x3e, 0x9f, 0xe7, 0xe4, 0xc9, 0x93, 0x24, 0x87, 0x0f, 0x1f, 0x26, 0x97, 0xcb, 0xf1, 0x60, 0xee, 0x0a, 0xa9, 0xd0, 0x12, 0x43, 0x1d,
0x35, 0x85, 0x00, 0x20, 0xba, 0xba, 0xba, 0xcc, 0x78, 0x3c, 0x9e, 0xed, 0xee, 0xee, 0x0e, 0x15, 0xcf, 0x59, 0xbe, 0x7b, 0x8d, 0x5f, 0x7f, 0xb9, 0x44, 0xa9, 0x54, 0x22, 0x9f, 0xcf, 0xfb, 0x27,
0x8b, 0xc5, 0x9a, 0xc9, 0x3b, 0xef, 0xd9, 0xd1, 0xa3, 0x47, 0xc9, 0xe5, 0x72, 0x6c, 0xdb, 0xb6, 0x2b, 0x22, 0x42, 0x7b, 0x7b, 0x3b, 0xa3, 0xa3, 0xa3, 0x2d, 0x00, 0x66, 0x20, 0x10, 0x10, 0xcb,
0x8d, 0x64, 0x32, 0x89, 0x61, 0x18, 0x94, 0x4a, 0x25, 0x26, 0x26, 0x26, 0x38, 0x77, 0xee, 0x1c, 0xb2, 0xb4, 0xaf, 0xa8, 0xd6, 0xa7, 0x6a, 0x7d, 0xcb, 0x0f, 0x60, 0xef, 0xde, 0xbd, 0x78, 0x9e,
0xae, 0xeb, 0x12, 0x8d, 0x46, 0xb9, 0x70, 0xe1, 0x02, 0xa6, 0x69, 0xd2, 0xda, 0xda, 0x4a, 0xa9, 0x87, 0xeb, 0xba, 0xd8, 0xb6, 0x5d, 0xb5, 0x1b, 0xa5, 0x14, 0x97, 0x2e, 0xfd, 0x4d, 0xd8, 0xd6,
0x54, 0xe2, 0xf0, 0xe1, 0xc3, 0x1c, 0x39, 0x72, 0x44, 0xf8, 0x40, 0x91, 0x48, 0x24, 0xdb, 0xd3, 0xd6, 0x46, 0xa5, 0x52, 0xe1, 0xe0, 0xc1, 0x83, 0x4c, 0x4d, 0x4d, 0xcd, 0x1f, 0x39, 0x72, 0x64,
0xd3, 0x13, 0x2a, 0x16, 0x8b, 0x35, 0x03, 0x51, 0xd3, 0x34, 0x84, 0x10, 0x48, 0x29, 0xc9, 0x66, 0x9f, 0x02, 0x92, 0x63, 0x63, 0x63, 0x3f, 0x2a, 0xa5, 0xf6, 0xfb, 0x2f, 0xd5, 0xda, 0xbd, 0x3f,
0xb3, 0x5c, 0xba, 0x74, 0x89, 0x91, 0x91, 0x11, 0xa6, 0xa6, 0xa6, 0x48, 0x26, 0x93, 0xb4, 0xb7, 0xf7, 0x3c, 0xaf, 0xee, 0xea, 0xc3, 0x3f, 0x0e, 0x6a, 0x8f, 0x86, 0x43, 0x87, 0x0e, 0xe9, 0xde,
0xb7, 0xd3, 0xd1, 0xd1, 0xc1, 0xed, 0xdb, 0xb7, 0x39, 0x7b, 0xf6, 0x2c, 0xba, 0xae, 0x33, 0x34, 0xde, 0x5e, 0x5a, 0x5a, 0x5a, 0x48, 0xa5, 0x52, 0x9c, 0x3a, 0x75, 0xea, 0xa2, 0x09, 0x78, 0x17,
0x34, 0x44, 0x28, 0x14, 0x22, 0x9d, 0x4e, 0x73, 0xe3, 0xc6, 0x0d, 0x2a, 0x95, 0x4a, 0xdb, 0xbe, 0x2e, 0x5c, 0xf8, 0x38, 0x16, 0x8b, 0xf5, 0x2a, 0xa5, 0xa2, 0x7e, 0x83, 0x00, 0x0a, 0x10, 0x40,
0x7d, 0xfb, 0x46, 0xc4, 0xce, 0x9d, 0x3b, 0xe3, 0x4a, 0xa9, 0xc9, 0x43, 0x87, 0x0e, 0xe9, 0x0b, 0x89, 0x88, 0x29, 0x22, 0x06, 0x60, 0x88, 0x88, 0x21, 0x22, 0xda, 0x9f, 0x6f, 0xa4, 0x5f, 0x01,
0x63, 0xeb, 0x79, 0x9e, 0xcf, 0xee, 0xc1, 0x91, 0x5f, 0x4f, 0xb2, 0xd9, 0x2c, 0x7d, 0x7d, 0x7d, 0x9e, 0x52, 0xca, 0x03, 0xec, 0x1b, 0x37, 0x6e, 0xc4, 0x8e, 0x1f, 0x3f, 0xfe, 0xf9, 0xd8, 0xd8,
0x34, 0x36, 0x36, 0x72, 0xe5, 0xca, 0x15, 0x3c, 0xcf, 0x23, 0x9d, 0x4e, 0x63, 0x59, 0xd6, 0xec, 0x58, 0x3c, 0x1a, 0x8d, 0x12, 0x0c, 0x06, 0x5d, 0xb5, 0x11, 0x8d, 0x06, 0xc2, 0x1b, 0x08, 0x6e,
0xf4, 0xf4, 0xf4, 0x66, 0x01, 0x3c, 0xd9, 0xd5, 0xd5, 0xf5, 0xa3, 0x10, 0x62, 0xf3, 0xc2, 0x81, 0xf5, 0x73, 0xb3, 0x11, 0x84, 0xb1, 0x01, 0x5d, 0x43, 0xc2, 0x46, 0x50, 0x02, 0xb8, 0xc0, 0x7a,
0xb8, 0x30, 0x74, 0x8f, 0xfa, 0xdb, 0x0e, 0x06, 0x83, 0x6c, 0xdc, 0xb8, 0x51, 0xae, 0x5c, 0xb9, 0x2a, 0x95, 0xf2, 0xb2, 0xd9, 0xec, 0x47, 0xf1, 0x78, 0x3c, 0xb9, 0xbc, 0xbc, 0xfc, 0xf5, 0x5f,
0x92, 0xe1, 0xe1, 0x61, 0x9a, 0x9a, 0x9a, 0xe8, 0xec, 0xec, 0xe4, 0xd8, 0xb1, 0x63, 0x7f, 0x08, 0x8c, 0x86, 0xc8, 0x61, 0x09, 0x89, 0x45, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xc0, 0x04, 0x96, 0xc6, 0x62, 0xb1, 0x67, 0x85, 0x10, 0xd1, 0xf9, 0x26, 0xe6, 0xde, 0x74, 0x79, 0xae, 0x42, 0x60, 0x82,
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,
}; };
const BITMAP_OPAQUE find_xpm[1] = {{ png, sizeof( png ), "find_xpm" }}; const BITMAP_OPAQUE find_xpm[1] = {{ png, sizeof( png ), "find_xpm" }};
......
...@@ -8,58 +8,57 @@ ...@@ -8,58 +8,57 @@
static const unsigned char png[] = { static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 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, 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, 0xce, 0x00, 0x00, 0x03, 0x16, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x56, 0x5d, 0x4b, 0x14,
0x41, 0x14, 0x25, 0x8a, 0xc4, 0x47, 0x7f, 0x81, 0x12, 0xc4, 0x8f, 0x5f, 0x01, 0x05, 0x4a, 0xdb, 0x51, 0x18, 0x96, 0x32, 0xe9, 0xb2, 0x5f, 0x50, 0x62, 0xf6, 0xf1, 0x2b, 0x54, 0x34, 0x75, 0x67,
0xfd, 0xa0, 0xb4, 0x8b, 0xe5, 0xab, 0x95, 0xaa, 0x40, 0x5b, 0x09, 0x49, 0x1f, 0x2c, 0x44, 0x49, 0x76, 0xdb, 0xaf, 0x5a, 0x35, 0xad, 0x8c, 0xd4, 0xdd, 0x0d, 0x02, 0x2f, 0x5a, 0xa3, 0x0b, 0x45,
0x7c, 0x81, 0xe8, 0x0b, 0x0f, 0xa8, 0x01, 0x83, 0x4d, 0x88, 0x20, 0x31, 0x1a, 0x48, 0x83, 0x09, 0x4a, 0xa4, 0x14, 0xa4, 0x12, 0x14, 0x5d, 0x90, 0xca, 0x0b, 0xbf, 0x37, 0x37, 0x15, 0x4b, 0x13,
0x44, 0x29, 0x12, 0x4c, 0x80, 0x90, 0x08, 0xf8, 0x22, 0x6f, 0x25, 0x3e, 0x28, 0x21, 0x0a, 0x81, 0x91, 0x85, 0x04, 0x35, 0x08, 0xdc, 0x2b, 0x57, 0x04, 0xcd, 0x8b, 0x14, 0x74, 0x21, 0x5a, 0x56,
0x26, 0x84, 0x52, 0x28, 0xb6, 0xbd, 0xce, 0x1d, 0x77, 0x37, 0x5b, 0xba, 0x5b, 0x9a, 0x88, 0x6c, 0xb7, 0x76, 0x7d, 0x9b, 0xf7, 0x6d, 0xe6, 0x30, 0xe3, 0xcc, 0x8e, 0x7b, 0x51, 0xd2, 0xc0, 0xc3,
0x72, 0xb2, 0x77, 0xe7, 0xcc, 0x9c, 0xb3, 0x73, 0x77, 0xe6, 0xce, 0xe6, 0x00, 0x40, 0xce, 0x69, 0x3e, 0x73, 0x9e, 0x73, 0x9e, 0x67, 0xf6, 0xcc, 0x39, 0xef, 0x99, 0x34, 0x00, 0x48, 0x3b, 0x0e,
0x20, 0xe5, 0xc1, 0xca, 0x95, 0x87, 0x58, 0xc6, 0xf8, 0x5b, 0x42, 0x25, 0x5b, 0xfe, 0x5d, 0xe2, 0x28, 0x6e, 0x6c, 0xc6, 0xc2, 0x10, 0xcf, 0x15, 0xff, 0x92, 0x60, 0xe1, 0x0b, 0x37, 0x24, 0xcd,
0x04, 0x4e, 0xbf, 0xc2, 0x33, 0x86, 0x7d, 0x09, 0xd8, 0x57, 0xe2, 0xb0, 0x9f, 0xd6, 0x38, 0x55, 0x6e, 0xbc, 0x12, 0x34, 0x71, 0x45, 0x7b, 0x12, 0xb0, 0xaf, 0xa4, 0x61, 0xbf, 0x64, 0xe3, 0x34,
0x23, 0xec, 0x14, 0x69, 0xcb, 0x85, 0x58, 0xfb, 0x19, 0x0a, 0x93, 0xc9, 0x04, 0x4a, 0x2e, 0xec, 0x83, 0xb0, 0x53, 0xa4, 0x2e, 0x1d, 0x62, 0x0f, 0x4f, 0x10, 0x0c, 0x06, 0x03, 0xc8, 0xb5, 0xb0,
0xcb, 0x83, 0x48, 0xdb, 0x39, 0x0a, 0x25, 0x87, 0xb1, 0x34, 0xe6, 0xe8, 0x38, 0x4d, 0xa3, 0x77, 0x27, 0x03, 0x22, 0x75, 0xa7, 0x08, 0x72, 0x0d, 0xb9, 0x34, 0xe6, 0xf0, 0xb8, 0xa4, 0x41, 0xfe,
0xcd, 0x85, 0x70, 0xeb, 0x86, 0x09, 0x02, 0xae, 0xab, 0x69, 0x46, 0x63, 0xae, 0x2b, 0x94, 0x1b, 0x9a, 0x6c, 0xb8, 0x73, 0xdd, 0x00, 0x3e, 0xe7, 0x45, 0x55, 0xd0, 0xa8, 0xf3, 0x02, 0x69, 0xa3,
0x73, 0x15, 0xa6, 0x19, 0x61, 0x7f, 0xbb, 0x95, 0x81, 0xd1, 0xe6, 0x6b, 0xda, 0x46, 0x82, 0x20, 0xce, 0x6c, 0x55, 0x10, 0xf6, 0xaf, 0xb0, 0x71, 0x30, 0x5c, 0x73, 0x29, 0x79, 0x90, 0xdd, 0x6e,
0xac, 0xb0, 0x2c, 0x8b, 0xd3, 0x06, 0x67, 0x15, 0x03, 0x43, 0xfd, 0xcf, 0xc0, 0x56, 0xc9, 0xd0, 0x0f, 0xf2, 0x3c, 0x8f, 0x7f, 0x1b, 0x2a, 0xaf, 0x71, 0xf0, 0xa6, 0xab, 0x1d, 0x1c, 0x16, 0x8e,
0x01, 0xb4, 0x5d, 0xe4, 0xea, 0x89, 0xd0, 0xcb, 0xe7, 0x4f, 0xe8, 0x5d, 0xc9, 0x61, 0x6c, 0x17, 0x06, 0x50, 0xbb, 0xa8, 0x95, 0x0b, 0x46, 0xaf, 0x3a, 0x5f, 0xd0, 0xaf, 0x5c, 0x43, 0x5e, 0x61,
0x18, 0x18, 0xe8, 0xeb, 0x49, 0xe1, 0xcc, 0x66, 0xf3, 0x4f, 0x9d, 0x4e, 0x77, 0x5e, 0x36, 0xe2, 0xe7, 0xa0, 0xa7, 0xe3, 0xb9, 0x42, 0x33, 0x9b, 0xcd, 0xdf, 0xf2, 0xf2, 0xf2, 0x4e, 0xb3, 0x20,
0x79, 0x7e, 0x3f, 0x1c, 0x0e, 0x43, 0x05, 0xc7, 0xc2, 0x7b, 0x77, 0x3e, 0xb8, 0xaa, 0x8d, 0x30, 0x93, 0xc9, 0xb4, 0x17, 0x0e, 0x87, 0xe1, 0xaa, 0x91, 0x87, 0x49, 0x57, 0x26, 0x38, 0x4b, 0x8a,
0xe1, 0xbe, 0x4c, 0x07, 0xc4, 0x62, 0x31, 0x0a, 0xe4, 0xc6, 0x5d, 0x05, 0x22, 0x57, 0x90, 0xc2, 0x61, 0xc2, 0x75, 0x9e, 0x06, 0xc4, 0x62, 0x31, 0x02, 0x6a, 0xe3, 0xce, 0x2c, 0x51, 0xcb, 0x52,
0x61, 0xfc, 0xd1, 0x73, 0x11, 0x5a, 0x6b, 0x0d, 0x10, 0x74, 0x5f, 0x92, 0x39, 0x62, 0x74, 0x60, 0x68, 0xc8, 0x3f, 0xba, 0xcf, 0xc2, 0xfd, 0xb2, 0x22, 0x98, 0x72, 0x9d, 0x63, 0x9a, 0x10, 0xb4,
0xb1, 0x58, 0x2e, 0xa4, 0x18, 0x45, 0x22, 0x11, 0x2a, 0x86, 0x39, 0x86, 0xfb, 0x39, 0x14, 0x62, 0x6f, 0xb5, 0x5a, 0xcf, 0x28, 0x82, 0x22, 0x91, 0x08, 0x99, 0xe1, 0x1c, 0xc3, 0xa3, 0x34, 0x82,
0x0a, 0xe8, 0x95, 0x89, 0xa3, 0xb1, 0xd8, 0xae, 0xe4, 0x34, 0x8d, 0xee, 0xdc, 0xac, 0x23, 0x82, 0x38, 0x05, 0x74, 0xe9, 0x69, 0xc4, 0xc5, 0x76, 0xb9, 0x96, 0x34, 0xe8, 0xee, 0xad, 0x1b, 0x82,
0x8c, 0x0c, 0x47, 0xad, 0x4d, 0x16, 0xcb, 0xc4, 0x61, 0xac, 0xc6, 0xa9, 0x19, 0x1d, 0x2c, 0x2e, 0x21, 0xc7, 0x70, 0xb3, 0xcc, 0xc1, 0xcc, 0xf4, 0x34, 0xe4, 0x5a, 0x9a, 0x56, 0xd0, 0xfe, 0xe2,
0x2e, 0x42, 0x22, 0x91, 0x90, 0xd3, 0x81, 0x88, 0xc7, 0xe3, 0xb2, 0x58, 0x26, 0x0e, 0x63, 0x35, 0xe2, 0x22, 0x24, 0x12, 0x09, 0x36, 0x1d, 0x88, 0x78, 0x3c, 0xce, 0xcc, 0xf4, 0x34, 0xe4, 0x5a,
0x2e, 0xcd, 0x88, 0xe3, 0xb8, 0x58, 0x63, 0x63, 0x23, 0xf8, 0xfd, 0x7e, 0x38, 0xc9, 0x4b, 0x35, 0x9a, 0x2a, 0xc8, 0x68, 0x34, 0xc6, 0xaa, 0xaa, 0xaa, 0xc0, 0xeb, 0xf5, 0xc2, 0xdf, 0xbc, 0x34,
0x75, 0x6b, 0x6b, 0x6b, 0x48, 0x40, 0x34, 0x1a, 0xcd, 0x4a, 0xc4, 0xeb, 0xf5, 0x42, 0x59, 0x59, 0xa7, 0x6e, 0x73, 0x73, 0x13, 0x05, 0x88, 0x46, 0xa3, 0x29, 0x99, 0xd4, 0xd6, 0xd6, 0x42, 0x41,
0x19, 0xae, 0x2e, 0xa8, 0x12, 0x04, 0x1a, 0x57, 0x92, 0xf1, 0x44, 0x98, 0xc6, 0x88, 0xa2, 0xa2, 0x41, 0x81, 0x2e, 0x72, 0x72, 0x72, 0x10, 0x01, 0x45, 0x90, 0xcf, 0xe7, 0x03, 0xb7, 0xdb, 0x0d,
0x22, 0xc4, 0x6c, 0x8a, 0x51, 0x20, 0x10, 0x00, 0x8f, 0xc7, 0x03, 0xc9, 0x64, 0xf2, 0x58, 0x13, 0x07, 0x07, 0x07, 0x47, 0x86, 0xe0, 0xf4, 0x88, 0x26, 0x0c, 0x6f, 0x07, 0x07, 0x61, 0x21, 0x10,
0x4c, 0x8f, 0x28, 0x02, 0x6f, 0x87, 0x87, 0xe1, 0xc7, 0xea, 0x2a, 0x8d, 0xbf, 0x2e, 0x2d, 0xc1, 0x20, 0xde, 0xdf, 0xdb, 0x0b, 0xcb, 0x4b, 0x4b, 0x4c, 0xc3, 0x25, 0xfe, 0x67, 0x33, 0xf2, 0xfc,
0xcc, 0xe4, 0xa4, 0xcc, 0x49, 0xc0, 0x25, 0xfe, 0x77, 0x33, 0xb2, 0xec, 0xa1, 0xcf, 0xe7, 0x83, 0x4f, 0x8f, 0xc7, 0x03, 0xa1, 0x50, 0x28, 0xa5, 0x7f, 0xa3, 0x15, 0xf4, 0x75, 0x75, 0x15, 0xfa,
0x50, 0x28, 0x94, 0xd5, 0x6c, 0x94, 0x46, 0x4b, 0xf3, 0xf3, 0xb2, 0x78, 0x64, 0x6b, 0x0b, 0xfc, 0x84, 0x00, 0xe4, 0x2b, 0xcb, 0xcb, 0xe0, 0x1f, 0x1a, 0x52, 0x07, 0x49, 0xab, 0x2e, 0xd5, 0x4b,
0x7d, 0x7d, 0xda, 0x46, 0xd2, 0xaa, 0xcb, 0xf6, 0x42, 0xa3, 0x87, 0x1d, 0x1d, 0xf0, 0x82, 0x88, 0x0a, 0x12, 0xc6, 0xc1, 0xe3, 0x86, 0x06, 0x78, 0xda, 0xd4, 0x04, 0xc2, 0x9c, 0x83, 0x6f, 0x60,
0xee, 0x6c, 0x6c, 0xc0, 0x97, 0x85, 0x05, 0x18, 0x1a, 0x18, 0x00, 0x92, 0x77, 0x98, 0x9a, 0x98, 0x00, 0x9e, 0x34, 0x36, 0x42, 0x42, 0xf0, 0x7a, 0x37, 0x32, 0x42, 0x5a, 0x7e, 0x7e, 0xbe, 0x3a,
0x00, 0x9e, 0xe3, 0x32, 0x1b, 0x35, 0x39, 0xed, 0x74, 0x0f, 0x48, 0x68, 0xa8, 0xaf, 0x96, 0xc5, 0xa8, 0xba, 0xb2, 0x82, 0xf6, 0x80, 0x84, 0xdb, 0xe5, 0x25, 0xcc, 0x1c, 0x35, 0xdc, 0x4b, 0x12,
0x91, 0xc3, 0xbd, 0x24, 0x61, 0x7e, 0x66, 0x86, 0x0a, 0xab, 0xc1, 0x5e, 0x57, 0x97, 0xd9, 0xe8, 0x30, 0xe8, 0x9e, 0xcb, 0x45, 0x01, 0x7a, 0xe0, 0x04, 0x1f, 0x55, 0xd0, 0x51, 0x9b, 0x52, 0x2a,
0xb8, 0x4d, 0x29, 0x15, 0xcd, 0xf0, 0xbd, 0x3c, 0x28, 0x2d, 0x2d, 0x85, 0x07, 0xed, 0xed, 0xb2, 0x9a, 0xe1, 0x07, 0x19, 0x14, 0x84, 0x4f, 0x6b, 0xb5, 0x58, 0x60, 0xd2, 0xef, 0x87, 0x8d, 0x95,
0xf0, 0x2b, 0x32, 0xa3, 0xf0, 0xfa, 0x3a, 0xe8, 0xf5, 0x7a, 0x28, 0x2e, 0x2e, 0x3e, 0xde, 0x68, 0x15, 0xe2, 0xc3, 0x7d, 0x7d, 0xb0, 0xb5, 0xbe, 0x4e, 0x1c, 0x91, 0x9b, 0x9b, 0xab, 0x1d, 0x34,
0x84, 0x14, 0xc5, 0x23, 0xc5, 0x51, 0x36, 0x1a, 0x15, 0xb9, 0x37, 0x4d, 0xd7, 0xa9, 0x40, 0x7f, 0x24, 0x14, 0xc5, 0x43, 0xc5, 0x91, 0x05, 0x0d, 0x8b, 0x5a, 0x7f, 0xf5, 0x65, 0x0a, 0xe2, 0x38,
0x6f, 0x2f, 0xec, 0x6e, 0x6e, 0xd2, 0x78, 0x76, 0x7a, 0x1a, 0x3e, 0xcf, 0xcd, 0xa5, 0x7d, 0x9f, 0x0e, 0x6b, 0x1a, 0xac, 0x06, 0x83, 0xf0, 0x61, 0x6c, 0x8c, 0xf8, 0x97, 0x85, 0x05, 0x08, 0xcc,
0x14, 0x23, 0xab, 0xd5, 0xfa, 0x8d, 0xec, 0xa5, 0x38, 0x16, 0x4e, 0x14, 0x1a, 0xec, 0x7f, 0x2a, 0xcc, 0x10, 0xc7, 0x07, 0x51, 0xbc, 0x23, 0x9b, 0xcd, 0xb6, 0x26, 0xec, 0xa5, 0x38, 0x16, 0x4e,
0x17, 0x47, 0x6c, 0x47, 0x60, 0x2c, 0x17, 0x55, 0x0b, 0x03, 0x9f, 0x82, 0x41, 0x48, 0x90, 0x97, 0x34, 0x7a, 0xdd, 0xf5, 0x92, 0x15, 0x47, 0x6c, 0x47, 0x20, 0x67, 0x45, 0xd5, 0xca, 0x91, 0x41,
0x4b, 0xee, 0xed, 0xc1, 0xe1, 0xce, 0x0e, 0xbd, 0xe3, 0x33, 0xc6, 0xf5, 0x5a, 0xa9, 0xb3, 0xd9, 0x64, 0x67, 0x47, 0x77, 0xda, 0x1a, 0xeb, 0xeb, 0x95, 0x41, 0x0e, 0x87, 0xe3, 0x24, 0xde, 0xe0,
0x6c, 0x67, 0xf1, 0x01, 0x8f, 0x82, 0x0f, 0xa4, 0x28, 0x2a, 0x8b, 0x23, 0xb6, 0x23, 0x30, 0x0e, 0x51, 0xf0, 0x5e, 0x28, 0x8a, 0xf2, 0xe2, 0x88, 0xed, 0x08, 0xe4, 0x53, 0xa2, 0x36, 0xee, 0xcc,
0x8a, 0xdc, 0xb8, 0x2b, 0x1f, 0x1e, 0x75, 0x76, 0x42, 0x74, 0x7b, 0x1b, 0x56, 0x96, 0x97, 0x61, 0x24, 0x83, 0x67, 0xcd, 0xcd, 0x34, 0x55, 0x68, 0xea, 0xed, 0xe8, 0xa0, 0x55, 0x87, 0xbc, 0xa7,
0x6c, 0x64, 0x84, 0xa6, 0x10, 0xcd, 0x5f, 0x0f, 0x0e, 0x42, 0x05, 0xcf, 0xab, 0x1b, 0x29, 0xcf, 0xbb, 0x1b, 0xda, 0x5a, 0x5a, 0xa0, 0xac, 0xb4, 0x54, 0x19, 0x24, 0x3f, 0x73, 0x34, 0xde, 0x11,
0x1c, 0x95, 0x6f, 0x24, 0x9f, 0x39, 0x52, 0xfb, 0xae, 0x2f, 0x17, 0x0c, 0x06, 0x03, 0x24, 0xc8, 0x3b, 0x73, 0xa4, 0xf6, 0x1f, 0x9e, 0x74, 0xb6, 0x74, 0x3b, 0xdb, 0xdb, 0xe1, 0xfb, 0xf6, 0x36,
0x2c, 0x1e, 0x77, 0x75, 0x41, 0x6b, 0x4b, 0x0b, 0x35, 0x6a, 0x70, 0x38, 0x32, 0xa7, 0x4e, 0x79, 0xbd, 0x8b, 0xb6, 0xd6, 0x56, 0x88, 0xee, 0xee, 0xa2, 0xb1, 0x62, 0xe9, 0xab, 0x82, 0xf0, 0x08,
0x24, 0x2b, 0x57, 0x9d, 0x99, 0x2d, 0xff, 0x25, 0x71, 0x18, 0x2b, 0xb9, 0xbb, 0x6e, 0x37, 0x15, 0x96, 0xaf, 0x3a, 0x33, 0x5f, 0xb8, 0x25, 0x69, 0xc8, 0xe5, 0x9a, 0x64, 0xf2, 0x69, 0x76, 0x16,
0xbf, 0xed, 0x74, 0x42, 0x4f, 0x77, 0x37, 0x4d, 0x59, 0x49, 0x49, 0x49, 0x76, 0x46, 0xd9, 0x82, 0xe6, 0xe7, 0xe6, 0x88, 0x4f, 0x4d, 0x4c, 0xc0, 0xe7, 0xf9, 0x79, 0xd5, 0x1e, 0x53, 0x05, 0xa5,
0xa6, 0xd2, 0x68, 0x04, 0x87, 0xdd, 0x0e, 0x3a, 0xb2, 0xc2, 0x30, 0x55, 0xb5, 0x35, 0x35, 0xaa, 0x0a, 0x1c, 0x78, 0xd8, 0x4c, 0x0f, 0xff, 0x7f, 0x10, 0x42, 0x30, 0x98, 0x16, 0xb0, 0x9f, 0x02,
0x26, 0xff, 0x6c, 0xa4, 0x25, 0x7a, 0xa2, 0x46, 0x08, 0x22, 0x30, 0x45, 0x70, 0x90, 0x05, 0xa6, 0xa6, 0x55, 0x1f, 0x27, 0xc7, 0xf6, 0x5d, 0xf7, 0x2f, 0xf1, 0x1b, 0x0c, 0xfc, 0xf5, 0xb8, 0xe2,
0xd2, 0x7e, 0x4e, 0x4e, 0xed, 0xbf, 0xee, 0x7f, 0xe2, 0x0f, 0xd1, 0x8f, 0xef, 0xbe, 0x17, 0x6f, 0x7e, 0x3a, 0xcb, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0x07, 0x74, 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" }}; const BITMAP_OPAQUE module_pin_filtered_list_xpm[1] = {{ png, sizeof( png ), "module_pin_filtered_list_xpm" }};
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
inkscape:export-ydpi="90.000000" inkscape:export-ydpi="90.000000"
inkscape:export-xdpi="90.000000" inkscape:export-xdpi="90.000000"
inkscape:export-filename="/home/steven/edit-find-48.png" inkscape:export-filename="/home/steven/edit-find-48.png"
sodipodi:docname="find.svg" sodipodi:docname="find.svg.BASE"
inkscape:version="0.48.2 r9819" inkscape:version="0.48.2 r9819"
sodipodi:version="0.32" sodipodi:version="0.32"
id="svg249" id="svg249"
...@@ -59,6 +59,18 @@ ...@@ -59,6 +59,18 @@
offset="1.0000000" offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:0.24761905;" /> style="stop-color:#ffffff;stop-opacity:0.24761905;" />
</linearGradient> </linearGradient>
<linearGradient
id="linearGradient4477"
inkscape:collect="always">
<stop
id="stop4479"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop4481"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<linearGradient <linearGradient
id="linearGradient2366"> id="linearGradient2366">
<stop <stop
...@@ -85,6 +97,66 @@ ...@@ -85,6 +97,66 @@
offset="1.0000000" offset="1.0000000"
id="stop2850" /> id="stop2850" />
</linearGradient> </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4477"
id="radialGradient1527"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.237968,0,28.93278)"
cx="24.130018"
cy="37.967922"
fx="24.130018"
fy="37.967922"
r="16.528622" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2846"
id="linearGradient1529"
gradientUnits="userSpaceOnUse"
x1="27.366341"
y1="26.580296"
x2="31.335964"
y2="30.557772" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4440"
id="linearGradient1531"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.334593,0,0,1.291292,-6.973842,-7.460658)"
x1="30.65625"
y1="34"
x2="33.21875"
y2="31.0625" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2366"
id="linearGradient1533"
gradientUnits="userSpaceOnUse"
x1="18.292673"
y1="13.602121"
x2="17.500893"
y2="25.743469" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4454"
id="radialGradient1537"
gradientUnits="userSpaceOnUse"
cx="18.240929"
cy="21.817987"
fx="18.240929"
fy="21.817987"
r="8.3085051" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4467"
id="radialGradient1539"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.592963,0,0,2.252104,-25.05975,-18.941)"
cx="15.414371"
cy="13.078408"
fx="15.414371"
fy="13.078408"
r="6.65625" />
<radialGradient <radialGradient
id="aigrd2-8" id="aigrd2-8"
cx="20.892099" cx="20.892099"
...@@ -211,39 +283,6 @@ ...@@ -211,39 +283,6 @@
fx="605.71429" fx="605.71429"
fy="486.64789" fy="486.64789"
r="117.14286" /> r="117.14286" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient259-0"
id="radialGradient3528"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6078834,0,0,0.56033901,26.024941,21.60394)"
cx="33.966679"
cy="35.736916"
fx="33.966679"
fy="35.736916"
r="86.70845" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient269-6"
id="radialGradient3530"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.61280726,0,0,0.55583696,28.147361,21.95186)"
cx="8.824419"
cy="3.7561285"
fx="8.824419"
fy="3.7561285"
r="37.751713" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient15662-0"
id="radialGradient3532"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.58918726,0,0,0.53188665,28.589241,22.509383)"
cx="8.1435566"
cy="7.2678967"
fx="8.1435566"
fy="7.2678967"
r="38.158695" />
<radialGradient <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#aigrd2-8" xlink:href="#aigrd2-8"
...@@ -299,552 +338,6 @@ ...@@ -299,552 +338,6 @@
fx="8.824419" fx="8.824419"
fy="3.7561285" fy="3.7561285"
r="37.751713" /> r="37.751713" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2966"
id="linearGradient2554"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-5.669292,0)"
x1="48.90625"
y1="17.376184"
x2="50.988335"
y2="22.250591" />
<linearGradient
id="linearGradient2966">
<stop
id="stop2968"
offset="0"
style="stop-color:#ffd1d1;stop-opacity:1;" />
<stop
style="stop-color:#ff1d1d;stop-opacity:1;"
offset="0.5"
id="stop3006" />
<stop
id="stop2970"
offset="1"
style="stop-color:#6f0000;stop-opacity:1;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2974"
id="linearGradient2556"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-5.669292,0)"
x1="46"
y1="19.8125"
x2="47.6875"
y2="22.625" />
<linearGradient
id="linearGradient2974">
<stop
id="stop2976"
offset="0"
style="stop-color:#c1c1c1;stop-opacity:1;" />
<stop
id="stop2978"
offset="1"
style="stop-color:#acacac;stop-opacity:1;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient2984"
id="radialGradient2558"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.923565,0,0,2.029717,-61.55532,-27.88417)"
cx="29.053354"
cy="27.640751"
fx="29.053354"
fy="27.640751"
r="3.2408545" />
<linearGradient
id="linearGradient2984"
inkscape:collect="always">
<stop
id="stop2986"
offset="0"
style="stop-color:#e7e2b8;stop-opacity:1;" />
<stop
id="stop2988"
offset="1"
style="stop-color:#e7e2b8;stop-opacity:0;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2994"
id="linearGradient2560"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-5.825542,0.125)"
x1="25.71875"
y1="31.046875"
x2="25.514589"
y2="30.703125" />
<linearGradient
id="linearGradient2994">
<stop
id="stop2996"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop2998"
offset="1"
style="stop-color:#c9c9c9;stop-opacity:1;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2846-1"
id="linearGradient2730"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,48.18409,0)"
x1="27.366341"
y1="26.580296"
x2="31.335964"
y2="30.557772" />
<linearGradient
id="linearGradient2846-1">
<stop
style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop2848-0" />
<stop
style="stop-color:#484848;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2850-4" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4440-1"
id="linearGradient2732"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.334593,0,0,1.291292,55.15793,-7.460658)"
x1="30.65625"
y1="34"
x2="33.21875"
y2="31.0625" />
<linearGradient
id="linearGradient4440-1">
<stop
id="stop4442-1"
offset="0"
style="stop-color:#7d7d7d;stop-opacity:1;" />
<stop
style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
offset="0.50000000"
id="stop4448-8" />
<stop
id="stop4444-6"
offset="1.0000000"
style="stop-color:#686868;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2366-4"
id="linearGradient2734"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,44.17827,0)"
x1="18.292673"
y1="13.602121"
x2="17.500893"
y2="25.743469" />
<linearGradient
id="linearGradient2366-4">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2368-3" />
<stop
id="stop2374-4"
offset="0.50000000"
style="stop-color:#ffffff;stop-opacity:0.21904762;" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2370-7" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4454-7"
id="radialGradient2736"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,43.352,0)"
cx="18.240929"
cy="21.817987"
fx="18.240929"
fy="21.817987"
r="8.3085051" />
<linearGradient
id="linearGradient4454-7">
<stop
id="stop4456-0"
offset="0.0000000"
style="stop-color:#729fcf;stop-opacity:0.20784314;" />
<stop
id="stop4458-7"
offset="1.0000000"
style="stop-color:#729fcf;stop-opacity:0.67619050;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4467-4"
id="radialGradient2738"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.592963,0,0,2.252104,-25.05976,-18.941)"
cx="15.414371"
cy="13.078408"
fx="15.414371"
fy="13.078408"
r="6.65625" />
<linearGradient
id="linearGradient4467-4">
<stop
id="stop4469-5"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop4471-3"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:0.24761905;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4477-0"
id="radialGradient2504"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.237968,0,28.93278)"
cx="24.130018"
cy="37.967922"
fx="24.130018"
fy="37.967922"
r="16.528622" />
<linearGradient
id="linearGradient4477-0"
inkscape:collect="always">
<stop
id="stop4479-7"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
id="stop4481-2"
offset="1"
style="stop-color:#000000;stop-opacity:0;" />
</linearGradient>
<radialGradient
r="5.256"
fy="114.5684"
fx="20.892099"
cy="114.5684"
cx="20.892099"
gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
gradientUnits="userSpaceOnUse"
id="radialGradient2283"
xlink:href="#aigrd2"
inkscape:collect="always" />
<radialGradient
id="aigrd2"
cx="20.892099"
cy="114.5684"
r="5.256"
fx="20.892099"
fy="114.5684"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
style="stop-color:#F0F0F0"
id="stop15566" />
<stop
offset="1.0000000"
style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
id="stop15568" />
</radialGradient>
<radialGradient
r="5.257"
fy="64.567902"
fx="20.892099"
cy="64.567902"
cx="20.892099"
gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
gradientUnits="userSpaceOnUse"
id="radialGradient2285"
xlink:href="#aigrd3"
inkscape:collect="always" />
<radialGradient
id="aigrd3"
cx="20.892099"
cy="64.567902"
r="5.257"
fx="20.892099"
fy="64.567902"
gradientUnits="userSpaceOnUse">
<stop
offset="0"
style="stop-color:#F0F0F0"
id="stop15573" />
<stop
offset="1.0000000"
style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
id="stop15575" />
</radialGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient15662"
id="radialGradient15668"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.58918726,0,0,0.53188665,45.117863,30.906277)"
cx="8.1435566"
cy="7.2678967"
fx="8.1435566"
fy="7.2678967"
r="38.158695" />
<linearGradient
id="linearGradient15662">
<stop
id="stop15664"
offset="0.0000000"
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
<stop
id="stop15666"
offset="1.0000000"
style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient259"
id="radialGradient15658"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.6078834,0,0,0.56033901,42.553563,30.000834)"
cx="33.966679"
cy="35.736916"
fx="33.966679"
fy="35.736916"
r="86.70845" />
<linearGradient
id="linearGradient259">
<stop
id="stop260"
offset="0.0000000"
style="stop-color:#fafafa;stop-opacity:1.0000000;" />
<stop
id="stop261"
offset="1.0000000"
style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient269"
id="radialGradient15656"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.61280726,0,0,0.55583696,44.675982,30.348754)"
cx="8.824419"
cy="3.7561285"
fx="8.824419"
fy="3.7561285"
r="37.751713" />
<linearGradient
id="linearGradient269">
<stop
id="stop270"
offset="0.0000000"
style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
<stop
id="stop271"
offset="1.0000000"
style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient5048"
id="linearGradient5027"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
x1="302.85715"
y1="366.64789"
x2="302.85715"
y2="609.50507" />
<linearGradient
id="linearGradient5048">
<stop
style="stop-color:black;stop-opacity:0;"
offset="0"
id="stop5050" />
<stop
id="stop5056"
offset="0.5"
style="stop-color:black;stop-opacity:1;" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5052" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5029"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<linearGradient
inkscape:collect="always"
id="linearGradient5060">
<stop
style="stop-color:black;stop-opacity:1;"
offset="0"
id="stop5062" />
<stop
style="stop-color:black;stop-opacity:0;"
offset="1"
id="stop5064" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient5060"
id="radialGradient5031"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
cx="605.71429"
cy="486.64789"
fx="605.71429"
fy="486.64789"
r="117.14286" />
<radialGradient
r="117.14286"
fy="486.64789"
fx="605.71429"
cy="486.64789"
cx="605.71429"
gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
gradientUnits="userSpaceOnUse"
id="radialGradient3237"
xlink:href="#linearGradient5060"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2846-1-5"
id="linearGradient2730-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,48.18409,0)"
x1="27.366341"
y1="26.580296"
x2="31.335964"
y2="30.557772" />
<linearGradient
id="linearGradient2846-1-5">
<stop
style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
offset="0.0000000"
id="stop2848-0-9" />
<stop
style="stop-color:#484848;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2850-4-6" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4440-1-1"
id="linearGradient2732-2"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1.334593,0,0,1.291292,55.15793,-7.460658)"
x1="30.65625"
y1="34"
x2="33.21875"
y2="31.0625" />
<linearGradient
id="linearGradient4440-1-1">
<stop
id="stop4442-1-7"
offset="0"
style="stop-color:#7d7d7d;stop-opacity:1;" />
<stop
style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
offset="0.50000000"
id="stop4448-8-8" />
<stop
id="stop4444-6-5"
offset="1.0000000"
style="stop-color:#686868;stop-opacity:1.0000000;" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2366-4-4"
id="linearGradient2734-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,44.17827,0)"
x1="18.292673"
y1="13.602121"
x2="17.500893"
y2="25.743469" />
<linearGradient
id="linearGradient2366-4-4">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2368-3-1" />
<stop
id="stop2374-4-8"
offset="0.50000000"
style="stop-color:#ffffff;stop-opacity:0.21904762;" />
<stop
style="stop-color:#ffffff;stop-opacity:1.0000000;"
offset="1.0000000"
id="stop2370-7-5" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4454-7-7"
id="radialGradient2736-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,43.352,0)"
cx="18.240929"
cy="21.817987"
fx="18.240929"
fy="21.817987"
r="8.3085051" />
<linearGradient
id="linearGradient4454-7-7">
<stop
id="stop4456-0-5"
offset="0.0000000"
style="stop-color:#729fcf;stop-opacity:0.20784314;" />
<stop
id="stop4458-7-3"
offset="1.0000000"
style="stop-color:#729fcf;stop-opacity:0.67619050;" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4467-4-8"
id="radialGradient2738-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.592963,0,0,2.252104,-25.05976,-18.941)"
cx="15.414371"
cy="13.078408"
fx="15.414371"
fy="13.078408"
r="6.65625" />
<linearGradient
id="linearGradient4467-4-8">
<stop
id="stop4469-5-3"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop4471-3-1"
offset="1.0000000"
style="stop-color:#ffffff;stop-opacity:0.24761905;" />
</linearGradient>
<radialGradient
r="6.65625"
fy="13.078408"
fx="15.414371"
cy="13.078408"
cx="15.414371"
gradientTransform="matrix(2.592963,0,0,2.252104,-25.05976,-18.941)"
gradientUnits="userSpaceOnUse"
id="radialGradient3411"
xlink:href="#linearGradient4467-4-8"
inkscape:collect="always" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
inkscape:window-y="26" inkscape:window-y="26"
...@@ -855,9 +348,9 @@ ...@@ -855,9 +348,9 @@
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
showgrid="true" showgrid="true"
inkscape:current-layer="layer5" inkscape:current-layer="layer5"
inkscape:cy="0.68895602" inkscape:cy="13.694933"
inkscape:cx="57.513012" inkscape:cx="19.492108"
inkscape:zoom="5.656854" inkscape:zoom="22.627416"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
borderopacity="0.25490196" borderopacity="0.25490196"
...@@ -1118,81 +611,66 @@ ...@@ -1118,81 +611,66 @@
id="rect15686-03" id="rect15686-03"
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" /> style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible" />
<g <g
style="display:inline" id="g1772"
id="g2711" transform="matrix(0.39105747,0,0,0.37162201,7.9100602,31.393184)">
transform="matrix(-0.70929483,0,0,0.70095374,27.327841,24.978833)" <path
inkscape:r_cx="true" sodipodi:type="arc"
inkscape:r_cy="true"> style="opacity:0.17112301;color:#000000;fill:url(#radialGradient1527);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
id="path4475"
sodipodi:cx="24.130018"
sodipodi:cy="37.967922"
sodipodi:rx="16.528622"
sodipodi:ry="3.9332814"
d="m 40.65864,37.967922 c 0,2.172292 -7.400116,3.933282 -16.528622,3.933282 -9.128505,0 -16.5286214,-1.76099 -16.5286214,-3.933282 0,-2.172291 7.4001164,-3.933281 16.5286214,-3.933281 9.128506,0 16.528622,1.76099 16.528622,3.933281 z"
transform="matrix(1.446431,0,0,1.51999,-10.97453,-17.75168)" />
<path <path
inkscape:connector-curvature="0"
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)"
sodipodi:nodetypes="csscccscccscczzzz" sodipodi:nodetypes="csscccscccscczzzz"
id="path2844-9" id="path2844"
d="m 18.627569,3.1435548 c -8.13913,0 -14.7448008,6.6056711 -14.7448008,14.7448012 0,8.13913 6.6056708,14.744802 14.7448008,14.744802 3.479555,0 6.551001,-1.384393 9.073723,-3.402647 -0.205377,1.006881 -0.07803,2.035368 0.756144,2.759925 l 10.964084,9.52741 c 1.233416,1.071329 3.087462,0.93096 4.15879,-0.302457 1.071328,-1.233418 0.930959,-3.087462 -0.302457,-4.15879 L 32.313769,27.529188 c -0.671527,-0.583279 -1.492878,-0.755969 -2.306238,-0.642722 1.9867,-2.512422 3.364839,-5.548803 3.364839,-8.99811 0,-8.1391301 -6.605671,-14.7448012 -14.744801,-14.7448012 z m -0.07562,1.2261833 c 7.639459,0 13.291775,4.7889505 13.291775,13.2917749 0,8.675113 -5.81669,13.291775 -13.291775,13.291775 -7.302949,0 -13.2917734,-5.478092 -13.2917734,-13.291775 0,-7.9841069 5.8246384,-13.291775 13.2917734,-13.2917749 z" d="m 18.627569,3.1435548 c -8.13913,0 -14.7448008,6.6056711 -14.7448008,14.7448012 0,8.13913 6.6056708,14.744802 14.7448008,14.744802 3.479555,0 6.551001,-1.384393 9.073723,-3.402647 -0.205377,1.006881 -0.07803,2.035368 0.756144,2.759925 l 10.964084,9.52741 c 1.233416,1.071329 3.087462,0.93096 4.15879,-0.302457 1.071328,-1.233418 0.930959,-3.087462 -0.302457,-4.15879 L 32.313769,27.529188 c -0.671527,-0.583279 -1.492878,-0.755969 -2.306238,-0.642722 1.9867,-2.512422 3.364839,-5.548803 3.364839,-8.99811 0,-8.1391301 -6.605671,-14.7448012 -14.744801,-14.7448012 z m -0.07562,1.2261833 c 7.639459,0 13.291775,4.7889505 13.291775,13.2917749 0,8.675113 -5.81669,13.291775 -13.291775,13.291775 -7.302949,0 -13.2917734,-5.478092 -13.2917734,-13.291775 0,-7.9841069 5.8246384,-13.291775 13.2917734,-13.2917749 z"
style="color:#000000;fill:#dcdcdc;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2730);stroke-width:3.10908341;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:#dcdcdc;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1529);stroke-width:3.00581574;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
inkscape:connector-curvature="0"
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)"
style="color:#000000;fill:#dcdcdc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000036;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:#dcdcdc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000036;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 18.602905,3.0803551 c -8.16544,0 -14.7924642,6.627024 -14.7924642,14.7924639 0,8.16544 6.6270242,14.792464 14.7924642,14.792464 3.490803,0 6.572177,-1.388867 9.103055,-3.413645 -0.206041,1.010136 -0.07829,2.041947 0.758587,2.768846 l 10.999526,9.558207 c 1.237403,1.074792 3.097442,0.93397 4.172233,-0.303435 1.074791,-1.237404 0.933968,-3.097442 -0.303435,-4.172233 L 32.333346,27.544815 c -0.673698,-0.585164 -1.497704,-0.758413 -2.313693,-0.644799 1.993122,-2.520544 3.375716,-5.56674 3.375716,-9.027197 0,-8.1654399 -6.627024,-14.7924639 -14.792464,-14.7924639 z m -0.07586,3.1860692 c 6.281108,2e-7 11.378818,5.0977107 11.378818,11.3788187 0,6.281108 -5.09771,11.378818 -11.378818,11.378818 -6.281108,0 -11.3788184,-5.09771 -11.3788184,-11.378818 2e-7,-6.281108 5.0977104,-11.3788187 11.3788184,-11.3788187 z" d="m 18.602905,3.0803551 c -8.16544,0 -14.7924642,6.627024 -14.7924642,14.7924639 0,8.16544 6.6270242,14.792464 14.7924642,14.792464 3.490803,0 6.572177,-1.388867 9.103055,-3.413645 -0.206041,1.010136 -0.07829,2.041947 0.758587,2.768846 l 10.999526,9.558207 c 1.237403,1.074792 3.097442,0.93397 4.172233,-0.303435 1.074791,-1.237404 0.933968,-3.097442 -0.303435,-4.172233 L 32.333346,27.544815 c -0.673698,-0.585164 -1.497704,-0.758413 -2.313693,-0.644799 1.993122,-2.520544 3.375716,-5.56674 3.375716,-9.027197 0,-8.1654399 -6.627024,-14.7924639 -14.792464,-14.7924639 z m -0.07586,3.1860692 c 6.281108,2e-7 11.378818,5.0977107 11.378818,11.3788187 0,6.281108 -5.09771,11.378818 -11.378818,11.378818 -6.281108,0 -11.3788184,-5.09771 -11.3788184,-11.378818 2e-7,-6.281108 5.0977104,-11.3788187 11.3788184,-11.3788187 z"
id="path4430-3" id="path4430" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
inkscape:connector-curvature="0" style="color:#000000;fill:url(#linearGradient1531);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)"
style="color:#000000;fill:url(#linearGradient2732);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 39.507004,41.57769 c -0.478672,-2.273187 1.39733,-4.811422 3.584053,-4.788375 0,0 -10.760367,-9.258111 -10.760367,-9.258111 -2.944791,-0.05671 -4.269502,2.272616 -3.776814,4.599922 l 10.953128,9.446564 z" d="m 39.507004,41.57769 c -0.478672,-2.273187 1.39733,-4.811422 3.584053,-4.788375 0,0 -10.760367,-9.258111 -10.760367,-9.258111 -2.944791,-0.05671 -4.269502,2.272616 -3.776814,4.599922 l 10.953128,9.446564 z"
id="path4438-0" id="path4438"
sodipodi:nodetypes="ccccc" sodipodi:nodetypes="ccccc" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
sodipodi:type="arc" sodipodi:type="arc"
style="color:#000000;fill:none;stroke:url(#linearGradient2734);stroke-width:1.24788225;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:none;stroke:url(#linearGradient1533);stroke-width:1.20643401;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="path4450-2" id="path4450"
sodipodi:cx="17.500893" sodipodi:cx="17.500893"
sodipodi:cy="18.920233" sodipodi:cy="18.920233"
sodipodi:rx="11.048544" sodipodi:rx="11.048544"
sodipodi:ry="11.048544" sodipodi:ry="11.048544"
d="m 28.549437,18.920233 c 0,6.101942 -4.946602,11.048544 -11.048544,11.048544 -6.101943,0 -11.0485443,-4.946602 -11.0485443,-11.048544 0,-6.101943 4.9466013,-11.0485442 11.0485443,-11.0485442 6.101942,0 11.048544,4.9466012 11.048544,11.0485442 z" d="m 28.549437,18.920233 c 0,6.101942 -4.946602,11.048544 -11.048544,11.048544 -6.101943,0 -11.0485443,-4.946602 -11.0485443,-11.048544 0,-6.101943 4.9466013,-11.0485442 11.0485443,-11.0485442 6.101942,0 11.048544,4.9466012 11.048544,11.0485442 z"
transform="matrix(-0.801358,0,0,0.801358,33.70147,0.855159)" transform="matrix(1.245743,0,0,1.245743,-3.425346,-6.177033)" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<rect <rect
style="opacity:0.43315507;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.55458939;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" style="opacity:0.43315507;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.50295389;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
id="rect4495-7" id="rect4495"
width="19.048439" width="19.048439"
height="4.4404783" height="4.4404783"
x="40.373337" x="40.373337"
y="0.14086054" y="0.14086054"
rx="3.3215265" rx="3.2112026"
ry="2.9348745" ry="2.837393"
transform="matrix(-0.484379,0.4233,0.417423,0.489452,31.49802,4.828704)" transform="matrix(0.752986,0.658037,-0.648902,0.760872,0,0)" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
sodipodi:type="arc" sodipodi:type="arc"
style="color:#000000;fill:url(#radialGradient2736);fill-opacity:1;fill-rule:evenodd;stroke:#3063a3;stroke-width:1.11148739;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible" style="color:#000000;fill:url(#radialGradient1537);fill-opacity:1;fill-rule:evenodd;stroke:#3063a3;stroke-width:1.07456946;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible"
id="path4452-9" id="path4452"
sodipodi:cx="17.589281" sodipodi:cx="17.589281"
sodipodi:cy="18.478292" sodipodi:cy="18.478292"
sodipodi:rx="8.3085051" sodipodi:rx="8.3085051"
sodipodi:ry="8.3085051" sodipodi:ry="8.3085051"
d="m 25.897786,18.478292 c 0,4.588661 -3.719844,8.308506 -8.308505,8.308506 -4.588661,0 -8.308505,-3.719845 -8.308505,-8.308506 0,-4.58866 3.719844,-8.308505 8.308505,-8.308505 4.588661,0 8.308505,3.719845 8.308505,8.308505 z" d="m 25.897786,18.478292 c 0,4.588661 -3.719844,8.308506 -8.308505,8.308506 -4.588661,0 -8.308505,-3.719845 -8.308505,-8.308506 0,-4.58866 3.719844,-8.308505 8.308505,-8.308505 4.588661,0 8.308505,3.719845 8.308505,8.308505 z"
transform="matrix(-0.899697,0,0,0.899697,35.502,-0.509826)" transform="matrix(1.398614,0,0,1.398614,-6.224338,-8.298958)" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
inkscape:connector-curvature="0" style="opacity:0.83422457;color:#000000;fill:url(#radialGradient1539);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
transform="matrix(0.643277,0,0,0.643277,7.855933,4.828704)"
style="opacity:0.83422457;color:#000000;fill:url(#radialGradient2738);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
d="m 18.156915,7.3966938 c -5.20759,0 -9.4245469,4.2169572 -9.4245469,9.4245472 0,1.503975 0.4203072,2.887773 1.0471719,4.149903 1.25238,0.461613 2.582757,0.775683 3.994767,0.775683 6.170955,0 11.099282,-4.861637 11.480106,-10.937129 C 23.523449,8.7641668 21.044374,7.3966938 18.156915,7.3966938 z" d="m 18.156915,7.3966938 c -5.20759,0 -9.4245469,4.2169572 -9.4245469,9.4245472 0,1.503975 0.4203072,2.887773 1.0471719,4.149903 1.25238,0.461613 2.582757,0.775683 3.994767,0.775683 6.170955,0 11.099282,-4.861637 11.480106,-10.937129 C 23.523449,8.7641668 21.044374,7.3966938 18.156915,7.3966938 z"
id="path4462-9" id="path4462" />
inkscape:r_cx="true"
inkscape:r_cy="true" />
</g> </g>
</g> </g>
</svg> </svg>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
...@@ -37,15 +37,15 @@ ...@@ -37,15 +37,15 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1600" inkscape:window-width="1280"
inkscape:window-height="841" inkscape:window-height="968"
id="namedview52" id="namedview52"
showgrid="true" showgrid="true"
inkscape:zoom="25.615385" inkscape:zoom="25.615385"
inkscape:cx="20.436413" inkscape:cx="20.436413"
inkscape:cy="13" inkscape:cy="13"
inkscape:window-x="0" inkscape:window-x="-4"
inkscape:window-y="28" inkscape:window-y="-4"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
inkscape:snap-to-guides="true" inkscape:snap-to-guides="true"
...@@ -160,14 +160,14 @@ ...@@ -160,14 +160,14 @@
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:13.32437897px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fff6f6;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:13.32437897px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#fff6f6;fill-opacity:1;stroke:none;font-family:Sans"
x="14.758149" x="16.649334"
y="20.166557" y="21.141987"
id="text3035" id="text3035"
sodipodi:linespacing="125%" sodipodi:linespacing="125%"
transform="scale(0.96099942,1.0405834)"><tspan transform="scale(0.96099939,1.0405834)"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan3037" id="tspan3037"
x="14.758149" x="16.649334"
y="20.166557" y="21.141987"
style="font-weight:bold;fill:#fff6f6;fill-opacity:1;-inkscape-font-specification:Sans Bold">#</tspan></text> style="font-weight:bold;fill:#fff6f6;fill-opacity:1;-inkscape-font-specification:Sans Bold">#</tspan></text>
</svg> </svg>
...@@ -49,6 +49,29 @@ ...@@ -49,6 +49,29 @@
wxPoint DIALOG_PAGES_SETTINGS::s_LastPos( -1, -1 ); wxPoint DIALOG_PAGES_SETTINGS::s_LastPos( -1, -1 );
wxSize DIALOG_PAGES_SETTINGS::s_LastSize; 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 ) void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
{ {
...@@ -92,6 +115,18 @@ void DIALOG_PAGES_SETTINGS::initDialog() ...@@ -92,6 +115,18 @@ void DIALOG_PAGES_SETTINGS::initDialog()
SetFocus(); 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 #ifdef EESCHEMA
// Init display value for sheet User size // Init display value for sheet User size
wxString format = m_TextSheetCount->GetLabel(); wxString format = m_TextSheetCount->GetLabel();
...@@ -232,7 +267,10 @@ void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event ) ...@@ -232,7 +267,10 @@ void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event )
void DIALOG_PAGES_SETTINGS::OnPaperSizeChoice( 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 ) ) if( paperType.Contains( PAGE_INFO::Custom ) )
{ {
m_orientationComboBox->Enable( false ); m_orientationComboBox->Enable( false );
...@@ -364,14 +402,15 @@ void DIALOG_PAGES_SETTINGS::OnComment4TextUpdated( wxCommandEvent& event ) ...@@ -364,14 +402,15 @@ void DIALOG_PAGES_SETTINGS::OnComment4TextUpdated( wxCommandEvent& event )
void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event ) void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event )
{ {
bool retSuccess; bool retSuccess = false;
m_save_flag = true; m_save_flag = true;
// wxFormBuilder must use "A4", "A3", etc for choices, in all languages/translations int idx = m_paperSizeComboBox->GetSelection();
const wxString paperType = m_paperSizeComboBox->GetStringSelection(); 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 ) ) if( paperType.Contains( PAGE_INFO::Custom ) )
{ {
GetCustomSizeMilsFromDialog(); GetCustomSizeMilsFromDialog();
...@@ -506,15 +545,11 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ), ...@@ -506,15 +545,11 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ),
void DIALOG_PAGES_SETTINGS::SetCurrentPageSizeSelection( const wxString& aPaperSize ) void DIALOG_PAGES_SETTINGS::SetCurrentPageSizeSelection( const wxString& aPaperSize )
{ {
// use wxChoice to store the sheet type in the wxChoice's choice // search all the not translated label list containing our paper type
// i.e. "A4", "A3", etc, anywhere within the text of the label. for( unsigned i = 0; i < m_pageFmt.GetCount(); ++i )
// 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 )
{ {
// parse each label looking for aPaperSize within it // parse each label looking for aPaperSize within it
wxStringTokenizer st( m_paperSizeComboBox->GetString( i ) ); wxStringTokenizer st( m_pageFmt[i] );
while( st.HasMoreTokens() ) while( st.HasMoreTokens() )
{ {
...@@ -609,8 +644,10 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample() ...@@ -609,8 +644,10 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample()
void DIALOG_PAGES_SETTINGS::GetPageLayoutInfoFromDialog() void DIALOG_PAGES_SETTINGS::GetPageLayoutInfoFromDialog()
{ {
// wxFormBuilder must use "A4", "A3", etc for choices, in all languages/translations int idx = m_paperSizeComboBox->GetSelection();
const wxString paperType = m_paperSizeComboBox->GetStringSelection(); if( idx < 0 )
idx = 0;
const wxString paperType = m_pageFmt[idx];
// here we assume translators will keep original paper size spellings // here we assume translators will keep original paper size spellings
if( paperType.Contains( PAGE_INFO::Custom ) ) if( paperType.Contains( PAGE_INFO::Custom ) )
......
...@@ -38,6 +38,7 @@ class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE ...@@ -38,6 +38,7 @@ class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE
private: private:
EDA_DRAW_FRAME* m_Parent; EDA_DRAW_FRAME* m_Parent;
BASE_SCREEN* m_Screen; BASE_SCREEN* m_Screen;
wxArrayString m_pageFmt; /// list of page sizes (not translated)
bool m_initialized; bool m_initialized;
bool m_modified; bool m_modified;
bool m_save_flag; bool m_save_flag;
......
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Feb 9 2012) // C++ code generated with wxFormBuilder (version Mar 17 2012)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_page_settings_base.h" #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 ) 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 ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bUpperSizerH; wxBoxSizer* bUpperSizerH;
bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); bUpperSizerH = new wxBoxSizer( wxHORIZONTAL );
wxFlexGridSizer* LeftColumnSizer; wxFlexGridSizer* LeftColumnSizer;
LeftColumnSizer = new wxFlexGridSizer( 3, 1, 0, 0 ); LeftColumnSizer = new wxFlexGridSizer( 3, 1, 0, 0 );
LeftColumnSizer->AddGrowableRow( 0 ); LeftColumnSizer->AddGrowableRow( 0 );
LeftColumnSizer->AddGrowableRow( 1 ); LeftColumnSizer->AddGrowableRow( 1 );
LeftColumnSizer->AddGrowableRow( 2 ); LeftColumnSizer->AddGrowableRow( 2 );
LeftColumnSizer->SetFlexibleDirection( wxBOTH ); LeftColumnSizer->SetFlexibleDirection( wxBOTH );
LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxStaticBoxSizer* PaperSizer; wxStaticBoxSizer* PaperSizer;
PaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper") ), wxVERTICAL ); PaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper") ), wxVERTICAL );
m_staticText5 = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5 = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText5->Wrap( -1 ); m_staticText5->Wrap( -1 );
PaperSizer->Add( m_staticText5, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); 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)") }; wxString m_paperSizeComboBoxChoices[] = { _("dummy text") };
int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString ); 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 = 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 ); PaperSizer->Add( m_paperSizeComboBox, 0, wxALL|wxEXPAND, 5 );
m_staticText6 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText6->Wrap( -1 ); m_staticText6->Wrap( -1 );
PaperSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); PaperSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") }; wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") };
int m_orientationComboBoxNChoices = sizeof( m_orientationComboBoxChoices ) / sizeof( wxString ); 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 = 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 ); PaperSizer->Add( m_orientationComboBox, 0, wxEXPAND|wxALL, 5 );
...@@ -85,224 +85,225 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind ...@@ -85,224 +85,225 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
CustomPaperSizer->Add( CustomPaperHeight, 0, wxEXPAND, 5 ); CustomPaperSizer->Add( CustomPaperHeight, 0, wxEXPAND, 5 );
CustomPaperSizer->Add( 5, 50, 0, 0, 5 ); CustomPaperSizer->Add( 5, 50, 0, 0, 5 );
PaperSizer->Add( CustomPaperSizer, 1, wxEXPAND, 5 ); PaperSizer->Add( CustomPaperSizer, 1, wxEXPAND, 5 );
LeftColumnSizer->Add( PaperSizer, 1, wxALL, 5 ); LeftColumnSizer->Add( PaperSizer, 1, wxALL, 5 );
wxStaticBoxSizer* PageLayoutExampleSizer; wxStaticBoxSizer* PageLayoutExampleSizer;
PageLayoutExampleSizer = new wxStaticBoxSizer( new wxStaticBox( this, ID_PAGE_LAYOUT_EXAMPLE_SIZER, _("Layout Preview") ), wxVERTICAL ); PageLayoutExampleSizer = new wxStaticBoxSizer( new wxStaticBox( this, ID_PAGE_LAYOUT_EXAMPLE_SIZER, _("Layout Preview") ), wxVERTICAL );
PageLayoutExampleSizer->SetMinSize( wxSize( 240,-1 ) ); 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 = 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->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
PageLayoutExampleSizer->Add( m_PageLayoutExampleBitmap, 0, wxALIGN_CENTER|wxALL, 5 ); PageLayoutExampleSizer->Add( m_PageLayoutExampleBitmap, 0, wxALIGN_CENTER|wxALL, 5 );
LeftColumnSizer->Add( PageLayoutExampleSizer, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); LeftColumnSizer->Add( PageLayoutExampleSizer, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 );
LeftColumnSizer->Add( 0, 1, 1, wxEXPAND, 5 ); LeftColumnSizer->Add( 0, 1, 1, wxEXPAND, 5 );
bUpperSizerH->Add( LeftColumnSizer, 0, wxALL|wxEXPAND, 5 ); bUpperSizerH->Add( LeftColumnSizer, 0, wxALL|wxEXPAND, 5 );
wxFlexGridSizer* RightColumnSizer; wxFlexGridSizer* RightColumnSizer;
RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 );
RightColumnSizer->AddGrowableCol( 0 ); RightColumnSizer->AddGrowableCol( 0 );
RightColumnSizer->AddGrowableRow( 0 ); RightColumnSizer->AddGrowableRow( 0 );
RightColumnSizer->AddGrowableRow( 1 ); RightColumnSizer->AddGrowableRow( 1 );
RightColumnSizer->AddGrowableRow( 2 ); RightColumnSizer->AddGrowableRow( 2 );
RightColumnSizer->AddGrowableRow( 3 ); RightColumnSizer->AddGrowableRow( 3 );
RightColumnSizer->AddGrowableRow( 4 ); RightColumnSizer->AddGrowableRow( 4 );
RightColumnSizer->AddGrowableRow( 5 ); RightColumnSizer->AddGrowableRow( 5 );
RightColumnSizer->AddGrowableRow( 6 ); RightColumnSizer->AddGrowableRow( 6 );
RightColumnSizer->AddGrowableRow( 7 ); RightColumnSizer->AddGrowableRow( 7 );
RightColumnSizer->SetFlexibleDirection( wxBOTH ); RightColumnSizer->SetFlexibleDirection( wxBOTH );
RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxStaticBoxSizer* BasicInscriptionsSizer; wxStaticBoxSizer* BasicInscriptionsSizer;
BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Basic Inscriptions") ), wxVERTICAL ); BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Basic Inscriptions") ), wxVERTICAL );
BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) ); BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) );
wxBoxSizer* SheetInfoSizer; wxBoxSizer* SheetInfoSizer;
SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL );
m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextSheetCount->Wrap( -1 ); m_TextSheetCount->Wrap( -1 );
SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 );
SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 );
m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextSheetNumber->Wrap( -1 ); m_TextSheetNumber->Wrap( -1 );
SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( SheetInfoSizer, 0, 0, 5 ); BasicInscriptionsSizer->Add( SheetInfoSizer, 0, 0, 5 );
wxStaticBoxSizer* RevisionSizer; wxStaticBoxSizer* RevisionSizer;
RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision") ), wxHORIZONTAL ); RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision") ), wxHORIZONTAL );
m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_TextRevision->SetMinSize( wxSize( 100,-1 ) ); m_TextRevision->SetMinSize( wxSize( 100,-1 ) );
RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); 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_RevisionExport = new wxCheckBox( this, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
RevisionSizer->Add( m_RevisionExport, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); RevisionSizer->Add( m_RevisionExport, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
BasicInscriptionsSizer->Add( RevisionSizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( RevisionSizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* TitleSizer; wxStaticBoxSizer* TitleSizer;
TitleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title") ), wxHORIZONTAL ); 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 ) ); m_TextTitle->SetMinSize( wxSize( 360,-1 ) );
TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
TitleSizer->Add( m_TitleExport, 0, wxALL, 5 ); TitleSizer->Add( m_TitleExport, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* CompanySizer; wxStaticBoxSizer* CompanySizer;
CompanySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Company") ), wxHORIZONTAL ); 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 ) ); m_TextCompany->SetMinSize( wxSize( 360,-1 ) );
CompanySizer->Add( m_TextCompany, 1, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); 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_CompanyExport, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* Comment1Sizer; wxStaticBoxSizer* Comment1Sizer;
Comment1Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment1") ), wxHORIZONTAL ); 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 ) ); m_TextComment1->SetMinSize( wxSize( 360,-1 ) );
Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); 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_Comment1Export, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* Comment2Sizer; wxStaticBoxSizer* Comment2Sizer;
Comment2Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment2") ), wxHORIZONTAL ); 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 ) ); m_TextComment2->SetMinSize( wxSize( 360,-1 ) );
Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); 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_Comment2Export, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* Comment3Sizer; wxStaticBoxSizer* Comment3Sizer;
Comment3Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment3") ), wxHORIZONTAL ); 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 ) ); m_TextComment3->SetMinSize( wxSize( 360,-1 ) );
Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); 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_Comment3Export, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 );
wxStaticBoxSizer* Comment4Sizer; wxStaticBoxSizer* Comment4Sizer;
Comment4Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment4") ), wxHORIZONTAL ); 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 ) ); m_TextComment4->SetMinSize( wxSize( 360,-1 ) );
Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); 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_Comment4Export, 0, wxALL, 5 );
BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 ); BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 );
RightColumnSizer->Add( BasicInscriptionsSizer, 1, wxALL|wxEXPAND, 5 ); RightColumnSizer->Add( BasicInscriptionsSizer, 1, wxALL|wxEXPAND, 5 );
bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 ); bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 );
bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 );
bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->Realize(); m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
bMainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 ); bMainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 );
this->SetSizer( bMainSizer ); this->SetSizer( bMainSizer );
this->Layout(); this->Layout();
// Connect Events // Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); 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_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_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_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_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_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_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_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_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_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_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_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_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 ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
} }
DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE()
{ {
// Disconnect Events // Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); 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_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_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_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_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_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_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_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_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_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_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_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_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_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Feb 9 2012) // C++ code generated with wxFormBuilder (version Mar 17 2012)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_PAGE_SETTINGS_BASE_H__ #ifndef __DIALOG_PAGE_SETTINGS_BASE_H__
#define __DIALOG_PAGE_SETTINGS_BASE_H__ #define __DIALOG_PAGE_SETTINGS_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/valtext.h> #include <wx/valtext.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/statbmp.h> #include <wx/statbmp.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#define ID_CHICE_PAGE_SIZE 1000 #define ID_CHICE_PAGE_SIZE 1000
#define ID_CHOICE_PAGE_ORIENTATION 1001 #define ID_CHOICE_PAGE_ORIENTATION 1001
#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002 #define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002
...@@ -50,65 +50,65 @@ ...@@ -50,65 +50,65 @@
#define ID_CHECKBOX_COMMENT3 1015 #define ID_CHECKBOX_COMMENT3 1015
#define ID_TEXTCTRL_COMMENT4 1016 #define ID_TEXTCTRL_COMMENT4 1016
#define ID_CHECKBOX_COMMENT4 1017 #define ID_CHECKBOX_COMMENT4 1017
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAGES_SETTINGS_BASE /// Class DIALOG_PAGES_SETTINGS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_PAGES_SETTINGS_BASE : public wxDialog class DIALOG_PAGES_SETTINGS_BASE : public wxDialog
{ {
private: private:
protected: protected:
wxStaticText* m_staticText5; wxStaticText* m_staticText5;
wxChoice* m_paperSizeComboBox; wxChoice* m_paperSizeComboBox;
wxStaticText* m_staticText6; wxStaticText* m_staticText6;
wxChoice* m_orientationComboBox; wxChoice* m_orientationComboBox;
wxTextCtrl* m_TextUserSizeX; wxTextCtrl* m_TextUserSizeX;
wxTextCtrl* m_TextUserSizeY; wxTextCtrl* m_TextUserSizeY;
wxStaticBitmap* m_PageLayoutExampleBitmap; wxStaticBitmap* m_PageLayoutExampleBitmap;
wxStaticText* m_TextSheetCount; wxStaticText* m_TextSheetCount;
wxStaticText* m_TextSheetNumber; wxStaticText* m_TextSheetNumber;
wxTextCtrl* m_TextRevision; wxTextCtrl* m_TextRevision;
wxCheckBox* m_RevisionExport; wxCheckBox* m_RevisionExport;
wxTextCtrl* m_TextTitle; wxTextCtrl* m_TextTitle;
wxCheckBox* m_TitleExport; wxCheckBox* m_TitleExport;
wxTextCtrl* m_TextCompany; wxTextCtrl* m_TextCompany;
wxCheckBox* m_CompanyExport; wxCheckBox* m_CompanyExport;
wxTextCtrl* m_TextComment1; wxTextCtrl* m_TextComment1;
wxCheckBox* m_Comment1Export; wxCheckBox* m_Comment1Export;
wxTextCtrl* m_TextComment2; wxTextCtrl* m_TextComment2;
wxCheckBox* m_Comment2Export; wxCheckBox* m_Comment2Export;
wxTextCtrl* m_TextComment3; wxTextCtrl* m_TextComment3;
wxCheckBox* m_Comment3Export; wxCheckBox* m_Comment3Export;
wxTextCtrl* m_TextComment4; wxTextCtrl* m_TextComment4;
wxCheckBox* m_Comment4Export; wxCheckBox* m_Comment4Export;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
virtual void OnPaperSizeChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnPaperSizeChoice( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPageOrientationChoice( wxCommandEvent& event ) { event.Skip(); } virtual void OnPageOrientationChoice( wxCommandEvent& event ) { event.Skip(); }
virtual void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRevisionTextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnRevisionTextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnTitleTextUpdated( 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 OnCompanyTextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnComment1TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment1TextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); } virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public: 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( 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__ #endif //__DIALOG_PAGE_SETTINGS_BASE_H__
This source diff could not be displayed because it is too large. You can view the blob instead.
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * 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 <stambaughw@verizon.net> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. * 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 ...@@ -305,7 +305,7 @@ bool ReadSchemaDescr( LINE_READER* aLine, wxString& aMsgDiag, SCH_SCREEN* aScree
if( !pageInfo.SetType( pagename ) ) if( !pageInfo.SetType( pagename ) )
{ {
aMsgDiag.Printf( _( "Eeschema file dimension definition error \ aMsgDiag.Printf( _( "Eeschema file dimension definition error \
line %d, \aAbort reading file.\n" ), line %d,\nAbort reading file.\n" ),
aLine->LineNumber() ); aLine->LineNumber() );
aMsgDiag << FROM_UTF8( line ); aMsgDiag << FROM_UTF8( line );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment