Pcbnew and Cvpcb: more about new netlist support: see CHANGELOG (important changes).

Also commit updated icnos from Fabrizio.
This commit is contained in:
jean-pierre charras 2012-02-01 20:49:37 +01:00
parent 9eb7cba156
commit f9e2f9dc77
47 changed files with 2933 additions and 2917 deletions

View File

@ -4,6 +4,21 @@ KiCad ChangeLog 2012
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2012-Feb-01, UPDATE Jean-Pierre Charras <jp.charras@wanadoo.fr>
================================================================================
Pcbnew:
Cvpcb:
more about new netlist format:
Cvpcb can now read new netlist format.
There is a big change in Cvpcb: now Cvpcb just creates or updates a .cmp file
Before this change, Cvpcb recreated the netlist (adding footprint info)
and updated the .cmp file.
But there is no reason to modify the netlist, because Pcbnew uses always the .cmp file
(when exists) to know the footprint selection for components.
Currently the netlist is used only when the corresponding .cmp file is not fount
to select footprints.
So users should not notice this important change.
2012-Jan-26, UPDATE Jean-Pierre Charras <jp.charras@wanadoo.fr> 2012-Jan-26, UPDATE Jean-Pierre Charras <jp.charras@wanadoo.fr>
================================================================================ ================================================================================
Pcbnew: Pcbnew:

View File

@ -8,39 +8,33 @@
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, 0x01, 0xed, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0xd6, 0x4f, 0x28, 0x04, 0xce, 0x00, 0x00, 0x01, 0x95, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0xd6, 0xbd, 0x4b, 0xc3,
0x51, 0x1c, 0x07, 0xf0, 0xf1, 0x2f, 0xb1, 0x14, 0xc6, 0xdf, 0x56, 0xd2, 0x66, 0xd7, 0xd6, 0xcc, 0x40, 0x18, 0x06, 0xf0, 0x03, 0x2d, 0x16, 0xe2, 0x20, 0xa2, 0x4e, 0x2a, 0xd2, 0x8a, 0x83, 0x14,
0xae, 0x28, 0xff, 0xae, 0x4a, 0x38, 0x49, 0xa1, 0x6c, 0x39, 0x70, 0x70, 0xb2, 0x61, 0x6f, 0x4a, 0x6c, 0x51, 0x10, 0xd4, 0xd5, 0xd5, 0x59, 0xc4, 0x41, 0x04, 0x67, 0xb5, 0x83, 0x82, 0x78, 0x83,
0x5c, 0x09, 0x17, 0x27, 0x42, 0x39, 0xba, 0x88, 0x1c, 0x9d, 0xb8, 0x28, 0xe4, 0x5f, 0x12, 0x49, 0x8a, 0x82, 0x83, 0xb8, 0x09, 0xfe, 0x03, 0x45, 0x5c, 0x84, 0x2e, 0x2e, 0x8e, 0xce, 0xba, 0x38,
0x91, 0x7f, 0x85, 0x8b, 0xe3, 0x2e, 0xad, 0xf1, 0x7d, 0xf6, 0x37, 0x3c, 0x13, 0x33, 0xb3, 0xdb, 0x38, 0xd6, 0x49, 0xc1, 0x0f, 0x1c, 0x83, 0xad, 0x9e, 0xcf, 0x5b, 0xde, 0x2b, 0x67, 0x0c, 0x77,
0x2e, 0xd9, 0xfa, 0xb4, 0xb3, 0xbf, 0xe6, 0xbd, 0xef, 0xbc, 0x79, 0xef, 0xcd, 0x8e, 0xa0, 0x28, 0xad, 0x24, 0xc1, 0xc0, 0xaf, 0x49, 0xdf, 0x24, 0xf7, 0x5c, 0x2e, 0x97, 0x10, 0xa1, 0x94, 0x12,
0x8a, 0xf0, 0x1b, 0xcc, 0x9d, 0x24, 0x08, 0x29, 0x50, 0x0c, 0xa9, 0x5c, 0x2d, 0x17, 0xac, 0xd1, 0x49, 0x10, 0xff, 0x2a, 0x08, 0x4b, 0x05, 0x7c, 0xd8, 0x0c, 0xd4, 0xa9, 0xf6, 0x1e, 0x65, 0xd0,
0x0e, 0x6a, 0x04, 0x76, 0x70, 0x08, 0xf9, 0x54, 0x5b, 0x81, 0x53, 0x88, 0x8b, 0x66, 0x50, 0x13, 0x13, 0xd0, 0xc6, 0x17, 0xcc, 0x1b, 0x75, 0xfa, 0xf1, 0xe3, 0x08, 0xfa, 0x60, 0x33, 0x46, 0x50,
0x05, 0x3d, 0xc1, 0x05, 0x14, 0x51, 0xd0, 0x0d, 0xb8, 0xcc, 0x84, 0x85, 0x1b, 0x34, 0x0a, 0x47, 0x15, 0x36, 0xa2, 0x0e, 0x2a, 0x41, 0x8d, 0x86, 0x0b, 0x46, 0x8c, 0xa0, 0xad, 0xa8, 0x83, 0xf6,
0x70, 0x0b, 0x7b, 0xf4, 0x5d, 0x1e, 0x8b, 0xa0, 0x61, 0x28, 0x81, 0x5d, 0xfa, 0x1d, 0xd3, 0xa0, 0xe1, 0x9c, 0xb7, 0x2b, 0x71, 0x07, 0x8d, 0xc2, 0x15, 0xff, 0x8f, 0x35, 0x28, 0x0d, 0x05, 0xb8,
0x78, 0x28, 0x84, 0xf3, 0x58, 0x04, 0xb9, 0x61, 0x15, 0xbc, 0xac, 0x53, 0x32, 0x08, 0xcb, 0xd1, 0x89, 0x3d, 0x88, 0x6b, 0xb3, 0x2d, 0x07, 0xe5, 0x72, 0xca, 0x27, 0x2d, 0x06, 0x09, 0x57, 0x90,
0x0e, 0x62, 0x1d, 0x97, 0x42, 0x9d, 0xda, 0x29, 0x8d, 0xac, 0x8e, 0xea, 0xe6, 0x82, 0x64, 0x59, 0xd9, 0xae, 0x2e, 0x28, 0x62, 0x09, 0xea, 0xa0, 0x29, 0x0c, 0x52, 0x07, 0x71, 0xdd, 0x83, 0x1d,
0xd9, 0x80, 0x35, 0xbd, 0x06, 0xea, 0x48, 0x8c, 0x6a, 0x2a, 0x97, 0x4b, 0x69, 0x43, 0x9f, 0x7e, 0x4b, 0x50, 0xa3, 0xdd, 0x1f, 0x05, 0xdb, 0x10, 0x60, 0x29, 0x06, 0x83, 0xb8, 0x2e, 0x5d, 0x41,
0x59, 0x7e, 0x29, 0xe3, 0x82, 0x5e, 0xb7, 0x9c, 0xce, 0xc7, 0x03, 0x34, 0xb2, 0xf1, 0x0d, 0xe9, 0xb4, 0x3f, 0x58, 0x90, 0x81, 0x46, 0xc6, 0xe0, 0x18, 0x16, 0xa1, 0x0d, 0xda, 0x43, 0x3a, 0xb0,
0xb6, 0xb4, 0xb0, 0x03, 0x9d, 0x0b, 0xc8, 0x80, 0x5e, 0xc8, 0xe6, 0xeb, 0x92, 0x14, 0xec, 0x40, 0x02, 0x27, 0x30, 0x69, 0x09, 0x92, 0xbf, 0x0b, 0x42, 0xf4, 0xc0, 0x2a, 0xdc, 0x1a, 0x53, 0x38,
0x90, 0x92, 0x93, 0x33, 0xd4, 0xfd, 0x7e, 0x41, 0x9f, 0x41, 0x77, 0xc7, 0x28, 0xc8, 0x6c, 0x43, 0x63, 0xb9, 0xd2, 0xac, 0x71, 0xdc, 0x7d, 0xbd, 0xf7, 0x42, 0x0c, 0xb8, 0x82, 0xcc, 0xc6, 0x35,
0x82, 0x8f, 0x36, 0x27, 0xeb, 0xa9, 0x07, 0xd2, 0x7e, 0x0a, 0xa3, 0xcf, 0x09, 0x3c, 0xd3, 0x3c, 0xfd, 0x26, 0x78, 0x83, 0x67, 0xf6, 0xc2, 0x5e, 0xd9, 0x67, 0xc8, 0x79, 0x25, 0x5b, 0xd0, 0x2e,
0xb6, 0x42, 0xb2, 0x1a, 0x94, 0x95, 0xe5, 0xed, 0xe7, 0x82, 0x82, 0xdb, 0x76, 0xfb, 0xe9, 0x35, 0xdf, 0x8b, 0x6b, 0xe3, 0x64, 0x5a, 0x9f, 0xc2, 0x04, 0x0c, 0xb3, 0x2c, 0xcb, 0xc0, 0x38, 0x77,
0x0a, 0x57, 0x10, 0xa4, 0x00, 0xe6, 0x15, 0xd6, 0x61, 0x01, 0x66, 0x39, 0x73, 0x64, 0x9e, 0x1c, 0x46, 0x77, 0xea, 0x0e, 0x0e, 0xa0, 0xdb, 0x35, 0x74, 0x73, 0xbc, 0x3e, 0x84, 0x4b, 0x78, 0x84,
0x72, 0x6d, 0x98, 0x80, 0x28, 0x7a, 0xf7, 0x42, 0x41, 0xbd, 0x03, 0x5f, 0x46, 0xe4, 0x70, 0x9c, 0x0b, 0x58, 0x63, 0xeb, 0xac, 0xc8, 0xce, 0xe0, 0x01, 0xca, 0x1c, 0x20, 0x35, 0x57, 0x50, 0x0a,
0x5d, 0xa2, 0x70, 0x4c, 0x57, 0xc6, 0x07, 0x2d, 0xc2, 0x38, 0x8c, 0x71, 0x46, 0x35, 0x76, 0x34, 0xa6, 0x61, 0x09, 0xb6, 0xb9, 0xb6, 0x07, 0x83, 0xd0, 0x67, 0xe8, 0x65, 0x54, 0xef, 0x37, 0x8e,
0x41, 0x0f, 0xa2, 0x38, 0xb0, 0xf9, 0x6d, 0x10, 0xdd, 0xba, 0x7a, 0xe8, 0x80, 0x29, 0xd8, 0xa7, 0xa5, 0x7b, 0xb4, 0x40, 0x57, 0x6a, 0x0d, 0x0a, 0xdc, 0xe8, 0x4e, 0x9a, 0x4d, 0x3c, 0xb3, 0x0a,
0xd1, 0x4d, 0x43, 0x0d, 0x54, 0x6b, 0x54, 0x71, 0xee, 0xe0, 0x1e, 0x96, 0xa0, 0x0f, 0xda, 0xad, 0x96, 0x09, 0x41, 0xb3, 0x73, 0x99, 0x87, 0x31, 0xdd, 0xd4, 0xac, 0xb3, 0x3d, 0xb4, 0x96, 0x7d,
0xd6, 0x85, 0x09, 0x0a, 0xf2, 0xfd, 0x34, 0x47, 0x09, 0x90, 0x47, 0x1d, 0x74, 0xc1, 0x08, 0x58, 0x29, 0xc7, 0x73, 0xd4, 0x7c, 0xd0, 0x5f, 0x84, 0x05, 0xe1, 0x9d, 0x54, 0xab, 0x46, 0x1d, 0x94,
0xb8, 0xfd, 0xa3, 0x95, 0x0e, 0x0d, 0xd0, 0x06, 0xcd, 0x50, 0xc1, 0x16, 0x86, 0x24, 0x05, 0x3c, 0xcf, 0xab, 0x21, 0xcf, 0x9b, 0x3a, 0x6a, 0x04, 0x19, 0xaf, 0x12, 0x19, 0xf9, 0xd7, 0x8f, 0x9e,
0x7a, 0x23, 0x92, 0xa9, 0xb1, 0xba, 0x74, 0x93, 0xe8, 0x01, 0x2a, 0x1a, 0x2c, 0x86, 0x4c, 0x7a, 0x85, 0x09, 0x04, 0x75, 0xd5, 0x25, 0xf5, 0x5d, 0xf7, 0x0d, 0x2a, 0x30, 0xaf, 0x71, 0x68, 0xa7,
0x5a, 0x24, 0xaa, 0xed, 0x3f, 0x17, 0x83, 0x4e, 0xd0, 0x37, 0x7b, 0xc5, 0x68, 0x43, 0x0b, 0xda, 0x5d, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0x73, 0xc2, 0x0e, 0x8a, 0xd4, 0xdf, 0x06, 0x49, 0x92, 0xdf, 0x53, 0x50, 0x30, 0x33, 0xc1, 0x6e,
0x6d, 0xb4, 0x82, 0xdc, 0xee, 0x40, 0xa9, 0xcd, 0xb6, 0x33, 0x69, 0xb1, 0xd4, 0x76, 0x7e, 0x04,
0xd1, 0x4a, 0xab, 0x64, 0xef, 0x00, 0x46, 0xf3, 0x61, 0xfa, 0x1d, 0x21, 0x34, 0xb7, 0xc5, 0xea,
0xd3, 0x3d, 0xac, 0x49, 0x8f, 0x30, 0x2c, 0xce, 0xf4, 0xdf, 0xc4, 0xaf, 0xbd, 0x6e, 0xfd, 0xab,
0xa0, 0x37, 0xe0, 0xc8, 0x60, 0x7b, 0x3e, 0x58, 0xe1, 0xbd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE add_dimension_xpm[1] = {{ png, sizeof( png ), "add_dimension_xpm" }}; const BITMAP_OPAQUE add_dimension_xpm[1] = {{ png, sizeof( png ), "add_dimension_xpm" }};

View File

@ -8,47 +8,42 @@
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, 0x02, 0x68, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xe5, 0xd6, 0x4d, 0x88, 0x95, 0xce, 0x00, 0x00, 0x02, 0x1b, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0xcd, 0x4b, 0x54,
0x55, 0x1c, 0xc7, 0xf1, 0xcf, 0x73, 0xbb, 0xaf, 0x33, 0x53, 0x38, 0x79, 0xb3, 0x46, 0x27, 0xe7, 0x51, 0x18, 0xc7, 0xf1, 0xcf, 0x8c, 0x8d, 0xe3, 0x50, 0xd2, 0x1b, 0x59, 0xa6, 0xc5, 0x38, 0x09,
0xbe, 0x95, 0x42, 0xe1, 0x2c, 0x24, 0x65, 0x36, 0xbd, 0x90, 0x8b, 0x88, 0x04, 0x17, 0xe1, 0x32, 0x6d, 0xa2, 0x90, 0xc0, 0x5d, 0x8b, 0x40, 0x28, 0xa2, 0xa0, 0x20, 0x24, 0x82, 0xc0, 0xca, 0x8a,
0x45, 0x21, 0xa9, 0x65, 0x0a, 0x11, 0x24, 0x88, 0x61, 0x1b, 0xa7, 0x01, 0xa1, 0x68, 0x48, 0x74, 0x96, 0x45, 0x10, 0xed, 0x42, 0xc8, 0x45, 0xd9, 0xa2, 0x36, 0xfd, 0x09, 0x81, 0xb5, 0x08, 0x82,
0x25, 0x45, 0xb6, 0x89, 0xa0, 0x88, 0x20, 0x92, 0x5e, 0x9c, 0x89, 0xa8, 0x99, 0xb9, 0xf3, 0x1c, 0x72, 0x59, 0xa0, 0x48, 0xef, 0x82, 0x9e, 0x08, 0x82, 0x16, 0x89, 0xe0, 0x26, 0xe9, 0x95, 0xd2,
0x11, 0x82, 0x5c, 0x88, 0x70, 0xa3, 0x0c, 0x32, 0xc4, 0x97, 0x59, 0x3c, 0x6d, 0x7c, 0x62, 0xd0, 0xc8, 0xd3, 0xe6, 0x06, 0x17, 0xf3, 0x65, 0xc6, 0xa8, 0x55, 0x8b, 0x2f, 0x97, 0x7b, 0x0f, 0xf7,
0x7b, 0x9b, 0x3b, 0x37, 0x6c, 0x51, 0x8b, 0xef, 0xe6, 0x39, 0xf0, 0xfb, 0xf2, 0x9c, 0xff, 0xff, 0xf7, 0xe5, 0x9c, 0xf3, 0x3c, 0xe7, 0x5e, 0x31, 0x46, 0xff, 0x02, 0xff, 0x45, 0x7f, 0x24, 0x0a,
0xfc, 0xcf, 0x91, 0x24, 0x89, 0x7f, 0x03, 0xff, 0x4d, 0xd1, 0x39, 0x8a, 0x53, 0x94, 0x7a, 0xe1, 0x3c, 0x0e, 0xbc, 0x5a, 0x2c, 0x23, 0x9c, 0x29, 0x57, 0xf4, 0x3e, 0x10, 0xff, 0x80, 0x1f, 0x2f,
0x14, 0x59, 0x44, 0x5d, 0x89, 0x02, 0x49, 0xcc, 0xf5, 0x5e, 0x98, 0x96, 0x99, 0x1f, 0x32, 0xb2, 0xd9, 0x5f, 0x96, 0x68, 0x98, 0x8f, 0xf5, 0x8a, 0x9d, 0xeb, 0x15, 0xdb, 0x2b, 0xa1, 0x5b, 0x6d,
0x7e, 0x29, 0xd9, 0x5f, 0xa2, 0xa2, 0xc6, 0xee, 0x9c, 0xea, 0x68, 0x5e, 0x75, 0x43, 0xb7, 0xf4, 0x4f, 0x60, 0x7a, 0x84, 0x2f, 0x81, 0x96, 0xb2, 0x44, 0x79, 0xcd, 0xbb, 0x90, 0xa9, 0x74, 0xfd,
0xab, 0x8c, 0x4e, 0xcb, 0x9c, 0x3e, 0xa1, 0xf4, 0x51, 0x9f, 0x91, 0xa1, 0x2e, 0x45, 0xb5, 0x5d, 0x07, 0x64, 0xbb, 0x02, 0x71, 0x84, 0xb1, 0x97, 0xd4, 0x2f, 0x4a, 0x84, 0x26, 0xbc, 0xc3, 0x07,
0xc8, 0x20, 0x5a, 0x0e, 0xd3, 0xdc, 0xdb, 0xa4, 0xf5, 0x92, 0xc1, 0x43, 0x0c, 0x97, 0xba, 0x15, 0x4c, 0x60, 0xdb, 0x6c, 0x41, 0x83, 0xb2, 0xb7, 0x13, 0xd9, 0x93, 0x51, 0x0a, 0x8b, 0x11, 0xdd,
0x45, 0xbd, 0x14, 0x7a, 0x9e, 0x2d, 0xb3, 0xa2, 0x5f, 0x1f, 0x75, 0xdf, 0x76, 0x64, 0x7a, 0x12, 0x40, 0x4c, 0xf1, 0x00, 0xc5, 0x99, 0x41, 0xf7, 0xc9, 0x0f, 0xca, 0x3e, 0x4f, 0xf6, 0xac, 0x37,
0x9d, 0xa5, 0x1a, 0xb8, 0x18, 0xf3, 0x7b, 0xcc, 0x6f, 0x93, 0x8c, 0xb6, 0x0b, 0x9a, 0xe5, 0xd0, 0xce, 0xcc, 0x99, 0x4f, 0x84, 0x7a, 0x7c, 0x4b, 0x04, 0xa3, 0xc9, 0x75, 0x0a, 0x1d, 0xb3, 0xcd,
0x17, 0xb2, 0xb3, 0x03, 0xea, 0x0f, 0xb7, 0xcb, 0x59, 0x52, 0x14, 0x78, 0x3b, 0x90, 0xa4, 0xbc, 0xaa, 0x9f, 0x35, 0x4f, 0x65, 0xc7, 0x02, 0xf1, 0x71, 0x75, 0xf6, 0x72, 0xbe, 0xa7, 0xb4, 0xe2,
0xcb, 0x29, 0x54, 0x6e, 0x91, 0x71, 0xc7, 0x9c, 0xe8, 0xf4, 0x3b, 0xfa, 0xde, 0x1f, 0xd0, 0xb8, 0x17, 0x0b, 0x89, 0xae, 0x24, 0xe1, 0xdf, 0x71, 0x21, 0x59, 0xc2, 0x88, 0x3e, 0x34, 0xcc, 0x26,
0x67, 0x59, 0xa2, 0x33, 0x0c, 0x05, 0xae, 0x06, 0x92, 0xaf, 0x39, 0x1f, 0x48, 0x9a, 0x5c, 0xdf, 0xeb, 0x93, 0xdb, 0x3a, 0x24, 0xf3, 0x39, 0x10, 0x0f, 0x1c, 0xae, 0x8b, 0xf9, 0x9e, 0x52, 0xcc,
0xc8, 0xce, 0x76, 0x7f, 0xf5, 0x1d, 0xf7, 0x37, 0xf9, 0xe5, 0x79, 0x2b, 0x5f, 0xe5, 0xa1, 0x7c, 0xf7, 0x94, 0xe2, 0x9c, 0x22, 0xac, 0xc2, 0xa7, 0x24, 0x78, 0x00, 0xc7, 0x71, 0x35, 0xb9, 0xff,
0xd7, 0xa2, 0xc0, 0xe1, 0x40, 0x32, 0xcf, 0xc2, 0x18, 0xaf, 0xcc, 0x70, 0x31, 0x90, 0x1c, 0xe7, 0x8a, 0xf6, 0xb9, 0x8a, 0xe3, 0xa1, 0xaa, 0xb3, 0x81, 0xf8, 0x2c, 0x97, 0x89, 0x75, 0x5d, 0xc5,
0x53, 0xac, 0x69, 0x27, 0x9b, 0x63, 0xeb, 0x0f, 0xa2, 0xd6, 0xc6, 0xd2, 0xf0, 0xb6, 0xfc, 0xfe, 0x05, 0x45, 0x17, 0x53, 0xfb, 0x72, 0x0f, 0xdd, 0xe8, 0x4a, 0x3d, 0xbb, 0x83, 0xba, 0x99, 0x92,
0xb5, 0xa5, 0xc2, 0x78, 0xad, 0x58, 0x18, 0xaf, 0x15, 0x3b, 0x8a, 0x02, 0x77, 0x07, 0xfe, 0x08, 0xc0, 0xba, 0xc0, 0xdb, 0x40, 0x3c, 0xb9, 0x77, 0xd5, 0xfc, 0x33, 0xc2, 0xb2, 0xd4, 0x32, 0xcd,
0x24, 0x1f, 0xf0, 0x0d, 0x76, 0xcf, 0xf0, 0x46, 0x20, 0x99, 0xe5, 0xca, 0x83, 0x6c, 0xef, 0xd4, 0xc5, 0x47, 0xec, 0x4b, 0x4b, 0x46, 0x29, 0x24, 0xa7, 0x4c, 0x1c, 0x50, 0xd5, 0x9b, 0xd3, 0x78,
0x1c, 0x4d, 0xd1, 0x91, 0xc9, 0x75, 0x7d, 0x57, 0x0a, 0xe3, 0xb5, 0x24, 0xe5, 0xef, 0x44, 0x07, 0x82, 0x25, 0xad, 0x68, 0x99, 0x4b, 0x74, 0x2e, 0x15, 0xd8, 0x8b, 0x6b, 0x29, 0x7a, 0x53, 0x63,
0xd2, 0xba, 0x1c, 0xe3, 0x93, 0x49, 0x5e, 0x3f, 0xc3, 0xc1, 0xf4, 0xdb, 0x5b, 0x7c, 0x88, 0x55, 0x37, 0xb1, 0x32, 0xc6, 0x28, 0x92, 0x09, 0xdc, 0x0a, 0xc4, 0x21, 0x99, 0xfe, 0xd5, 0x8a, 0x47,
0xed, 0x44, 0x81, 0x89, 0xe3, 0x0f, 0x94, 0x2e, 0x2f, 0x29, 0x0a, 0x0c, 0x84, 0x1b, 0xdb, 0xd4, 0x28, 0xae, 0x98, 0xaf, 0xea, 0xf2, 0x78, 0x83, 0x49, 0x8c, 0xe3, 0x14, 0x8a, 0xa8, 0x4e, 0xa8,
0x89, 0xef, 0xb9, 0xb4, 0x9a, 0xad, 0x6d, 0x5a, 0xfd, 0x99, 0x98, 0xf3, 0x1b, 0x0a, 0xc3, 0x2f, 0xc1, 0xeb, 0xa4, 0x40, 0xc6, 0xd1, 0x96, 0x64, 0x5c, 0x4a, 0xfa, 0xe8, 0xf5, 0x16, 0x1b, 0x8e,
0x66, 0xcb, 0xe5, 0xb1, 0xa8, 0x9c, 0xdb, 0x1c, 0x95, 0x73, 0x9b, 0x3b, 0x89, 0xf6, 0xa5, 0x81, 0x15, 0x94, 0x36, 0x96, 0x55, 0xde, 0xd8, 0x89, 0x3d, 0xbf, 0x82, 0x7e, 0x6b, 0x40, 0x5a, 0x93,
0x13, 0x9c, 0x7c, 0x81, 0x23, 0x29, 0x13, 0x9c, 0x4c, 0xd7, 0x0e, 0xf3, 0x1e, 0x06, 0x17, 0xd5, 0xf1, 0xdd, 0x2f, 0x38, 0x9a, 0xf4, 0xcf, 0x44, 0xbb, 0xba, 0xce, 0x9c, 0xe6, 0x16, 0x95, 0xf4,
0x67, 0x38, 0xf0, 0xf3, 0x3e, 0x83, 0x7b, 0x4b, 0x1a, 0x63, 0x8b, 0x77, 0xe8, 0x16, 0x51, 0x20, 0x51, 0x39, 0x04, 0x76, 0x04, 0x26, 0x03, 0x53, 0x97, 0xd4, 0x9e, 0xae, 0x51, 0x6a, 0x9b, 0x2d,
0x1f, 0xf8, 0x29, 0xe6, 0xda, 0x14, 0xad, 0x1c, 0x7b, 0x50, 0x41, 0x1e, 0xf9, 0xc7, 0x29, 0x36, 0x23, 0x7d, 0x7a, 0x4f, 0x0f, 0xc9, 0x4c, 0x04, 0xc6, 0x2b, 0xe4, 0x5b, 0x20, 0xde, 0x95, 0x3b,
0xf9, 0xb1, 0xc9, 0xc2, 0x14, 0xad, 0x7e, 0xb6, 0xa4, 0xed, 0x1d, 0xf8, 0xf2, 0x63, 0xb9, 0x37, 0x5f, 0xad, 0xe9, 0x20, 0xdb, 0x73, 0xf3, 0x9d, 0x75, 0xe3, 0x23, 0x4c, 0x0e, 0x33, 0x95, 0xbc,
0xf3, 0xea, 0xdb, 0x90, 0xed, 0xaa, 0xeb, 0xf0, 0x04, 0x9e, 0x96, 0x06, 0xdd, 0x7c, 0x2e, 0xd8, 0x58, 0x11, 0x8f, 0x64, 0xaf, 0x17, 0x6c, 0x3a, 0x44, 0x69, 0xf9, 0x82, 0x5f, 0xd8, 0x82, 0xc6,
0x74, 0x63, 0xfd, 0x29, 0xe4, 0x62, 0x5e, 0x9b, 0x11, 0x7d, 0x75, 0xa7, 0xfa, 0x73, 0x54, 0x56, 0x86, 0x1a, 0x9b, 0x3a, 0xaa, 0x35, 0x1d, 0xac, 0x94, 0x1a, 0xcd, 0x47, 0x0a, 0x9a, 0x1b, 0xcb,
0xdc, 0x96, 0x11, 0x14, 0x78, 0x32, 0xa6, 0xb5, 0xc9, 0x9a, 0x3d, 0x05, 0xf5, 0xc6, 0x6d, 0x99, 0xfa, 0x94, 0xa3, 0x8a, 0xcd, 0xb5, 0x8b, 0x63, 0xed, 0xd2, 0xff, 0x7f, 0x41, 0x7f, 0x8d, 0x9f,
0x75, 0x73, 0xac, 0x8a, 0xb9, 0x70, 0xd0, 0x5d, 0x2f, 0x17, 0x55, 0x1e, 0xeb, 0x94, 0xf1, 0x8f, 0x8e, 0x31, 0x67, 0x6a, 0x5f, 0x12, 0x40, 0xd2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xa6, 0xf7, 0x01, 0x32, 0x81, 0xcf, 0x3e, 0x97, 0x3d, 0x9a, 0xd7, 0x78, 0xf6, 0xe6, 0x69, 0xd0, 0xae, 0x42, 0x60, 0x82,
0x56, 0x34, 0xcf, 0x42, 0xcc, 0xb5, 0xe5, 0xf2, 0xad, 0x4c, 0x73, 0x85, 0xda, 0x0e, 0x56, 0x97,
0x97, 0xbc, 0x8f, 0x4e, 0xd0, 0x5f, 0xb7, 0x76, 0xac, 0x17, 0x56, 0xaa, 0x3e, 0x52, 0x54, 0x1d,
0xe9, 0xfa, 0x71, 0xb2, 0xdc, 0x0b, 0x6f, 0x31, 0xff, 0xcf, 0xe7, 0xd6, 0x9f, 0x54, 0x68, 0x3c,
0xdd, 0x99, 0xca, 0x2f, 0xa9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82,
}; };
const BITMAP_OPAQUE add_glabel_xpm[1] = {{ png, sizeof( png ), "add_glabel_xpm" }}; const BITMAP_OPAQUE add_glabel_xpm[1] = {{ png, sizeof( png ), "add_glabel_xpm" }};

View File

@ -8,96 +8,83 @@
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, 0x83, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x5f, 0x6c, 0x53, 0xce, 0x00, 0x00, 0x04, 0xae, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x6d, 0x48, 0x5b,
0x55, 0x1c, 0xc7, 0xbf, 0xbf, 0xd3, 0x6e, 0x2d, 0x5b, 0x3b, 0x2a, 0x2b, 0xdb, 0x32, 0xca, 0x2c, 0x67, 0x14, 0x80, 0xfd, 0x98, 0x06, 0x53, 0xb5, 0x3a, 0xa4, 0x6e, 0xb2, 0xfe, 0x09, 0xac, 0x1b,
0xe8, 0xdc, 0x1f, 0xba, 0xf1, 0x67, 0xc8, 0x9f, 0x40, 0x50, 0xd8, 0x04, 0x43, 0x7c, 0x50, 0xc7, 0x53, 0x61, 0x7f, 0xfc, 0x53, 0x98, 0x13, 0xe9, 0x3f, 0x75, 0x03, 0x15, 0xb6, 0xc1, 0x9c, 0x53,
0x12, 0x13, 0x34, 0x10, 0xf5, 0xcd, 0x07, 0x35, 0xea, 0x23, 0x04, 0x12, 0x1e, 0x78, 0xc0, 0x40, 0x18, 0xdd, 0x90, 0x89, 0x15, 0x65, 0x9b, 0xe0, 0x8f, 0x52, 0x37, 0xe9, 0x1a, 0x5c, 0x0b, 0xda,
0x23, 0x86, 0x98, 0x60, 0x22, 0x8b, 0x90, 0x68, 0x87, 0x15, 0x44, 0x70, 0x0c, 0xb6, 0x50, 0x26, 0xd2, 0xb4, 0xb8, 0xda, 0x98, 0xb5, 0xd1, 0xaa, 0xf1, 0x03, 0xfc, 0xda, 0xd0, 0xa9, 0x71, 0xcc,
0x96, 0x4d, 0x97, 0xb2, 0x0c, 0xdc, 0x98, 0xc2, 0x9d, 0x54, 0xe8, 0x06, 0xed, 0xe8, 0xe5, 0xf6, 0xd9, 0x8d, 0x8a, 0xd1, 0xc5, 0x4e, 0x6d, 0x68, 0xab, 0x8d, 0x31, 0xc6, 0x8f, 0x98, 0x44, 0x73,
0xae, 0xed, 0xbd, 0xbd, 0xc7, 0x87, 0xad, 0xdd, 0x6d, 0x57, 0xde, 0xfc, 0x25, 0x37, 0xb9, 0xe7, 0x93, 0xb3, 0x73, 0x8e, 0xde, 0x78, 0xa3, 0x4d, 0xe8, 0x60, 0x81, 0x87, 0xe4, 0x26, 0xef, 0x3d,
0xdc, 0x7b, 0xce, 0xe7, 0xf7, 0xfd, 0x9e, 0x73, 0x7e, 0xf7, 0x12, 0x80, 0x22, 0x00, 0x25, 0xf8, 0xcf, 0x7b, 0xde, 0x73, 0xde, 0xf7, 0x26, 0x24, 0x24, 0x24, 0xe4, 0x65, 0xe4, 0xed, 0xff, 0x11,
0xff, 0x62, 0x9c, 0x73, 0xce, 0x73, 0x3b, 0x8d, 0x00, 0x16, 0x84, 0xc3, 0xe1, 0x36, 0x80, 0x18, 0x19, 0x00, 0x84, 0x1c, 0x86, 0x5e, 0xa7, 0x2d, 0x16, 0x8b, 0xd3, 0x6a, 0x5d, 0xf3, 0xac, 0xad,
0x11, 0x00, 0x22, 0x10, 0x11, 0x08, 0x33, 0xf7, 0xe9, 0x37, 0x67, 0xfa, 0x01, 0xcc, 0xf6, 0xe5, 0x21, 0x36, 0x9b, 0xc7, 0xb6, 0xbe, 0xee, 0x59, 0x27, 0x36, 0x36, 0x3c, 0x1b, 0x22, 0x9b, 0x9b,
0x84, 0xff, 0xfa, 0xf5, 0xc7, 0xaf, 0xb4, 0xb4, 0xb4, 0x03, 0x50, 0xf2, 0x81, 0x60, 0x30, 0x1a, 0x9e, 0x4d, 0x62, 0x6b, 0xcb, 0xb3, 0x15, 0x80, 0x89, 0x89, 0x09, 0x13, 0xc6, 0x7b, 0x25, 0xa0,
0x0d, 0xc9, 0x64, 0x72, 0x1a, 0xa0, 0xbf, 0x72, 0x61, 0x9c, 0x03, 0xa4, 0xc3, 0x50, 0x36, 0x72, 0xc8, 0x66, 0xb3, 0x09, 0x2b, 0x16, 0x0b, 0x58, 0x56, 0x57, 0x61, 0xd5, 0x6a, 0x05, 0xeb, 0xda,
0x7e, 0x49, 0x89, 0xe1, 0x69, 0x32, 0x09, 0x80, 0x23, 0x2a, 0x8a, 0x6f, 0x29, 0xc9, 0x24, 0xce, 0x1a, 0xa0, 0x10, 0x50, 0x08, 0xeb, 0xc4, 0xc6, 0x06, 0xa0, 0x08, 0x36, 0x89, 0xad, 0x2d, 0xd8,
0x9c, 0x3d, 0x8b, 0x9a, 0x9a, 0x1a, 0x30, 0x62, 0x00, 0xe5, 0x64, 0x9e, 0x56, 0xa3, 0x07, 0xe7, 0x12, 0xb1, 0xdb, 0xfd, 0x98, 0x9d, 0x9d, 0x35, 0x07, 0x15, 0x61, 0x30, 0x81, 0x24, 0x8d, 0x8d,
0x44, 0x22, 0x91, 0xd0, 0x34, 0x4d, 0x13, 0x39, 0xe7, 0x9a, 0xdb, 0xed, 0x1e, 0xf6, 0x7a, 0xbd, 0x8d, 0x30, 0x34, 0x34, 0x04, 0xbf, 0x8e, 0x8c, 0xc0, 0x08, 0x31, 0x3a, 0x0a, 0xa3, 0x81, 0x18,
0xd7, 0xb2, 0x14, 0x11, 0x11, 0x88, 0x31, 0x58, 0x2d, 0x16, 0x54, 0x57, 0x57, 0x03, 0x00, 0x18, 0x1b, 0x83, 0x31, 0x42, 0xaf, 0xdf, 0x03, 0x3f, 0xe3, 0xbd, 0xee, 0xde, 0xde, 0x5e, 0x63, 0x5f,
0x63, 0xf9, 0xd5, 0xe5, 0x2a, 0xcd, 0x56, 0xc5, 0x00, 0xd8, 0x18, 0x11, 0xea, 0xeb, 0xeb, 0x8b, 0x5f, 0xdf, 0x74, 0x5e, 0x5e, 0x5e, 0xdd, 0x11, 0x11, 0x2e, 0x8d, 0x40, 0x59, 0x68, 0xb5, 0x5a,
0xe7, 0x58, 0x47, 0x00, 0xd8, 0xcc, 0x00, 0xc6, 0x18, 0x12, 0x89, 0x04, 0x7c, 0x3e, 0x1f, 0x4c, 0xce, 0xca, 0xbc, 0xb2, 0xe2, 0x9f, 0x9d, 0x34, 0x43, 0xca, 0x4e, 0x9a, 0xe1, 0x7e, 0x96, 0x87,
0x85, 0x85, 0x19, 0x15, 0x7a, 0x0b, 0x73, 0xdb, 0xf9, 0x22, 0x12, 0x89, 0x2c, 0xdc, 0xb9, 0x73, 0xa9, 0xa9, 0xa9, 0x69, 0x39, 0x2a, 0xda, 0xdc, 0x14, 0x28, 0x50, 0x4b, 0x4b, 0x0b, 0x58, 0x31,
0x67, 0x93, 0xa2, 0x28, 0xdc, 0xe3, 0xf1, 0xfc, 0x9d, 0xa5, 0x88, 0x88, 0xc0, 0x18, 0x83, 0xaa, 0xf8, 0xd2, 0xf2, 0x32, 0x4b, 0x75, 0x3a, 0x1d, 0xe8, 0x3a, 0x3b, 0xa1, 0x93, 0xe8, 0xea, 0x82,
0xaa, 0xa8, 0xab, 0xad, 0x85, 0x63, 0x71, 0x15, 0x18, 0x9b, 0x56, 0xc1, 0x88, 0xa0, 0x04, 0x02, 0xae, 0x7d, 0xba, 0xbb, 0xbb, 0xa1, 0xbb, 0xa7, 0x07, 0x7a, 0x82, 0x50, 0x56, 0x56, 0xf6, 0x67,
0x25, 0xca, 0xcd, 0x9b, 0xcf, 0xe8, 0x7d, 0xcf, 0x5d, 0x27, 0xf3, 0xd6, 0xad, 0xa1, 0x82, 0x8a, 0x41, 0x41, 0xc1, 0x97, 0x84, 0x4c, 0x26, 0x7b, 0x83, 0x45, 0x38, 0x2b, 0x81, 0x66, 0xda, 0xd2,
0x8a, 0x44, 0x73, 0x73, 0x73, 0x25, 0x80, 0x4a, 0x10, 0x69, 0x1e, 0x8f, 0x27, 0x34, 0x0b, 0xd2, 0xda, 0xca, 0x33, 0x7f, 0xf2, 0xf4, 0x29, 0x2f, 0x87, 0x65, 0x35, 0x48, 0xbd, 0xf6, 0x67, 0x4e,
0xaf, 0x01, 0x11, 0x0c, 0x06, 0x03, 0x38, 0xd7, 0xa0, 0x69, 0xd3, 0x6d, 0x4e, 0x04, 0xd1, 0xed, 0xb5, 0xb1, 0x07, 0xc1, 0xb5, 0xb3, 0x03, 0x49, 0x49, 0x49, 0xef, 0xb1, 0x08, 0x0b, 0x2b, 0xd0,
0x6e, 0x92, 0x3b, 0x2f, 0x6e, 0x52, 0x8a, 0x2d, 0x52, 0x3e, 0x15, 0xc6, 0x98, 0x64, 0x79, 0xb2, 0xcd, 0xad, 0x28, 0x7a, 0x66, 0x36, 0xc3, 0xc2, 0xe2, 0x22, 0xd7, 0xc1, 0xbc, 0x12, 0xa0, 0x41,
0xf1, 0x5c, 0xff, 0xf2, 0x1f, 0xbe, 0x3f, 0xaf, 0x4b, 0x86, 0x32, 0xd6, 0x61, 0x26, 0xe3, 0x74, 0xa4, 0xcb, 0x27, 0x0a, 0x03, 0x48, 0x9d, 0x2e, 0xd7, 0x81, 0x08, 0xbf, 0x10, 0x68, 0xb0, 0x5a,
0xe6, 0x8c, 0xb1, 0x0c, 0x34, 0x77, 0xad, 0x26, 0xaa, 0xeb, 0x46, 0x7f, 0x7b, 0xf3, 0x9d, 0x81, 0xad, 0x86, 0x88, 0x88, 0x08, 0x5a, 0x50, 0x08, 0x0b, 0x0b, 0x83, 0xb9, 0x87, 0x0f, 0x79, 0x29,
0x8a, 0x0a, 0x7b, 0x0c, 0x98, 0xb6, 0x2f, 0x2d, 0x6a, 0xa1, 0xbf, 0x77, 0x51, 0x99, 0xe7, 0x64, 0x45, 0xc1, 0x8c, 0x4c, 0x06, 0x06, 0xfc, 0x2d, 0x18, 0x73, 0xa7, 0x4e, 0xc1, 0x36, 0x4e, 0xc0,
0x4b, 0x30, 0x18, 0xea, 0xae, 0xaa, 0xaa, 0x8c, 0xe7, 0x5d, 0xa3, 0x8c, 0xef, 0xba, 0x89, 0xf5, 0xe1, 0x70, 0x30, 0x3b, 0xd2, 0x8c, 0xec, 0xdb, 0xdb, 0x02, 0xd9, 0x2b, 0x2b, 0x2b, 0x59, 0x22,
0x10, 0x96, 0xb1, 0x88, 0xd0, 0xd0, 0x58, 0x13, 0xde, 0xdc, 0xb2, 0xe1, 0x51, 0x7a, 0x63, 0xa4, 0x72, 0x5d, 0xa5, 0xf2, 0xcb, 0xe2, 0x45, 0x44, 0x84, 0xb9, 0xae, 0x0e, 0x5c, 0x98, 0x09, 0xb1,
0xdd, 0xc0, 0xdb, 0xaf, 0x07, 0x47, 0x3b, 0x4e, 0x36, 0x0f, 0x1f, 0x39, 0xda, 0xe8, 0x3c, 0x72, 0xeb, 0x76, 0x1f, 0x88, 0xb6, 0x51, 0x84, 0x40, 0x66, 0x66, 0xa6, 0x9f, 0x28, 0x3f, 0x3f, 0x9f,
0xb0, 0x6f, 0xfa, 0x44, 0x70, 0x64, 0x29, 0x22, 0x22, 0x98, 0x1e, 0x3c, 0x28, 0x9a, 0xf2, 0x7a, 0xeb, 0x42, 0xcb, 0x44, 0x19, 0x8b, 0xa2, 0xa6, 0x6b, 0x6a, 0x50, 0x37, 0xb5, 0x41, 0xf3, 0xed,
0x6d, 0xea, 0xd4, 0x14, 0x60, 0xb7, 0x3f, 0x21, 0x87, 0xe3, 0x09, 0xcb, 0x81, 0xa7, 0x0f, 0xb5, 0x76, 0x1f, 0x1a, 0x75, 0x07, 0xf4, 0x9c, 0xfb, 0x86, 0x7f, 0x9f, 0x8e, 0x3d, 0x0e, 0x4e, 0x2c,
0xd1, 0x60, 0xe0, 0x19, 0xcb, 0x75, 0x1b, 0xc3, 0xbc, 0xa5, 0xf9, 0xba, 0xb9, 0xf3, 0xfc, 0x2a, 0xc1, 0xee, 0xee, 0x2e, 0x08, 0x82, 0x20, 0x11, 0x39, 0x1c, 0x2c, 0x8a, 0x8b, 0x8b, 0x63, 0x41,
0xe0, 0x60, 0x3f, 0x63, 0x8c, 0x6b, 0x9a, 0x96, 0xad, 0x08, 0x44, 0x58, 0x74, 0xe8, 0x50, 0x6b, 0x7a, 0x7a, 0x3a, 0xbf, 0xc7, 0xc7, 0xc7, 0x73, 0x46, 0x24, 0xa1, 0x8c, 0x45, 0xd1, 0x3d, 0x75,
0x58, 0x10, 0x1a, 0x01, 0x20, 0xb9, 0x60, 0x41, 0x28, 0x70, 0xfa, 0xf4, 0xf1, 0xa6, 0xa6, 0xa6, 0x1b, 0xcf, 0x96, 0x96, 0x85, 0x82, 0x89, 0xb8, 0x71, 0xf6, 0x0b, 0x19, 0x19, 0x3c, 0xc6, 0xf4,
0x68, 0x5a, 0x51, 0x7a, 0x32, 0x96, 0xa3, 0x16, 0xba, 0xdd, 0xe8, 0xd8, 0xb7, 0xd7, 0x9f, 0x58, 0xf9, 0x17, 0x7c, 0xed, 0x27, 0xc2, 0xb5, 0x14, 0xc6, 0xc7, 0xc7, 0x7d, 0x99, 0xe0, 0xa6, 0x83,
0xb3, 0xf6, 0xe5, 0xdf, 0x2f, 0xf4, 0x94, 0xad, 0x7d, 0xad, 0x65, 0x3c, 0xfd, 0x9c, 0xa5, 0x5f, 0xf0, 0xf0, 0x70, 0xfe, 0x3c, 0x30, 0x38, 0xc8, 0x12, 0x9a, 0x88, 0x28, 0x6a, 0x6b, 0x6e, 0xf7,
0x8a, 0x77, 0x77, 0xdb, 0x4d, 0x63, 0x63, 0x0d, 0x99, 0xdd, 0x13, 0x89, 0x54, 0x04, 0x0e, 0x1c, 0x0b, 0x2e, 0xc5, 0x7e, 0xff, 0x3e, 0x18, 0xb0, 0xbe, 0x06, 0xbc, 0xdf, 0x61, 0x30, 0x1c, 0x15,
0xd8, 0x18, 0x8b, 0xc5, 0x0c, 0x4c, 0x97, 0x39, 0x40, 0x20, 0x62, 0x73, 0xcf, 0xd9, 0xcc, 0x84, 0x55, 0x57, 0x57, 0x73, 0x60, 0xfc, 0x12, 0x56, 0xb1, 0xd3, 0x52, 0x53, 0x53, 0xf9, 0xba, 0xa2,
0x66, 0x97, 0x4b, 0x4a, 0x39, 0x9d, 0x42, 0xe4, 0xe8, 0x17, 0x6b, 0xf5, 0x49, 0xb0, 0x74, 0x26, 0xa2, 0x82, 0x25, 0x0e, 0xa7, 0xd3, 0x27, 0x6a, 0xd7, 0x74, 0xf8, 0x05, 0xa7, 0x60, 0x52, 0x1e,
0x93, 0x07, 0x0e, 0xbc, 0x0c, 0xce, 0x49, 0x35, 0x1a, 0x95, 0xfb, 0x76, 0x7b, 0x08, 0x00, 0x56, 0x17, 0x17, 0xf3, 0x38, 0xd5, 0x5b, 0xd1, 0x10, 0xfb, 0xc3, 0x9b, 0x20, 0xbb, 0xa4, 0xd8, 0xdd,
0x04, 0x02, 0xf5, 0x97, 0xba, 0xba, 0xca, 0x89, 0xcd, 0x4c, 0xac, 0x2b, 0x12, 0xf9, 0x76, 0x6a, 0x13, 0x39, 0x9d, 0x42, 0x5a, 0x5a, 0x1a, 0x07, 0x2e, 0x2c, 0x2c, 0xe4, 0x4e, 0x2b, 0x2a, 0x2a,
0xba, 0x5d, 0xbe, 0x7b, 0x77, 0x6f, 0xe9, 0x40, 0x5f, 0x7d, 0x38, 0x3c, 0x59, 0x90, 0x05, 0x4a, 0xe2, 0xeb, 0x94, 0x94, 0x14, 0x96, 0xd0, 0x52, 0x1d, 0x16, 0x49, 0x83, 0x7b, 0x3c, 0x1e, 0x1f,
0x0c, 0x0c, 0x94, 0xc4, 0xfb, 0xfb, 0x57, 0x03, 0xc0, 0xed, 0x25, 0x4b, 0xee, 0xde, 0x70, 0xb9, 0x3b, 0x4b, 0x4b, 0xf0, 0x40, 0xbe, 0x37, 0x36, 0xe3, 0xb3, 0x57, 0x41, 0xa6, 0x54, 0xf0, 0xd1,
0x86, 0x01, 0xa0, 0x3c, 0x1c, 0x2e, 0x0b, 0x75, 0x74, 0x2c, 0x53, 0x15, 0x85, 0xcd, 0x4e, 0x8a, 0x70, 0xda, 0x64, 0x32, 0x09, 0xa1, 0xa1, 0xa1, 0x1c, 0x58, 0xa3, 0xd1, 0xf0, 0x91, 0xd3, 0xd0,
0x39, 0x80, 0x5c, 0x58, 0xc5, 0x67, 0x9f, 0x8e, 0xcc, 0x53, 0xe2, 0xa6, 0x63, 0xee, 0x8f, 0xb7, 0xd0, 0xe0, 0x5b, 0xca, 0xf9, 0xf9, 0x79, 0xae, 0x87, 0x54, 0xf4, 0x3c, 0x81, 0xd7, 0xeb, 0x65,
0x1c, 0x19, 0x38, 0x5e, 0x5b, 0xf8, 0xe1, 0xa2, 0xcd, 0x0c, 0x00, 0x22, 0x7b, 0xf6, 0x6c, 0x42, 0x04, 0x6c, 0xa0, 0xbf, 0xe2, 0x63, 0x78, 0x6c, 0xd6, 0x27, 0x89, 0x07, 0x22, 0x95, 0x4a, 0xe5,
0x2a, 0x65, 0xd0, 0x88, 0xb4, 0xeb, 0x2b, 0x57, 0x8e, 0x9a, 0x5b, 0x5b, 0x07, 0xb9, 0xc5, 0x32, 0x11, 0x83, 0xf6, 0xf7, 0xf7, 0xf3, 0xa1, 0x4a, 0x07, 0xac, 0x28, 0xaf, 0xaf, 0xaf, 0xe7, 0x7a,
0x09, 0x00, 0xcb, 0xfb, 0xfb, 0x97, 0x75, 0x75, 0x75, 0x2d, 0x9c, 0xb5, 0x4e, 0x57, 0x1d, 0x9e, 0x88, 0xa2, 0x8e, 0x9f, 0x74, 0x7e, 0x12, 0x51, 0x40, 0xd0, 0xeb, 0x19, 0x6e, 0x13, 0x1a, 0xa7,
0x06, 0x33, 0x18, 0x78, 0x70, 0x7d, 0xad, 0x20, 0x5f, 0x3b, 0xd7, 0xb2, 0xf7, 0xd7, 0xcf, 0xdf, 0x51, 0x44, 0xc1, 0x31, 0xe5, 0xeb, 0x20, 0xfb, 0x5e, 0xe1, 0x66, 0x51, 0x6e, 0x6e, 0xae, 0x57,
0xa7, 0xc5, 0xa6, 0x6f, 0xd9, 0x0e, 0x60, 0xfe, 0x94, 0xcf, 0xb7, 0x0e, 0x00, 0xe2, 0x46, 0x63, 0xda, 0xd6, 0x87, 0xc9, 0xca, 0xca, 0x3a, 0x22, 0x3a, 0x2c, 0xa1, 0x17, 0x5d, 0x3b, 0x8c, 0x46,
0xf2, 0xa5, 0xbe, 0xbe, 0xba, 0x2d, 0xed, 0xed, 0xeb, 0xa8, 0xa0, 0x40, 0x01, 0x80, 0x45, 0xa1, 0x98, 0x89, 0x8c, 0xe4, 0x86, 0xe8, 0xb9, 0x78, 0x05, 0x7e, 0x1b, 0xff, 0x9d, 0xba, 0xf7, 0x2c,
0x50, 0xe5, 0x68, 0x47, 0x47, 0x6d, 0x2a, 0x95, 0xd2, 0x63, 0xf2, 0xc2, 0xf4, 0x57, 0xd9, 0xc3, 0x89, 0xde, 0x89, 0x8d, 0x8d, 0x85, 0x60, 0x22, 0xb9, 0x5c, 0xee, 0xd7, 0xde, 0xba, 0x3b, 0x9d,
0x27, 0xa6, 0x88, 0xcd, 0x1a, 0x2b, 0x25, 0xdb, 0x38, 0x97, 0xb5, 0x11, 0xe3, 0x07, 0xc0, 0x6e, 0x3e, 0x09, 0xbd, 0xe8, 0x9d, 0x3b, 0x0e, 0xc7, 0xfc, 0x83, 0x93, 0xa2, 0x31, 0x53, 0x39, 0xef,
0xae, 0x28, 0x26, 0x00, 0x28, 0x52, 0x14, 0xf3, 0x52, 0x41, 0x58, 0xca, 0x05, 0x61, 0x69, 0x66, 0x43, 0xab, 0xb6, 0x0b, 0x6c, 0xb8, 0x07, 0xc5, 0xae, 0x2b, 0x11, 0x03, 0xe6, 0xe4, 0xe4, 0x80,
0x4a, 0xce, 0xa9, 0xe1, 0xda, 0x35, 0x57, 0x4f, 0x4f, 0xcf, 0xad, 0x86, 0xac, 0x62, 0x9e, 0xad, 0x52, 0xa9, 0x84, 0xda, 0xda, 0x5a, 0x28, 0x2f, 0x2f, 0xa7, 0x13, 0xd8, 0x27, 0xa3, 0x13, 0x59,
0x04, 0x00, 0x34, 0x4d, 0x83, 0xa6, 0x69, 0x50, 0x86, 0x87, 0x8b, 0xad, 0xc3, 0x63, 0x0e, 0xfb, 0x2a, 0x92, 0x2e, 0x17, 0x49, 0xa8, 0xae, 0x0b, 0x77, 0xef, 0xee, 0x6d, 0xd8, 0xa8, 0x28, 0xa8,
0x9a, 0x8f, 0x7e, 0x3e, 0x5e, 0xb7, 0xe9, 0xaf, 0xed, 0xdb, 0xb7, 0xff, 0x64, 0xb4, 0x03, 0xef, 0xfb, 0xea, 0x3c, 0x0c, 0x0c, 0xfc, 0x0c, 0xcd, 0x5a, 0xed, 0x63, 0xbc, 0xff, 0x35, 0x12, 0xa9,
0x02, 0x40, 0xc4, 0x66, 0x0b, 0x1f, 0x6b, 0x6c, 0xf4, 0x2f, 0xab, 0xab, 0x93, 0x55, 0x55, 0x85, 0x28, 0x10, 0xd6, 0x43, 0x28, 0x2d, 0x2d, 0xfd, 0x83, 0x8a, 0x4e, 0xa7, 0xc1, 0xe4, 0xe4, 0x24,
0x2c, 0xcb, 0xd8, 0xd6, 0xdb, 0xfb, 0x62, 0xf9, 0xbd, 0x7b, 0xce, 0x67, 0x83, 0xc1, 0xaa, 0xb3, 0x3f, 0x6b, 0xa2, 0xa3, 0xa3, 0x59, 0x54, 0x52, 0x52, 0xe2, 0x13, 0x4d, 0xc5, 0xc5, 0x83, 0x31,
0x5e, 0xef, 0xf3, 0x0d, 0x79, 0x3e, 0x43, 0x44, 0x04, 0xce, 0x39, 0x52, 0xa9, 0x14, 0xe2, 0xf1, 0x31, 0xd1, 0xc7, 0xdf, 0x27, 0x4e, 0xc0, 0x4c, 0x42, 0x02, 0x4c, 0xef, 0xff, 0x3e, 0x53, 0x7a,
0x38, 0xe2, 0xf1, 0x38, 0x1e, 0xef, 0xdb, 0xd7, 0x34, 0xe1, 0x70, 0x0a, 0xcf, 0xad, 0x76, 0xdd, 0x0e, 0x86, 0x7e, 0xd1, 0xc3, 0xcd, 0x5b, 0xb7, 0xcc, 0x31, 0x31, 0x31, 0x09, 0xe2, 0xf3, 0xc8,
0x5b, 0xb3, 0x6e, 0xfd, 0x23, 0x00, 0x82, 0x51, 0x01, 0xfe, 0x99, 0xb2, 0xd9, 0x78, 0xc0, 0xe5, 0xb0, 0x3f, 0xeb, 0xb1, 0xaa, 0xaa, 0xaa, 0x6b, 0x52, 0x11, 0xb5, 0x74, 0x76, 0x76, 0x36, 0x8b,
0xba, 0x0d, 0x87, 0x63, 0xfc, 0x13, 0xb7, 0xfb, 0x4f, 0x49, 0x92, 0x30, 0x31, 0x31, 0x81, 0x85, 0x14, 0x0a, 0xc5, 0x0b, 0x9d, 0x75, 0xc6, 0x93, 0x27, 0xe1, 0xf6, 0xf5, 0x66, 0xf8, 0xee, 0xe2,
0x57, 0xaf, 0x8e, 0x07, 0xf7, 0xec, 0x69, 0x95, 0x92, 0x49, 0x53, 0x79, 0x20, 0xe0, 0x9c, 0x28, 0xa5, 0x27, 0x89, 0x89, 0x89, 0xc7, 0xa4, 0x0f, 0xbe, 0xe3, 0x48, 0x1c, 0x22, 0xc7, 0xa6, 0xb8,
0x2d, 0x15, 0xf5, 0xb6, 0xa5, 0x21, 0xaa, 0xaa, 0x42, 0x14, 0x45, 0x48, 0x92, 0x04, 0x59, 0x96, 0xa0, 0xd7, 0xeb, 0xe7, 0x87, 0x87, 0x87, 0x1f, 0xe1, 0x49, 0xe1, 0x26, 0x29, 0x65, 0x85, 0x7f,
0xa1, 0x5d, 0xbe, 0xbc, 0xee, 0xca, 0xf2, 0x8d, 0x37, 0x36, 0xd7, 0x2e, 0x79, 0xf8, 0x4d, 0xfb, 0x5e, 0x78, 0x13, 0xbb, 0xf0, 0x39, 0x65, 0x7f, 0x64, 0x02, 0x6d, 0xfd, 0x8f, 0x70, 0xef, 0x6a,
0xc9, 0x7b, 0x00, 0x22, 0xc6, 0x55, 0xc0, 0x1b, 0x2b, 0x9c, 0xce, 0x0d, 0x4c, 0x96, 0x69, 0x85, 0x13, 0x73, 0xe7, 0xca, 0x4d, 0xb8, 0xf1, 0xed, 0x65, 0xa8, 0xfb, 0xfa, 0x02, 0x5c, 0x3d, 0xaf,
0xd9, 0x6c, 0x05, 0x50, 0x9c, 0x4e, 0xdb, 0xba, 0x6b, 0xd7, 0x58, 0xd5, 0x8e, 0x1d, 0xee, 0xce, 0x84, 0xc6, 0xcb, 0x2a, 0xf8, 0xe8, 0xe3, 0xe2, 0xb9, 0xe4, 0xe4, 0xe4, 0x48, 0xbf, 0x27, 0x6c,
0xce, 0xce, 0xf2, 0x22, 0x00, 0x74, 0xe2, 0xc4, 0x0a, 0xbd, 0x55, 0x00, 0x90, 0x4a, 0xa5, 0x20, 0x80, 0x3f, 0x12, 0x72, 0x14, 0x2e, 0x8a, 0x67, 0x99, 0x74, 0x73, 0x4a, 0x3b, 0x8d, 0x3e, 0xd3,
0x49, 0x12, 0xa2, 0xd1, 0x28, 0xa2, 0xd1, 0x28, 0x94, 0x53, 0xa7, 0x96, 0x18, 0x53, 0x1a, 0x05, 0xa9, 0x81, 0xfb, 0x10, 0xeb, 0x31, 0x00, 0x0f, 0xa6, 0xa6, 0xbc, 0x79, 0x1f, 0x7c, 0x78, 0x03,
0xab, 0xeb, 0x85, 0xaf, 0xbf, 0xeb, 0x18, 0x6c, 0xff, 0xf2, 0xf0, 0x45, 0xce, 0xb9, 0x62, 0xe4, 0xef, 0x0f, 0x3d, 0x12, 0x33, 0x90, 0x68, 0x70, 0x70, 0xd0, 0x88, 0x12, 0x2f, 0x4a, 0x18, 0x94,
0x9c, 0x0b, 0x00, 0x04, 0x00, 0xd8, 0xbf, 0x7f, 0xff, 0xab, 0x00, 0x5c, 0xfa, 0x6a, 0x61, 0xb5, 0x30, 0x18, 0xdc, 0x0f, 0x97, 0x6b, 0xc7, 0xbb, 0x6c, 0x5e, 0xf1, 0xb6, 0xea, 0xba, 0xec, 0xef,
0x5a, 0x53, 0x6d, 0x6d, 0x6d, 0xf7, 0x89, 0x08, 0xf7, 0xbd, 0xde, 0x1a, 0x71, 0xe2, 0xb1, 0x6d, 0x9e, 0x39, 0xf3, 0xe9, 0xf3, 0xe2, 0x05, 0x13, 0xbd, 0x44, 0xfb, 0xeb, 0x3f, 0xa2, 0x08, 0x24,
0xf6, 0xcb, 0x3e, 0xad, 0x46, 0x96, 0x65, 0xc4, 0x62, 0x31, 0x88, 0xa2, 0x08, 0xcb, 0x99, 0x33, 0x21, 0xfe, 0x05, 0x91, 0xa7, 0xfc, 0x24, 0x73, 0x8d, 0x40, 0x41, 0x00, 0x00, 0x00, 0x00, 0x49,
0x6b, 0x07, 0xca, 0x9d, 0x77, 0xae, 0xf6, 0xf9, 0x2f, 0x8d, 0x0c, 0xfa, 0x2e, 0x70, 0xce, 0xb5, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xd9, 0x5a, 0x37, 0x13, 0x43, 0x43, 0x43, 0xb2, 0xdf, 0xef, 0x9f, 0x94, 0x65, 0x99, 0x39, 0x1c,
0x0e, 0x2b, 0xe9, 0x2a, 0xc7, 0x9c, 0x7f, 0x00, 0x22, 0x68, 0x9a, 0x06, 0x55, 0x55, 0xa1, 0x28,
0x0a, 0x92, 0xc9, 0x24, 0x92, 0x82, 0x30, 0xcf, 0x74, 0x57, 0x58, 0x76, 0xc4, 0x54, 0x75, 0x78,
0x24, 0x36, 0xe8, 0x49, 0x43, 0xe6, 0x80, 0x3c, 0x1e, 0x8f, 0x0f, 0x80, 0x8f, 0x88, 0x0a, 0x87,
0x86, 0x86, 0xde, 0xcb, 0xd8, 0xa8, 0x8b, 0x02, 0x49, 0x2c, 0x36, 0x5c, 0xe9, 0xae, 0x9c, 0x7c,
0x70, 0xa7, 0x88, 0x73, 0x8e, 0x64, 0x22, 0x01, 0x45, 0x92, 0x60, 0x90, 0x24, 0x58, 0xce, 0xff,
0xf2, 0xc2, 0xbf, 0x1a, 0xfe, 0xb8, 0x13, 0xa3, 0xb3, 0x7a, 0xc8, 0x1c, 0x90, 0x3e, 0x24, 0x49,
0x4a, 0xe9, 0x2d, 0x02, 0x00, 0x63, 0x65, 0xa5, 0x68, 0xee, 0xb9, 0x62, 0xd3, 0x8e, 0x7f, 0xb5,
0x4d, 0x60, 0x94, 0x79, 0xae, 0x71, 0x0d, 0xaa, 0xa2, 0x72, 0x88, 0xa2, 0xf8, 0x23, 0xb7, 0x9d,
0x9e, 0x82, 0x3a, 0x3c, 0xc7, 0x81, 0x3c, 0xff, 0x7a, 0x20, 0x22, 0x06, 0xa0, 0x2c, 0x5f, 0x02,
0x05, 0xb0, 0x3b, 0x38, 0x0a, 0x6d, 0x00, 0x72, 0x06, 0x16, 0x4c, 0x11, 0x0a, 0x65, 0x02, 0x4f,
0x26, 0xf8, 0xe8, 0xad, 0xdc, 0x71, 0xff, 0x01, 0xe7, 0xad, 0x52, 0x19, 0x12, 0x68, 0x7f, 0x3e,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE add_hierarchical_label_xpm[1] = {{ png, sizeof( png ), "add_hierarchical_label_xpm" }}; const BITMAP_OPAQUE add_hierarchical_label_xpm[1] = {{ png, sizeof( png ), "add_hierarchical_label_xpm" }};

View File

@ -8,34 +8,34 @@
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, 0x01, 0x99, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x3d, 0x6b, 0x93, 0xce, 0x00, 0x00, 0x01, 0xa3, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x3f, 0x6b, 0x93,
0x61, 0x14, 0xc6, 0xf1, 0x5f, 0x92, 0x2a, 0xf8, 0x82, 0x66, 0x69, 0x87, 0x80, 0x9b, 0x22, 0x3a, 0x51, 0x14, 0xc7, 0xf1, 0x4f, 0x93, 0x68, 0xb1, 0xad, 0x0a, 0x2a, 0x82, 0x50, 0x8b, 0x08, 0x0e,
0xd8, 0xa5, 0x31, 0x50, 0x5c, 0xda, 0xe6, 0x29, 0xa2, 0x81, 0xb4, 0x82, 0xe0, 0x60, 0xd3, 0x0a, 0x82, 0x83, 0x55, 0x42, 0x03, 0x15, 0xa9, 0xed, 0x93, 0x22, 0xb4, 0xda, 0x5a, 0x70, 0x11, 0x1b,
0x22, 0x18, 0x83, 0x08, 0x26, 0xa9, 0x4b, 0xc0, 0xc5, 0x59, 0x14, 0x37, 0x47, 0x3f, 0x80, 0xdf, 0x33, 0x39, 0xb4, 0xd1, 0xc5, 0x46, 0xa7, 0x8a, 0xa0, 0x2f, 0x40, 0x7c, 0x01, 0xba, 0xf8, 0x0a,
0x40, 0x27, 0x5d, 0xba, 0xf8, 0x45, 0x74, 0xd3, 0x1a, 0x4b, 0x73, 0x3b, 0xf8, 0x44, 0xa2, 0x0f, 0x1c, 0x74, 0x76, 0x12, 0xc1, 0x97, 0xa2, 0xa3, 0xf4, 0x1f, 0x7d, 0xae, 0x83, 0x4f, 0x4a, 0x12,
0xb1, 0x4f, 0x52, 0x23, 0x08, 0x1d, 0xae, 0xe9, 0x7e, 0xf9, 0x73, 0x9f, 0x73, 0x9d, 0x73, 0x6e, 0x7d, 0xe2, 0x93, 0xc6, 0x8a, 0x43, 0x87, 0xdf, 0x76, 0xee, 0xfd, 0x72, 0xce, 0xf9, 0x9d, 0x7b,
0x21, 0x04, 0xff, 0x42, 0xfb, 0x3b, 0xdc, 0x11, 0x7e, 0x8a, 0x3c, 0x8e, 0x21, 0x33, 0x69, 0xd0, 0xae, 0x10, 0x82, 0x5e, 0x84, 0xbe, 0x86, 0x3a, 0xc6, 0xf5, 0x04, 0x59, 0x15, 0x76, 0xc4, 0x31,
0x1d, 0x94, 0x71, 0x74, 0xd2, 0xa0, 0x36, 0xaa, 0x38, 0x7e, 0x00, 0x1a, 0x0e, 0x88, 0x9c, 0x11, 0x14, 0xfe, 0x05, 0xa8, 0x8a, 0xe3, 0x69, 0x99, 0xfd, 0x4d, 0x50, 0x0d, 0x27, 0xf7, 0x41, 0x9d,
0x79, 0xe6, 0x9a, 0xe0, 0xb2, 0x60, 0x55, 0x30, 0xe7, 0x9d, 0x82, 0x06, 0x4e, 0xee, 0x1b, 0xe4, 0x01, 0x65, 0xe7, 0x44, 0x5e, 0x59, 0x10, 0x5c, 0x17, 0xdc, 0x12, 0x14, 0x7d, 0x74, 0xc1, 0x04,
0xb1, 0xac, 0x25, 0x6d, 0x91, 0x6d, 0x6b, 0x76, 0xd5, 0x05, 0x0f, 0x05, 0x75, 0xc1, 0x4d, 0x3d, 0x0e, 0xf4, 0x0c, 0xf2, 0x4c, 0xce, 0x94, 0x27, 0xca, 0xd6, 0x2c, 0xda, 0xb6, 0x24, 0x78, 0x24,
0x65, 0xdf, 0xcc, 0x7b, 0x2e, 0x2f, 0x8f, 0xec, 0xf8, 0xa0, 0x65, 0x2d, 0x15, 0x9f, 0x35, 0x07, 0x58, 0x12, 0xdc, 0x15, 0x8b, 0x6c, 0x1a, 0xf7, 0xd2, 0x09, 0x87, 0xdb, 0x33, 0xeb, 0x0e, 0x34,
0x42, 0x36, 0xa8, 0xa6, 0xe0, 0xaa, 0xae, 0xa2, 0x57, 0x28, 0x20, 0x37, 0x32, 0x48, 0xd9, 0x39, 0xad, 0x6e, 0xd6, 0x77, 0x2b, 0x4d, 0x25, 0x6b, 0xd6, 0x8a, 0x60, 0xc6, 0xba, 0x31, 0x6f, 0x70,
0x91, 0x6d, 0xad, 0x21, 0x90, 0xbe, 0xda, 0x82, 0xb2, 0x1d, 0x05, 0x9b, 0x98, 0xe9, 0xd7, 0xd5, 0xb4, 0x19, 0x96, 0x1d, 0x12, 0x39, 0xaf, 0x6c, 0x4d, 0x3d, 0x05, 0xd2, 0xd0, 0x63, 0x41, 0x64,
0x28, 0x79, 0x79, 0x69, 0x4d, 0xef, 0x8f, 0x90, 0xbe, 0xd6, 0xf5, 0x94, 0x6c, 0x61, 0xb1, 0x5f, 0xd3, 0x19, 0x55, 0x0c, 0xfc, 0x02, 0x42, 0x01, 0xfd, 0xa9, 0x8a, 0xbc, 0xb6, 0x28, 0xee, 0x08,
0x57, 0x49, 0xf7, 0x0c, 0xd3, 0x8a, 0xa0, 0x91, 0x62, 0x5f, 0x47, 0x70, 0x5f, 0xb0, 0xe8, 0x23, 0x69, 0xe8, 0x9e, 0x58, 0xc9, 0x27, 0x8c, 0x20, 0xbf, 0x03, 0xca, 0x74, 0x78, 0x5e, 0x50, 0xcb,
0x6e, 0x63, 0x1a, 0x99, 0xf4, 0xa0, 0x65, 0x61, 0xcf, 0xb0, 0xfd, 0x1a, 0xbe, 0x5d, 0xd4, 0x71, 0x10, 0xb7, 0x2a, 0x78, 0x28, 0x98, 0xf4, 0x15, 0x25, 0xf4, 0x77, 0x07, 0x9a, 0x16, 0xfe, 0x58,
0x1a, 0x53, 0xe9, 0x41, 0xd5, 0x11, 0x5f, 0xb4, 0xe0, 0x13, 0xee, 0xe1, 0x02, 0x0e, 0xff, 0x00, 0xb6, 0xd6, 0xf2, 0x6d, 0xe3, 0x26, 0x06, 0xbb, 0x03, 0xcd, 0x75, 0x9d, 0xd1, 0x37, 0xdc, 0x68,
0x91, 0xc3, 0x29, 0xac, 0xc7, 0x8b, 0x49, 0x95, 0xbc, 0x57, 0x4b, 0x99, 0xa3, 0x0d, 0x3d, 0x25, 0x05, 0xfd, 0xec, 0xcf, 0x08, 0x2e, 0xa1, 0xf8, 0x5b, 0x5d, 0xf5, 0x4e, 0x25, 0x63, 0x8f, 0xaa,
0x1f, 0x12, 0x2f, 0x8a, 0x61, 0x53, 0x38, 0x11, 0x77, 0xe1, 0xa4, 0x8a, 0xe6, 0x45, 0xbe, 0xa6, 0x62, 0x25, 0x5f, 0x30, 0xd6, 0x52, 0xba, 0x04, 0x96, 0xc7, 0xc1, 0x54, 0x5d, 0x71, 0x59, 0xd9,
0x76, 0xdd, 0x8c, 0x17, 0x89, 0x1c, 0xa5, 0x76, 0xde, 0x92, 0x8e, 0x8a, 0x2f, 0x43, 0x61, 0x2d, 0x7a, 0x46, 0xd7, 0x6d, 0x39, 0xe5, 0x39, 0x4e, 0xb7, 0x98, 0x21, 0xb3, 0xc5, 0xa7, 0x3c, 0x35,
0x41, 0x45, 0xd7, 0xac, 0x37, 0x78, 0x90, 0x70, 0x5d, 0x6a, 0xd0, 0x75, 0x39, 0x0b, 0x9e, 0x88, 0xd3, 0xc1, 0xe2, 0x75, 0xc1, 0xac, 0x0d, 0xa3, 0x3e, 0x24, 0x46, 0x38, 0xb4, 0xbb, 0x81, 0xbd,
0x74, 0xd5, 0xf4, 0x34, 0xe2, 0xcb, 0x1b, 0x82, 0x9a, 0x9e, 0xb2, 0x1d, 0xb3, 0xde, 0xca, 0x6a, 0x2d, 0x6f, 0xd2, 0x0b, 0x65, 0x1b, 0x2a, 0x62, 0xb5, 0xe4, 0xf2, 0x9a, 0xa0, 0x22, 0x16, 0xd9,
0xe2, 0xc6, 0x58, 0x75, 0x34, 0x10, 0xe2, 0x8c, 0x39, 0x17, 0x5d, 0xf2, 0xda, 0x4a, 0xec, 0xc6, 0x32, 0xea, 0xbd, 0x82, 0x6b, 0x38, 0xb2, 0xab, 0x81, 0x6d, 0xd9, 0xa8, 0xe3, 0x2e, 0x9a, 0xf0,
0xaa, 0xa0, 0x68, 0xcb, 0xb4, 0xa7, 0xb8, 0x8b, 0x2b, 0x63, 0x77, 0x86, 0x04, 0x8c, 0x23, 0xbf, 0xd6, 0x7c, 0xe2, 0xc6, 0x39, 0x41, 0xd1, 0x67, 0xc3, 0x6a, 0x38, 0x8b, 0x81, 0x9e, 0x9e, 0xa0,
0x75, 0xef, 0x47, 0xb8, 0x85, 0xf3, 0x71, 0xae, 0xb3, 0x93, 0x1c, 0x13, 0xab, 0x7f, 0xa5, 0x7b, 0x36, 0x60, 0xae, 0xed, 0xf5, 0x7e, 0x80, 0xe1, 0xb4, 0x2d, 0xbb, 0xbf, 0x8f, 0xfe, 0x0b, 0xd0,
0x1f, 0x4c, 0xd8, 0xff, 0x10, 0xc4, 0x21, 0x9c, 0xc5, 0xc6, 0x5e, 0xdf, 0xad, 0xef, 0xd9, 0x83, 0xf2, 0xde, 0x81, 0x18, 0xc2, 0x02, 0xee, 0xe3, 0x4e, 0xf2, 0xe5, 0xda, 0x13, 0x50, 0x1f, 0x06,
0x86, 0x62, 0x6a, 0x21, 0xa9, 0xef, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x93, 0x99, 0x19, 0x42, 0x2e, 0x2d, 0xf6, 0x07, 0x38, 0xc8, 0x81, 0xcd, 0xab, 0xde, 0xd2, 0xd3,
0x60, 0x82, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE add_junction_xpm[1] = {{ png, sizeof( png ), "add_junction_xpm" }}; const BITMAP_OPAQUE add_junction_xpm[1] = {{ png, sizeof( png ), "add_junction_xpm" }};

View File

@ -8,82 +8,93 @@
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, 0x04, 0x99, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x96, 0x7b, 0x48, 0x9b, 0xce, 0x00, 0x00, 0x05, 0x48, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x55, 0x6b, 0x4c, 0x53,
0x67, 0x14, 0xc6, 0xed, 0xda, 0x8e, 0xd1, 0x8d, 0x6d, 0x4c, 0x18, 0xab, 0x65, 0xad, 0x63, 0x17, 0x67, 0x18, 0x76, 0xa8, 0x13, 0x37, 0x8d, 0x71, 0x63, 0x8e, 0x6d, 0x2e, 0x9a, 0xb0, 0x60, 0xe2,
0xd9, 0x85, 0x31, 0xa9, 0x14, 0xcb, 0xd8, 0x28, 0x83, 0xee, 0x9f, 0xb1, 0x8e, 0x8d, 0x86, 0xb1, 0xa6, 0x5b, 0x96, 0xdd, 0x4d, 0xd8, 0x62, 0x5c, 0xf6, 0xc3, 0x3f, 0x66, 0x8e, 0x99, 0x25, 0xfe,
0x95, 0xd2, 0x82, 0xa8, 0x69, 0x0d, 0x54, 0x97, 0xd4, 0x1a, 0xa3, 0x31, 0x31, 0xa6, 0x99, 0xce, 0x70, 0x89, 0x3b, 0x52, 0xa0, 0xdc, 0xa4, 0xb4, 0x5c, 0x6d, 0xa1, 0xc8, 0xd0, 0x8d, 0x3b, 0xe1,
0xd8, 0x7a, 0x2b, 0x73, 0x46, 0x44, 0x46, 0x9c, 0xad, 0x9a, 0x26, 0x6a, 0x34, 0x6a, 0x6c, 0x92, 0xe2, 0xa6, 0x92, 0x08, 0x01, 0xa7, 0xd8, 0x96, 0x72, 0xa7, 0xa5, 0x72, 0x2b, 0x2d, 0x20, 0x72,
0x5a, 0x2f, 0xc1, 0x4b, 0x5c, 0x30, 0xd1, 0x46, 0x8d, 0xd7, 0x4c, 0xe3, 0x35, 0xc6, 0x4b, 0x14, 0x1f, 0x88, 0xdc, 0x4a, 0x29, 0x20, 0x14, 0xca, 0x1d, 0x05, 0xde, 0xbd, 0xef, 0xc9, 0x29, 0x21,
0x27, 0x67, 0xe7, 0x7c, 0x98, 0x51, 0x2a, 0x5b, 0xb3, 0x2b, 0x5b, 0xe0, 0xe1, 0xfb, 0xf8, 0xbe, 0x68, 0x2a, 0x66, 0xd9, 0x4e, 0xf2, 0x24, 0xcd, 0xd7, 0xef, 0xbc, 0xcf, 0xfb, 0x3e, 0xcf, 0xf3,
0xf0, 0xfe, 0xde, 0xe7, 0x79, 0xcf, 0x39, 0x49, 0x10, 0x00, 0x04, 0xfd, 0x1b, 0x0a, 0xfa, 0x4f, 0x7d, 0x67, 0x13, 0x00, 0x6c, 0xfa, 0x3f, 0xf0, 0x42, 0x9b, 0x25, 0x22, 0x51, 0x64, 0x5a, 0x7c,
0x82, 0x04, 0x5c, 0xee, 0xfb, 0xf2, 0x8c, 0x8c, 0xee, 0x6b, 0x32, 0x59, 0xd7, 0xd5, 0xd4, 0xd4, 0xbc, 0xf1, 0x8f, 0xa4, 0x24, 0xc3, 0xc5, 0x90, 0x90, 0xea, 0xff, 0x8c, 0xe8, 0x72, 0x78, 0x78,
0x6b, 0xff, 0x18, 0x08, 0x17, 0x2f, 0xfe, 0xd1, 0x62, 0x81, 0xa1, 0xa1, 0x21, 0x28, 0x29, 0x2c, 0x6d, 0x47, 0x47, 0x07, 0x3c, 0x78, 0xf0, 0x00, 0xae, 0x24, 0x26, 0x1a, 0xfe, 0x35, 0x91, 0xd0,
0xb4, 0xff, 0x2d, 0xa0, 0xf4, 0x2b, 0x57, 0xb2, 0x84, 0x3c, 0xde, 0xa7, 0x0f, 0x3e, 0xcb, 0x95, 0xd3, 0xf3, 0x90, 0x44, 0x20, 0xa8, 0x0d, 0xe0, 0xf1, 0x0e, 0xac, 0x5d, 0x4f, 0x89, 0x8d, 0xed,
0xc9, 0xcc, 0xc3, 0xc3, 0xc3, 0xe0, 0x74, 0x3a, 0xa1, 0x52, 0xa9, 0x74, 0x89, 0x58, 0xac, 0xc7, 0xc6, 0x07, 0x7a, 0x7a, 0x7a, 0xe0, 0x4e, 0x76, 0xf6, 0x48, 0x00, 0x9f, 0xbf, 0xd7, 0xfa, 0x9f,
0xfd, 0xef, 0x44, 0x89, 0x89, 0x11, 0x59, 0x42, 0xa1, 0x36, 0x3e, 0x3e, 0xfe, 0xd9, 0x80, 0x40, 0xc8, 0xcd, 0x6d, 0xff, 0xa5, 0x0b, 0x17, 0xea, 0xc3, 0x05, 0x82, 0xb3, 0x1b, 0x22, 0x0a, 0xf4,
0xf8, 0xd9, 0x23, 0x4b, 0x4b, 0xfb, 0xa1, 0xa9, 0xa1, 0x61, 0x4d, 0x53, 0x55, 0xe5, 0x91, 0x0a, 0xf6, 0xfe, 0x3c, 0x3d, 0x21, 0xc1, 0xa4, 0xab, 0xad, 0xa5, 0xae, 0x47, 0xc4, 0x42, 0xa1, 0x44,
0x04, 0xaa, 0x94, 0xf8, 0xf8, 0xcf, 0xbe, 0x49, 0x4f, 0x37, 0xe9, 0x6a, 0x6b, 0xe7, 0xc7, 0xc7, 0x2c, 0x10, 0x88, 0x62, 0xa4, 0xd2, 0xd6, 0x2a, 0x8d, 0x66, 0xaa, 0xbf, 0xbf, 0x1f, 0x86, 0x86,
0xc7, 0xc1, 0xe5, 0x72, 0x41, 0xbf, 0xd5, 0xea, 0xbb, 0x21, 0x97, 0xdb, 0xa5, 0xc9, 0xc9, 0x82, 0x86, 0xe0, 0xef, 0xf6, 0xf6, 0xc7, 0xa9, 0x31, 0x31, 0x7d, 0x51, 0xa1, 0xa1, 0x69, 0xd2, 0xc0,
0x6c, 0xb1, 0x58, 0xd1, 0x54, 0x57, 0x37, 0xe7, 0x9a, 0x9c, 0x84, 0xef, 0x72, 0x73, 0x6d, 0x89, 0xc0, 0x88, 0xcc, 0xab, 0x57, 0x87, 0x4d, 0xb8, 0xae, 0xcc, 0xcd, 0x9d, 0x88, 0x0c, 0x0a, 0x12,
0x1c, 0x4e, 0xc8, 0x23, 0x41, 0x3c, 0x36, 0xfb, 0xf9, 0x1b, 0x39, 0x39, 0xae, 0x9e, 0x9e, 0x1e, 0x3d, 0x97, 0x48, 0x12, 0x10, 0x90, 0x51, 0xa1, 0xd1, 0x2c, 0xe9, 0x74, 0x3a, 0x68, 0x6e, 0x6e,
0x20, 0xf5, 0x76, 0x77, 0x6f, 0x1b, 0xf4, 0x7a, 0x1f, 0xb9, 0x98, 0xc4, 0x85, 0x66, 0x66, 0x66, 0x86, 0xbb, 0x6a, 0xf5, 0x82, 0xb6, 0xba, 0x7a, 0x89, 0x08, 0x0c, 0x06, 0x03, 0x0c, 0x0f, 0x0f,
0x60, 0x71, 0x71, 0x11, 0x56, 0x56, 0x56, 0x60, 0x73, 0x73, 0x13, 0x46, 0x1c, 0x8e, 0xed, 0xb1, 0x83, 0xd9, 0x6c, 0x86, 0xe9, 0xe9, 0x69, 0x58, 0x5c, 0x5c, 0x84, 0x01, 0x5c, 0x6f, 0x6d, 0x6a,
0x91, 0x91, 0x6d, 0x8f, 0xc7, 0x03, 0x0b, 0x0b, 0x0b, 0x60, 0x6a, 0x69, 0x59, 0x4e, 0xe5, 0xf1, 0x7a, 0x62, 0xb1, 0x58, 0xd8, 0x75, 0xe3, 0xe0, 0x20, 0x5c, 0x96, 0x48, 0x3a, 0xc5, 0x62, 0xb1,
0xbe, 0x0c, 0x28, 0x3a, 0xf1, 0xe5, 0xcb, 0x5f, 0x68, 0x6f, 0xdf, 0xf6, 0xd8, 0x6c, 0x36, 0x70, 0x9d, 0x4d, 0x22, 0xf1, 0x99, 0x33, 0xf6, 0xbf, 0x49, 0xa5, 0x5d, 0xcd, 0x4d, 0x4d, 0xd0, 0xd6,
0x38, 0x1c, 0x30, 0x3a, 0x3a, 0xca, 0xb8, 0x98, 0x9d, 0x9d, 0x05, 0x5a, 0x70, 0x7d, 0x7d, 0x9d, 0xd6, 0xc6, 0xfa, 0xd1, 0xd7, 0xd7, 0x07, 0x46, 0xa3, 0x11, 0x1e, 0x3d, 0x7a, 0x04, 0x93, 0x93,
0xd1, 0xea, 0xea, 0x2a, 0x2c, 0x2f, 0x2f, 0xc3, 0xd2, 0xd2, 0x12, 0xcc, 0xcf, 0xcf, 0xc3, 0xa0, 0x93, 0x30, 0x3b, 0x3b, 0x0b, 0xf3, 0xf3, 0xf3, 0x30, 0x33, 0x33, 0x03, 0x53, 0x53, 0x53, 0x30,
0xdd, 0xbe, 0xf5, 0xb5, 0x50, 0xa8, 0xfc, 0x43, 0x67, 0x94, 0x25, 0x16, 0xf7, 0x8f, 0x8d, 0x8d, 0x31, 0x31, 0x01, 0xe3, 0xe3, 0xe3, 0xec, 0xff, 0xa8, 0xc2, 0x10, 0xc9, 0xb8, 0x21, 0x8f, 0x44,
0xc1, 0xc4, 0xc4, 0x04, 0x4c, 0x4f, 0x4f, 0x33, 0xbb, 0xf5, 0xbb, 0xf0, 0xf9, 0x7c, 0x0c, 0xc4, 0x9e, 0x9e, 0x47, 0xf3, 0x6e, 0xdf, 0xb6, 0x90, 0x17, 0x03, 0x03, 0x03, 0xec, 0x14, 0x54, 0x88,
0xef, 0x62, 0x6e, 0x6e, 0x8e, 0xd9, 0x44, 0x59, 0x51, 0xd1, 0x74, 0x42, 0x54, 0xd4, 0x73, 0x01, 0x8a, 0x12, 0x01, 0x81, 0x26, 0xb2, 0x4e, 0x31, 0x36, 0x36, 0x06, 0x23, 0x23, 0x23, 0xd0, 0xa0,
0x83, 0xb8, 0x71, 0x71, 0x47, 0x54, 0x15, 0x15, 0x6e, 0xbf, 0x0b, 0xda, 0xf1, 0xda, 0xda, 0x1a, 0xd3, 0x2d, 0x85, 0x9e, 0x3f, 0x2f, 0xda, 0x70, 0x18, 0x50, 0xe3, 0xa4, 0xa6, 0xc6, 0xc6, 0x15,
0x38, 0x06, 0x07, 0x37, 0xbe, 0x57, 0x28, 0x9c, 0xc5, 0xf9, 0xf9, 0xb6, 0x8e, 0xbb, 0x77, 0x3d, 0x9a, 0x62, 0x74, 0x74, 0x94, 0xed, 0x78, 0x6e, 0x6e, 0x0e, 0x46, 0x91, 0xb0, 0x44, 0xa9, 0x1c,
0x6e, 0x8c, 0x91, 0xde, 0xd3, 0x46, 0xa6, 0xa6, 0xa6, 0xc0, 0x6a, 0xb1, 0xfc, 0x9c, 0xce, 0xe7, 0x93, 0x65, 0x67, 0x1b, 0xf5, 0x35, 0x35, 0x53, 0x44, 0x40, 0x53, 0x50, 0x23, 0xe4, 0x1b, 0x35,
0xcb, 0x7e, 0x17, 0xc4, 0xe3, 0xf1, 0x9e, 0x4c, 0xbc, 0x70, 0x21, 0x12, 0x2b, 0x2d, 0xfa, 0x6a, 0x75, 0x49, 0x2c, 0xbe, 0xf7, 0x5c, 0x22, 0x92, 0x4d, 0xc8, 0xe7, 0x7f, 0x98, 0x12, 0x13, 0x33,
0x4a, 0x4a, 0xf7, 0x18, 0xc6, 0x45, 0x71, 0x78, 0xbd, 0x5e, 0xd8, 0xd8, 0xd8, 0x80, 0x7b, 0x06, 0x40, 0x1d, 0x52, 0x21, 0x9a, 0x62, 0x61, 0x61, 0x01, 0xaa, 0xca, 0xcb, 0xcd, 0x68, 0x7c, 0x4a,
0xc3, 0x92, 0x98, 0xcb, 0x3d, 0xc7, 0x62, 0xb1, 0xf6, 0xd2, 0xf7, 0x93, 0xd8, 0xec, 0xf0, 0x92, 0x10, 0xc3, 0xbc, 0x45, 0x7b, 0x43, 0x7d, 0x7c, 0x8e, 0x5c, 0x4f, 0x4d, 0x1d, 0x24, 0x12, 0x6a,
0xfc, 0x7c, 0x27, 0xb9, 0xa1, 0xb3, 0xa3, 0x78, 0xa9, 0x22, 0x95, 0xa5, 0xa5, 0x33, 0xd9, 0x12, 0x88, 0x48, 0x48, 0x01, 0xc5, 0xad, 0x5b, 0x16, 0x89, 0x50, 0x98, 0x8e, 0xaa, 0x9c, 0x0c, 0xf4,
0xc9, 0x3d, 0x09, 0x9f, 0xff, 0x6d, 0xf2, 0xa5, 0x4b, 0x27, 0x77, 0x81, 0x70, 0x27, 0x12, 0xac, 0xf0, 0x70, 0xb6, 0x7a, 0xc5, 0x12, 0xd0, 0xcb, 0xbf, 0x4b, 0xa5, 0x3d, 0xd9, 0x19, 0x19, 0x26,
0xaa, 0xb5, 0x3e, 0x2c, 0x80, 0x49, 0x8c, 0x8b, 0x62, 0xa1, 0x78, 0xfc, 0x31, 0xc9, 0x25, 0x12, 0xec, 0xd8, 0xdc, 0xdd, 0xd5, 0xb5, 0x4c, 0x92, 0x90, 0x07, 0x24, 0x93, 0x05, 0x7d, 0xb9, 0x2c,
0xf3, 0xae, 0x16, 0x48, 0x4a, 0xe2, 0xa0, 0x8b, 0x2d, 0x02, 0xd8, 0xed, 0x76, 0xe8, 0xeb, 0xeb, 0x16, 0x17, 0xaf, 0xef, 0x32, 0x98, 0xcf, 0xff, 0x0c, 0x1b, 0xb0, 0x90, 0x87, 0x5d, 0x5d, 0x5d,
0x83, 0xde, 0xde, 0x5e, 0xe8, 0xea, 0xea, 0x82, 0x56, 0x93, 0x09, 0x72, 0xa4, 0x52, 0xeb, 0x2e, 0xac, 0xa7, 0x2d, 0x2d, 0x2d, 0x80, 0xe1, 0x81, 0x42, 0xa5, 0xf2, 0xc9, 0xb5, 0x94, 0x94, 0x49,
0x10, 0xba, 0x28, 0x70, 0x8e, 0x8c, 0x30, 0x2e, 0xe8, 0x80, 0x09, 0x40, 0x07, 0x4e, 0xe7, 0xf2, 0xa1, 0x87, 0xc7, 0x8f, 0xab, 0x44, 0xfe, 0x6e, 0x6e, 0x1f, 0x14, 0x2a, 0x14, 0x13, 0x34, 0x3e,
0x13, 0x46, 0x88, 0xef, 0xf3, 0x1e, 0x06, 0xf1, 0xe3, 0xe2, 0x5e, 0xd3, 0xeb, 0x74, 0x9e, 0xfe, 0x4d, 0x41, 0xda, 0x93, 0x54, 0x04, 0x22, 0x6b, 0xac, 0xab, 0x9b, 0xc1, 0x17, 0x5c, 0x9e, 0x25,
0xfe, 0x7e, 0x06, 0xd0, 0xd9, 0xd9, 0x09, 0xad, 0xad, 0xad, 0x60, 0x34, 0x1a, 0xc1, 0x84, 0xa0, 0x49, 0xd6, 0xb5, 0x6b, 0x46, 0x3a, 0x5b, 0x94, 0xd0, 0x86, 0x86, 0x06, 0xd0, 0x6a, 0xb5, 0x50,
0xdc, 0xcc, 0xcc, 0x81, 0x5d, 0xa0, 0x0c, 0x3e, 0xff, 0x6c, 0x49, 0x41, 0xc1, 0x40, 0x15, 0x36, 0x51, 0x51, 0x01, 0x65, 0x65, 0x65, 0x90, 0x9f, 0x97, 0x07, 0x21, 0x7e, 0x7e, 0xc2, 0x55, 0xa2,
0x62, 0x9b, 0xd1, 0xe8, 0x25, 0x08, 0xc5, 0x46, 0xce, 0x08, 0x5c, 0x9c, 0x97, 0xe7, 0xa0, 0x1e, 0xf3, 0xe7, 0xce, 0x1d, 0xcc, 0x48, 0x4b, 0x9b, 0x68, 0xbd, 0x7f, 0x9f, 0xd5, 0x9b, 0x62, 0x4b,
0x7b, 0x10, 0x24, 0x4d, 0x49, 0x51, 0xd8, 0xb1, 0x32, 0xc9, 0x41, 0x5b, 0x5b, 0x1b, 0x03, 0xd0, 0xc9, 0x22, 0xc3, 0x29, 0x65, 0x6d, 0xcd, 0xcd, 0x8f, 0x03, 0xf9, 0xfc, 0xef, 0x9f, 0x4a, 0xa8,
0x54, 0x57, 0x7b, 0x10, 0x60, 0xc7, 0x29, 0xd2, 0x9e, 0xc6, 0xe5, 0x4a, 0x7f, 0xb3, 0x18, 0x44, 0xbb, 0xfb, 0x0e, 0x0c, 0xcd, 0x28, 0x91, 0xe8, 0xf5, 0x7a, 0xa8, 0xc6, 0x49, 0xaa, 0xaa, 0xaa,
0x22, 0xd1, 0x3e, 0x84, 0x66, 0x62, 0xa9, 0x6e, 0x53, 0xbf, 0x90, 0x43, 0xb7, 0xdb, 0x0d, 0xf7, 0x58, 0x82, 0x9b, 0x59, 0x59, 0xd3, 0xa9, 0xf1, 0xf1, 0xe3, 0xc1, 0x3e, 0x3e, 0x7e, 0xab, 0x44,
0x07, 0x06, 0x7c, 0xd7, 0x65, 0xb2, 0x36, 0x41, 0x42, 0xc2, 0x27, 0xdc, 0xd8, 0xd8, 0x37, 0x32, 0xa8, 0xe3, 0x16, 0xbc, 0x05, 0xbe, 0x88, 0x10, 0x0a, 0xf9, 0x78, 0x06, 0x6e, 0x16, 0xca, 0xe5,
0x04, 0x82, 0xb2, 0x66, 0xad, 0x76, 0x8e, 0x9c, 0x90, 0x8b, 0x96, 0x96, 0x16, 0x06, 0x24, 0x4b, 0xe6, 0xb5, 0xb1, 0x1d, 0x45, 0xbf, 0xfe, 0x4c, 0x4e, 0xee, 0x46, 0xcd, 0x5f, 0xb7, 0x92, 0xb8,
0x4d, 0xed, 0x0e, 0xb8, 0xea, 0x44, 0x17, 0x2f, 0x3e, 0xa5, 0x54, 0x28, 0x26, 0x08, 0x42, 0x0d, 0xba, 0xba, 0x6e, 0x8e, 0x0a, 0x0b, 0x93, 0x63, 0x68, 0x96, 0x6a, 0xf1, 0x70, 0xd3, 0x14, 0x2a,
0x4a, 0xd5, 0x47, 0x55, 0x45, 0x57, 0x73, 0x7b, 0xfb, 0xfa, 0x9d, 0xc6, 0xc6, 0x25, 0x1b, 0xc6, 0x95, 0x0a, 0xe4, 0xb9, 0xb9, 0x8b, 0x41, 0x5e, 0x5e, 0xc9, 0xa4, 0x80, 0xc0, 0xdd, 0xdd, 0xd1,
0x45, 0x4e, 0x68, 0xf1, 0xa6, 0xa6, 0x26, 0xa8, 0xab, 0xab, 0x03, 0x55, 0x65, 0xe5, 0x26, 0x6e, 0x66, 0xea, 0xd0, 0x2f, 0x1d, 0xa5, 0xc9, 0x1a, 0x5b, 0x93, 0xc9, 0x04, 0xbd, 0xbd, 0xbd, 0x2b,
0x84, 0x1d, 0x30, 0x88, 0x22, 0xca, 0x4e, 0x4f, 0xb7, 0x93, 0x13, 0x02, 0xd0, 0xd8, 0xa1, 0x41, 0x7f, 0x65, 0x66, 0x9a, 0xa2, 0xc3, 0xc2, 0xf2, 0x22, 0x43, 0x42, 0x6e, 0x5c, 0x49, 0x48, 0xe8,
0x4a, 0x0d, 0x6c, 0xc1, 0xa1, 0x6a, 0x36, 0x9b, 0x7f, 0x75, 0xd1, 0xd0, 0xd0, 0x00, 0x1a, 0x8d, 0x6e, 0xd0, 0xeb, 0x17, 0x49, 0x2a, 0x8d, 0x46, 0x03, 0x25, 0x25, 0x25, 0x50, 0x5a, 0x5a, 0x0a,
0x06, 0x6a, 0x6a, 0x6a, 0x40, 0x5b, 0x5b, 0xbb, 0x85, 0x33, 0xb2, 0x34, 0x60, 0x50, 0xa6, 0x50, 0xf1, 0xd1, 0xd1, 0x06, 0x31, 0xc3, 0xbc, 0xb2, 0xa1, 0x78, 0x07, 0xf9, 0xf8, 0x1c, 0xbf, 0xab,
0x28, 0xb7, 0xf4, 0xf4, 0xf8, 0xfc, 0x65, 0x4b, 0xd3, 0xc1, 0x6a, 0xb5, 0x32, 0x23, 0xa9, 0xa3, 0x52, 0x4d, 0x5b, 0x63, 0x4b, 0x37, 0x02, 0x12, 0xc1, 0xc3, 0x87, 0x0f, 0xa1, 0x1b, 0x0f, 0x70,
0xa3, 0x83, 0x39, 0xe8, 0xe6, 0xe6, 0x66, 0xd0, 0x6a, 0xb5, 0x0c, 0x40, 0xaf, 0xd7, 0x83, 0x4e, 0x3b, 0x67, 0x7a, 0x65, 0x65, 0x25, 0x3b, 0x45, 0x51, 0x51, 0x11, 0x28, 0x14, 0x0a, 0x50, 0xa1,
0xa7, 0x63, 0xae, 0xb7, 0x94, 0xca, 0x45, 0x6c, 0x91, 0x8f, 0x1f, 0x09, 0xa2, 0x66, 0xc5, 0x0e, 0x2f, 0x17, 0xfc, 0xfd, 0xb5, 0x1b, 0x3e, 0x47, 0x17, 0x83, 0x83, 0x23, 0xf4, 0x5a, 0xed, 0xac,
0x77, 0x93, 0x93, 0x11, 0xac, 0x42, 0xad, 0x46, 0xe3, 0xc1, 0x26, 0x9d, 0x36, 0x19, 0x8d, 0xdb, 0xf5, 0x6c, 0x10, 0x01, 0xdd, 0xda, 0x4d, 0x78, 0x5b, 0xd4, 0xd7, 0xd7, 0x43, 0x4d, 0x4d, 0x0d,
0x14, 0x95, 0xc1, 0x60, 0x60, 0x16, 0xad, 0xaf, 0xaf, 0x87, 0xa6, 0xc6, 0x46, 0xea, 0x9b, 0x05, 0x3b, 0x05, 0x4d, 0x90, 0x9f, 0x9f, 0x0f, 0x32, 0x99, 0x0c, 0xf2, 0xd0, 0x97, 0xe2, 0xe2, 0x62,
0x74, 0x7f, 0x5f, 0x75, 0xf3, 0xa6, 0x97, 0x5c, 0xe2, 0x5c, 0xdc, 0xc2, 0x1e, 0x52, 0x07, 0xe4, 0xb8, 0x9e, 0x9e, 0x3e, 0x16, 0xe8, 0xeb, 0xfb, 0xf5, 0x73, 0x89, 0x42, 0x7c, 0x7d, 0x8f, 0xdd,
0x08, 0x8b, 0xe1, 0xab, 0xaa, 0xf2, 0x72, 0x4f, 0x61, 0x76, 0xf6, 0x64, 0xf4, 0x99, 0x33, 0xd1, 0xc9, 0xc9, 0x19, 0x23, 0x12, 0x8a, 0x2d, 0x9d, 0x8d, 0xce, 0xce, 0x4e, 0x68, 0x6c, 0x6c, 0x04,
0x6f, 0x85, 0x85, 0x45, 0x70, 0xa2, 0xa2, 0xae, 0x63, 0x25, 0x4d, 0xde, 0xc1, 0xb8, 0xd4, 0x6a, 0xba, 0xff, 0xc8, 0x6c, 0xb5, 0x5a, 0xcd, 0x4e, 0x41, 0xc5, 0x0b, 0x0a, 0x0a, 0xa0, 0x14, 0x65,
0x35, 0xd4, 0xaa, 0xd5, 0xdb, 0xd8, 0x90, 0x1d, 0x27, 0x8e, 0x1f, 0xff, 0x08, 0xa3, 0x7e, 0x09, 0xa3, 0x35, 0x92, 0x8f, 0xbc, 0x8a, 0x8f, 0x8a, 0xea, 0x13, 0x32, 0xcc, 0x2e, 0x9b, 0x44, 0xe1,
0xdf, 0x73, 0x0a, 0xe5, 0x72, 0x57, 0xa6, 0x48, 0x64, 0x8a, 0x89, 0x89, 0xd9, 0x1f, 0xc8, 0xcf, 0x22, 0x51, 0xfe, 0xbd, 0xba, 0xba, 0xc7, 0x24, 0x15, 0x4e, 0xf5, 0x04, 0xbf, 0x41, 0x7d, 0x09,
0xc4, 0x5e, 0xd4, 0x33, 0x67, 0x4f, 0x9f, 0x66, 0x85, 0x86, 0x84, 0xbc, 0x83, 0xf7, 0xa4, 0x77, 0xd1, 0xd1, 0xfd, 0xf9, 0x72, 0xf9, 0x5c, 0x2d, 0xfa, 0x51, 0x5e, 0x5e, 0xce, 0x16, 0x27, 0x22,
0x51, 0x27, 0x3f, 0x3f, 0x75, 0xaa, 0x48, 0xa3, 0x52, 0x31, 0x91, 0x95, 0x29, 0x14, 0xde, 0x57, 0xa5, 0x42, 0xb1, 0x9c, 0x12, 0x17, 0x37, 0x84, 0xef, 0x28, 0x62, 0xa3, 0xa2, 0x7a, 0x35, 0x6a,
0x43, 0x43, 0xcf, 0xe1, 0xf3, 0x13, 0xa8, 0x63, 0xa8, 0x37, 0x8f, 0x85, 0x87, 0x47, 0xbc, 0x18, 0xf5, 0x72, 0x25, 0x12, 0xc5, 0x44, 0x46, 0x76, 0xe3, 0x91, 0xd9, 0x63, 0x93, 0x88, 0x61, 0x98,
0x1c, 0x7c, 0x08, 0xef, 0x0f, 0x04, 0x02, 0x7a, 0x0c, 0xf5, 0x34, 0xea, 0x05, 0xd4, 0xcb, 0xa8, 0xad, 0xbf, 0x86, 0x86, 0x96, 0x66, 0xa0, 0x04, 0x58, 0x20, 0x95, 0xcf, 0xe7, 0x6f, 0x13, 0xbb,
0xb7, 0x51, 0x91, 0xa8, 0x0f, 0x22, 0x23, 0x22, 0x12, 0xca, 0xcb, 0xca, 0x36, 0xc8, 0x55, 0x81, 0xba, 0xbe, 0x8c, 0xf1, 0xfe, 0x01, 0x3f, 0x17, 0x06, 0x22, 0x92, 0xcb, 0xe5, 0xa0, 0x90, 0xc9,
0x5c, 0x3e, 0x8b, 0xcf, 0x3e, 0x44, 0xbd, 0x87, 0x3a, 0x8a, 0x7a, 0x1d, 0x75, 0x18, 0x15, 0x8c, 0x56, 0x30, 0xba, 0x59, 0x22, 0x1e, 0x6f, 0xb7, 0x35, 0xea, 0xb8, 0x5f, 0x86, 0x8d, 0xf5, 0xac,
0x7a, 0x22, 0xe0, 0xe9, 0x8d, 0x9f, 0xfd, 0xe4, 0x6c, 0x07, 0x78, 0x04, 0xf5, 0xca, 0xe1, 0x83, 0x4d, 0x9b, 0x4d, 0x8f, 0xe8, 0xda, 0xa0, 0xeb, 0x63, 0xfd, 0x3a, 0x5e, 0x98, 0xc9, 0x85, 0xe8,
0x07, 0x8f, 0x26, 0xc4, 0xc6, 0x56, 0xf0, 0x38, 0x9c, 0x6a, 0xf6, 0xf9, 0xf3, 0x19, 0xf8, 0x2c, 0x09, 0xf9, 0x92, 0x73, 0xe3, 0x86, 0xd9, 0x9f, 0xc7, 0x3b, 0xbc, 0x7e, 0x0f, 0x35, 0xf6, 0x42,
0x8c, 0x62, 0x43, 0x1d, 0xda, 0x01, 0x1c, 0x78, 0xb8, 0xa9, 0xff, 0xd4, 0x7f, 0x86, 0x1d, 0xb7, 0x9f, 0x72, 0x7c, 0x36, 0x23, 0xb6, 0x21, 0x5e, 0x45, 0xec, 0x42, 0x38, 0xfc, 0x72, 0xfa, 0xb4,
0x14, 0xed, 0xbe, 0x9d, 0xeb, 0x9e, 0xff, 0xf7, 0xdf, 0xad, 0xbf, 0xa2, 0x5f, 0x00, 0xac, 0xf3, 0xfb, 0xed, 0x9c, 0x9c, 0xe5, 0x32, 0x0c, 0x41, 0x6a, 0x5c, 0xdc, 0xb0, 0x83, 0x83, 0xc3, 0xdb,
0x53, 0x02, 0xc3, 0xa6, 0x73, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0xb8, 0xbe, 0x1b, 0xb1, 0x03, 0x61, 0x8f, 0xd8, 0x82, 0x78, 0xc9, 0x26, 0x11, 0xf7, 0xd8, 0x73,
0x60, 0x82, 0x2f, 0x3a, 0x22, 0xf6, 0x23, 0x0e, 0x20, 0x0e, 0x23, 0x3e, 0x41, 0x7c, 0xe9, 0xec, 0xe4, 0x74,
0xc2, 0x8b, 0x61, 0x14, 0xde, 0x0c, 0xa3, 0x3c, 0x73, 0xea, 0x54, 0x22, 0xae, 0x7d, 0x85, 0xf8,
0x14, 0xf1, 0x11, 0xe2, 0x20, 0xc2, 0x09, 0xf1, 0x0e, 0x35, 0xc5, 0x35, 0xb8, 0xf9, 0x59, 0x44,
0xdb, 0x11, 0xaf, 0x71, 0x1b, 0xdf, 0x43, 0x1c, 0xe2, 0x8a, 0xb8, 0x20, 0xbe, 0x43, 0x9c, 0x40,
0xfc, 0x84, 0xf8, 0x19, 0x71, 0x16, 0x71, 0x1a, 0x71, 0x12, 0x71, 0x1c, 0x71, 0x94, 0x1a, 0xe1,
0x08, 0xa9, 0xb9, 0x7d, 0x88, 0x3d, 0x88, 0x9d, 0x08, 0xbb, 0xf5, 0x44, 0x76, 0x5c, 0x17, 0xd4,
0xcd, 0x5e, 0xae, 0xbb, 0xf7, 0x11, 0x1f, 0x73, 0x45, 0x5c, 0xb8, 0x82, 0xdf, 0x72, 0x38, 0x86,
0xf8, 0x06, 0x71, 0x84, 0x6b, 0x88, 0x26, 0x77, 0xe6, 0x48, 0xde, 0xe4, 0xe4, 0xde, 0x6a, 0xd3,
0xa3, 0x35, 0xfe, 0xec, 0xe4, 0xa6, 0x74, 0xe4, 0xc8, 0xf7, 0x71, 0x92, 0xee, 0xe7, 0x7e, 0xbf,
0x8b, 0x20, 0x9f, 0xde, 0xe0, 0x0a, 0x6f, 0xe7, 0x7c, 0x7a, 0xaa, 0xe6, 0x3f, 0xed, 0x36, 0xc6,
0xbf, 0x74, 0x35, 0x85, 0x76, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82,
}; };
const BITMAP_OPAQUE config_xpm[1] = {{ png, sizeof( png ), "config_xpm" }}; const BITMAP_OPAQUE config_xpm[1] = {{ png, sizeof( png ), "config_xpm" }};

View File

@ -8,86 +8,89 @@
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, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x00, 0xce, 0x00, 0x00, 0x05, 0x17, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xdf, 0x6f, 0x14,
0x53, 0x74, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x47, 0x61, 0x72, 0x72, 0x69, 0x74, 0x79, 0xc7, 0x05, 0x55, 0x14, 0xc7, 0x3f, 0xf7, 0xce, 0xce, 0xee, 0x4e, 0x77, 0xbb, 0x3b, 0x4a, 0x2b, 0x5d, 0x37,
0x3b, 0x51, 0x00, 0x00, 0x04, 0xbb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x4b, 0x6c, 0x82, 0xd0, 0x2e, 0x5b, 0xf9, 0xb5, 0x12, 0xe8, 0x83, 0x18, 0xa8, 0xc6, 0x44, 0x94, 0x84, 0xa4,
0x1b, 0x55, 0x14, 0x86, 0xbf, 0x7b, 0x67, 0xfc, 0x4a, 0x1c, 0xdb, 0x72, 0xd3, 0x34, 0x4a, 0xe3, 0x2f, 0x18, 0x63, 0x24, 0x06, 0x49, 0x34, 0xf2, 0xa2, 0x89, 0xf2, 0xe0, 0x9b, 0x89, 0x7f, 0x00,
0x28, 0xa5, 0xb1, 0xe2, 0x3a, 0x21, 0x88, 0x22, 0x0a, 0x34, 0x52, 0xda, 0xaa, 0xa2, 0x5d, 0x20, 0x09, 0xd1, 0xc4, 0x12, 0xab, 0x31, 0x3c, 0x18, 0x5e, 0x04, 0x2d, 0x18, 0x1e, 0x0c, 0x62, 0xd1,
0xd2, 0xec, 0x40, 0xa2, 0x11, 0x0b, 0x58, 0x50, 0x56, 0xac, 0x91, 0x8a, 0x58, 0x21, 0x58, 0x74, 0x18, 0x52, 0x13, 0x28, 0x3f, 0x0a, 0xa5, 0x34, 0x50, 0x6a, 0x61, 0xe9, 0x8f, 0xfd, 0x31, 0x65,
0xd3, 0x15, 0xad, 0x94, 0x45, 0x57, 0x45, 0x42, 0x42, 0x65, 0x55, 0xb1, 0xa0, 0x40, 0xc5, 0x06, 0xa7, 0xdd, 0xdd, 0x99, 0xb9, 0x3e, 0x40, 0x27, 0x5d, 0xba, 0x18, 0x88, 0x89, 0x27, 0x39, 0x99,
0xa5, 0x4f, 0x35, 0xcd, 0x4b, 0x4e, 0x1f, 0x4e, 0x5b, 0x8b, 0x46, 0x69, 0x1c, 0xb7, 0x71, 0x33, 0x3b, 0xb9, 0x77, 0xce, 0xf7, 0x7c, 0xcf, 0xaf, 0xb9, 0x42, 0x29, 0xc5, 0xff, 0x21, 0x01, 0x80,
0x9e, 0xc7, 0x61, 0x41, 0xc6, 0xb2, 0x63, 0x07, 0xe8, 0x86, 0x2b, 0xfd, 0x9a, 0x3b, 0x9a, 0x3b, 0x83, 0x07, 0x0f, 0x7e, 0x2f, 0x84, 0x78, 0x33, 0x10, 0x08, 0xa0, 0x69, 0x1a, 0x4a, 0x29, 0x1c,
0xf7, 0x3f, 0xff, 0x39, 0x67, 0xfe, 0x3b, 0x4a, 0x44, 0xf8, 0x3f, 0x86, 0x09, 0x70, 0xf6, 0xec, 0xc7, 0xc1, 0x75, 0x5d, 0x1c, 0xc7, 0xf1, 0xf5, 0x71, 0xdf, 0xa5, 0x94, 0x5f, 0xf5, 0xf4, 0xf4,
0xd9, 0xf3, 0x4a, 0xa9, 0xf7, 0x4d, 0xd3, 0xc4, 0x30, 0x0c, 0x44, 0x04, 0xc7, 0x71, 0x70, 0x5d, 0x7c, 0x00, 0xc0, 0x81, 0x03, 0x07, 0x62, 0xdd, 0xdd, 0xdd, 0x95, 0x6a, 0xb5, 0xaa, 0x5c, 0xd7,
0x17, 0xc7, 0x71, 0xaa, 0x78, 0xd1, 0x7b, 0xad, 0xf5, 0xb7, 0x13, 0x13, 0x13, 0x27, 0x00, 0x38, 0xad, 0xab, 0x8e, 0xe3, 0xf8, 0x5a, 0xad, 0x56, 0x6b, 0xb4, 0x52, 0xa9, 0xf8, 0x5a, 0x2e, 0x97,
0x7d, 0xfa, 0x74, 0xec, 0xcc, 0x99, 0x33, 0x15, 0xdb, 0xb6, 0xc5, 0x75, 0xdd, 0xa6, 0x70, 0x1c, 0x7d, 0xb5, 0x2c, 0x4b, 0xed, 0xda, 0xb5, 0xcb, 0x53, 0x4a, 0xa1, 0x94, 0x22, 0xe0, 0xba, 0xae,
0xa7, 0x0a, 0xdb, 0xb6, 0xeb, 0x50, 0xa9, 0x54, 0xaa, 0xb0, 0x2c, 0xab, 0x8a, 0x52, 0xa9, 0x24, 0x94, 0x52, 0x7a, 0x42, 0x08, 0x6e, 0xde, 0xbc, 0x89, 0x10, 0x02, 0x00, 0x21, 0x44, 0xcd, 0xba,
0xe3, 0xe3, 0xe3, 0x9e, 0x88, 0x20, 0x22, 0x98, 0xae, 0xeb, 0x6a, 0xad, 0xb5, 0xa7, 0x94, 0x22, 0xde, 0xf3, 0x61, 0x22, 0xa5, 0xc4, 0x34, 0x4d, 0x94, 0x52, 0xa2, 0x26, 0x74, 0x9e, 0xe7, 0xd5,
0x9f, 0xcf, 0xa3, 0x94, 0x02, 0x40, 0x29, 0x55, 0x37, 0x6f, 0x76, 0xdd, 0x6a, 0x68, 0xad, 0x49, 0x35, 0x5e, 0x6f, 0xfd, 0x28, 0x40, 0xf5, 0xf6, 0x03, 0x00, 0xae, 0xeb, 0x02, 0x60, 0x59, 0x16,
0x24, 0x12, 0x88, 0x88, 0xaa, 0x4b, 0x9d, 0xe7, 0x79, 0x4d, 0x37, 0x6f, 0x36, 0xff, 0x2f, 0x44, 0xf9, 0x7c, 0x9e, 0x65, 0xcb, 0x96, 0x21, 0xa5, 0x64, 0x64, 0x64, 0x84, 0x07, 0x8b, 0xe5, 0xdf,
0xcd, 0x9e, 0x9b, 0x00, 0xae, 0xeb, 0x02, 0x50, 0x2a, 0x95, 0x58, 0x59, 0x59, 0xa1, 0xa7, 0xa7, 0x40, 0x94, 0x52, 0xa4, 0xd3, 0x69, 0xff, 0xcc, 0xc2, 0x6f, 0x17, 0x31, 0x6a, 0x6b, 0x6b, 0x23,
0x07, 0xad, 0x35, 0x0b, 0x0b, 0x0b, 0x6c, 0x6e, 0x96, 0x7f, 0x22, 0x11, 0x11, 0xfa, 0xfb, 0xfb, 0x14, 0x0a, 0x61, 0xdb, 0x36, 0xa9, 0x54, 0xea, 0xb1, 0xc2, 0xa7, 0x94, 0x42, 0x4a, 0x89, 0x94,
0xab, 0x6b, 0x6a, 0xdf, 0x6d, 0x50, 0xd4, 0xd7, 0xd7, 0x47, 0x28, 0x14, 0xa2, 0x5c, 0x2e, 0x93, 0x72, 0x31, 0x50, 0xb1, 0x58, 0xc4, 0x34, 0x4d, 0x00, 0x4c, 0xd3, 0x44, 0x08, 0x41, 0xb9, 0x5c,
0x4e, 0xa7, 0x5f, 0x28, 0x7d, 0x22, 0x82, 0xd6, 0x1a, 0xad, 0x75, 0x23, 0xd1, 0xea, 0xea, 0x2a, 0x46, 0x08, 0xc1, 0xb5, 0x6b, 0xd7, 0xfc, 0xc3, 0x96, 0x65, 0x31, 0x33, 0x33, 0x83, 0x61, 0x18,
0x89, 0x44, 0x02, 0x80, 0x44, 0x22, 0x81, 0x52, 0x0a, 0xcb, 0xb2, 0x50, 0x4a, 0x91, 0xcb, 0xe5, 0x98, 0xa6, 0xc9, 0xe4, 0xe4, 0x24, 0xd5, 0x6a, 0x95, 0x4c, 0x26, 0x43, 0x4b, 0x4b, 0x4b, 0x5d,
0xea, 0x16, 0x6f, 0xde, 0x5c, 0x44, 0x18, 0x18, 0x18, 0xd8, 0x32, 0x75, 0x0d, 0x8a, 0x5c, 0xd7, 0xd6, 0x8b, 0x18, 0xb9, 0xae, 0x8b, 0x52, 0x0a, 0x21, 0x84, 0xbf, 0x29, 0x84, 0x20, 0x95, 0x4a,
0x45, 0x44, 0x50, 0x4a, 0x55, 0x1f, 0x2a, 0xa5, 0x48, 0xa7, 0xd3, 0xd5, 0xe8, 0x9a, 0x35, 0x87, 0xe1, 0xba, 0x2e, 0x03, 0x03, 0x03, 0x6c, 0xd8, 0xb0, 0x81, 0x58, 0x2c, 0xce, 0xe8, 0x1d, 0x8b,
0xaf, 0x60, 0x33, 0xb9, 0xbf, 0xb6, 0x81, 0xc8, 0x71, 0x9c, 0xa6, 0x11, 0xfd, 0x9b, 0xa2, 0x66, 0xdb, 0xd3, 0x77, 0xe9, 0xd8, 0xbc, 0x96, 0x66, 0xd3, 0x60, 0x6c, 0x6c, 0x8c, 0x33, 0x67, 0xce,
0x0a, 0xb3, 0xd9, 0x6c, 0xf5, 0xde, 0x2f, 0x49, 0x43, 0x33, 0xf8, 0x91, 0xf8, 0x1b, 0xf8, 0x85, 0xb0, 0x69, 0xd3, 0x26, 0x74, 0x5d, 0xf7, 0xed, 0x2c, 0xb4, 0xe5, 0x03, 0x39, 0x8e, 0x53, 0xd7,
0xad, 0x55, 0x92, 0xcb, 0xe5, 0xb0, 0x6d, 0x9b, 0xb6, 0xb6, 0x36, 0x4c, 0xd3, 0xa4, 0x58, 0x2c, 0xa3, 0xa1, 0xa1, 0x21, 0x6c, 0xdb, 0x66, 0xeb, 0xd6, 0x4e, 0xbe, 0x3b, 0x71, 0x91, 0x5f, 0xce,
0xb2, 0xbe, 0xbe, 0x4e, 0x36, 0x9b, 0x25, 0x14, 0x0a, 0xd5, 0x29, 0x6c, 0x20, 0xb2, 0x6d, 0xbb, 0xf6, 0x93, 0x68, 0x8a, 0xf2, 0x74, 0x53, 0x94, 0x1f, 0x7e, 0xbf, 0xc1, 0x64, 0x71, 0x96, 0xf7,
0x4e, 0xb2, 0xbf, 0xf1, 0xfc, 0xfc, 0x7c, 0x55, 0x91, 0x65, 0x59, 0x88, 0x08, 0x83, 0x43, 0xaf, 0xb6, 0xb7, 0xb3, 0x65, 0xcb, 0x16, 0x8e, 0x1f, 0x3f, 0x4e, 0x22, 0x91, 0x60, 0xdd, 0xba, 0x75,
0xf0, 0xd3, 0xd5, 0x87, 0x4c, 0xdd, 0x5c, 0xc2, 0x71, 0x3c, 0xd2, 0xdd, 0x09, 0xde, 0x79, 0xa3, 0xbe, 0x9d, 0xf9, 0x94, 0x2c, 0x2a, 0x86, 0x79, 0x4f, 0xe6, 0x81, 0x4a, 0xa5, 0x12, 0x9d, 0x9d,
0x8f, 0xc5, 0xc5, 0xfb, 0x14, 0x0a, 0x05, 0x46, 0x46, 0x46, 0x30, 0x0c, 0xa3, 0x91, 0xa8, 0x58, 0x2f, 0xf1, 0xe1, 0x17, 0xa7, 0x58, 0xb2, 0xc4, 0xe4, 0x93, 0xb7, 0x5f, 0xa4, 0xe5, 0x09, 0x83,
0x2c, 0x12, 0x8b, 0xc5, 0xea, 0xd2, 0xb1, 0x59, 0x91, 0xe7, 0x79, 0xcc, 0xcc, 0xcc, 0xd0, 0xb2, 0x90, 0xae, 0x11, 0xd2, 0x25, 0xd9, 0xfc, 0x2c, 0x5f, 0xf7, 0x0e, 0x70, 0xf1, 0x7a, 0x8e, 0x77,
0xbd, 0x97, 0x93, 0xe7, 0xae, 0x71, 0x6c, 0x64, 0x0f, 0x1f, 0x0e, 0xec, 0xc2, 0xb2, 0x3d, 0xee, 0x5f, 0x7f, 0x8d, 0xd3, 0xa7, 0x4f, 0xa3, 0x69, 0x5a, 0x5d, 0x20, 0x09, 0x50, 0xad, 0x56, 0x6b,
0x14, 0x56, 0xf9, 0xea, 0xbb, 0x9b, 0x1c, 0x7d, 0xb5, 0x93, 0x3d, 0xe9, 0x34, 0x4b, 0x4b, 0x4b, 0x28, 0x0b, 0x21, 0x18, 0x1d, 0x1d, 0x25, 0x93, 0xc9, 0xf0, 0xcd, 0xcf, 0xe7, 0x09, 0x87, 0xc3,
0x74, 0x76, 0x76, 0x36, 0x57, 0xe4, 0x38, 0x4e, 0xc3, 0x47, 0x09, 0x30, 0x37, 0x37, 0x87, 0x88, 0x6c, 0x59, 0x9b, 0xa0, 0x41, 0xbf, 0x77, 0xd6, 0x75, 0x1d, 0x3c, 0xcf, 0xe3, 0xa9, 0x58, 0x88,
0xf0, 0xf8, 0xf1, 0x63, 0x5e, 0x7f, 0x73, 0x98, 0x2f, 0xce, 0x5d, 0xe5, 0xb3, 0xf7, 0xf6, 0xd1, 0xf7, 0x76, 0xac, 0x65, 0xe0, 0x7a, 0x81, 0xc1, 0xd1, 0x3c, 0x89, 0x44, 0x82, 0xf1, 0xf1, 0x71,
0xb5, 0x2d, 0x8a, 0xe3, 0x7a, 0x94, 0x2d, 0x9b, 0x4c, 0x77, 0x8c, 0x64, 0x6c, 0x88, 0xef, 0x7f, 0xbf, 0x18, 0x6a, 0x80, 0x0a, 0x85, 0x82, 0xcf, 0x68, 0x21, 0xab, 0xc1, 0xc1, 0x41, 0x22, 0x91,
0xbe, 0x4d, 0x3a, 0xd5, 0xcf, 0xfd, 0x85, 0x5b, 0x74, 0x74, 0x74, 0x6c, 0x5d, 0xa3, 0x66, 0xa9, 0x28, 0x27, 0xcf, 0xdd, 0xe1, 0xf9, 0xe7, 0x9e, 0xc1, 0x93, 0x3a, 0x9a, 0xae, 0x23, 0xb5, 0x00,
0xcb, 0x64, 0x32, 0x68, 0xad, 0xb1, 0x2c, 0x8b, 0x1f, 0x7e, 0xbf, 0xcb, 0xdb, 0x6f, 0xf5, 0x13, 0x0a, 0x49, 0xd5, 0x05, 0x57, 0x41, 0x3c, 0x6a, 0xb0, 0x6b, 0x7b, 0x86, 0x6f, 0x4f, 0x5c, 0x26,
0x8f, 0x46, 0x70, 0x3c, 0x01, 0xa5, 0x09, 0x06, 0x02, 0x78, 0x68, 0x44, 0x2a, 0xbc, 0x36, 0xd8, 0x99, 0x4c, 0x72, 0xeb, 0xd6, 0xad, 0x87, 0x87, 0xce, 0x71, 0x9c, 0x45, 0x4d, 0x39, 0x31, 0x31,
0xc3, 0xc4, 0xc5, 0x69, 0x4e, 0x1c, 0xdd, 0xc5, 0xf2, 0xf2, 0x32, 0x91, 0x48, 0xa4, 0xb9, 0xa2, 0xc1, 0xdf, 0x93, 0x16, 0x8d, 0x0d, 0x01, 0x66, 0x66, 0x66, 0x98, 0xb3, 0x4b, 0x98, 0x86, 0x20,
0x66, 0x63, 0x7e, 0x7e, 0x1e, 0xdb, 0xb6, 0x31, 0x4d, 0x93, 0x85, 0x47, 0x25, 0x76, 0xf7, 0xec, 0x12, 0xd6, 0xd1, 0x03, 0x92, 0x80, 0x14, 0x68, 0x12, 0x04, 0xd0, 0xf2, 0x84, 0xc1, 0xdd, 0x59,
0xe0, 0xe9, 0xb3, 0x32, 0xeb, 0xa6, 0x42, 0x21, 0xb8, 0xae, 0xc7, 0xda, 0xba, 0xcd, 0x83, 0x47, 0x07, 0x4d, 0xd3, 0xc8, 0xe5, 0x72, 0xbe, 0x9d, 0xba, 0x39, 0x7a, 0x30, 0x74, 0x73, 0x73, 0x73,
0x4b, 0xd8, 0x15, 0xe1, 0xb9, 0xe5, 0x10, 0x0e, 0x87, 0x29, 0x14, 0x0a, 0x74, 0x77, 0x77, 0xd7, 0xdc, 0xc9, 0x95, 0x68, 0x8c, 0x1a, 0xc4, 0x62, 0x31, 0x00, 0xb2, 0x45, 0x87, 0x15, 0x86, 0x81,
0xfb, 0x5f, 0xb1, 0x58, 0xac, 0x76, 0xdd, 0xe6, 0x3a, 0x65, 0x32, 0x19, 0x32, 0x99, 0x0c, 0x86, 0x12, 0x12, 0x39, 0x0f, 0xa6, 0x09, 0xdc, 0xb2, 0x83, 0xd4, 0x24, 0xe5, 0x4a, 0xc5, 0x6f, 0x0d,
0x61, 0x60, 0x1a, 0x0a, 0xcc, 0x20, 0xda, 0x0c, 0x12, 0x0c, 0x86, 0x88, 0x44, 0x22, 0x44, 0x5a, 0xa5, 0x54, 0x7d, 0x46, 0x0f, 0x4a, 0xa5, 0x52, 0x61, 0x79, 0x73, 0x03, 0x77, 0xa6, 0x2c, 0x2c,
0x5a, 0xc0, 0x0c, 0x93, 0xda, 0xd9, 0x49, 0x57, 0xe7, 0x76, 0x42, 0xc1, 0x00, 0x96, 0x65, 0xe1, 0xcb, 0xba, 0xdf, 0x4b, 0x30, 0x9d, 0x2f, 0xb2, 0xac, 0x39, 0x82, 0x19, 0x09, 0x12, 0xd4, 0x40,
0x79, 0x5e, 0x43, 0x19, 0xaa, 0x8a, 0x6a, 0x53, 0xe7, 0x8f, 0xd9, 0xd9, 0x59, 0x3c, 0xcf, 0x63, 0xe0, 0x31, 0x95, 0x2f, 0x80, 0xe7, 0x12, 0xd4, 0x75, 0xc2, 0xe1, 0x70, 0xfd, 0x11, 0x54, 0x28,
0x6d, 0x6d, 0x8d, 0xc1, 0xde, 0x76, 0xae, 0xdc, 0xbe, 0xc7, 0xb3, 0xd5, 0x36, 0xa2, 0x21, 0x8d, 0x14, 0xfc, 0x86, 0x5d, 0x98, 0xa7, 0x44, 0x22, 0x81, 0xc4, 0x21, 0xa4, 0x6b, 0x04, 0x82, 0x06,
0x16, 0x07, 0x25, 0x36, 0xcf, 0x6d, 0xc5, 0xba, 0xa3, 0x58, 0x29, 0x7b, 0x84, 0x03, 0x42, 0xb9, 0x11, 0x23, 0xe8, 0xef, 0x17, 0x2b, 0x12, 0x47, 0x28, 0xe2, 0x0d, 0x41, 0x1a, 0x42, 0x1a, 0xb9,
0x5c, 0x26, 0x99, 0x4c, 0x36, 0x3a, 0xba, 0xdf, 0xde, 0x00, 0x4f, 0x9e, 0x3c, 0x61, 0x7a, 0x7a, 0xf2, 0x2c, 0x6b, 0x57, 0x3c, 0x89, 0x6d, 0xdb, 0x34, 0x37, 0x37, 0x2f, 0x4a, 0x83, 0x5f, 0x75,
0x1a, 0xcb, 0xb2, 0xaa, 0x35, 0x1a, 0x1c, 0x1c, 0x44, 0x6b, 0xcd, 0xb1, 0xfd, 0xbb, 0x78, 0xf8, 0x8e, 0xe3, 0xd4, 0x84, 0x0e, 0xa0, 0xa3, 0xa3, 0x83, 0xbe, 0xbe, 0x3e, 0xf6, 0xbd, 0x91, 0xa1,
0xe7, 0x53, 0x08, 0x44, 0x69, 0x8d, 0x6f, 0x63, 0xfb, 0x8e, 0x9d, 0x74, 0xa5, 0x76, 0xd3, 0xd3, 0xaf, 0x7f, 0x98, 0x7c, 0xa1, 0x88, 0x65, 0xdd, 0x63, 0x97, 0xcb, 0x15, 0x98, 0x98, 0x98, 0xe2,
0xd3, 0x4b, 0x47, 0x67, 0x17, 0x33, 0xf9, 0xa7, 0x7c, 0x3a, 0x3a, 0xc4, 0xf5, 0xeb, 0xd7, 0x49, 0xe6, 0xdf, 0xe3, 0x9c, 0xbf, 0x3c, 0xc2, 0x4f, 0xbf, 0x0d, 0xf1, 0xfe, 0x8e, 0x0c, 0xfd, 0xfd,
0xa5, 0x52, 0xcd, 0xdd, 0xdb, 0xaf, 0x91, 0x61, 0x18, 0xa4, 0xd3, 0x69, 0x5a, 0x5b, 0x5b, 0xa9, 0xfd, 0xac, 0x5e, 0xbd, 0xba, 0x2e, 0x23, 0xbf, 0xbc, 0x01, 0x72, 0xb9, 0x1c, 0x83, 0x83, 0x83,
0x54, 0x2a, 0xcc, 0xce, 0xce, 0x22, 0x22, 0x84, 0xc3, 0x61, 0x2e, 0x5f, 0xfe, 0x8d, 0x93, 0xe3, 0x94, 0xcb, 0x65, 0x5a, 0x5b, 0x5b, 0xb1, 0x6d, 0x9b, 0x78, 0xc8, 0xe5, 0x9d, 0x57, 0x57, 0xf1,
0x07, 0xf8, 0xe6, 0xfc, 0x24, 0xd1, 0x48, 0x80, 0x9d, 0xed, 0x61, 0xa2, 0xad, 0x11, 0xd6, 0x2a, 0xe7, 0xc0, 0x18, 0xd6, 0xac, 0x22, 0x12, 0x6d, 0xa4, 0x31, 0x16, 0x27, 0x1c, 0x89, 0x33, 0x5e,
0x26, 0x53, 0xb9, 0x02, 0x9f, 0xbc, 0x3b, 0x40, 0x40, 0x39, 0x58, 0x96, 0xc5, 0xe4, 0xe4, 0x24, 0x14, 0x9c, 0xba, 0x30, 0xcd, 0x67, 0xbb, 0x5f, 0xa0, 0x3c, 0x57, 0x42, 0x08, 0xc1, 0xf0, 0xf0,
0xc3, 0xc3, 0xc3, 0xf5, 0x44, 0xc5, 0x62, 0x91, 0x78, 0x3c, 0x8e, 0x88, 0x10, 0x8f, 0xc7, 0xd1, 0xf0, 0xc3, 0x81, 0xe6, 0x73, 0xa4, 0x69, 0x1a, 0xa9, 0x54, 0x8a, 0x68, 0x34, 0x0a, 0xc0, 0xfa,
0x5a, 0x57, 0x15, 0xf6, 0xf7, 0xf7, 0x63, 0x18, 0x06, 0x4a, 0x29, 0x8a, 0xc5, 0x22, 0xd7, 0xfe, 0xf5, 0xeb, 0xd9, 0xbf, 0x7f, 0x3f, 0xc9, 0xc8, 0x2c, 0x5f, 0x7e, 0xf4, 0x32, 0x21, 0x65, 0xd3,
0xb8, 0xcc, 0x97, 0xe3, 0xc3, 0xdc, 0x5b, 0x5a, 0xe7, 0xd6, 0x9d, 0x65, 0xca, 0x65, 0x9b, 0x97, 0x77, 0x66, 0x90, 0xde, 0x5f, 0xcf, 0x73, 0xfa, 0xaf, 0xab, 0x2c, 0x8d, 0x0a, 0x0e, 0x7e, 0xfc,
0x5f, 0x4a, 0xf0, 0xc1, 0x81, 0x7d, 0x5c, 0xbd, 0x32, 0x89, 0x93, 0x48, 0x10, 0x0a, 0x85, 0xc8, 0x0a, 0x21, 0x55, 0xe2, 0xea, 0xd5, 0xab, 0xd8, 0xb6, 0x4d, 0x3e, 0x9f, 0xe7, 0xe4, 0xc9, 0x93,
0xe7, 0xf3, 0x2c, 0x2e, 0x2e, 0x36, 0xa6, 0xae, 0xb6, 0xeb, 0x6a, 0xbd, 0xad, 0xd6, 0x50, 0x93, 0x35, 0x85, 0x00, 0x20, 0xba, 0xba, 0xba, 0xcc, 0x78, 0x3c, 0x9e, 0xed, 0xee, 0xee, 0x0e, 0x15,
0xc9, 0x24, 0x87, 0x0f, 0x1f, 0x26, 0x97, 0xcb, 0xf1, 0x60, 0xee, 0x0a, 0xa9, 0xd0, 0x12, 0x43, 0x8b, 0xc5, 0x9a, 0xc9, 0x3b, 0xef, 0xd9, 0xd1, 0xa3, 0x47, 0xc9, 0xe5, 0x72, 0x6c, 0xdb, 0xb6,
0x1d, 0xcf, 0x59, 0xbe, 0x7b, 0x8d, 0x5f, 0x7f, 0xb9, 0x44, 0xa9, 0x54, 0x22, 0x9f, 0xcf, 0xfb, 0x8d, 0x64, 0x32, 0x89, 0x61, 0x18, 0x94, 0x4a, 0x25, 0x26, 0x26, 0x26, 0x38, 0x77, 0xee, 0x1c,
0x27, 0x2b, 0x22, 0x42, 0x7b, 0x7b, 0x3b, 0xa3, 0xa3, 0xa3, 0x2d, 0x00, 0x66, 0x20, 0x10, 0x10, 0xae, 0xeb, 0x12, 0x8d, 0x46, 0xb9, 0x70, 0xe1, 0x02, 0xa6, 0x69, 0xd2, 0xda, 0xda, 0x4a, 0xa9,
0xcb, 0xb2, 0xb4, 0xaf, 0xa8, 0xd6, 0xa7, 0x6a, 0x7d, 0xcb, 0x0f, 0x60, 0xef, 0xde, 0xbd, 0x78, 0x54, 0xe2, 0xf0, 0xe1, 0xc3, 0x1c, 0x39, 0x72, 0x44, 0xf8, 0x40, 0x91, 0x48, 0x24, 0xdb, 0xd3,
0x9e, 0x87, 0xeb, 0xba, 0xd8, 0xb6, 0x5d, 0xb5, 0x1b, 0xa5, 0x14, 0x97, 0x2e, 0xfd, 0x4d, 0xd8, 0xd3, 0x13, 0x2a, 0x16, 0x8b, 0x35, 0x03, 0x51, 0xd3, 0x34, 0x84, 0x10, 0x48, 0x29, 0xc9, 0x66,
0xd6, 0xd6, 0x46, 0xa5, 0x52, 0xe1, 0xe0, 0xc1, 0x83, 0x4c, 0x4d, 0x4d, 0xcd, 0x1f, 0x39, 0x72, 0xb3, 0x5c, 0xba, 0x74, 0x89, 0x91, 0x91, 0x11, 0xa6, 0xa6, 0xa6, 0x48, 0x26, 0x93, 0xb4, 0xb7,
0x64, 0x9f, 0x02, 0x92, 0x63, 0x63, 0x63, 0x3f, 0x2a, 0xa5, 0xf6, 0xfb, 0x2f, 0xd5, 0xda, 0xbd, 0xb7, 0xd3, 0xd1, 0xd1, 0xc1, 0xed, 0xdb, 0xb7, 0x39, 0x7b, 0xf6, 0x2c, 0xba, 0xae, 0x33, 0x34,
0x3f, 0xf7, 0x3c, 0xaf, 0xee, 0xea, 0xc3, 0x3f, 0x0e, 0x6a, 0x8f, 0x86, 0x43, 0x87, 0x0e, 0xe9, 0x34, 0x44, 0x28, 0x14, 0x22, 0x9d, 0x4e, 0x73, 0xe3, 0xc6, 0x0d, 0x2a, 0x95, 0x4a, 0xdb, 0xbe,
0xde, 0xde, 0x5e, 0x5a, 0x5a, 0x5a, 0x48, 0xa5, 0x52, 0x9c, 0x3a, 0x75, 0xea, 0xa2, 0x09, 0x78, 0x7d, 0xfb, 0x46, 0xc4, 0xce, 0x9d, 0x3b, 0xe3, 0x4a, 0xa9, 0xc9, 0x43, 0x87, 0x0e, 0xe9, 0x0b,
0x17, 0x2e, 0x5c, 0xf8, 0x38, 0x16, 0x8b, 0xf5, 0x2a, 0xa5, 0xa2, 0x7e, 0x83, 0x00, 0x0a, 0x10, 0x63, 0xeb, 0x79, 0x9e, 0xcf, 0xee, 0xc1, 0x91, 0x5f, 0x4f, 0xb2, 0xd9, 0x2c, 0x7d, 0x7d, 0x7d,
0x40, 0x89, 0x88, 0x29, 0x22, 0x06, 0x60, 0x88, 0x88, 0x21, 0x22, 0xda, 0x9f, 0x6f, 0xa4, 0x5f, 0x34, 0x36, 0x36, 0x72, 0xe5, 0xca, 0x15, 0x3c, 0xcf, 0x23, 0x9d, 0x4e, 0x63, 0x59, 0xd6, 0xec,
0x01, 0x9e, 0x52, 0xca, 0x03, 0xec, 0x1b, 0x37, 0x6e, 0xc4, 0x8e, 0x1f, 0x3f, 0xfe, 0xf9, 0xd8, 0xf4, 0xf4, 0xf4, 0x66, 0x01, 0x3c, 0xd9, 0xd5, 0xd5, 0xf5, 0xa3, 0x10, 0x62, 0xf3, 0xc2, 0x81,
0xd8, 0x58, 0x3c, 0x1a, 0x8d, 0x12, 0x0c, 0x06, 0x5d, 0xb5, 0x11, 0x8d, 0x06, 0xc2, 0x1b, 0x08, 0xb8, 0x30, 0x74, 0x8f, 0xfa, 0xdb, 0x0e, 0x06, 0x83, 0x6c, 0xdc, 0xb8, 0x51, 0xae, 0x5c, 0xb9,
0x6e, 0xf5, 0x73, 0xb3, 0x11, 0x84, 0xb1, 0x01, 0x5d, 0x43, 0xc2, 0x46, 0x50, 0x02, 0xb8, 0xc0, 0x92, 0xe1, 0xe1, 0x61, 0x9a, 0x9a, 0x9a, 0xe8, 0xec, 0xec, 0xe4, 0xd8, 0xb1, 0x63, 0x7f, 0x08,
0x7a, 0x2a, 0x95, 0xf2, 0xb2, 0xd9, 0xec, 0x47, 0xf1, 0x78, 0x3c, 0xb9, 0xbc, 0xbc, 0xfc, 0xf5, 0xc0, 0x04, 0x96, 0xc6, 0x62, 0xb1, 0x67, 0x85, 0x10, 0xd1, 0xf9, 0x26, 0xe6, 0xde, 0x74, 0x79,
0x5f, 0x8c, 0x86, 0xc8, 0x61, 0x09, 0x89, 0x45, 0xfd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0xec, 0x4b, 0x5f, 0x53, 0x53, 0x93, 0xb1, 0x67, 0xcf, 0x9e, 0x4f, 0xd7, 0xac, 0x59, 0xb3, 0xaa,
0x44, 0xae, 0x42, 0x60, 0x82, 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" }};

View File

@ -8,104 +8,110 @@
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, 0x00, 0x15, 0x74, 0x45, 0x58, 0x74, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x00, 0xce, 0x00, 0x00, 0x06, 0x5f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x6b, 0x4c, 0x53,
0x53, 0x74, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x47, 0x61, 0x72, 0x72, 0x69, 0x74, 0x79, 0xc7, 0x05, 0x67, 0x18, 0xc7, 0xdd, 0x3e, 0x20, 0x71, 0xce, 0x4b, 0x96, 0xe8, 0xcc, 0xe6, 0xb6, 0x18, 0x8d,
0x3b, 0x51, 0x00, 0x00, 0x05, 0xdc, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x6d, 0x6c, 0xcb, 0xb2, 0x65, 0xc9, 0x96, 0x2d, 0x31, 0xd1, 0x2d, 0xee, 0x8b, 0x13, 0x50, 0x2e, 0xd3, 0x30,
0x5b, 0x57, 0x1d, 0xc6, 0x7f, 0xe7, 0xbe, 0xc4, 0x76, 0xec, 0xc6, 0x89, 0xed, 0x38, 0xc9, 0x9c, 0x18, 0x93, 0x9b, 0xa2, 0x10, 0xc1, 0x6b, 0x30, 0x80, 0x88, 0x08, 0xca, 0x65, 0x04, 0xb9, 0x2a,
0xa6, 0x2f, 0x32, 0x49, 0xdd, 0x84, 0x08, 0x81, 0x02, 0xac, 0x59, 0x06, 0x8c, 0x8a, 0x8e, 0xb5, 0x50, 0x2c, 0x57, 0x07, 0x8c, 0x4b, 0xb9, 0x54, 0xb4, 0x38, 0x05, 0xe4, 0x1a, 0xa0, 0x48, 0x55,
0x19, 0xe1, 0x65, 0xda, 0x5a, 0x21, 0xd6, 0x49, 0x0c, 0xd8, 0xa7, 0x82, 0x34, 0xc4, 0xcb, 0x84, 0x0a, 0x94, 0x96, 0x52, 0x5a, 0xa1, 0x94, 0x72, 0xbf, 0x08, 0x28, 0xfb, 0xef, 0x3c, 0xef, 0x3c,
0x78, 0x6b, 0x05, 0xa2, 0xfb, 0x32, 0x09, 0x2a, 0xd1, 0xc2, 0x8a, 0x46, 0x2b, 0x90, 0x18, 0xea, 0x95, 0xaa, 0x9f, 0x77, 0x92, 0x7f, 0x7b, 0x4e, 0x7b, 0xce, 0xf3, 0x7b, 0x9f, 0xe7, 0x7d, 0x2e,
0x5a, 0x4d, 0x94, 0xa9, 0xa3, 0x6c, 0x2a, 0xd3, 0x56, 0xe8, 0x42, 0x69, 0x68, 0x9c, 0x5a, 0x49, 0x67, 0x05, 0x80, 0x15, 0xff, 0x87, 0xd8, 0x47, 0x6a, 0x6a, 0xaa, 0x50, 0x20, 0x10, 0x20, 0x2b,
0xfc, 0x92, 0x25, 0x5d, 0x13, 0x27, 0x76, 0x13, 0x3b, 0xf6, 0xbd, 0xbe, 0xd7, 0x87, 0x0f, 0x5d, 0x2b, 0x0b, 0xb9, 0xb9, 0xb9, 0xc8, 0xc9, 0xc9, 0x41, 0x46, 0x46, 0x06, 0xd2, 0xd3, 0xd3, 0x91,
0xae, 0xe2, 0x34, 0x2d, 0x1f, 0x90, 0xb8, 0xd2, 0xa3, 0xfb, 0x3f, 0xf7, 0x1e, 0x9d, 0xe7, 0x3c, 0x92, 0x92, 0x82, 0xa4, 0xa4, 0x24, 0x24, 0x24, 0x24, 0x20, 0x36, 0x36, 0x16, 0xd1, 0xd1, 0xd1,
0xcf, 0xf9, 0x9f, 0x73, 0xfe, 0x42, 0x4a, 0xc9, 0xff, 0xe3, 0xd1, 0x00, 0x8e, 0x1e, 0x3d, 0xfa, 0xb8, 0x72, 0xe5, 0x0a, 0xc2, 0xc2, 0xc2, 0x10, 0x12, 0x12, 0x82, 0xa0, 0xa0, 0x20, 0x9c, 0x3b,
0xbc, 0xa2, 0x28, 0x4f, 0xd4, 0xd5, 0xd5, 0xa1, 0xaa, 0x2a, 0x52, 0x4a, 0x2c, 0xcb, 0xc2, 0xb6, 0x77, 0x0e, 0x67, 0xcf, 0x9e, 0xc5, 0xa9, 0x53, 0xa7, 0xe0, 0xeb, 0xeb, 0x0b, 0x6f, 0x6f, 0x6f,
0x6d, 0x2c, 0xcb, 0x72, 0xe2, 0xb5, 0xed, 0x95, 0x78, 0x75, 0x7b, 0xe5, 0x6d, 0x9a, 0x26, 0x42, 0x78, 0x7a, 0x7a, 0xe2, 0xf0, 0xe1, 0xc3, 0x25, 0x66, 0xa0, 0x6b, 0xd7, 0xae, 0x61, 0x71, 0x71,
0x88, 0x53, 0xc7, 0x8e, 0x1d, 0xfb, 0x1c, 0x00, 0x52, 0x4a, 0x8e, 0x1c, 0x39, 0x22, 0x4d, 0xd3, 0x11, 0x4b, 0x4b, 0x4b, 0x6f, 0xd5, 0x8b, 0x17, 0x2f, 0x4c, 0x7a, 0xfe, 0xfc, 0xb9, 0x99, 0xe8,
0x94, 0xb6, 0x6d, 0xaf, 0x0b, 0xcb, 0xb2, 0x1c, 0x54, 0x2a, 0x95, 0x1a, 0x98, 0xa6, 0xe9, 0xc0, 0x39, 0x5e, 0x0b, 0x0b, 0x0b, 0x26, 0xcd, 0xce, 0xce, 0xc2, 0xcd, 0xcd, 0x6d, 0xd1, 0xc9, 0xc9,
0x30, 0x0c, 0x07, 0xc5, 0x62, 0x51, 0xee, 0xdf, 0xbf, 0xdf, 0xdc, 0xbb, 0x77, 0x6f, 0x8b, 0x94, 0x69, 0xa3, 0x09, 0x94, 0x9c, 0x9c, 0xcc, 0x0c, 0xaa, 0xd5, 0x6a, 0xf4, 0xf7, 0xf7, 0x33, 0x69,
0xf2, 0x96, 0x22, 0x29, 0x25, 0xaa, 0xaa, 0x92, 0xc9, 0x64, 0x10, 0x42, 0x00, 0x20, 0x84, 0x40, 0x34, 0x1a, 0x0c, 0x0c, 0x0c, 0x30, 0xd5, 0xd7, 0xd7, 0x43, 0x24, 0x12, 0xa1, 0xb2, 0xb2, 0x12,
0x4a, 0x49, 0x36, 0x9b, 0x25, 0x9f, 0xcf, 0x63, 0xdb, 0x36, 0x3e, 0x9f, 0x8f, 0x50, 0x28, 0x84, 0x0d, 0x0d, 0x0d, 0x90, 0x48, 0x24, 0x28, 0x2f, 0x2f, 0x47, 0x6b, 0x6b, 0x2b, 0x9e, 0x3e, 0x7d,
0xcf, 0xe7, 0xbb, 0xab, 0x4d, 0x42, 0x08, 0x02, 0x81, 0x00, 0x8a, 0xa2, 0x54, 0x2d, 0xcb, 0x12, 0xfa, 0x86, 0x06, 0x07, 0x07, 0xf1, 0xec, 0xd9, 0x33, 0x78, 0x78, 0x78, 0xcc, 0x1f, 0x3c, 0x78,
0x00, 0x0a, 0x40, 0xb5, 0x5a, 0x75, 0x3a, 0xac, 0x20, 0x9f, 0xcf, 0x93, 0x48, 0x24, 0x88, 0x44, 0xf0, 0x43, 0x13, 0x28, 0x31, 0x31, 0x91, 0x81, 0x78, 0x00, 0x0f, 0xe9, 0xee, 0xee, 0x46, 0x41,
0x22, 0xb4, 0x6d, 0xea, 0xc2, 0x15, 0xdc, 0x4a, 0x6b, 0x64, 0x13, 0xba, 0xae, 0x93, 0x48, 0x24, 0x41, 0x01, 0xb4, 0x5a, 0x2d, 0xc6, 0x27, 0x26, 0xd1, 0xf2, 0x58, 0x8d, 0xfc, 0xaa, 0x0e, 0x34,
0x90, 0x52, 0xd6, 0xf4, 0x5f, 0x8b, 0x15, 0x01, 0x35, 0x6b, 0x64, 0xdb, 0x36, 0x00, 0xc5, 0x62, 0xc9, 0xfa, 0x60, 0x30, 0x8e, 0x42, 0xa7, 0xd3, 0x31, 0x20, 0x2d, 0x90, 0x8c, 0xf3, 0x1a, 0x1a,
0x91, 0xd9, 0xd9, 0x59, 0xea, 0xeb, 0xeb, 0xf1, 0x78, 0x3c, 0x68, 0x4d, 0x5b, 0x78, 0xe6, 0x37, 0x1a, 0xc2, 0xfc, 0xfc, 0x3c, 0xdc, 0xdd, 0xdd, 0xcd, 0x41, 0x71, 0x71, 0x71, 0x0c, 0xd4, 0xd9,
0x6f, 0xf3, 0xbe, 0x8d, 0x41, 0xbc, 0x1e, 0x9d, 0x53, 0x6f, 0x24, 0xb1, 0xed, 0x2a, 0xdf, 0xf8, 0xd9, 0x89, 0xea, 0xea, 0x6a, 0xa8, 0x54, 0x2a, 0xc8, 0xe5, 0x72, 0xe6, 0xc5, 0xf4, 0xf4, 0x0c,
0x7c, 0x2f, 0x97, 0x2f, 0x0f, 0x53, 0x5f, 0x5f, 0x7f, 0x9b, 0x9a, 0xed, 0xdb, 0xb7, 0x3b, 0xf1, 0x52, 0x45, 0x2d, 0x70, 0x38, 0x5f, 0x8a, 0x73, 0x69, 0x75, 0xb8, 0x5a, 0xfc, 0x10, 0x27, 0x93,
0x6d, 0x44, 0x96, 0x65, 0x01, 0xa0, 0xaa, 0x2a, 0x1d, 0x1d, 0x1d, 0x8c, 0x8f, 0x8f, 0x63, 0xd6, 0xaa, 0x61, 0x1f, 0x24, 0xc2, 0x1f, 0xb9, 0x75, 0x98, 0xe0, 0x16, 0x40, 0x9e, 0xd2, 0xc2, 0xf4,
0x85, 0x38, 0x77, 0xf9, 0x3a, 0xcf, 0x3c, 0x3e, 0x80, 0xcf, 0xa3, 0x53, 0x32, 0x6d, 0x8a, 0x65, 0x7a, 0xbd, 0x49, 0x04, 0xe2, 0x42, 0x67, 0x0e, 0x8a, 0x89, 0x89, 0x61, 0x20, 0xf2, 0x80, 0xbc,
0x8b, 0xd1, 0x4c, 0x8e, 0x1f, 0x9f, 0x1c, 0xe6, 0xd0, 0x13, 0x7d, 0x4c, 0x8e, 0x27, 0xe8, 0xec, 0x31, 0x1a, 0x8d, 0x2c, 0x29, 0xa6, 0xa7, 0xa7, 0x71, 0x22, 0x4e, 0x82, 0xd0, 0xac, 0x66, 0xf4,
0xec, 0x5c, 0xd7, 0xba, 0xbb, 0x2a, 0xf2, 0x7a, 0xbd, 0x24, 0x93, 0x49, 0x62, 0xb1, 0x18, 0x3f, 0xe8, 0x26, 0x30, 0x34, 0x36, 0x07, 0x8d, 0x61, 0x86, 0x9d, 0xd7, 0x3d, 0xd1, 0x23, 0x20, 0xbd,
0x38, 0x39, 0xc2, 0xd7, 0x1f, 0xfb, 0x08, 0xaa, 0x02, 0xcb, 0x65, 0x13, 0xa3, 0x62, 0x63, 0x18, 0x11, 0xee, 0x57, 0xc4, 0xec, 0xbe, 0xb2, 0xb2, 0x32, 0x0c, 0x0f, 0x0f, 0x33, 0x19, 0x0c, 0x06,
0x15, 0x5c, 0x6a, 0x95, 0x8e, 0xb6, 0x46, 0x8e, 0xbf, 0x72, 0x8d, 0x8f, 0xb6, 0x9b, 0x8c, 0x8e, 0x06, 0x72, 0x75, 0x75, 0x35, 0x07, 0x45, 0x45, 0x45, 0x31, 0x10, 0x85, 0x88, 0x62, 0x4c, 0x7b,
0x8e, 0x3a, 0x83, 0xa9, 0xaa, 0xca, 0xb6, 0x6d, 0xdb, 0x1c, 0xa2, 0xdb, 0xd2, 0xdb, 0xb2, 0x2c, 0x42, 0xde, 0x15, 0xdf, 0x93, 0xe1, 0x78, 0xfc, 0x7d, 0xa8, 0x06, 0x27, 0xa1, 0x1f, 0x9f, 0x63,
0xc7, 0xf3, 0x5c, 0x2e, 0x47, 0x73, 0x5b, 0x07, 0xad, 0x41, 0x1f, 0x5e, 0x97, 0x86, 0x55, 0x95, 0xe2, 0x41, 0x32, 0xf5, 0x28, 0x6e, 0xb5, 0x6a, 0x71, 0x3c, 0xa1, 0x06, 0xa9, 0x25, 0x2d, 0x50,
0xd8, 0x55, 0xb0, 0xa4, 0x02, 0x8a, 0x46, 0xb1, 0xa2, 0x10, 0x69, 0x0d, 0x31, 0x3c, 0x32, 0xc1, 0x2a, 0x95, 0x68, 0x6f, 0x6f, 0x67, 0x90, 0x91, 0x91, 0x91, 0xb7, 0x83, 0x2e, 0x5f, 0xbe, 0xcc,
0x7d, 0x9b, 0xbd, 0x6c, 0xd9, 0xb2, 0x05, 0xaf, 0xd7, 0xbb, 0xae, 0x5d, 0x77, 0xb4, 0x6e, 0x45, 0x32, 0x8a, 0x62, 0x4e, 0x2a, 0x2e, 0x2e, 0x66, 0xee, 0x3b, 0x5f, 0x2c, 0x43, 0xed, 0xa3, 0xa7,
0xdd, 0xc2, 0x62, 0x89, 0x06, 0xaf, 0x4e, 0xb5, 0x5a, 0x65, 0x71, 0xa9, 0x88, 0x25, 0x05, 0x86, 0x50, 0xeb, 0xa7, 0x30, 0x60, 0x98, 0x86, 0x7a, 0x78, 0x1a, 0xbd, 0x1c, 0xb4, 0x73, 0x60, 0x1c,
0x25, 0x99, 0x9e, 0x5b, 0xe2, 0x9d, 0x6c, 0x01, 0x00, 0xc3, 0xac, 0x50, 0x2e, 0x97, 0xb9, 0x78, 0xed, 0x2a, 0x23, 0x0a, 0x1e, 0xf4, 0x21, 0xed, 0x4e, 0x0f, 0x0e, 0x04, 0x97, 0x32, 0x4f, 0xf2,
0xf1, 0x22, 0xe1, 0x70, 0xd8, 0xb1, 0xac, 0xa7, 0xa7, 0xc7, 0x21, 0x58, 0x49, 0xb2, 0xdb, 0x88, 0xf3, 0xf3, 0x19, 0x84, 0x22, 0x42, 0xa0, 0x43, 0x87, 0x0e, 0x99, 0x83, 0x42, 0x43, 0x43, 0x4d,
0x84, 0x10, 0xb8, 0xdd, 0x6e, 0x3a, 0xc2, 0x3e, 0xae, 0x5f, 0x48, 0xb3, 0x58, 0x28, 0x61, 0x0b, 0x20, 0xf2, 0x88, 0xea, 0x48, 0xab, 0xd5, 0xc1, 0x39, 0xb4, 0x1c, 0x32, 0xd5, 0x08, 0x94, 0x83,
0x8d, 0x82, 0x61, 0x73, 0xe3, 0xa6, 0x49, 0xa1, 0xa2, 0xe2, 0xf7, 0xfb, 0xb1, 0xab, 0x55, 0xbc, 0x13, 0x9c, 0x26, 0x99, 0x27, 0x4f, 0x34, 0x63, 0x78, 0xd8, 0x37, 0x8a, 0xba, 0x4e, 0x3d, 0xd2,
0xee, 0x3a, 0xa6, 0xa7, 0xa7, 0x19, 0x1c, 0x1c, 0x44, 0xd3, 0xb4, 0x75, 0xd3, 0x7c, 0x65, 0x49, 0x25, 0x0a, 0x06, 0x72, 0x0e, 0x13, 0x43, 0xd5, 0xaf, 0x43, 0x44, 0x44, 0x04, 0x46, 0x47, 0x47,
0xd6, 0xb5, 0x2e, 0x12, 0x89, 0xb0, 0xb0, 0xb0, 0x40, 0xb8, 0xd1, 0xc3, 0x68, 0x26, 0x87, 0x59, 0x99, 0x08, 0xe4, 0xe2, 0xe2, 0x62, 0x0e, 0x0a, 0x0e, 0x0e, 0x66, 0x20, 0x3e, 0x35, 0x09, 0x24,
0x5a, 0xa4, 0x6c, 0x2b, 0x94, 0x2d, 0x85, 0xea, 0x7b, 0x4e, 0xc4, 0x93, 0x73, 0x3c, 0xbe, 0x33, 0xef, 0x51, 0xb2, 0xf8, 0xcb, 0x54, 0x06, 0x28, 0x74, 0x63, 0xe8, 0xd6, 0x8e, 0xe1, 0x71, 0xff,
0xca, 0xeb, 0x7f, 0xba, 0x44, 0x3c, 0x1e, 0xaf, 0x59, 0xa3, 0xee, 0xee, 0x6e, 0x84, 0x10, 0x98, 0x28, 0xa4, 0x4a, 0x23, 0x1a, 0xe4, 0xc3, 0xc8, 0xbe, 0xaf, 0x64, 0x10, 0x92, 0x5b, 0x44, 0x25,
0x46, 0x09, 0x61, 0xbc, 0xab, 0x6c, 0x30, 0xc6, 0x1e, 0x02, 0x9e, 0xd7, 0xd6, 0x32, 0x1b, 0x86, 0xda, 0x1e, 0xf7, 0xb2, 0xe2, 0x1d, 0x1b, 0x1b, 0x63, 0x22, 0x10, 0x57, 0x43, 0xe6, 0xa0, 0x80,
0x41, 0x26, 0x93, 0xe1, 0xa9, 0xcf, 0xec, 0xe4, 0xe0, 0x6f, 0xff, 0x4e, 0x28, 0xe8, 0x67, 0x63, 0x80, 0x00, 0x56, 0x7c, 0x7c, 0x6a, 0x12, 0x88, 0xce, 0x5d, 0x2e, 0x95, 0xa1, 0x5d, 0x31, 0x08,
0x6b, 0x13, 0x7a, 0x45, 0x62, 0x98, 0x36, 0x23, 0x89, 0x29, 0x3e, 0xdc, 0x19, 0xc2, 0xcc, 0x65, 0xb9, 0xc6, 0xc8, 0x41, 0x8c, 0x68, 0xe9, 0x31, 0xe0, 0xb6, 0x54, 0x07, 0xe1, 0x5d, 0x05, 0x04,
0xd8, 0xbd, 0x7b, 0x37, 0xd1, 0x68, 0xb4, 0x46, 0x85, 0x94, 0x92, 0xb9, 0x99, 0x49, 0xde, 0x7c, 0x92, 0x57, 0xb2, 0x0f, 0x2a, 0x41, 0x6f, 0xaf, 0x12, 0xe1, 0xe1, 0xe1, 0x18, 0x1f, 0x1f, 0xe7,
0xf1, 0x27, 0x3c, 0xf7, 0xc0, 0xfd, 0xfa, 0xcd, 0xcb, 0xca, 0x2f, 0xbf, 0x39, 0xd4, 0x74, 0x9f, 0x32, 0x71, 0x82, 0x81, 0x1c, 0x1d, 0x1d, 0xe7, 0xad, 0xac, 0xac, 0x5e, 0x81, 0xfc, 0xfd, 0xfd,
0xb2, 0xda, 0xba, 0x78, 0x3c, 0xce, 0xcc, 0xcc, 0x0c, 0xd9, 0x6c, 0x96, 0x74, 0x2a, 0xc9, 0xd3, 0xcd, 0x40, 0x94, 0x41, 0x54, 0x53, 0x41, 0x29, 0x7f, 0x23, 0xa3, 0xf2, 0x11, 0x6a, 0x3a, 0x34,
0x5f, 0xe8, 0xe1, 0x03, 0x9b, 0xfd, 0xfc, 0xfb, 0x5a, 0x86, 0x7f, 0x8e, 0x8c, 0x93, 0xcb, 0xce, 0xa8, 0x6c, 0x55, 0xa3, 0xb0, 0x4e, 0x85, 0xac, 0x7b, 0xbd, 0x66, 0x90, 0xc8, 0xbf, 0x3a, 0xe0,
0x71, 0x60, 0xe8, 0xfd, 0x6c, 0xae, 0xcf, 0x31, 0x3a, 0x3a, 0x4a, 0xb1, 0x58, 0xe4, 0xca, 0x95, 0x15, 0x25, 0x66, 0x89, 0x90, 0x97, 0x97, 0xc7, 0x20, 0xa4, 0xb9, 0xd9, 0x19, 0xfc, 0x6a, 0xf7,
0x2b, 0x35, 0x1b, 0x75, 0xe4, 0xad, 0x33, 0x4c, 0xbe, 0xf1, 0x12, 0x9f, 0x0e, 0x0e, 0x10, 0x7a, 0xd3, 0xe2, 0x61, 0xab, 0x8d, 0xbe, 0x2e, 0xbb, 0x57, 0xbf, 0xcb, 0x40, 0xa7, 0x4f, 0x9f, 0x66,
0xf1, 0x75, 0xea, 0x5f, 0xbe, 0xaa, 0x35, 0x15, 0xc4, 0xfd, 0x8e, 0xa2, 0xf3, 0xe7, 0xcf, 0x53, 0x20, 0x82, 0x50, 0x12, 0xf4, 0xf6, 0xf6, 0xa2, 0xb0, 0xb0, 0x10, 0x23, 0xa3, 0x13, 0x70, 0x0c,
0x2e, 0x97, 0x19, 0x1b, 0x1b, 0xc3, 0xe5, 0x72, 0x91, 0x4e, 0xa7, 0xc9, 0x64, 0x32, 0x14, 0x0a, 0x29, 0x43, 0xd1, 0x03, 0x05, 0x2a, 0x9a, 0xd5, 0x28, 0xe0, 0x40, 0x99, 0xcb, 0x40, 0x49, 0x15,
0x05, 0x1e, 0x8c, 0xdd, 0x83, 0xcf, 0x17, 0x66, 0x7c, 0x7c, 0x9c, 0x53, 0xbf, 0xbf, 0xc0, 0x9e, 0x5d, 0xb0, 0x0d, 0x2c, 0x81, 0x5a, 0xab, 0x67, 0xde, 0xd0, 0x73, 0x53, 0x53, 0x53, 0xd0, 0x69,
0x3d, 0x7b, 0xd8, 0xb1, 0x63, 0x47, 0x4d, 0x1a, 0x4b, 0x59, 0xe5, 0xcc, 0xf1, 0xef, 0x12, 0xd2, 0x94, 0xb8, 0x71, 0xf1, 0x00, 0x06, 0x53, 0x42, 0xa1, 0xf5, 0xb1, 0x5e, 0x0a, 0xb1, 0x59, 0x7f,
0x0a, 0x44, 0xda, 0x76, 0x72, 0xc9, 0x13, 0xc2, 0x5f, 0x57, 0xc7, 0xb5, 0xe6, 0x65, 0xeb, 0x86, 0x97, 0x81, 0xfc, 0xfc, 0xfc, 0x58, 0xaf, 0x22, 0x08, 0x79, 0x45, 0x59, 0x47, 0xc5, 0x4a, 0xd7,
0x47, 0xfc, 0x41, 0x1c, 0x3e, 0x7c, 0xd8, 0xab, 0xeb, 0x7a, 0xa1, 0xbd, 0xbd, 0x9d, 0x78, 0x3c, 0xdd, 0xea, 0x61, 0xfc, 0x1e, 0x56, 0x81, 0xf3, 0xc2, 0x46, 0x5c, 0xbf, 0x25, 0x87, 0xa0, 0x4a,
0x4e, 0x30, 0x18, 0xa4, 0xa5, 0xa5, 0x85, 0x48, 0x24, 0x42, 0x34, 0x1a, 0xe5, 0xea, 0xd5, 0xab, 0x81, 0xf8, 0xb2, 0x4e, 0xf8, 0x0b, 0x1a, 0xe1, 0xc0, 0x85, 0xac, 0x4d, 0x3e, 0x80, 0xa6, 0xa6,
0xe4, 0xf3, 0x79, 0x4a, 0xa5, 0x12, 0xcd, 0xcd, 0xcd, 0xe8, 0xba, 0x5e, 0xb3, 0x29, 0x01, 0xca, 0x26, 0xd6, 0x41, 0xa8, 0x9e, 0x3a, 0x9a, 0x25, 0x28, 0x4d, 0x3a, 0x83, 0x21, 0x61, 0x0a, 0xfe,
0xcb, 0x8b, 0x0c, 0x9f, 0x7d, 0x96, 0x8f, 0x7d, 0x68, 0x23, 0x81, 0x86, 0x3a, 0x0a, 0xd3, 0x17, 0xb1, 0xb6, 0x86, 0x71, 0xd3, 0x26, 0x24, 0xfe, 0xb0, 0x5e, 0xcf, 0x40, 0x3e, 0x3e, 0x3e, 0x0c,
0x79, 0xa7, 0xf2, 0x25, 0x52, 0xff, 0x38, 0x4b, 0x3c, 0x37, 0x72, 0xf0, 0xc8, 0xcb, 0xb3, 0xdf, 0x44, 0xc5, 0x4a, 0xfb, 0x43, 0x6d, 0x85, 0x1a, 0x6d, 0x6d, 0x6d, 0x2d, 0xeb, 0x10, 0x33, 0x33,
0xd3, 0xdc, 0x6e, 0xf7, 0x4f, 0xfb, 0xfb, 0xfb, 0x39, 0x77, 0xee, 0x1c, 0x91, 0x48, 0x04, 0x8f, 0xb3, 0xb8, 0x29, 0x91, 0xe1, 0x64, 0x7c, 0x15, 0x1c, 0x2f, 0x88, 0x70, 0x3c, 0xf6, 0x0e, 0x84,
0xc7, 0x43, 0x57, 0x57, 0x17, 0x81, 0x40, 0x00, 0xcb, 0xb2, 0xe8, 0xec, 0xec, 0x44, 0x51, 0x14, 0x15, 0x52, 0x4c, 0x4e, 0xcd, 0x40, 0x2c, 0x16, 0xe3, 0xd2, 0xa5, 0x4b, 0xdc, 0x3d, 0x33, 0x28,
0x07, 0xaa, 0xaa, 0x3a, 0xb1, 0x10, 0x82, 0x74, 0x62, 0x98, 0xd7, 0xfe, 0xfc, 0x1c, 0x7b, 0x3e, 0xcf, 0x09, 0x47, 0x49, 0xac, 0x23, 0xe4, 0x25, 0x42, 0x48, 0x6e, 0xdf, 0x46, 0xa3, 0xb3, 0x33,
0x1e, 0x43, 0x31, 0xe6, 0x58, 0x4c, 0xbd, 0x49, 0x62, 0xba, 0x44, 0x66, 0xe9, 0x34, 0xc3, 0x05, 0x6e, 0x6e, 0x5f, 0xbb, 0x74, 0x62, 0xcf, 0x9a, 0x3c, 0x06, 0x3a, 0x72, 0xe4, 0x08, 0x2b, 0x34,
0xb7, 0x59, 0x90, 0x7d, 0xbf, 0x00, 0xd0, 0x3c, 0x1e, 0x4f, 0x7b, 0x38, 0x1c, 0x66, 0x60, 0x60, 0x1a, 0x0d, 0xa5, 0xa5, 0xa5, 0x2c, 0x4d, 0x69, 0x04, 0x90, 0x67, 0xd7, 0xaf, 0x5f, 0x47, 0x5a,
0x80, 0x54, 0x2a, 0x45, 0x2c, 0x16, 0x43, 0x55, 0x55, 0xe6, 0xe7, 0xe7, 0x6f, 0x0d, 0x94, 0x4e, 0x5a, 0x1a, 0x5b, 0x35, 0xf5, 0x34, 0x8a, 0x3f, 0x7d, 0x53, 0xab, 0xa2, 0x24, 0xa2, 0xf6, 0x33,
0x3b, 0x0a, 0x56, 0x13, 0xa8, 0xaa, 0xca, 0xf8, 0xf0, 0x19, 0x3c, 0x46, 0x82, 0x4f, 0xf5, 0xc7, 0x39, 0x31, 0x06, 0x41, 0xb8, 0x13, 0x6a, 0x6f, 0xfc, 0x06, 0xa5, 0xd8, 0x1b, 0x0f, 0x53, 0xbe,
0x28, 0xcd, 0x8e, 0x90, 0xcf, 0x26, 0xf9, 0x57, 0x5a, 0x62, 0x6d, 0xf8, 0x20, 0x5f, 0x39, 0xf8, 0xc1, 0xed, 0xc8, 0x60, 0x08, 0xbc, 0x1c, 0xe0, 0x6b, 0xf3, 0x41, 0x3a, 0xdb, 0x23, 0xee, 0x78,
0x2b, 0xbe, 0xfc, 0xe4, 0xd7, 0x24, 0x94, 0x6f, 0xa5, 0xf7, 0xe4, 0xe4, 0xe4, 0xd3, 0x27, 0x4e, 0x87, 0xe6, 0x07, 0xcd, 0x23, 0x6a, 0x3b, 0x94, 0xa2, 0x81, 0x81, 0x81, 0xec, 0x9a, 0xe6, 0x4f,
0x9c, 0x18, 0xea, 0xed, 0xed, 0x65, 0xeb, 0xd6, 0xad, 0xa4, 0x52, 0x29, 0x22, 0x91, 0x88, 0x73, 0x4d, 0x4d, 0x0d, 0xdb, 0x68, 0x0a, 0x0d, 0xcd, 0x22, 0x4a, 0x9c, 0xf8, 0xf8, 0x78, 0xe6, 0x09,
0x01, 0xb6, 0xb4, 0xb4, 0x20, 0x84, 0x40, 0xd3, 0x34, 0x74, 0x5d, 0x47, 0xd3, 0x34, 0x54, 0x05, 0x01, 0xfb, 0x14, 0x8f, 0x90, 0x14, 0xb0, 0x07, 0xb2, 0xc2, 0x23, 0xe8, 0x29, 0x76, 0x41, 0x5b,
0x5e, 0xfd, 0xdd, 0x0f, 0x89, 0xb6, 0x4a, 0x36, 0xb5, 0x6d, 0x62, 0x29, 0x73, 0x81, 0xf9, 0xf9, 0xe2, 0xe7, 0x28, 0x09, 0xda, 0x8c, 0x08, 0xaf, 0xef, 0xe0, 0x64, 0xb7, 0x6b, 0xd1, 0x94, 0x75,
0x79, 0x2e, 0xa5, 0xdd, 0x74, 0xdd, 0xfb, 0x18, 0xbb, 0x1e, 0xfd, 0x16, 0x8a, 0xa2, 0xd4, 0x1e, 0xdc, 0x00, 0xb3, 0x22, 0x4f, 0x48, 0x34, 0xc0, 0xc8, 0x13, 0xa1, 0x50, 0xc8, 0x20, 0x75, 0x75,
0x41, 0x87, 0x0e, 0x1d, 0x9a, 0xd8, 0xb7, 0x6f, 0x1f, 0x07, 0x0e, 0x1c, 0x60, 0x6a, 0x6a, 0x8a, 0x75, 0x68, 0x6b, 0x6b, 0x83, 0x54, 0x2a, 0x85, 0x4c, 0x26, 0x63, 0x61, 0x54, 0x28, 0x14, 0x2c,
0x60, 0x30, 0x88, 0xdb, 0xed, 0xc6, 0x30, 0x0c, 0x84, 0x10, 0x4c, 0x4c, 0x4c, 0xd4, 0x5c, 0x21, 0x23, 0x69, 0x2f, 0x6b, 0x6e, 0x65, 0x42, 0x78, 0x71, 0x2f, 0x14, 0x62, 0x3f, 0x3c, 0xc9, 0xb5,
0xcb, 0x4b, 0xf3, 0x8c, 0xbe, 0xf6, 0x73, 0x76, 0xf5, 0x6f, 0xa3, 0x5e, 0x2d, 0x91, 0x4f, 0xfe, 0x42, 0x73, 0xec, 0x16, 0xa4, 0x9f, 0xd8, 0x8c, 0xe8, 0x53, 0xbb, 0x31, 0xa4, 0xeb, 0x83, 0x83,
0x95, 0xe4, 0xf5, 0x22, 0x63, 0xf3, 0xcd, 0x0c, 0x3d, 0xf9, 0x33, 0xa2, 0x3d, 0xfd, 0xac, 0x57, 0x83, 0xc3, 0xab, 0xf4, 0xe6, 0x56, 0xae, 0xa1, 0xbd, 0xe1, 0x8d, 0x17, 0x15, 0x15, 0x31, 0x68,
0x1e, 0x38, 0x1b, 0x56, 0x51, 0x14, 0xfc, 0x7e, 0xbf, 0x33, 0x13, 0x97, 0xcb, 0x85, 0xaa, 0xaa, 0x57, 0x57, 0x17, 0xfa, 0xfa, 0xfa, 0x4c, 0x33, 0x8a, 0xba, 0x33, 0x75, 0x0e, 0xca, 0xcc, 0x91,
0xf4, 0xf5, 0xf5, 0x39, 0x24, 0xb9, 0xec, 0x0c, 0xaf, 0xbc, 0xf0, 0x2c, 0x43, 0x9f, 0xec, 0xc5, 0x11, 0x03, 0xfe, 0x4c, 0x3c, 0x09, 0x71, 0xc2, 0x41, 0xa8, 0x6e, 0xf9, 0xa2, 0x43, 0xb0, 0x03,
0x5a, 0x4c, 0xb2, 0x70, 0x23, 0xce, 0x95, 0x8c, 0xcd, 0xb2, 0xbb, 0x9b, 0xa7, 0x7e, 0xf4, 0x6b, 0x35, 0x91, 0x9f, 0x21, 0xe6, 0xd8, 0x56, 0x64, 0x5f, 0xf5, 0xc6, 0xcc, 0xf4, 0x14, 0x9b, 0x47,
0x7c, 0xfe, 0x20, 0x77, 0xaa, 0x41, 0x94, 0xb5, 0x67, 0xdd, 0xda, 0x8e, 0xab, 0xdb, 0x67, 0x5f, 0x66, 0xa0, 0xcc, 0xcc, 0x4c, 0x15, 0xad, 0x8e, 0x0c, 0x53, 0xfd, 0xd0, 0x1e, 0xf1, 0x1d, 0x98,
0xf8, 0x0e, 0x0f, 0x3e, 0xf2, 0x28, 0x7a, 0xa8, 0x8d, 0xb9, 0xa9, 0x38, 0x17, 0x12, 0x1a, 0x8d, 0x5a, 0x09, 0x5f, 0x80, 0x93, 0x93, 0x93, 0x2c, 0x75, 0x87, 0x87, 0x74, 0xb8, 0x76, 0xc1, 0x16,
0x5d, 0x8f, 0xf0, 0xd5, 0xef, 0xff, 0x11, 0x6f, 0x43, 0x00, 0x29, 0xa5, 0x83, 0x3b, 0x2a, 0xb2, 0xcd, 0xb9, 0x6e, 0x50, 0x94, 0x7a, 0x40, 0x9a, 0xfc, 0x25, 0x2a, 0x42, 0x3e, 0x41, 0xb8, 0xd7,
0x6d, 0x9b, 0xc6, 0xc6, 0x46, 0xe7, 0x47, 0xb5, 0x5a, 0xad, 0xf1, 0xf9, 0xad, 0xbf, 0x9c, 0xa4, 0x57, 0x68, 0xac, 0xba, 0xc9, 0x00, 0x73, 0x73, 0x73, 0x6f, 0x82, 0xb8, 0xb8, 0xef, 0xa5, 0xfd,
0xbb, 0x33, 0x80, 0x75, 0x73, 0x9a, 0xf9, 0x99, 0x14, 0x6f, 0xdf, 0x68, 0xe5, 0x81, 0x2f, 0x7e, 0xa0, 0x86, 0x48, 0xfb, 0xc1, 0x77, 0x5f, 0x1e, 0x44, 0xed, 0x84, 0x07, 0x19, 0x86, 0x07, 0x91,
0x9b, 0x9e, 0xbe, 0x5d, 0x77, 0xbc, 0x8b, 0xa4, 0x94, 0x8a, 0xa6, 0x69, 0x12, 0x40, 0x00, 0x8d, 0x1c, 0xb4, 0x07, 0x9d, 0xa2, 0xa3, 0x90, 0xe7, 0x3b, 0xa0, 0x25, 0x6e, 0x1b, 0xb2, 0xce, 0x7c,
0x83, 0x83, 0x83, 0xc7, 0xa5, 0x94, 0x43, 0x6b, 0x95, 0x38, 0xf5, 0x83, 0xb4, 0xb8, 0x37, 0x5a, 0x8c, 0x08, 0xdf, 0x9d, 0x18, 0x50, 0x77, 0x99, 0x20, 0x34, 0xc6, 0xdf, 0x00, 0xd1, 0xc7, 0xfe,
0x21, 0x99, 0xce, 0xe0, 0x73, 0xc1, 0x4c, 0xa1, 0x81, 0x65, 0x11, 0x46, 0xa2, 0xde, 0xb5, 0x76, 0xfd, 0xfb, 0xd9, 0x0d, 0xd4, 0x36, 0x78, 0xd1, 0xf5, 0xf2, 0x77, 0x00, 0xfa, 0x2d, 0x33, 0xc6,
0x50, 0x55, 0xf5, 0xfc, 0xe9, 0xd3, 0xa7, 0x3f, 0x2b, 0xa5, 0x5c, 0x14, 0x40, 0x03, 0xd0, 0xe2, 0x13, 0xaa, 0xb6, 0x44, 0xf4, 0x4b, 0xe3, 0x51, 0x1f, 0xb3, 0x0d, 0x71, 0x3e, 0x5b, 0x70, 0x23,
0x76, 0xbb, 0xef, 0x91, 0x52, 0x6e, 0x90, 0x52, 0xae, 0x1c, 0xc5, 0x02, 0x90, 0x00, 0x9f, 0xe8, 0xd2, 0x95, 0x85, 0x6a, 0xf9, 0xb3, 0xfc, 0xf3, 0xf6, 0xf6, 0xf6, 0x8b, 0x9c, 0xed, 0xff, 0xde,
0xd1, 0x1f, 0x6e, 0x6a, 0x50, 0x03, 0x7f, 0x8b, 0x1b, 0x67, 0x66, 0x73, 0x72, 0xe1, 0xbf, 0xd5, 0x19, 0xb8, 0x63, 0xdd, 0xbe, 0x7d, 0xfb, 0x44, 0x36, 0x36, 0x36, 0x58, 0x2e, 0x6b, 0xae, 0xd8,
0x70, 0x42, 0x08, 0x5b, 0x08, 0x91, 0x2f, 0x97, 0xcb, 0xd7, 0x81, 0x77, 0xa5, 0x94, 0x05, 0xb1, 0x96, 0x5f, 0x3b, 0x58, 0xef, 0x42, 0x61, 0xac, 0x2d, 0x54, 0x8d, 0x97, 0x21, 0x15, 0x1d, 0x43,
0x6a, 0xe6, 0x6e, 0xc0, 0xf5, 0x1e, 0xfe, 0xd7, 0xc7, 0x04, 0xca, 0x52, 0xca, 0xf2, 0xca, 0x87, 0xb0, 0xdb, 0x76, 0x38, 0xd9, 0x7c, 0x8b, 0xd7, 0x9f, 0x5b, 0x2e, 0x5b, 0x5b, 0xdb, 0x7b, 0x9c,
0xff, 0x00, 0x1e, 0x79, 0x2a, 0x13, 0xef, 0x45, 0x5a, 0xda, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0xfd, 0x35, 0x3c, 0x68, 0x0d, 0xa7, 0x6d, 0x96, 0x96, 0x96, 0x3f, 0xae, 0x5c, 0xb9, 0x72, 0x9f,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x85, 0x85, 0x85, 0xdd, 0x4b, 0xd9, 0xf3, 0xe7, 0xef, 0xad, 0xb2, 0xf8, 0x25, 0xd0, 0xe3, 0x6b,
0x83, 0xcb, 0xcf, 0x9f, 0x2e, 0xf8, 0x3b, 0x7e, 0xa4, 0xb4, 0xdb, 0xf1, 0x7e, 0xf6, 0x86, 0xf5,
0x2b, 0x5d, 0x96, 0xdd, 0x6b, 0x26, 0xb2, 0xc3, 0xd9, 0xdb, 0xc5, 0xd9, 0xdd, 0xca, 0x69, 0xb5,
0x29, 0x74, 0x2f, 0x0f, 0x4b, 0x4e, 0x6b, 0x39, 0x6d, 0x78, 0x5d, 0x76, 0x3b, 0x56, 0x1d, 0x3b,
0xba, 0x77, 0x6d, 0xf6, 0xce, 0x2f, 0x2c, 0xbf, 0x7f, 0xdb, 0xff, 0x6f, 0xd1, 0x3a, 0xb2, 0xb7,
0xfc, 0x05, 0xf2, 0x5f, 0xc0, 0xc4, 0x93, 0xb7, 0x9b, 0x0e, 0xd6, 0xd2, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE find_replace_xpm[1] = {{ png, sizeof( png ), "find_replace_xpm" }}; const BITMAP_OPAQUE find_replace_xpm[1] = {{ png, sizeof( png ), "find_replace_xpm" }};

View File

@ -8,53 +8,38 @@
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, 0x02, 0xe1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x96, 0x4b, 0x6c, 0x8c, 0xce, 0x00, 0x00, 0x01, 0xf1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xc5, 0x96, 0xcd, 0x4b, 0x56,
0x51, 0x14, 0xc7, 0x7f, 0xd3, 0x32, 0x2d, 0xea, 0x35, 0x09, 0x12, 0x11, 0x89, 0x08, 0x42, 0x2c, 0x41, 0x14, 0x87, 0x1f, 0x21, 0xdf, 0x82, 0x92, 0x40, 0x68, 0x13, 0xe2, 0x4e, 0x43, 0xd7, 0xe5,
0x48, 0x74, 0x12, 0x09, 0x25, 0x69, 0x22, 0x54, 0xd2, 0xda, 0xa8, 0xe7, 0x42, 0x23, 0xa9, 0xa4, 0x4a, 0x5d, 0x8a, 0x9a, 0xa6, 0x4b, 0x89, 0x16, 0x86, 0xd0, 0xa2, 0x4f, 0x35, 0xd1, 0xea, 0x9e,
0xaa, 0x94, 0x52, 0xcc, 0xbd, 0x9f, 0x6f, 0x61, 0xe9, 0x19, 0x21, 0xf5, 0x8a, 0xb4, 0x24, 0x9a, 0x33, 0xce, 0x1f, 0x10, 0xa2, 0xb4, 0x11, 0x5a, 0x04, 0xb9, 0x11, 0x09, 0x0b, 0xda, 0xbc, 0x44,
0x21, 0x48, 0xba, 0x50, 0x22, 0x54, 0x17, 0xde, 0xf5, 0xd8, 0xa1, 0xda, 0x88, 0x48, 0xd4, 0x6b, 0x04, 0xae, 0x82, 0x88, 0xa8, 0x5d, 0x59, 0x46, 0x48, 0x90, 0x62, 0xad, 0x02, 0x3f, 0x92, 0x9a,
0x45, 0xca, 0x18, 0xfc, 0x2d, 0x7c, 0x99, 0x0c, 0xf3, 0x14, 0x8f, 0x58, 0x9c, 0xc5, 0x39, 0xf7, 0x16, 0x0e, 0xc3, 0xd5, 0xf7, 0xeb, 0x46, 0xde, 0xd7, 0xc5, 0x6f, 0x71, 0xce, 0x3d, 0x67, 0x9e,
0xfc, 0xef, 0xef, 0xde, 0x73, 0xcf, 0xbd, 0xb9, 0x48, 0xe2, 0x5f, 0x18, 0xff, 0x1c, 0x84, 0xe5, 0x99, 0x33, 0x67, 0x66, 0x2e, 0xce, 0x39, 0xca, 0x21, 0xca, 0x0e, 0x42, 0x79, 0x82, 0xe2, 0xf6,
0x1c, 0x16, 0xfd, 0x61, 0x7b, 0x98, 0x2d, 0xe8, 0x05, 0x96, 0x30, 0x96, 0xcd, 0x18, 0x36, 0x60, 0x59, 0xef, 0x93, 0x82, 0xbe, 0xa1, 0xcc, 0xa1, 0xdc, 0x42, 0xb8, 0x89, 0xf2, 0x1c, 0x65, 0x6b,
0xb9, 0x84, 0x25, 0xf2, 0xa7, 0x41, 0x87, 0x71, 0x29, 0x48, 0x28, 0xc1, 0x26, 0x06, 0x62, 0xd9, 0xbf, 0x41, 0xf7, 0xb1, 0x1c, 0xcb, 0x29, 0xc1, 0x28, 0x55, 0x28, 0xa3, 0x09, 0x41, 0x1f, 0x4a,
0x94, 0x25, 0xe8, 0x51, 0x26, 0x50, 0x55, 0xc6, 0x9a, 0x5b, 0xea, 0xb2, 0x00, 0x3d, 0x4e, 0x07, 0x81, 0x2e, 0x97, 0xac, 0xb9, 0x32, 0x92, 0x00, 0xb4, 0x58, 0x0c, 0x94, 0xdd, 0x33, 0xfb, 0x29,
0x6a, 0xfd, 0x69, 0xf5, 0x7b, 0xb1, 0x74, 0x61, 0x79, 0x83, 0xa5, 0x05, 0xc3, 0xc4, 0x38, 0x4d, 0x94, 0x25, 0x94, 0xef, 0x28, 0x4f, 0x11, 0x1a, 0x62, 0x39, 0xd7, 0x11, 0x66, 0x11, 0x66, 0x51,
0x0d, 0x86, 0x66, 0x0c, 0xcd, 0x58, 0x7a, 0x7f, 0x0d, 0x64, 0x18, 0x27, 0x09, 0x5c, 0xfc, 0x18, 0xd6, 0xff, 0x0d, 0x24, 0xd4, 0x39, 0xe7, 0xc0, 0x92, 0x41, 0x78, 0x97, 0x27, 0x79, 0x3d, 0x0e,
0x1e, 0x24, 0x11, 0xf7, 0xc6, 0xc3, 0xe2, 0xf4, 0x2b, 0x92, 0xe4, 0x76, 0xa6, 0x02, 0xbd, 0x8c, 0x8b, 0xe5, 0xf7, 0xe7, 0x89, 0xfd, 0x58, 0x08, 0xb4, 0x1a, 0x6c, 0xe1, 0x86, 0x0f, 0xde, 0xc6,
0xf9, 0x86, 0xb5, 0x5e, 0x72, 0x14, 0x87, 0x5d, 0x9e, 0xff, 0xdc, 0x8b, 0xdd, 0xc7, 0xb2, 0x38, 0x30, 0xe1, 0xed, 0xaf, 0xde, 0xf7, 0x16, 0xa5, 0x2f, 0xc8, 0xd2, 0xe8, 0x9c, 0x03, 0xc3, 0xf4,
0x66, 0x2e, 0x93, 0x24, 0x81, 0x43, 0xc3, 0x4f, 0xa0, 0x27, 0xa9, 0x40, 0xad, 0x71, 0xfe, 0x19, 0x1e, 0xd0, 0xa7, 0x42, 0xa0, 0x6c, 0xcc, 0x9e, 0xf7, 0xc1, 0x8f, 0x82, 0xcf, 0x70, 0xb1, 0xc0,
0x2f, 0xf9, 0x74, 0x2c, 0xe6, 0x50, 0x91, 0xe2, 0x2c, 0x7a, 0x70, 0x19, 0xc9, 0x1a, 0xf2, 0xb0, 0x5e, 0xac, 0x60, 0x39, 0xc9, 0x35, 0x0e, 0xa3, 0xbc, 0x4a, 0x13, 0xe4, 0x30, 0xbc, 0xc4, 0x92,
0xdc, 0xfa, 0x9b, 0x20, 0xe1, 0x70, 0x1d, 0x17, 0x3f, 0x2e, 0xa3, 0xbd, 0xf3, 0x14, 0x96, 0xae, 0xc1, 0x52, 0xeb, 0xf7, 0xd3, 0xa1, 0x2c, 0xfd, 0x6f, 0xe9, 0xde, 0x20, 0xf4, 0x22, 0xf4, 0xee,
0xdf, 0x2d, 0xdd, 0x5d, 0x0c, 0x0b, 0x30, 0x2c, 0xf8, 0x61, 0x07, 0x0e, 0x0d, 0x9e, 0x76, 0x0e, 0x5a, 0x81, 0x61, 0xda, 0xe7, 0xb6, 0xa1, 0xfc, 0x46, 0xf9, 0x5c, 0xba, 0x19, 0x2e, 0x51, 0x89,
0x96, 0x2f, 0x58, 0xba, 0x33, 0x37, 0x43, 0x25, 0x7d, 0xb1, 0xdc, 0x49, 0xb2, 0xfa, 0x77, 0x18, 0xf2, 0x3a, 0xcf, 0xec, 0x7f, 0x22, 0x9c, 0x0a, 0x79, 0x96, 0x1a, 0x94, 0x95, 0x18, 0x6c, 0xc0,
0x26, 0xc4, 0x74, 0x2e, 0xa3, 0xb0, 0xf4, 0xc4, 0xc1, 0x56, 0x7a, 0xf3, 0x99, 0xf4, 0x20, 0xcb, 0x8f, 0x27, 0xc5, 0x41, 0xca, 0xb3, 0xe0, 0x1b, 0xe1, 0x28, 0x86, 0xc9, 0x5d, 0xed, 0x6d, 0xa9,
0xc5, 0x58, 0xac, 0x8e, 0x01, 0x38, 0xec, 0xf9, 0xa1, 0xbd, 0x5d, 0xc6, 0xc7, 0xc6, 0x43, 0x4c, 0x0f, 0xdf, 0x23, 0x4e, 0xfb, 0xdc, 0x16, 0x94, 0x5f, 0x3e, 0x7f, 0x13, 0xe5, 0x0c, 0x50, 0x81,
0xf3, 0xb4, 0x33, 0xb1, 0x7c, 0xf2, 0xf4, 0x1f, 0xb1, 0x14, 0x02, 0x3e, 0x2c, 0xfb, 0xd2, 0x5f, 0x72, 0xaf, 0xf8, 0x81, 0x15, 0x86, 0x12, 0x1c, 0xd8, 0x41, 0x94, 0x3f, 0x28, 0x17, 0x7c, 0xb9,
0x58, 0x43, 0x6d, 0x16, 0x17, 0x76, 0x1d, 0x96, 0xaf, 0x58, 0x96, 0x7b, 0xe5, 0x5a, 0x1d, 0xb7, 0xae, 0xc4, 0x56, 0xbd, 0xcc, 0x6d, 0x4e, 0x60, 0xc9, 0x24, 0xb9, 0x82, 0x66, 0x18, 0xe3, 0x78,
0xeb, 0x67, 0x6c, 0x61, 0x18, 0x2e, 0xfe, 0x6c, 0x9e, 0xa0, 0xe3, 0xd4, 0x33, 0x38, 0x01, 0xe0, 0x0e, 0xc0, 0x72, 0x04, 0x61, 0x2c, 0x16, 0xb7, 0x45, 0x44, 0xab, 0x1f, 0xe3, 0x41, 0xcc, 0xff,
0x92, 0x8f, 0xa1, 0x3e, 0x2e, 0x2f, 0x42, 0x88, 0x22, 0x6f, 0x8e, 0x63, 0x71, 0xf1, 0xcb, 0xb8, 0x02, 0xcb, 0xa1, 0xa4, 0x97, 0xea, 0x1a, 0xca, 0x63, 0x94, 0x3b, 0x28, 0xc3, 0x28, 0x59, 0x94,
0xf4, 0xc9, 0xf6, 0x51, 0x7d, 0x8d, 0xe5, 0x2c, 0x96, 0xad, 0x58, 0xd6, 0x63, 0x69, 0xc5, 0xf2, 0x8d, 0x3c, 0x71, 0x3f, 0x10, 0xea, 0x72, 0xda, 0xdb, 0x70, 0x37, 0x8d, 0x67, 0x62, 0x11, 0x4b,
0x21, 0x49, 0xde, 0x5b, 0x0c, 0xe3, 0x12, 0xda, 0xdb, 0x61, 0x47, 0x66, 0x50, 0x3d, 0x62, 0x21, 0xb5, 0x6f, 0x8e, 0x55, 0xef, 0xfb, 0x92, 0xce, 0x7b, 0x64, 0x58, 0xc0, 0x92, 0x21, 0xa2, 0x15,
0x62, 0x1a, 0x62, 0x2a, 0x62, 0x3a, 0x62, 0x51, 0xfa, 0x77, 0x0d, 0x97, 0x80, 0xd7, 0x1c, 0x2f, 0x65, 0x3b, 0x3d, 0xd0, 0x4e, 0x23, 0x3d, 0xf4, 0xe3, 0x5d, 0x4d, 0x17, 0xb4, 0x23, 0xe3, 0x3b,
0xbd, 0xd8, 0xd3, 0xf4, 0xa0, 0x85, 0x88, 0x01, 0xa8, 0xa0, 0xa0, 0x40, 0x4b, 0x16, 0x55, 0xaa, 0x71, 0xbc, 0x1c, 0x4f, 0xf9, 0x79, 0xa0, 0xa2, 0x1c, 0xa0, 0x4d, 0x22, 0x9a, 0x73, 0x41, 0x11,
0xb6, 0x66, 0xa7, 0x66, 0x15, 0xcd, 0x96, 0xcf, 0xe7, 0x13, 0x23, 0x10, 0xe5, 0x29, 0xef, 0xd2, 0x4d, 0x18, 0x7a, 0x30, 0xf4, 0x20, 0x9c, 0x0b, 0x32, 0x74, 0x63, 0xe8, 0x46, 0xe8, 0x0a, 0x32,
0x55, 0x5c, 0xfc, 0x84, 0x28, 0xc2, 0x12, 0x4d, 0x0d, 0xaa, 0x43, 0x4c, 0x46, 0x3e, 0x9f, 0x4f, 0x9c, 0x0d, 0x12, 0x3a, 0x11, 0x3a, 0x31, 0x74, 0x04, 0x09, 0xed, 0x08, 0xed, 0x44, 0x34, 0x1d,
0x55, 0x55, 0x55, 0xba, 0x72, 0xe1, 0x93, 0x8e, 0x1f, 0x92, 0x8e, 0xee, 0xef, 0xd5, 0xe9, 0x13, 0xdc, 0xef, 0x56, 0xda, 0xfa, 0x0b, 0xde, 0xf2, 0x0c, 0xbf, 0x52, 0xcf, 0x4f, 0xff, 0x00, 0x00,
0xd2, 0xcd, 0xeb, 0x4f, 0x54, 0x5c, 0x5c, 0x2c, 0x40, 0x94, 0xa4, 0x80, 0x19, 0x9a, 0xbc, 0xf9,
0xaa, 0x93, 0x83, 0xaa, 0x69, 0x25, 0x80, 0x02, 0x81, 0x80, 0xda, 0xdb, 0xdb, 0xf5, 0xaa, 0x47,
0x6a, 0x3a, 0xf8, 0x45, 0x63, 0xc7, 0x04, 0xe5, 0xf7, 0xf7, 0xd7, 0xc6, 0xb5, 0xe7, 0x75, 0xe5,
0x82, 0x14, 0x89, 0x44, 0x54, 0x56, 0x56, 0x96, 0x1e, 0x66, 0x71, 0xbc, 0x4e, 0xdc, 0x96, 0x08,
0x2a, 0xa6, 0x03, 0x50, 0x69, 0x69, 0xa9, 0xa2, 0xd1, 0xa8, 0xba, 0x3b, 0xa5, 0x23, 0xfb, 0xde,
0xab, 0x7f, 0xbf, 0xc1, 0x02, 0xb4, 0xac, 0x7c, 0xb7, 0x5a, 0x4e, 0x49, 0x92, 0xd4, 0xd6, 0xd6,
0xa6, 0x9c, 0x9c, 0x1c, 0x31, 0x14, 0xb1, 0x39, 0x25, 0x6c, 0x29, 0xe0, 0x4b, 0x5e, 0xba, 0x52,
0x44, 0x1e, 0x0a, 0x06, 0x83, 0xea, 0xe8, 0xb8, 0xa7, 0xb3, 0x27, 0xa5, 0x1d, 0xdb, 0x3b, 0xb5,
0xbe, 0xba, 0x45, 0x8d, 0x0d, 0x9f, 0xd5, 0xdd, 0x29, 0x85, 0xc3, 0x61, 0xe5, 0xe7, 0xe7, 0x8b,
0xe1, 0x88, 0xda, 0xb4, 0xcd, 0xf1, 0x91, 0x10, 0x33, 0x12, 0x41, 0x21, 0x82, 0x38, 0x94, 0xb1,
0x9c, 0x0a, 0x86, 0x70, 0x2d, 0x37, 0x37, 0x57, 0x15, 0x15, 0xab, 0xd4, 0x78, 0xf4, 0x86, 0x9a,
0x9b, 0xba, 0xd4, 0x70, 0x20, 0xac, 0xc2, 0xc2, 0xc2, 0xef, 0x25, 0x1b, 0xc4, 0x6d, 0x56, 0x51,
0x8e, 0xc3, 0x7c, 0x0c, 0x25, 0x18, 0x4a, 0x70, 0x98, 0x17, 0x33, 0xc3, 0x5c, 0x0c, 0x73, 0x09,
0x11, 0xcc, 0xf8, 0xdd, 0x02, 0xe6, 0x01, 0x4d, 0xc0, 0x73, 0xe0, 0x35, 0xf0, 0x18, 0x68, 0x04,
0xa6, 0xfc, 0xd7, 0xff, 0xba, 0x6f, 0xc5, 0xac, 0x2c, 0x79, 0x4c, 0x51, 0x2a, 0x29, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };

View File

@ -8,56 +8,37 @@
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, 0x02, 0xfc, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x96, 0x6d, 0x48, 0x53, 0xce, 0x00, 0x00, 0x01, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xc5, 0x96, 0xcd, 0x2b, 0x44,
0x51, 0x18, 0xc7, 0x9f, 0x6d, 0x65, 0x53, 0x17, 0xd5, 0xa2, 0x17, 0xc2, 0x02, 0xb3, 0x92, 0xfc, 0x51, 0x18, 0xc6, 0x1f, 0xf2, 0x91, 0x26, 0x45, 0xf2, 0x91, 0x50, 0x3e, 0x27, 0x16, 0x48, 0x3e,
0x50, 0xf6, 0xb2, 0x45, 0x52, 0x1a, 0xac, 0xa0, 0x51, 0x6e, 0xd2, 0x87, 0x2c, 0x24, 0x48, 0x22, 0x32, 0xf9, 0x58, 0xa0, 0x4c, 0xf9, 0x5a, 0xda, 0x4a, 0xd9, 0x20, 0x1b, 0x09, 0x73, 0x67, 0xcc,
0x83, 0x69, 0x49, 0x51, 0x61, 0xba, 0xd9, 0x08, 0xa9, 0x20, 0xb3, 0x22, 0xaa, 0x15, 0x49, 0x68, 0x9e, 0x26, 0x76, 0x76, 0xfe, 0x01, 0xd9, 0xd8, 0xdb, 0x2a, 0x49, 0xfc, 0x01, 0x4a, 0xb2, 0xa0,
0x41, 0xb1, 0xc4, 0x3e, 0x88, 0x44, 0x11, 0x35, 0xf6, 0xc5, 0x8a, 0xec, 0xe5, 0x6b, 0x66, 0x49, 0xec, 0x94, 0xc4, 0xe2, 0x7a, 0xce, 0xf1, 0x76, 0x9d, 0x19, 0xc3, 0xbd, 0x32, 0x77, 0x2c, 0x9e,
0x18, 0xd8, 0xcb, 0x87, 0xa0, 0x92, 0x74, 0xd5, 0xd3, 0xff, 0x9e, 0x0e, 0xeb, 0x3a, 0xef, 0x76, 0xee, 0x3d, 0xef, 0x3d, 0xe7, 0xfd, 0x9d, 0xf3, 0x9e, 0xf7, 0xbc, 0xe7, 0xc2, 0xb6, 0x6d, 0x64,
0x17, 0x99, 0x74, 0xe1, 0xcf, 0xbd, 0xe7, 0xb9, 0xe7, 0x3c, 0xbf, 0x73, 0x9e, 0xf3, 0x9c, 0xe7, 0x43, 0xc8, 0x3a, 0x08, 0x51, 0xf4, 0x21, 0x86, 0xe9, 0x0c, 0x6b, 0xc4, 0x1b, 0xc8, 0xc2, 0x38,
0x5e, 0x62, 0x66, 0x1a, 0x0d, 0xd1, 0xa8, 0x83, 0xc8, 0x47, 0xcb, 0xa8, 0x96, 0xdc, 0x23, 0x2c, 0xed, 0x3d, 0x7c, 0x36, 0x63, 0x1d, 0x4d, 0x88, 0x23, 0x44, 0xfb, 0x64, 0x66, 0x41, 0x71, 0x74,
0x47, 0x72, 0x20, 0x2f, 0xad, 0x85, 0xdd, 0x86, 0xfb, 0x5c, 0xaa, 0xa2, 0x39, 0xe4, 0xa7, 0x3c, 0x52, 0x79, 0x5f, 0x42, 0x40, 0x9b, 0x06, 0x67, 0x04, 0x64, 0xa1, 0xde, 0x35, 0xe6, 0x71, 0xae,
0xd8, 0x0b, 0x47, 0x16, 0xe4, 0xa7, 0x5c, 0x68, 0xcc, 0xb0, 0x10, 0xc0, 0x26, 0xc0, 0x23, 0x02, 0xd0, 0x0d, 0x64, 0x61, 0xf4, 0x7b, 0x50, 0x14, 0xfd, 0x8e, 0x6d, 0x0d, 0xc5, 0x6c, 0xef, 0x51,
0xf2, 0x52, 0xa6, 0x6e, 0xcc, 0xfd, 0x58, 0xa1, 0x1e, 0xc8, 0x4b, 0xab, 0xe3, 0x83, 0x7c, 0xb4, 0xd7, 0xd4, 0x23, 0x75, 0xcc, 0xc1, 0xad, 0x06, 0xac, 0x81, 0xea, 0xd6, 0xb2, 0x30, 0xf1, 0x3b,
0x3c, 0x6a, 0xdb, 0x4f, 0xe3, 0xd1, 0x3e, 0x05, 0x75, 0x43, 0x1f, 0xa0, 0x36, 0x0c, 0x9e, 0xaf, 0xd0, 0x36, 0x02, 0xe2, 0xa4, 0x80, 0x1d, 0xaf, 0x68, 0xb7, 0x53, 0xf4, 0x6c, 0xc2, 0x0c, 0x68,
0x82, 0xcd, 0x86, 0x96, 0x0a, 0x79, 0x69, 0xfd, 0x9f, 0x81, 0x8e, 0x51, 0xba, 0x74, 0x92, 0x82, 0x9d, 0x77, 0x10, 0x37, 0xdf, 0x69, 0x5b, 0x58, 0x11, 0xc7, 0x6f, 0x1c, 0x94, 0x90, 0xf6, 0x9d,
0x8e, 0xcf, 0x60, 0xe7, 0x18, 0xf5, 0xab, 0x61, 0x2a, 0xe8, 0xac, 0xe4, 0x41, 0xd8, 0xfc, 0x68, 0xd8, 0x2e, 0xa9, 0x59, 0x47, 0x71, 0xb4, 0x89, 0x8f, 0x0e, 0x6f, 0x20, 0x33, 0x6c, 0x51, 0x1c,
0xdb, 0x4b, 0x95, 0xd2, 0x71, 0x04, 0x83, 0x1a, 0x64, 0xbb, 0x57, 0xda, 0x9e, 0x42, 0x9b, 0xa2, 0x89, 0xd3, 0x43, 0xc7, 0x16, 0xc3, 0x5c, 0x9a, 0x15, 0x2a, 0xdd, 0x13, 0x56, 0x4d, 0xe5, 0xf2,
0xf2, 0x53, 0x8e, 0xf4, 0xb1, 0x30, 0x39, 0x90, 0x3a, 0x6c, 0x3e, 0x6a, 0x95, 0x4e, 0x5b, 0xa2, 0x7d, 0xd8, 0x4f, 0x90, 0xcd, 0x6f, 0xa7, 0x3a, 0xdc, 0x09, 0x14, 0xf1, 0x3d, 0x2c, 0x99, 0xfb,
0xb6, 0x5a, 0x2a, 0xd5, 0x58, 0xa1, 0xa2, 0x3e, 0xc0, 0x66, 0x40, 0x46, 0x3c, 0x17, 0xfc, 0x4b, 0xe7, 0xd0, 0x5d, 0xb0, 0x3d, 0xa3, 0x15, 0xc5, 0x99, 0x01, 0xdb, 0x97, 0xfd, 0xaa, 0xe0, 0xb7,
0x10, 0xe3, 0x5d, 0x87, 0x08, 0x77, 0x03, 0xa5, 0xe2, 0xd9, 0x29, 0x33, 0xf7, 0xaf, 0x43, 0xf7, 0x29, 0xb6, 0xc7, 0xdc, 0x93, 0x61, 0x01, 0xf9, 0xb4, 0x9d, 0xa7, 0x99, 0xfd, 0x13, 0x9d, 0x04,
0x18, 0xed, 0x22, 0x21, 0x1f, 0x3d, 0x54, 0xc1, 0x02, 0x72, 0xbf, 0xa6, 0xe2, 0x9d, 0x0b, 0xed, 0x8d, 0x24, 0xa8, 0xd1, 0xa1, 0xfb, 0x84, 0xcd, 0x8b, 0xbd, 0xe5, 0x67, 0x50, 0x04, 0x21, 0xc7,
0x35, 0xfa, 0xc9, 0x50, 0x46, 0x63, 0x61, 0x7b, 0xa4, 0x31, 0xfb, 0x4f, 0x70, 0x92, 0xad, 0x4a, 0xb6, 0x8a, 0x00, 0x6d, 0xbb, 0x49, 0xe9, 0x4d, 0x07, 0x06, 0xa4, 0x44, 0xc6, 0x0e, 0x52, 0xaf,
0x82, 0x0c, 0x11, 0xba, 0xdf, 0xb0, 0x6d, 0xd2, 0x3e, 0x2f, 0x31, 0xa8, 0x86, 0xf2, 0xa2, 0xb6, 0x02, 0x7b, 0x51, 0xd5, 0x44, 0xdb, 0x37, 0xd1, 0xee, 0x76, 0x60, 0x1b, 0x5d, 0x0f, 0x2c, 0xfb,
0xbd, 0x94, 0x0e, 0xdb, 0xc9, 0x21, 0xe9, 0x0d, 0x07, 0x2a, 0xc8, 0x44, 0x39, 0x76, 0x25, 0x34, 0xc8, 0xc4, 0x6a, 0xa5, 0xbd, 0x68, 0xac, 0xfa, 0x16, 0x1b, 0x28, 0x57, 0xc9, 0xe1, 0xa5, 0x04,
0x28, 0x61, 0x5f, 0x95, 0x6a, 0x22, 0xec, 0xd5, 0xb4, 0x40, 0xef, 0xc0, 0x66, 0xe9, 0x1e, 0x58, 0x75, 0xa9, 0xf0, 0xa5, 0x39, 0x2f, 0xb9, 0x29, 0x25, 0x68, 0x92, 0x4e, 0xcb, 0xc4, 0xc7, 0x81,
0xf4, 0x91, 0x13, 0x9b, 0x29, 0xdb, 0xe5, 0xaa, 0x55, 0xbf, 0xa6, 0x03, 0x34, 0x45, 0x49, 0x8e, 0x01, 0x3b, 0x31, 0x4b, 0x98, 0x5b, 0xf5, 0x0e, 0xb3, 0x73, 0xaf, 0x8e, 0xb7, 0x5a, 0x01, 0xb3,
0x64, 0x4a, 0xd0, 0x62, 0x25, 0x7c, 0x1a, 0xe7, 0xc5, 0x18, 0x53, 0x82, 0x0a, 0xe1, 0x74, 0xb2, 0xf2, 0x9b, 0xa2, 0x1a, 0x56, 0x7b, 0x8b, 0x65, 0x14, 0xa6, 0x24, 0xc7, 0x4e, 0xe6, 0xaf, 0x09,
0xf4, 0x71, 0x49, 0x05, 0xbb, 0xab, 0x2e, 0x61, 0x7a, 0xd5, 0xdb, 0x89, 0xce, 0x76, 0x11, 0x6f, 0x9e, 0x19, 0x9d, 0xde, 0x1f, 0xc9, 0xf1, 0x20, 0xb0, 0x1b, 0x7f, 0xee, 0xa3, 0x08, 0x06, 0x74,
0x65, 0x05, 0xc8, 0xca, 0x38, 0x45, 0xd5, 0xa9, 0xec, 0x2d, 0xed, 0xa4, 0x71, 0x31, 0xc9, 0x51, 0x68, 0x23, 0x18, 0xd2, 0xc7, 0xc2, 0x37, 0x90, 0xec, 0xad, 0xf8, 0x5b, 0xf2, 0x17, 0xf4, 0x11,
0xaf, 0x0f, 0x2a, 0xc7, 0x41, 0x5c, 0x44, 0x47, 0x69, 0x1a, 0xb5, 0x23, 0x08, 0xb7, 0x71, 0x4a, 0xc6, 0xa0, 0x64, 0xe2, 0x96, 0xff, 0x57, 0xb9, 0xda, 0x2b, 0x20, 0x27, 0x1b, 0xff, 0x0c, 0x4e,
0x5a, 0x51, 0x68, 0xea, 0x44, 0xa6, 0xc5, 0xa9, 0x6b, 0x22, 0xbd, 0x7f, 0x25, 0xc7, 0x5b, 0x09, 0xda, 0x27, 0x83, 0xd6, 0x51, 0xca, 0x59, 0x54, 0x79, 0xd2, 0x26, 0x2a, 0x7f, 0x94, 0xaa, 0x75,
0xeb, 0x49, 0x0c, 0x5a, 0x42, 0x47, 0xc8, 0x44, 0x1f, 0x2d, 0x16, 0x0b, 0x6f, 0x2e, 0x2e, 0xe3, 0x4a, 0xf4, 0xf9, 0x7f, 0xbf, 0x5b, 0x7e, 0xeb, 0x1d, 0x44, 0x01, 0x60, 0x36, 0xe3, 0x58, 0xd9,
0xdd, 0xbb, 0x8e, 0x73, 0x41, 0xfe, 0x2a, 0x36, 0x18, 0x0c, 0x4c, 0x66, 0x7a, 0x85, 0xf7, 0x87, 0x88, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0x35, 0x61, 0x35, 0xb4, 0x42, 0x84, 0xb6, 0x86, 0xf2, 0xc5, 0xb1, 0x88, 0x0b, 0xda, 0x4e, 0x25,
0x64, 0xa5, 0xb0, 0xe2, 0xd0, 0xe3, 0xf1, 0xf0, 0xbd, 0x5b, 0x83, 0x7c, 0xf9, 0x02, 0x73, 0xe3,
0x99, 0x7e, 0x6e, 0xb9, 0xc2, 0xfc, 0xa0, 0xe3, 0x05, 0x3b, 0x1c, 0x0e, 0x74, 0xa6, 0x1f, 0x94,
0x4d, 0xe7, 0x34, 0x61, 0xd8, 0x5b, 0xe9, 0xaf, 0x42, 0x1b, 0xb4, 0x81, 0xd6, 0x21, 0xc2, 0x6f,
0xac, 0x56, 0x2b, 0x87, 0xc3, 0x61, 0x7e, 0xd7, 0xc7, 0xdc, 0x7c, 0xfe, 0x3b, 0x67, 0x65, 0xda,
0x39, 0x25, 0x25, 0x8d, 0xf7, 0x55, 0xde, 0x04, 0x98, 0x79, 0x60, 0x60, 0x80, 0xdd, 0x6e, 0x77,
0x62, 0x98, 0x3c, 0x67, 0xb8, 0x1f, 0x1c, 0x0e, 0xca, 0xa4, 0x43, 0x18, 0xcc, 0x2e, 0x97, 0x8b,
0x23, 0x91, 0x08, 0xbf, 0xec, 0x62, 0xbe, 0x78, 0xfa, 0x33, 0xa7, 0xa5, 0x4e, 0x50, 0x9c, 0x72,
0xc9, 0xc6, 0x13, 0xdc, 0x76, 0x9d, 0xc5, 0x15, 0x0a, 0x85, 0xd8, 0x68, 0x34, 0x32, 0x8e, 0x74,
0x1f, 0xe6, 0x5d, 0x1c, 0x67, 0x65, 0x19, 0x18, 0x67, 0xd0, 0x0e, 0x5d, 0x0e, 0xbe, 0x3d, 0x46,
0xfa, 0x62, 0xb7, 0xdb, 0xb9, 0xb3, 0xf3, 0x09, 0xdf, 0xb8, 0xca, 0x5c, 0x5f, 0xd7, 0xc5, 0x7b,
0x2a, 0xda, 0xb8, 0x29, 0xf0, 0x4d, 0xc0, 0x83, 0xc1, 0x20, 0x9b, 0xcd, 0x66, 0x65, 0xaf, 0x7a,
0x68, 0x0b, 0x6d, 0x4d, 0xf0, 0xe1, 0x8b, 0xa6, 0xfd, 0x50, 0x50, 0x15, 0x4d, 0xc2, 0x2c, 0xa6,
0xe3, 0xaf, 0x20, 0x17, 0xb9, 0xd3, 0x6e, 0x32, 0x99, 0xb8, 0xb4, 0x74, 0x07, 0x37, 0x35, 0xde,
0xe7, 0x6b, 0xcd, 0xdd, 0x1c, 0x38, 0x1b, 0x64, 0x9b, 0xcd, 0x26, 0x56, 0x87, 0x8f, 0xf9, 0x1d,
0x72, 0x20, 0xe5, 0xab, 0x91, 0x93, 0x5a, 0x52, 0x6a, 0x9d, 0x22, 0xf8, 0xd4, 0xfd, 0xdd, 0xc2,
0xe5, 0x84, 0x9a, 0xa1, 0x5e, 0xe8, 0x3d, 0xf4, 0x1c, 0x6a, 0x82, 0x72, 0xff, 0xeb, 0xff, 0xba,
0x9f, 0xf9, 0x86, 0xa5, 0xd1, 0xbe, 0x37, 0x48, 0xba, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE show_zone_disable_xpm[1] = {{ png, sizeof( png ), "show_zone_disable_xpm" }}; const BITMAP_OPAQUE show_zone_disable_xpm[1] = {{ png, sizeof( png ), "show_zone_disable_xpm" }};

View File

@ -8,60 +8,42 @@
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, 0x42, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x5d, 0x48, 0x93, 0xce, 0x00, 0x00, 0x02, 0x27, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xcb, 0x6b, 0x13,
0x61, 0x14, 0xc7, 0xff, 0x6e, 0x69, 0x7e, 0x2c, 0xab, 0x75, 0x51, 0x81, 0x90, 0x25, 0x41, 0x5f, 0x51, 0x14, 0x87, 0x3f, 0x1a, 0x8d, 0x22, 0x56, 0xa8, 0x2e, 0x74, 0xd1, 0x85, 0x08, 0x85, 0xfa,
0x96, 0x1f, 0xdb, 0xd4, 0x08, 0xb3, 0x06, 0x7d, 0x49, 0xae, 0x24, 0x35, 0x91, 0x24, 0xa3, 0xac, 0xe8, 0xa2, 0x93, 0xc9, 0x43, 0xbb, 0x52, 0xa1, 0xbe, 0xa8, 0x56, 0x69, 0x7c, 0x20, 0x96, 0x8a,
0x96, 0x26, 0x5a, 0x4a, 0xb9, 0x69, 0xbb, 0x28, 0xba, 0x29, 0x2a, 0xa4, 0xb0, 0x0f, 0x2b, 0x2d, 0x0f, 0x5a, 0xdb, 0x50, 0x9a, 0xda, 0x50, 0x93, 0x7b, 0x87, 0xbb, 0x11, 0xb7, 0x8a, 0xff, 0x85,
0x28, 0x56, 0x14, 0x21, 0x14, 0xd1, 0x85, 0x4b, 0x88, 0xf2, 0xc2, 0x2c, 0xe8, 0xa2, 0xb2, 0x24, 0x3b, 0x11, 0xdc, 0xaa, 0x7f, 0x80, 0xa2, 0xe0, 0xc2, 0x2e, 0x2b, 0xee, 0x7c, 0x6c, 0x8a, 0x50,
0x4a, 0xac, 0xb4, 0xbc, 0xd1, 0xac, 0x39, 0xf5, 0x74, 0xf6, 0xee, 0x6d, 0x1f, 0xec, 0x75, 0x9b, 0x5b, 0xed, 0x71, 0x31, 0xd7, 0x64, 0x86, 0xc4, 0x74, 0xa2, 0x93, 0x2e, 0x7e, 0xcc, 0xdc, 0x99,
0xa8, 0x0d, 0xfe, 0x7b, 0xf6, 0x3e, 0x1f, 0xe7, 0x77, 0x9e, 0x73, 0xce, 0xf3, 0xec, 0x05, 0x11, 0x3b, 0xf7, 0x3b, 0xf7, 0x9c, 0xdf, 0xb9, 0x0c, 0x22, 0xc2, 0x46, 0xa8, 0x76, 0xe3, 0xca, 0x28,
0xe1, 0x7f, 0xc8, 0xf5, 0x43, 0x45, 0xf9, 0x48, 0xa4, 0xb3, 0x13, 0xaa, 0x04, 0xaa, 0x64, 0x82, 0x29, 0x79, 0x18, 0xab, 0x1c, 0x29, 0x83, 0x74, 0x54, 0x41, 0xa4, 0x65, 0x1f, 0xee, 0xaf, 0x55,
0xcc, 0x09, 0x82, 0x9a, 0x16, 0x40, 0x35, 0x6c, 0xc3, 0x86, 0x87, 0x4d, 0x13, 0xaa, 0xa4, 0xbe, 0x4e, 0x3e, 0x7f, 0x11, 0xab, 0x32, 0x4b, 0xdf, 0x70, 0xe4, 0x7c, 0x0d, 0x94, 0x92, 0x5e, 0xdc,
0x5e, 0x86, 0x6d, 0x75, 0x81, 0x12, 0x69, 0x11, 0x54, 0x83, 0xbf, 0x60, 0x44, 0xb9, 0x87, 0xaa, 0x95, 0xef, 0x28, 0xe6, 0x42, 0xd2, 0xdc, 0x41, 0x71, 0x16, 0x4d, 0x16, 0x4d, 0x1a, 0xcd, 0x45,
0xa0, 0xe7, 0x36, 0x83, 0xdb, 0x24, 0x96, 0x9a, 0x95, 0xcd, 0x2a, 0xf3, 0x9a, 0x37, 0x9a, 0x56, 0x34, 0xc5, 0xba, 0x79, 0x7f, 0xd3, 0xc0, 0xc7, 0x0f, 0xb8, 0x72, 0xb9, 0x39, 0xc8, 0xe3, 0x04,
0x7d, 0x79, 0xcb, 0x91, 0xda, 0xee, 0x1b, 0x54, 0x8d, 0xf5, 0x30, 0x21, 0xc4, 0x2b, 0xd6, 0xdc, 0x86, 0x64, 0x5d, 0xae, 0x0d, 0x49, 0x0c, 0x99, 0x88, 0xa0, 0x85, 0xe6, 0x20, 0x4d, 0xff, 0xba,
0xc7, 0xd2, 0x04, 0x06, 0xfa, 0xfc, 0xce, 0x37, 0xa8, 0x0a, 0xf1, 0x7e, 0x93, 0x6b, 0xdf, 0xe1, 0xc5, 0xd5, 0xa4, 0xff, 0x17, 0x34, 0x12, 0x8a, 0xde, 0xe3, 0x38, 0x1e, 0xb7, 0xd0, 0x4c, 0xa1,
0x38, 0x41, 0xdb, 0x3c, 0xbc, 0xaf, 0x86, 0x96, 0xb5, 0x87, 0x0d, 0x17, 0xf1, 0x58, 0x26, 0x8e, 0xb8, 0xc0, 0x3d, 0x76, 0x05, 0xde, 0x3b, 0x78, 0x0c, 0xe1, 0x31, 0x84, 0x62, 0xa6, 0x35, 0xd0,
0x62, 0x96, 0xdb, 0x78, 0x02, 0x8f, 0x6d, 0x16, 0x64, 0x44, 0xe9, 0xd8, 0x40, 0x47, 0x30, 0x53, 0x3c, 0x5d, 0x22, 0x02, 0x79, 0x12, 0x68, 0xc6, 0x1a, 0x44, 0x3a, 0x13, 0x84, 0x05, 0xa0, 0x87,
0xe8, 0xcb, 0x82, 0x9c, 0x8d, 0xef, 0x94, 0xf0, 0xb4, 0xd4, 0x1d, 0xe6, 0x06, 0x5d, 0x36, 0x16, 0x5a, 0x01, 0x4d, 0x06, 0x52, 0x93, 0xb2, 0x1f, 0xcc, 0xe2, 0x71, 0xd4, 0x8e, 0x27, 0x50, 0x94,
0xd0, 0x01, 0xb7, 0xd0, 0x24, 0x8a, 0x0b, 0x0e, 0xb1, 0xc7, 0x6b, 0xc4, 0xe7, 0xfd, 0xdc, 0x56, 0xd1, 0x4c, 0x63, 0xe8, 0xad, 0xca, 0x82, 0x51, 0x0c, 0x46, 0x05, 0xd5, 0xd2, 0xa6, 0x18, 0xb6,
0xf2, 0x73, 0x09, 0x1b, 0x5e, 0xe4, 0x94, 0x08, 0xe6, 0xf1, 0x75, 0x81, 0x82, 0x5c, 0x61, 0x33, 0xa6, 0x38, 0x17, 0x80, 0xf7, 0xa1, 0xb8, 0x8f, 0xe6, 0x29, 0x15, 0x4a, 0x21, 0x77, 0x1a, 0xb6,
0x62, 0x8b, 0x58, 0x14, 0x3a, 0x37, 0x78, 0x2c, 0xeb, 0x04, 0xeb, 0x81, 0x57, 0x75, 0x9a, 0xa0, 0xf3, 0x84, 0x04, 0x15, 0xae, 0xb5, 0x0f, 0xe4, 0xcf, 0xbb, 0x4a, 0x9e, 0x04, 0x86, 0x1d, 0xb6,
0x80, 0x99, 0xa3, 0x60, 0xc0, 0x8e, 0xc9, 0x03, 0x39, 0xe6, 0xe5, 0x09, 0xe1, 0x36, 0x21, 0x52, 0x9e, 0x31, 0xa4, 0x4e, 0x51, 0x40, 0xd1, 0x83, 0xa2, 0x27, 0xb4, 0x03, 0xc5, 0xa0, 0xad, 0xd7,
0xcc, 0xe7, 0x04, 0x84, 0xce, 0x88, 0x62, 0xd6, 0x42, 0x41, 0xee, 0x3b, 0xe0, 0xd0, 0x89, 0xf9, 0x5e, 0x34, 0x77, 0x19, 0x58, 0x8c, 0x60, 0x06, 0x43, 0x07, 0x9a, 0xd1, 0xba, 0x02, 0x7b, 0x4c,
0x8a, 0xe6, 0x79, 0x87, 0x03, 0x2b, 0x06, 0x13, 0x64, 0x3c, 0x39, 0x5f, 0xc2, 0x73, 0x7b, 0x7e, 0x63, 0xd8, 0x59, 0x0d, 0xa8, 0x44, 0xa7, 0x6d, 0xec, 0x3f, 0x69, 0xec, 0xb3, 0x81, 0x1e, 0x6e,
0x94, 0x4e, 0x87, 0x2a, 0x30, 0x4d, 0x3c, 0xd8, 0xff, 0xc2, 0x18, 0x2b, 0x3a, 0x9a, 0xe2, 0x1b, 0x0e, 0xf2, 0xc8, 0x57, 0x17, 0xb9, 0xcd, 0x66, 0x14, 0xc7, 0x42, 0xf6, 0x7e, 0xe0, 0x07, 0x62,
0x54, 0x8d, 0x2c, 0xa7, 0x91, 0x42, 0x04, 0x73, 0xdf, 0x5a, 0x8f, 0xf2, 0x3e, 0xe9, 0x70, 0x44, 0x83, 0xd9, 0x63, 0xaf, 0xdd, 0x28, 0x66, 0x2d, 0xa8, 0x58, 0x7d, 0x9e, 0xfb, 0xfc, 0xae, 0x79,
0x74, 0x66, 0x8e, 0xd8, 0x46, 0x09, 0x3b, 0x77, 0x80, 0xca, 0x9c, 0xfd, 0x29, 0xdd, 0xaf, 0x7d, 0xc3, 0x56, 0x70, 0x23, 0x34, 0xac, 0x9f, 0x5a, 0xc3, 0x01, 0x3b, 0xee, 0x0f, 0xec, 0x6a, 0x1c,
0x1f, 0x58, 0x03, 0x0f, 0xfb, 0x3f, 0xb0, 0x8e, 0xd0, 0x9a, 0xb0, 0x44, 0x7c, 0x8e, 0x77, 0xdb, 0xc3, 0x36, 0x52, 0x6b, 0xaf, 0xa2, 0x1c, 0x41, 0x67, 0x28, 0xb0, 0xa5, 0x41, 0xbf, 0x6c, 0x42,
0xd5, 0x3e, 0xee, 0x0f, 0x87, 0x6a, 0xe4, 0x69, 0x20, 0x57, 0x50, 0x3a, 0x67, 0x62, 0xaa, 0xc4, 0x93, 0x0d, 0x2c, 0x5a, 0xc4, 0xd0, 0x2d, 0x22, 0xe0, 0x71, 0x2a, 0xf0, 0xfd, 0x25, 0x52, 0x6b,
0x79, 0x99, 0x22, 0xdc, 0x7d, 0x2e, 0xa3, 0xf6, 0x1d, 0x44, 0x09, 0x63, 0xd5, 0xd8, 0xe8, 0xb6, 0x2f, 0xd7, 0x07, 0xf9, 0x8b, 0x4c, 0xa1, 0x18, 0xa6, 0x42, 0x0e, 0x83, 0x8b, 0x62, 0x04, 0xaf,
0x3e, 0x87, 0x21, 0x16, 0xff, 0x20, 0x87, 0x91, 0x22, 0xa1, 0xfa, 0x0c, 0x48, 0x66, 0x63, 0x2a, 0xc1, 0x09, 0xa0, 0x28, 0x30, 0x4f, 0x57, 0x9d, 0xbd, 0x73, 0x5f, 0xde, 0x46, 0x03, 0xb5, 0x22,
0x7b, 0x55, 0xb2, 0x81, 0x52, 0x89, 0x43, 0x5c, 0x6c, 0xcf, 0xad, 0x57, 0x79, 0x27, 0xf7, 0xbc, 0xcd, 0x4d, 0x0c, 0x5b, 0x29, 0xd1, 0x89, 0x62, 0xd2, 0xb7, 0xf7, 0xe2, 0x42, 0xfc, 0x20, 0xbf,
0xf2, 0x0f, 0x2a, 0xe1, 0xef, 0x54, 0xd4, 0x63, 0x1e, 0x9e, 0x71, 0x06, 0x5a, 0x10, 0x03, 0x0b, 0xb6, 0x57, 0x6c, 0x2f, 0xf9, 0xe6, 0x68, 0x1b, 0xc8, 0xd7, 0x69, 0x11, 0x81, 0x32, 0x4e, 0xbb,
0xd2, 0x70, 0x8d, 0x0d, 0x55, 0x48, 0xde, 0x6b, 0x55, 0xd8, 0xcd, 0xce, 0x84, 0x0a, 0xc5, 0xc1, 0x41, 0x73, 0x54, 0x38, 0xe2, 0xdb, 0xfb, 0xeb, 0x9b, 0xf6, 0x82, 0x7c, 0xed, 0xc7, 0x91, 0x46,
0xd5, 0x1b, 0xd8, 0xa5, 0x6a, 0x07, 0x04, 0xa3, 0x4f, 0xa1, 0x50, 0x50, 0x6e, 0x4e, 0x21, 0x95, 0xae, 0xfb, 0xb9, 0xcc, 0xd8, 0xf5, 0xc7, 0xf1, 0xe9, 0xc6, 0x23, 0xdc, 0x1f, 0xef, 0xc3, 0xa0,
0x1e, 0x3c, 0x4d, 0xab, 0x53, 0xd3, 0x28, 0x28, 0x28, 0x88, 0x10, 0x81, 0x2e, 0x1e, 0xbf, 0x2e, 0x83, 0x92, 0x24, 0xb3, 0xf4, 0x8c, 0xf4, 0xca, 0xa7, 0x7f, 0xd7, 0x6a, 0x03, 0x2d, 0xbf, 0x26,
0x09, 0x33, 0x20, 0x57, 0x3c, 0x4b, 0x8e, 0xe2, 0x18, 0x15, 0xa4, 0xc7, 0x31, 0xcc, 0x45, 0x9b, 0x2b, 0xbb, 0x43, 0xbf, 0x5b, 0x1b, 0xf6, 0x5f, 0xd7, 0x6e, 0xfd, 0x06, 0x82, 0x7e, 0x65, 0xf0,
0xdd, 0xa0, 0x5e, 0xaf, 0xa7, 0xa6, 0xc7, 0x83, 0x74, 0xe3, 0x12, 0x51, 0xdd, 0xf9, 0x01, 0xba, 0xeb, 0x19, 0x47, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0x7b, 0x93, 0xa8, 0xe5, 0xf9, 0x07, 0xd2, 0x6a, 0xb5, 0xbc, 0x00, 0x23, 0x7c, 0x9d, 0xde, 0x1b,
0xe5, 0xd6, 0xde, 0x24, 0xd8, 0xac, 0xe4, 0x19, 0x92, 0xa0, 0x15, 0x9f, 0x06, 0x10, 0x86, 0x1e,
0xa5, 0x52, 0x49, 0xcd, 0xcd, 0xcd, 0xd4, 0xfd, 0x8d, 0xa8, 0xe1, 0xe2, 0x30, 0xc5, 0xcc, 0xd7,
0x50, 0x48, 0x48, 0x38, 0x95, 0x97, 0x3c, 0x62, 0x30, 0x91, 0xd5, 0x6a, 0x25, 0x9d, 0x4e, 0xe7,
0x1b, 0x66, 0xc0, 0x4a, 0x47, 0x79, 0xf7, 0xbe, 0xf4, 0x06, 0x45, 0x5f, 0xb6, 0xf2, 0x62, 0xca,
0xc8, 0xc8, 0x20, 0x9b, 0xcd, 0x46, 0x1d, 0xed, 0x44, 0x57, 0x6a, 0xfa, 0x29, 0x3c, 0x6c, 0xba,
0xdd, 0x28, 0xe5, 0x65, 0x9f, 0xa1, 0xc6, 0x3b, 0x24, 0x7c, 0x2c, 0x16, 0x0b, 0xc9, 0x64, 0x32,
0x62, 0xc7, 0x7e, 0x72, 0xcd, 0x19, 0x46, 0xd9, 0xd9, 0x62, 0xfe, 0x1b, 0x97, 0xaa, 0xba, 0xa1,
0x3f, 0x88, 0x8b, 0x7b, 0x02, 0xb9, 0xdc, 0xaa, 0xd1, 0x68, 0xa8, 0xb5, 0xb5, 0x8d, 0xee, 0xdf,
0x22, 0x3a, 0x75, 0xbc, 0x9d, 0xca, 0x8a, 0x1a, 0xa9, 0xbe, 0x76, 0x48, 0x80, 0x9b, 0xcd, 0x66,
0x0a, 0x0d, 0x0d, 0xe5, 0x5c, 0x45, 0xfc, 0x40, 0x66, 0xe6, 0x55, 0x14, 0x14, 0xd4, 0x48, 0x6b,
0xd7, 0x39, 0xa8, 0xad, 0x6f, 0x3c, 0x41, 0x4b, 0x29, 0x04, 0x9a, 0xfe, 0x46, 0xa8, 0x6d, 0x9d,
0x58, 0xde, 0xf1, 0x15, 0x33, 0xd2, 0x07, 0xe4, 0x72, 0x39, 0x15, 0x14, 0xec, 0xa5, 0xfa, 0xba,
0x17, 0x74, 0xbb, 0xe1, 0x23, 0xd5, 0x5e, 0x30, 0x93, 0x5a, 0xad, 0x16, 0x76, 0x87, 0x48, 0xed,
0x6f, 0xc4, 0x7f, 0xef, 0x12, 0xe6, 0xfb, 0x94, 0xb5, 0x15, 0x49, 0x34, 0xdb, 0xe3, 0x75, 0xcb,
0xeb, 0x60, 0x82, 0x0f, 0x1f, 0xd0, 0xc0, 0xea, 0x64, 0xf5, 0xb0, 0xde, 0xb3, 0xea, 0x59, 0x71,
0xe3, 0x7a, 0xaf, 0x9b, 0x6c, 0xfd, 0x05, 0x75, 0x01, 0x93, 0x9f, 0x54, 0x68, 0xdb, 0xaa, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE show_zone_outline_only_xpm[1] = {{ png, sizeof( png ), "show_zone_outline_only_xpm" }}; const BITMAP_OPAQUE show_zone_outline_only_xpm[1] = {{ png, sizeof( png ), "show_zone_outline_only_xpm" }};

View File

@ -8,54 +8,38 @@
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, 0x02, 0xda, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x96, 0x5f, 0x48, 0x14, 0xce, 0x00, 0x00, 0x01, 0xdb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x51, 0x14, 0xc6, 0xef, 0xba, 0x26, 0xeb, 0xff, 0x5a, 0x30, 0xd2, 0x08, 0x57, 0x44, 0x14, 0x97, 0x03, 0x3d, 0x30, 0xc3, 0x90, 0xb0, 0x88, 0xa1, 0x81, 0x81, 0x0b, 0x88, 0x0d, 0x18, 0x6a, 0x18,
0x99, 0xd9, 0x58, 0x77, 0xed, 0x29, 0x37, 0x8c, 0xa0, 0x08, 0x97, 0x8c, 0x92, 0x8a, 0x10, 0x0b, 0x54, 0xc1, 0xfc, 0x42, 0x06, 0x4e, 0x28, 0x5f, 0x9d, 0xba, 0x16, 0x55, 0x33, 0x58, 0x30, 0xd4,
0x2a, 0x34, 0x14, 0x0b, 0x29, 0xc8, 0x22, 0xa8, 0x87, 0x08, 0x2b, 0xa1, 0x12, 0xcb, 0x7c, 0x50, 0x32, 0xfc, 0x07, 0xe2, 0x13, 0x50, 0x8b, 0x0d, 0xa0, 0xfc, 0x0b, 0x38, 0x2d, 0xba, 0xae, 0xab,
0xcb, 0x64, 0x33, 0x7a, 0x10, 0xa9, 0xe8, 0xc1, 0xc5, 0x0a, 0x5d, 0x48, 0x34, 0xf3, 0xcf, 0xda, 0x3b, 0xe3, 0xba, 0x9e, 0xde, 0x0b, 0x9c, 0x58, 0x5f, 0xbf, 0x8f, 0x2a, 0x16, 0xdd, 0xd0, 0xd3,
0x6a, 0x05, 0x49, 0x68, 0x26, 0x59, 0x48, 0xa1, 0xab, 0x7e, 0x9d, 0x3b, 0xdc, 0xa2, 0x87, 0xd4, 0x5b, 0x01, 0x34, 0xf0, 0x3f, 0x1e, 0xfc, 0xfd, 0x8e, 0x9e, 0x9e, 0x18, 0xc5, 0x16, 0xe1, 0xc3,
0xd4, 0x29, 0xea, 0xc0, 0x07, 0xf3, 0xdd, 0x99, 0x73, 0x7f, 0x73, 0xcf, 0xb9, 0x73, 0x19, 0x06, 0x40, 0x47, 0x6c, 0x05, 0x59, 0x76, 0x4d, 0x5f, 0xbf, 0x99, 0x62, 0x8b, 0xee, 0x1a, 0x1b, 0xf3,
0x80, 0xfd, 0x0d, 0xb1, 0xff, 0x02, 0xc4, 0x4e, 0xb3, 0x10, 0x92, 0x85, 0x15, 0xb3, 0x04, 0xd5, 0x5f, 0xd5, 0xd6, 0x96, 0x40, 0xc6, 0x97, 0x74, 0x75, 0x05, 0xa1, 0xc1, 0x6a, 0x0f, 0xf5, 0xd5,
0x17, 0xb2, 0x60, 0xe1, 0x13, 0xb5, 0x05, 0x9d, 0x60, 0xeb, 0xd8, 0x49, 0x06, 0x52, 0xab, 0x00, 0xdb, 0x8b, 0x7a, 0x7a, 0xdc, 0xb4, 0x08, 0xba, 0x0f, 0x37, 0xd4, 0xd5, 0x79, 0x41, 0xf2, 0xd7,
0x5b, 0x84, 0xef, 0x98, 0x15, 0xd4, 0x2b, 0x49, 0xe5, 0xbd, 0xb2, 0x3c, 0x34, 0xab, 0x14, 0xe5, 0xf4, 0xf4, 0x4e, 0x82, 0xc4, 0x80, 0xea, 0xf2, 0x29, 0xb3, 0x48, 0x5f, 0xbf, 0x03, 0x18, 0xe1,
0xa2, 0x26, 0x20, 0xaf, 0x2c, 0xd7, 0xd1, 0x84, 0x98, 0x43, 0x5f, 0xfb, 0x65, 0x79, 0xe5, 0x92, 0x17, 0xe0, 0x58, 0x4f, 0xef, 0x35, 0xd8, 0x32, 0x7d, 0xfd, 0x62, 0xb0, 0xaf, 0xf4, 0xf4, 0x82,
0x41, 0x73, 0x89, 0x5e, 0xa2, 0x91, 0xc3, 0x7a, 0x14, 0xe5, 0xcc, 0x92, 0x41, 0x03, 0x56, 0x6b, 0xa1, 0x96, 0x3f, 0xd8, 0xef, 0xe0, 0xc0, 0x42, 0xb5, 0x38, 0xba, 0xa1, 0xab, 0xeb, 0x0f, 0x35,
0x64, 0xb7, 0xd9, 0xbc, 0xea, 0x67, 0x75, 0x4a, 0xd2, 0x0a, 0x51, 0xd6, 0x34, 0xb1, 0xaa, 0xd1, 0xf8, 0xf1, 0x19, 0x63, 0x63, 0x56, 0xa0, 0x52, 0x26, 0xa0, 0xa5, 0xb7, 0xc1, 0x62, 0xba, 0xba,
0xe7, 0xb2, 0x1c, 0xfa, 0x27, 0x4a, 0x37, 0xe6, 0x4d, 0x4c, 0x0c, 0xe7, 0xf7, 0x7b, 0x64, 0xd9, 0x51, 0xd4, 0x4b, 0x0c, 0x0c, 0x0c, 0x8c, 0x40, 0x43, 0xaf, 0x43, 0x2d, 0x8b, 0x87, 0xfa, 0x3a,
0xc3, 0xc7, 0xe8, 0xb9, 0x82, 0xa5, 0x81, 0x14, 0xe5, 0x1c, 0x35, 0xbc, 0xe3, 0x87, 0x64, 0x79, 0x03, 0x1a, 0x7c, 0xe7, 0xa9, 0x9a, 0xea, 0x80, 0xf1, 0x92, 0x0c, 0xb5, 0xe8, 0x0a, 0xc8, 0xe2,
0x44, 0x85, 0x29, 0xca, 0x51, 0x75, 0x55, 0xb2, 0xbc, 0x5d, 0xc0, 0xdf, 0x34, 0x39, 0x1c, 0x81, 0xfb, 0x0a, 0x0a, 0x1c, 0x40, 0xf6, 0x4b, 0x68, 0x90, 0xba, 0x51, 0xcd, 0x22, 0x60, 0xca, 0x63,
0x9a, 0xf5, 0xc8, 0x2b, 0x49, 0x4e, 0x31, 0xf1, 0xdb, 0x67, 0x56, 0xeb, 0x32, 0x7a, 0x34, 0x80, 0x03, 0x06, 0xd3, 0x33, 0x70, 0xd2, 0xd6, 0xd5, 0xf5, 0x82, 0x06, 0x69, 0x0d, 0xd4, 0xf2, 0xdd,
0xa0, 0x3e, 0x75, 0x4c, 0x92, 0x76, 0x6b, 0xb7, 0x19, 0x18, 0xd3, 0xd1, 0xa4, 0xbd, 0x02, 0x96, 0x54, 0xcd, 0x47, 0x40, 0x0b, 0xca, 0xa1, 0x06, 0x1f, 0x80, 0x5a, 0x2e, 0x04, 0x64, 0x7f, 0x01,
0x2d, 0x56, 0x7d, 0x48, 0x94, 0xaf, 0x5d, 0xd3, 0x5d, 0x47, 0x7d, 0xd9, 0x2f, 0x40, 0x5d, 0x1c, 0x89, 0x1d, 0x37, 0xd1, 0x3e, 0x39, 0xdb, 0x45, 0xf1, 0xff, 0x52, 0x07, 0xe5, 0x0f, 0x40, 0xfe,
0xfc, 0xda, 0x64, 0x32, 0xd0, 0xf5, 0xb0, 0x28, 0xe9, 0x26, 0xcd, 0x40, 0xb4, 0xf3, 0x82, 0xa8, 0x8e, 0x93, 0x26, 0xda, 0x47, 0x41, 0xfc, 0xc5, 0x8e, 0xca, 0x9f, 0x40, 0x7c, 0x60, 0x10, 0xcf,
0x4c, 0xef, 0xd4, 0xad, 0x2d, 0x49, 0x5b, 0x44, 0x49, 0x8b, 0x05, 0xfc, 0x91, 0xa6, 0xdf, 0x11, 0x26, 0xda, 0x22, 0x50, 0xfe, 0x02, 0x6a, 0x02, 0x69, 0xfc, 0x7f, 0x53, 0x5f, 0xdf, 0x0c, 0x1a,
0x01, 0x8e, 0x89, 0x89, 0xdd, 0x02, 0x6e, 0xa4, 0xeb, 0x71, 0x3e, 0xd6, 0x92, 0x62, 0xf6, 0x54, 0xa4, 0x13, 0x08, 0x94, 0x22, 0x30, 0x7c, 0x83, 0xa4, 0x92, 0x01, 0xa8, 0xa1, 0x07, 0xaa, 0x71,
0x6c, 0x8c, 0xc3, 0x2d, 0x47, 0xfc, 0x18, 0xf9, 0x07, 0x9e, 0x14, 0xf3, 0x53, 0xee, 0x6b, 0x36, 0x0d, 0x88, 0x7f, 0xdb, 0xdc, 0x9c, 0xef, 0xaa, 0x81, 0x81, 0x41, 0x5e, 0xa8, 0x64, 0xac, 0x46,
0xc4, 0x7f, 0xe6, 0x9e, 0x4a, 0x5c, 0xf1, 0xdb, 0x20, 0xfe, 0x7d, 0x51, 0x12, 0x4f, 0x44, 0x9f, 0x1e, 0xe7, 0x7f, 0xc3, 0x6c, 0xee, 0x4b, 0x20, 0x7e, 0x69, 0x90, 0x54, 0x38, 0x88, 0xaf, 0x9f,
0xa2, 0xd8, 0x45, 0x49, 0x4b, 0xe7, 0x39, 0x45, 0xbe, 0xcb, 0xbb, 0xa0, 0x93, 0x81, 0x12, 0x4a, 0xcd, 0x7d, 0x13, 0xc4, 0xbf, 0xa9, 0xab, 0xab, 0x41, 0x92, 0x45, 0xb7, 0xf5, 0xf4, 0x64, 0x80,
0x44, 0x62, 0x3d, 0xf7, 0xbe, 0xd4, 0xd4, 0x88, 0x6e, 0x8b, 0xc5, 0x92, 0xbf, 0x23, 0x7a, 0x6f, 0x96, 0xfc, 0x02, 0xe2, 0xbf, 0xc0, 0xa0, 0x53, 0xa1, 0x59, 0x59, 0x07, 0xf5, 0xd5, 0x02, 0x68,
0x52, 0x7e, 0x30, 0xd6, 0xe6, 0x85, 0x76, 0x72, 0x5f, 0x94, 0x19, 0x93, 0xc5, 0xbd, 0x92, 0x17, 0x1e, 0xfa, 0x08, 0x2b, 0xd1, 0x2f, 0xeb, 0xeb, 0xbe, 0x3d, 0x62, 0xaa, 0xf5, 0xff, 0x84, 0x89,
0xda, 0xc7, 0x7d, 0x9f, 0x24, 0x25, 0xcd, 0x0b, 0xa2, 0x08, 0x27, 0x65, 0x92, 0xae, 0x44, 0xe8, 0x36, 0xc8, 0x11, 0x2f, 0xae, 0x18, 0xe8, 0xbe, 0x01, 0xf1, 0x81, 0x71, 0xf7, 0x1b, 0xc4, 0x07,
0xf5, 0xb5, 0xfb, 0xa2, 0xa2, 0xa6, 0xcb, 0x4c, 0xa6, 0x99, 0xf6, 0xe4, 0xe4, 0x04, 0xcd, 0xce, 0x06, 0xf1, 0x61, 0x92, 0x2d, 0xba, 0xaa, 0xaf, 0xaf, 0x0d, 0xd4, 0xfc, 0x8f, 0xc8, 0xb8, 0x21,
0x3a, 0x8a, 0x6d, 0xa4, 0xe1, 0xb0, 0xb0, 0x30, 0xec, 0xca, 0x3a, 0x80, 0xc2, 0xfc, 0x0b, 0x48, 0x2f, 0x8e, 0xa8, 0x5a, 0xf1, 0x8d, 0x5a, 0x44, 0xd7, 0xc6, 0xc9, 0xa0, 0x6c, 0xd7, 0x01, 0x00,
0x5b, 0xef, 0x80, 0x4e, 0xa7, 0x43, 0x82, 0xc1, 0x30, 0x55, 0x1a, 0x1b, 0xfb, 0x91, 0x9f, 0xe8, 0x4a, 0x98, 0x73, 0x71, 0x38, 0xc9, 0x99, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0x2f, 0x14, 0x69, 0xf4, 0x89, 0x2d, 0x19, 0xad, 0x29, 0xe6, 0x49, 0xee, 0xbb, 0x2c, 0xd2, 0x07, 0xae, 0x42, 0x60, 0x82,
0xee, 0xa9, 0x77, 0x7e, 0xee, 0xa9, 0xc4, 0x8f, 0x7f, 0x09, 0xa2, 0x30, 0x92, 0x6a, 0xf9, 0x84,
0xb9, 0xb9, 0xb9, 0x68, 0x7a, 0x38, 0x89, 0x9a, 0xeb, 0x40, 0xe5, 0xd5, 0x2f, 0xa8, 0xbf, 0x09,
0x78, 0x5a, 0xfa, 0x91, 0x9e, 0x9e, 0x0e, 0x1d, 0xa5, 0x9d, 0x5a, 0xbd, 0x7a, 0x71, 0x3d, 0xa2,
0x88, 0x26, 0xbd, 0x34, 0x1a, 0x8d, 0x68, 0x6e, 0x6e, 0xc6, 0xfb, 0x21, 0xa0, 0xfa, 0xda, 0x34,
0xe2, 0xe3, 0xec, 0x08, 0x0a, 0x0a, 0x41, 0x51, 0xc1, 0x7d, 0x02, 0x03, 0x13, 0x13, 0x13, 0x70,
0x3a, 0x9d, 0x3c, 0x61, 0x86, 0xad, 0x61, 0xe7, 0x17, 0x5c, 0x3a, 0x8a, 0x6c, 0x12, 0x32, 0x32,
0x32, 0xe0, 0xf7, 0xfb, 0xf1, 0xca, 0x07, 0xdc, 0xb8, 0x3c, 0x8e, 0x90, 0xe0, 0x48, 0x7e, 0x13,
0x7b, 0x76, 0x5e, 0x42, 0xc3, 0x1d, 0xa8, 0xe1, 0x76, 0xbb, 0x11, 0x10, 0x10, 0x00, 0x16, 0xc8,
0x06, 0xd9, 0xf1, 0x45, 0xf4, 0x48, 0xc0, 0x3e, 0xd9, 0xed, 0x76, 0xb4, 0xb5, 0xb5, 0xe3, 0xde,
0x6d, 0xa0, 0xe4, 0xac, 0x0f, 0x47, 0x0e, 0x37, 0xa0, 0xaa, 0x7c, 0x4a, 0x85, 0xbb, 0x5c, 0x2e,
0x18, 0x0c, 0x06, 0xfe, 0x70, 0x27, 0x6d, 0x95, 0xad, 0x8b, 0xde, 0x0c, 0x14, 0x31, 0xa4, 0xbb,
0x7a, 0xbd, 0x1e, 0x39, 0x39, 0x07, 0x51, 0x55, 0xd9, 0x8a, 0xba, 0xea, 0x01, 0x94, 0x97, 0xb9,
0x60, 0xb3, 0xd9, 0xd4, 0xd5, 0x91, 0x1a, 0x49, 0xcb, 0x35, 0xf9, 0x39, 0xa1, 0xd8, 0x4c, 0xaa,
0x26, 0x0d, 0x92, 0x46, 0x78, 0xff, 0x48, 0x55, 0x24, 0xcb, 0x3f, 0xfd, 0x5f, 0xf7, 0x0d, 0x6d,
0xa7, 0x1b, 0x71, 0x83, 0x5a, 0x52, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE showtrack_xpm[1] = {{ png, sizeof( png ), "showtrack_xpm" }}; const BITMAP_OPAQUE showtrack_xpm[1] = {{ png, sizeof( png ), "showtrack_xpm" }};

View File

@ -8,88 +8,73 @@
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, 0x05, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x9d, 0x56, 0x6b, 0x4c, 0x14, 0xce, 0x00, 0x00, 0x04, 0x0f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x55, 0x5d, 0x68, 0x14,
0x57, 0x14, 0xbe, 0x02, 0xfb, 0xca, 0xb2, 0xbb, 0x33, 0xbb, 0x0b, 0xcb, 0xee, 0xcc, 0x6c, 0xa0, 0x57, 0x14, 0x3e, 0x66, 0x9d, 0xfd, 0x61, 0x32, 0x3b, 0x77, 0x76, 0x37, 0x99, 0xec, 0xce, 0x0f,
0x40, 0x44, 0x81, 0xa5, 0x80, 0xb2, 0x46, 0x45, 0x68, 0x0a, 0x42, 0x43, 0x4c, 0xd3, 0xa4, 0x3f, 0xd9, 0x26, 0x8b, 0xd1, 0xc4, 0xac, 0x49, 0x34, 0x5b, 0x8c, 0xd1, 0x14, 0x8a, 0xb1, 0x04, 0x29,
0x08, 0x92, 0x08, 0x6d, 0x63, 0x83, 0x10, 0xb1, 0x50, 0x82, 0xb2, 0x26, 0x52, 0x43, 0x15, 0x1a, 0x85, 0x3e, 0xc5, 0x80, 0x7f, 0xc5, 0xa2, 0x11, 0xb5, 0xa6, 0x92, 0xda, 0x7d, 0xb0, 0x2d, 0xd2,
0x5b, 0x9e, 0xcb, 0x63, 0x51, 0x6a, 0x1b, 0x6a, 0x13, 0xc4, 0x06, 0x02, 0xad, 0x14, 0x53, 0x82, 0xc6, 0x22, 0xe4, 0xc7, 0xdd, 0x64, 0x77, 0x53, 0x6d, 0x0b, 0xad, 0x05, 0xb5, 0xa0, 0x34, 0xc5,
0xa9, 0x34, 0x4d, 0x34, 0x58, 0x22, 0x25, 0x55, 0x4b, 0xfd, 0x61, 0xd3, 0x44, 0xdb, 0xa2, 0x42, 0x34, 0x52, 0x51, 0x5a, 0x4b, 0x41, 0x89, 0x04, 0x53, 0xc1, 0xaa, 0xf8, 0x22, 0x05, 0x8b, 0xd5,
0x1f, 0x3c, 0x0c, 0xa7, 0xe7, 0x5e, 0x19, 0x5c, 0x2d, 0xa0, 0x30, 0xc9, 0x97, 0x99, 0x7b, 0xee, 0x4a, 0x69, 0x49, 0x54, 0x7a, 0x7b, 0xee, 0x75, 0x67, 0x1d, 0x6d, 0x92, 0x9a, 0xe8, 0x63, 0x1f,
0xcc, 0xf9, 0xee, 0xfd, 0xce, 0xb9, 0xe7, 0x0c, 0x01, 0x00, 0xb2, 0x1a, 0xe8, 0x1a, 0x04, 0x93, 0x3e, 0x66, 0xce, 0xb9, 0xdc, 0xf3, 0xdd, 0x73, 0xce, 0x77, 0xcf, 0x05, 0x4a, 0x29, 0x4c, 0x07,
0xb1, 0x51, 0x4a, 0xe3, 0x9b, 0xa5, 0x43, 0x7c, 0x8b, 0xf4, 0x39, 0xef, 0x16, 0xdc, 0x5c, 0x83, 0x52, 0x42, 0xf3, 0xfb, 0x7a, 0x8d, 0x46, 0x25, 0x65, 0xec, 0x54, 0xd2, 0xc6, 0x17, 0x4a, 0x52,
0x2d, 0x87, 0xaf, 0x13, 0xa3, 0x49, 0x32, 0xf1, 0x23, 0x84, 0xac, 0x5b, 0xea, 0xbb, 0xe7, 0x26, 0x4b, 0x92, 0x44, 0x68, 0x8d, 0xd2, 0xa3, 0xcf, 0x87, 0x06, 0x98, 0x0d, 0x00, 0xb3, 0x26, 0xda,
0x20, 0x1d, 0x91, 0x4a, 0xa3, 0xc7, 0xfe, 0x1e, 0xdf, 0x2a, 0xcd, 0xf2, 0x1e, 0x69, 0x86, 0xab, 0xf7, 0xc4, 0x04, 0x70, 0xa8, 0xdc, 0xe9, 0xcb, 0x98, 0xef, 0x2a, 0xfd, 0xc6, 0x5d, 0x25, 0x63,
0x15, 0x6e, 0x18, 0x8e, 0x06, 0x0d, 0x18, 0x8e, 0x5b, 0x87, 0x39, 0xb7, 0x38, 0x81, 0x76, 0xe0, 0x8c, 0x93, 0x6e, 0xed, 0x67, 0xf9, 0xbd, 0xa2, 0x93, 0xf2, 0x07, 0xc1, 0x61, 0x92, 0xd4, 0x6f,
0xea, 0xc4, 0x6b, 0xba, 0xc2, 0x80, 0xed, 0x48, 0xe6, 0xbb, 0x26, 0x22, 0xc3, 0x29, 0x69, 0x13, 0xa1, 0x9f, 0x92, 0x1e, 0xfd, 0x82, 0xb4, 0xb5, 0x60, 0x09, 0x92, 0x39, 0x66, 0x44, 0x24, 0xef,
0x3a, 0x1f, 0xe5, 0x9a, 0xc5, 0x3b, 0x9a, 0x6c, 0xbe, 0x92, 0xa8, 0xc8, 0x2b, 0xe8, 0x2c, 0x0e, 0x37, 0x16, 0x62, 0xf0, 0x51, 0x92, 0xd2, 0x6f, 0x78, 0x5a, 0x94, 0x0e, 0x70, 0xc1, 0x4b, 0x18,
0xf1, 0x02, 0x22, 0x10, 0x11, 0xac, 0x4a, 0xd4, 0xa6, 0x19, 0xaa, 0xac, 0x83, 0x7c, 0x8b, 0x38, 0xac, 0x1a, 0xf1, 0x1c, 0xa2, 0x10, 0x51, 0xec, 0xaa, 0x17, 0x1b, 0xe5, 0x3d, 0xc1, 0x53, 0x4a,
0x67, 0xa8, 0xb0, 0x36, 0x91, 0x18, 0xa2, 0x5d, 0x15, 0x91, 0xf9, 0x94, 0x64, 0xc3, 0xd5, 0xde, 0x5a, 0xbf, 0x27, 0xef, 0x0e, 0xf6, 0x41, 0x14, 0xc4, 0x69, 0x11, 0x05, 0xf6, 0x1b, 0x21, 0x3c,
0xc3, 0x95, 0x7f, 0xed, 0x6b, 0x55, 0x66, 0xa3, 0xd3, 0x8d, 0x08, 0x15, 0x5d, 0x35, 0xc2, 0x87, 0xed, 0x6d, 0x3c, 0xf9, 0x37, 0x8e, 0xa0, 0xb3, 0x05, 0x83, 0xce, 0x43, 0xb8, 0xd8, 0xa9, 0x11,
0x4a, 0xb5, 0x70, 0xa7, 0x63, 0xa5, 0xbe, 0x34, 0x20, 0x9f, 0x6f, 0x16, 0xa7, 0x74, 0xa5, 0x96, 0x79, 0xac, 0x54, 0xd9, 0x2f, 0xb3, 0x9d, 0xde, 0xf6, 0x82, 0x56, 0x25, 0xa5, 0xff, 0x21, 0xb5,
0x36, 0x1c, 0xfb, 0x3f, 0x37, 0x11, 0x92, 0x9c, 0xe7, 0xea, 0x85, 0x61, 0x74, 0xf3, 0x2a, 0x7e, 0xab, 0x07, 0xd0, 0xce, 0x7f, 0x62, 0x22, 0x24, 0x39, 0x4e, 0xf6, 0x69, 0xc3, 0x18, 0xe6, 0x65,
0x68, 0xf6, 0x96, 0x85, 0x6f, 0x12, 0x1d, 0x24, 0x9e, 0x28, 0x28, 0xd1, 0xa2, 0x43, 0x7c, 0xd6, 0xdc, 0x18, 0xb0, 0x97, 0x45, 0xe9, 0xd3, 0x2b, 0xa1, 0x06, 0x04, 0x46, 0x94, 0x0b, 0x88, 0xff,
0x7f, 0x60, 0xcd, 0xe6, 0x3d, 0xe2, 0x9c, 0x3a, 0x43, 0x4f, 0x17, 0xa6, 0x78, 0x82, 0xc8, 0x6b, 0xde, 0x0f, 0x83, 0x2d, 0x4a, 0x46, 0xbf, 0xe7, 0x6e, 0xf2, 0xb2, 0x83, 0x09, 0x8f, 0x10, 0xd9,
0x65, 0x8b, 0xe0, 0x9a, 0xa5, 0x1c, 0x94, 0xec, 0x1f, 0xc5, 0x26, 0x4d, 0x01, 0x8e, 0x43, 0x11, 0x4e, 0x96, 0x03, 0x49, 0x19, 0x6b, 0xb0, 0x64, 0x7f, 0x09, 0x0b, 0x3d, 0x9b, 0xd1, 0x2e, 0x41,
0x7e, 0x64, 0x7f, 0xb8, 0x8a, 0x6b, 0xb1, 0xef, 0xc1, 0x44, 0x18, 0xa1, 0x71, 0xe1, 0x1b, 0xc5, 0xcc, 0x86, 0x2d, 0x11, 0x17, 0x49, 0x9b, 0xab, 0x51, 0x08, 0x23, 0xac, 0x2f, 0x4a, 0xaf, 0x7e,
0x5f, 0x51, 0x32, 0x97, 0x21, 0xdf, 0xc0, 0xcb, 0x89, 0xc0, 0xbe, 0xad, 0x13, 0xce, 0x72, 0x35, 0x1d, 0x4b, 0x16, 0x97, 0x5b, 0x65, 0xc5, 0x12, 0x02, 0xdf, 0xdb, 0xa3, 0x1d, 0x26, 0x5d, 0xda,
0xc2, 0x2d, 0x2a, 0x2b, 0xf3, 0x47, 0x27, 0x66, 0x08, 0x59, 0x7f, 0x8f, 0x90, 0xda, 0x3b, 0x84, 0x35, 0x56, 0x56, 0x1e, 0x8f, 0x2d, 0x8c, 0x03, 0xcc, 0xb9, 0x0d, 0xd0, 0x7d, 0x03, 0x20, 0x69,
0xb8, 0xbd, 0x91, 0x7c, 0xc8, 0x32, 0xbe, 0x2b, 0xcf, 0xfc, 0xf3, 0x15, 0x4c, 0x85, 0xdf, 0x08, 0x47, 0xc3, 0x4e, 0xf5, 0xea, 0xca, 0x8d, 0x81, 0x2b, 0xe7, 0x50, 0x0a, 0xbf, 0x00, 0xf4, 0x31,
0x69, 0xa2, 0xb6, 0xac, 0xb7, 0x4d, 0xc3, 0x8c, 0x00, 0x21, 0x35, 0xda, 0x67, 0xe4, 0x67, 0x94, 0x5f, 0xf3, 0xeb, 0xfe, 0x61, 0x4e, 0x80, 0x30, 0x7a, 0xcd, 0x71, 0xeb, 0x1f, 0x4b, 0xfb, 0x5d,
0xf6, 0xdb, 0x85, 0x78, 0x31, 0x32, 0xc3, 0x09, 0x7b, 0x28, 0xb5, 0x2b, 0xe2, 0xb5, 0x7b, 0xe8, 0xb6, 0x5f, 0x9c, 0x4c, 0xde, 0x6b, 0x96, 0x30, 0xbf, 0x50, 0x23, 0xae, 0x66, 0x59, 0x71, 0xa2,
0xae, 0x18, 0xd1, 0xdf, 0x84, 0x64, 0xb0, 0xcd, 0x3d, 0x85, 0xe8, 0x2a, 0x1b, 0x9c, 0xd9, 0xaa, 0x3f, 0x01, 0x9a, 0x78, 0x72, 0x8f, 0x61, 0xfe, 0x9e, 0x10, 0x3d, 0xb8, 0x58, 0xcc, 0xd9, 0x63,
0x5d, 0x1c, 0x4f, 0x2b, 0xd6, 0x41, 0x68, 0xb5, 0x00, 0x66, 0x8f, 0x04, 0x31, 0x97, 0x77, 0xc0, 0xc2, 0x2c, 0x5a, 0xd2, 0xa9, 0xd1, 0x40, 0xc6, 0xa0, 0xd1, 0xb3, 0x4b, 0xe9, 0xf3, 0x97, 0x56,
0x96, 0xeb, 0xe9, 0x10, 0x7b, 0xf5, 0x25, 0x30, 0x7f, 0x12, 0x0c, 0x28, 0xd5, 0x43, 0xe5, 0x8b, 0xd0, 0xaa, 0xf3, 0x2f, 0xd0, 0xc0, 0xa7, 0xc5, 0x14, 0x4b, 0x75, 0xdf, 0xb9, 0xc0, 0xf3, 0x2a,
0x9a, 0xd7, 0xe9, 0xae, 0x65, 0x85, 0x70, 0xd7, 0x7f, 0x68, 0xb3, 0x8d, 0x35, 0xf8, 0xac, 0x5d, 0xcb, 0xda, 0xaa, 0x10, 0x66, 0x7d, 0x53, 0x6c, 0xf1, 0x75, 0xe1, 0xbf, 0x38, 0x29, 0xd1, 0xaf,
0x96, 0xe8, 0xae, 0xce, 0x97, 0xad, 0xf4, 0xba, 0x55, 0xb1, 0x68, 0x6b, 0xdf, 0xa6, 0x65, 0xb6, 0x92, 0x83, 0x9f, 0xf4, 0x52, 0x50, 0xc8, 0xf9, 0x3e, 0xab, 0x13, 0xb9, 0xaf, 0xbe, 0x2b, 0xcc,
0xc4, 0x9a, 0x10, 0x46, 0x22, 0x23, 0xac, 0x2f, 0x96, 0xd9, 0x75, 0xc5, 0x81, 0xe7, 0xd0, 0xa9, 0x49, 0x2c, 0x94, 0x0e, 0x56, 0x71, 0xbf, 0xd4, 0x56, 0xf8, 0x25, 0x06, 0x95, 0xad, 0x76, 0x90,
0x41, 0x0e, 0x07, 0xd7, 0x22, 0xf5, 0xeb, 0x5c, 0x96, 0x1e, 0xb4, 0x09, 0xcb, 0x12, 0xfd, 0xe9, 0xb4, 0x31, 0x24, 0xc5, 0xd5, 0xaf, 0xd0, 0xa7, 0x4d, 0x4a, 0xf4, 0x5b, 0x7e, 0x1e, 0xdf, 0x7c,
0xef, 0xc3, 0x3e, 0x1e, 0x13, 0x1e, 0x13, 0xf5, 0xc6, 0x6a, 0x98, 0x2d, 0xa1, 0x36, 0xf8, 0x09, 0x51, 0x7b, 0x48, 0x34, 0x50, 0xe5, 0xe1, 0xbe, 0xda, 0xee, 0xe2, 0x47, 0x88, 0xc2, 0x5f, 0x47,
0xa2, 0x90, 0x2f, 0x63, 0x98, 0x5d, 0x9b, 0x67, 0xfe, 0x0c, 0x9d, 0x86, 0xcb, 0xc9, 0xc1, 0x79, 0xb9, 0x5f, 0xdc, 0x18, 0xf8, 0x1c, 0x83, 0x46, 0x2c, 0x71, 0x90, 0x8c, 0x71, 0x42, 0x8a, 0x17,
0xa4, 0x0b, 0x3a, 0x57, 0x50, 0x27, 0x8e, 0xd7, 0xaf, 0x28, 0x5d, 0x4c, 0xa5, 0x95, 0xed, 0x42, 0x1d, 0x41, 0x7b, 0xce, 0x94, 0xa5, 0x8b, 0x76, 0x04, 0x79, 0x16, 0x96, 0x7d, 0x1f, 0x5b, 0x5a,
0x1e, 0x3f, 0xc4, 0x90, 0x3a, 0xd0, 0x66, 0x44, 0xa7, 0x1b, 0x2e, 0x3a, 0xc1, 0x39, 0xb6, 0x13, 0x89, 0x3e, 0x1f, 0x06, 0x9d, 0x7b, 0x3a, 0x46, 0x63, 0x17, 0x97, 0xd3, 0x8a, 0xef, 0x17, 0x53,
0xa2, 0x2e, 0x6d, 0x05, 0x53, 0x1b, 0x4a, 0xd7, 0x2c, 0x4d, 0xfb, 0x5a, 0x14, 0x6f, 0x79, 0xef, 0xff, 0x01, 0x2c, 0x5d, 0xca, 0x18, 0x73, 0xa8, 0xc2, 0x6b, 0xf6, 0x8c, 0x90, 0xfc, 0x96, 0xb8,
0x08, 0xc9, 0x27, 0xb4, 0xbb, 0xb9, 0x13, 0x68, 0x13, 0x99, 0x61, 0x88, 0x10, 0xfe, 0x20, 0x21, 0x8a, 0xec, 0x45, 0x9f, 0xce, 0x1d, 0x67, 0x00, 0x94, 0xb7, 0x00, 0x36, 0xa0, 0xb4, 0xb6, 0xb7,
0x7b, 0x31, 0xb5, 0x8a, 0xf2, 0x09, 0x29, 0x96, 0x11, 0x72, 0xc4, 0x32, 0x12, 0x5e, 0x12, 0x70, 0x02, 0xb4, 0x59, 0x08, 0xef, 0x52, 0x47, 0x22, 0x3b, 0x0a, 0xce, 0x6e, 0x00, 0x68, 0xdf, 0x94,
0x79, 0x2f, 0x21, 0xa5, 0xfb, 0x16, 0x6c, 0x71, 0x6f, 0x9a, 0xba, 0xe5, 0x04, 0x30, 0x9e, 0x7c, 0xf5, 0x55, 0xaf, 0xf7, 0x1f, 0xb3, 0x04, 0xe0, 0xfb, 0xe8, 0xc1, 0x97, 0x8b, 0x21, 0xae, 0x7e,
0x74, 0x67, 0xc9, 0xe0, 0xb2, 0x7c, 0x83, 0x0e, 0x93, 0xe5, 0x18, 0x19, 0x3c, 0xd2, 0xa3, 0x64, 0x8b, 0x01, 0x1b, 0xac, 0x1e, 0xc9, 0x19, 0xe3, 0x81, 0x18, 0xca, 0x5d, 0x9b, 0xd8, 0x7d, 0xb2,
0x88, 0x54, 0xed, 0xa3, 0xe7, 0xc9, 0x3b, 0xbd, 0x95, 0x08, 0xb5, 0x37, 0xb8, 0x6a, 0xdb, 0x1b, 0xcb, 0xdb, 0x89, 0x70, 0xdb, 0x41, 0x3a, 0x43, 0xeb, 0x30, 0xfd, 0x71, 0xf7, 0x0a, 0x7e, 0x1f,
0xb8, 0xfd, 0x19, 0x75, 0x3a, 0x3b, 0x0f, 0xfe, 0x0b, 0x76, 0xcd, 0xc6, 0xbe, 0x84, 0x5e, 0x7b, 0xf2, 0xb3, 0x7e, 0xcf, 0xbc, 0xc1, 0xda, 0x01, 0xf3, 0x68, 0x05, 0x12, 0x99, 0x54, 0x3f, 0x32,
0x57, 0x14, 0x12, 0xd9, 0x41, 0xec, 0xdc, 0x00, 0x8e, 0xef, 0x13, 0x41, 0x61, 0x54, 0xe4, 0xe2, 0x97, 0x56, 0xfe, 0x58, 0x4f, 0x05, 0x9f, 0xb0, 0x16, 0xd7, 0xcc, 0x87, 0x65, 0xd3, 0x0f, 0x91,
0x9c, 0xfd, 0xb1, 0x6c, 0x62, 0x07, 0xd7, 0x20, 0x8e, 0xe2, 0x38, 0x63, 0x31, 0xeb, 0x96, 0xad, 0x84, 0x3e, 0x8a, 0x76, 0x53, 0x4e, 0x75, 0x93, 0xce, 0x37, 0x76, 0x1f, 0x12, 0xda, 0x10, 0xe9,
0x6f, 0xf4, 0x3c, 0x34, 0x08, 0xfd, 0x5c, 0x8d, 0x6d, 0x9c, 0x58, 0xd4, 0x21, 0xb2, 0x13, 0xe7, 0x0a, 0x5d, 0x05, 0xd5, 0x1d, 0xb6, 0x82, 0xc4, 0x46, 0x1b, 0x13, 0xac, 0x37, 0xac, 0x74, 0x56,
0x68, 0x5a, 0x03, 0x8d, 0x0d, 0x95, 0x4e, 0x8e, 0x93, 0xd2, 0xac, 0xdc, 0x8d, 0xf3, 0xec, 0x2c, 0x9f, 0x9c, 0x01, 0xe7, 0x2a, 0x5c, 0xe7, 0x77, 0x09, 0x27, 0x43, 0x33, 0x1e, 0x70, 0xcc, 0x55,
0x61, 0x65, 0xc8, 0xc2, 0x05, 0x4e, 0xab, 0xb6, 0x69, 0x0f, 0xc8, 0x31, 0x7b, 0x66, 0x65, 0x30, 0x27, 0x6e, 0xb3, 0x7a, 0xf6, 0x9f, 0x93, 0xc1, 0xff, 0xbe, 0xa1, 0x61, 0xfd, 0x7f, 0xf7, 0x76,
0x1d, 0x93, 0x04, 0xd4, 0xff, 0xbe, 0xbe, 0xd2, 0x36, 0xa4, 0xce, 0x32, 0xd0, 0xda, 0xe6, 0xeb, 0x84, 0xce, 0xb8, 0x9b, 0x65, 0x36, 0xdb, 0x1c, 0xb1, 0x9f, 0x1a, 0xf7, 0xd9, 0xc5, 0x90, 0x25,
0xfc, 0x31, 0xad, 0xde, 0x3b, 0x19, 0x16, 0x88, 0xb2, 0x70, 0x8e, 0xa3, 0x24, 0x28, 0xd9, 0x03, 0x6a, 0xc6, 0x35, 0xc2, 0x48, 0xb0, 0x64, 0x77, 0xa4, 0x1d, 0x05, 0xfd, 0x68, 0x2f, 0xfd, 0xd7,
0x5d, 0x49, 0x40, 0x2b, 0x8e, 0x77, 0xfc, 0xaf, 0x32, 0xac, 0x04, 0x7d, 0x45, 0x50, 0x02, 0x9e, 0x64, 0x98, 0x0a, 0xde, 0xdd, 0x45, 0xb5, 0x78, 0xd3, 0x2f, 0x2b, 0x7d, 0xc6, 0x1d, 0xef, 0xdb,
0xf4, 0x9b, 0x7c, 0x93, 0xf4, 0x40, 0x5f, 0x66, 0x79, 0x27, 0xe1, 0x6a, 0x4a, 0xcb, 0xd3, 0x44, 0xea, 0x1b, 0xb5, 0xe7, 0x5f, 0x4c, 0x3f, 0x4e, 0xe4, 0x59, 0x26, 0x6d, 0xc7, 0x29, 0x71, 0x9c,
0x9a, 0x24, 0x5d, 0x11, 0x56, 0x89, 0xf3, 0x74, 0x27, 0xba, 0x77, 0x03, 0x4f, 0x63, 0xc9, 0xda, 0x65, 0x22, 0xbd, 0x59, 0xf8, 0x09, 0x8e, 0xac, 0x95, 0x48, 0xe2, 0x9d, 0xfe, 0x33, 0x51, 0x0e,
0x85, 0x24, 0xfa, 0xd5, 0xb7, 0x89, 0x48, 0xe2, 0xaf, 0x2f, 0xb7, 0xd6, 0xe2, 0xd9, 0x98, 0xe5, 0xf9, 0xde, 0x77, 0x82, 0xdd, 0x78, 0x37, 0xee, 0x2a, 0xfd, 0xe6, 0xdf, 0xea, 0xc1, 0x52, 0x6a,
0x5b, 0xed, 0xf3, 0x96, 0x33, 0x61, 0x60, 0xef, 0x8e, 0x02, 0xf1, 0x6c, 0x04, 0x98, 0x3f, 0x0e, 0x1e, 0xab, 0xa0, 0xfa, 0xe1, 0x32, 0x1a, 0xf8, 0xb8, 0x98, 0x0b, 0x82, 0x74, 0x6a, 0x23, 0x42,
0x66, 0x09, 0xc1, 0x55, 0x0b, 0x23, 0x8a, 0x78, 0x4d, 0x21, 0x12, 0x6c, 0x66, 0x87, 0xd4, 0xab, 0x8d, 0x67, 0x2b, 0x12, 0x2c, 0xe2, 0x97, 0xd4, 0xf6, 0x36, 0x4d, 0xeb, 0xd1, 0xe3, 0x13, 0x3a,
0x37, 0xad, 0xaa, 0xe9, 0xb1, 0x0a, 0x1d, 0xae, 0x11, 0x22, 0xba, 0x36, 0x5f, 0x88, 0x18, 0x74, 0xe2, 0xd1, 0xca, 0x8e, 0x2e, 0x3a, 0x51, 0x76, 0x2a, 0x46, 0xc3, 0x03, 0x51, 0x5a, 0x3a, 0x54,
0x42, 0x48, 0x6f, 0x0c, 0x84, 0xf5, 0xc7, 0x41, 0xd4, 0x77, 0xdb, 0x41, 0x1d, 0xab, 0x2d, 0xc6, 0x4d, 0x2b, 0x7e, 0x58, 0x42, 0xdd, 0x55, 0x62, 0x1b, 0xae, 0x2f, 0x43, 0x84, 0x2c, 0xe5, 0xcd,
0xf9, 0x24, 0x84, 0x4d, 0xce, 0xbc, 0x15, 0xdb, 0x04, 0x5e, 0xb4, 0x71, 0xd1, 0xb2, 0xf1, 0x03, 0xe8, 0xe1, 0xb3, 0x0f, 0xdf, 0xd8, 0x85, 0xe5, 0xc9, 0x09, 0x7a, 0xc4, 0xc4, 0xe0, 0xb7, 0x4f,
0x62, 0x04, 0x31, 0x88, 0x28, 0x93, 0x65, 0xa0, 0xab, 0x74, 0x5e, 0xdb, 0xe9, 0x5e, 0x22, 0x46, 0xf2, 0xa7, 0x22, 0xe2, 0xaa, 0x9b, 0x42, 0x0c, 0x4f, 0xfd, 0x94, 0xff, 0x4f, 0xf4, 0x4c, 0x88,
0x34, 0x19, 0x4c, 0xde, 0x95, 0x7c, 0x49, 0x22, 0xea, 0x08, 0x41, 0x03, 0x08, 0x29, 0x29, 0xe9, 0x16, 0x0c, 0xd6, 0x95, 0x1b, 0xdb, 0x22, 0x71, 0x7d, 0x73, 0xe9, 0x2e, 0x0b, 0xe0, 0x74, 0xbc,
0x50, 0x5f, 0xf3, 0x15, 0x78, 0xdc, 0x43, 0x50, 0x5c, 0x74, 0x18, 0xf4, 0x7a, 0x3d, 0x7d, 0xe1, 0xc2, 0x06, 0xea, 0x33, 0x25, 0xca, 0x3e, 0xfb, 0xd2, 0x04, 0xc8, 0x9b, 0x74, 0xcf, 0x4c, 0x88,
0x3e, 0xa2, 0x84, 0x65, 0xdd, 0x0a, 0xc9, 0xb0, 0x62, 0x2b, 0xc7, 0x2b, 0x05, 0x71, 0xdb, 0x6e, 0x66, 0x82, 0x7f, 0x00, 0xb0, 0x8e, 0x32, 0x7a, 0x11, 0x1e, 0x57, 0x91, 0x00, 0x00, 0x00, 0x00,
0xb7, 0x43, 0x4f, 0x4f, 0x1f, 0x74, 0x7c, 0x0a, 0x50, 0x5b, 0x75, 0x1b, 0x2a, 0x0e, 0x0f, 0x43, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0x7b, 0x2b, 0xc0, 0xad, 0xf1, 0xbf, 0x20, 0x37, 0x37, 0x97, 0xbe, 0x48, 0x71, 0x7c, 0x4d, 0x44,
0x78, 0xa5, 0x23, 0x66, 0x93, 0x92, 0x92, 0x60, 0x6a, 0x6a, 0x0a, 0xc6, 0x46, 0x00, 0x1a, 0x3f,
0xbc, 0x0b, 0x0a, 0x85, 0x9a, 0x39, 0x2e, 0xcc, 0xfb, 0x02, 0x06, 0xfa, 0x00, 0xe6, 0xe7, 0xe7,
0xa1, 0xa0, 0xa0, 0x80, 0xd9, 0x4c, 0xe9, 0x41, 0x57, 0xd6, 0x42, 0x94, 0x89, 0x98, 0x4b, 0x4d,
0x4d, 0x85, 0xc9, 0xc9, 0x49, 0xb8, 0xf9, 0x13, 0x40, 0x6b, 0xdd, 0x24, 0x18, 0xf4, 0x41, 0xe0,
0xe7, 0xa7, 0x04, 0x57, 0xc9, 0x45, 0xb8, 0x34, 0x00, 0xec, 0x2a, 0x2f, 0x2f, 0x67, 0x44, 0xba,
0x58, 0xee, 0x86, 0x73, 0x2c, 0x6d, 0x4d, 0xd2, 0xbd, 0x8c, 0x18, 0x17, 0x04, 0x01, 0x3a, 0x3a,
0x3a, 0xa1, 0xf7, 0x1c, 0x40, 0x9b, 0xfb, 0x5f, 0x68, 0xfc, 0xe8, 0x77, 0x26, 0xe3, 0x2f, 0xe3,
0x13, 0x90, 0x93, 0x93, 0x23, 0x4b, 0xd7, 0xe0, 0xe8, 0xda, 0x12, 0x2d, 0x1d, 0x08, 0x77, 0x89,
0x05, 0x61, 0x47, 0x64, 0x10, 0xa5, 0xef, 0x6b, 0xb4, 0xa0, 0x3e, 0xf3, 0x77, 0x8b, 0xd6, 0x30,
0xc4, 0x31, 0x2a, 0xa3, 0xc3, 0xe1, 0x80, 0xb2, 0x83, 0xb5, 0xf0, 0xfe, 0xd1, 0x76, 0xc8, 0xcc,
0xcc, 0x02, 0x95, 0x4a, 0x45, 0x5f, 0xc0, 0x26, 0x4b, 0xf6, 0x7b, 0xb5, 0x7d, 0xdd, 0x12, 0xf0,
0x59, 0xf6, 0x68, 0x2c, 0xa1, 0x25, 0x2d, 0x33, 0xb4, 0x46, 0x75, 0x21, 0xba, 0x11, 0xa7, 0x11,
0xb4, 0x1d, 0x2b, 0x57, 0xfb, 0xb3, 0xe9, 0x8d, 0xff, 0x00, 0xa8, 0x18, 0xc4, 0xe6, 0x5e, 0x14,
0x0e, 0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
}; };
const BITMAP_OPAQUE via_sketch_xpm[1] = {{ png, sizeof( png ), "via_sketch_xpm" }}; const BITMAP_OPAQUE via_sketch_xpm[1] = {{ png, sizeof( png ), "via_sketch_xpm" }};

View File

@ -7,11 +7,11 @@
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48" height="26"
width="48" width="26"
version="1.1" version="1.1"
id="svg2" id="svg2"
inkscape:version="0.47 r22583" inkscape:version="0.48.2 r9819"
sodipodi:docname="add_dimension.svg"> sodipodi:docname="add_dimension.svg">
<metadata <metadata
id="metadata58"> id="metadata58">
@ -35,16 +35,24 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1280" inkscape:window-width="1280"
inkscape:window-height="949" inkscape:window-height="969"
id="namedview56" id="namedview56"
showgrid="false" showgrid="true"
inkscape:zoom="4.9166667" inkscape:zoom="6.9532167"
inkscape:cx="-12.610169" inkscape:cx="25.661216"
inkscape:cy="23.59322" inkscape:cy="16.497638"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="25" inkscape:window-y="26"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg2" /> inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid3028"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<defs <defs
id="defs4"> id="defs4">
<marker <marker
@ -52,32 +60,33 @@
refY="0" refY="0"
refX="0" refX="0"
overflow="visible" overflow="visible"
orient="auto"> orient="auto"
style="overflow:visible">
<path <path
stroke-linejoin="round" d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
d="m8.7186 4.0337-10.926-4.0177 10.926-4.0177c-1.7455 2.3721-1.7354 5.6175-6e-7 8.0354z" transform="scale(0.6,0.6)"
fill-rule="evenodd" id="path10"
transform="scale(.6)" inkscape:connector-curvature="0"
stroke-width=".625" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
id="path10" />
</marker> </marker>
<marker <marker
id="g" id="g"
refY="0" refY="0"
refX="0" refX="0"
overflow="visible" overflow="visible"
orient="auto"> orient="auto"
style="overflow:visible">
<path <path
stroke-linejoin="round" d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
d="m8.7186 4.0337-10.926-4.0177 10.926-4.0177c-1.7455 2.3721-1.7354 5.6175-6e-7 8.0354z" transform="scale(-0.6,-0.6)"
fill-rule="evenodd" id="path13"
transform="scale(-.6)" inkscape:connector-curvature="0"
stroke-width=".625" style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
id="path13" />
</marker> </marker>
<filter <filter
inkscape:collect="always" inkscape:collect="always"
id="filter3750"> id="filter3750"
color-interpolation-filters="sRGB">
<feGaussianBlur <feGaussianBlur
inkscape:collect="always" inkscape:collect="always"
stdDeviation="0.48916009" stdDeviation="0.48916009"
@ -85,89 +94,98 @@
</filter> </filter>
<filter <filter
inkscape:collect="always" inkscape:collect="always"
id="filter3802"> id="filter3802"
color-interpolation-filters="sRGB">
<feGaussianBlur <feGaussianBlur
inkscape:collect="always" inkscape:collect="always"
stdDeviation="0.65221346" stdDeviation="0.65221346"
id="feGaussianBlur3804" /> id="feGaussianBlur3804" />
</filter> </filter>
<filter
inkscape:collect="always"
id="filter3879">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.24369333"
id="feGaussianBlur3881" />
</filter>
</defs> </defs>
<g <g
id="g3794" id="g3075"
style="opacity:0.3414634;filter:url(#filter3802)" style="opacity:0.48971193;fill:#000000;filter:url(#filter3879)"
transform="translate(60.20339,25.016949)"> transform="translate(-37.945844,16.034598)">
<path <path
d="m -53.113133,1.0458908 35.685051,-0.062189" d="m 42.945842,1.612044 18,-0.03577"
id="path44-7" id="path44-3"
style="fill:none;stroke:#000000;stroke-width:1.9916749px;marker-start:url(#h);marker-end:url(#g)" /> style="fill:#000000;stroke:#000000;stroke-width:1.07280254px;marker-start:url(#h);marker-end:url(#g)"
inkscape:connector-curvature="0" />
<rect <rect
height="21.044893" height="12.965411"
width="2.8273764" width="1.9970714"
y="-6.150856" y="-4.0000091"
x="-56.58511" x="39.948772"
id="rect46-0" id="rect46-1"
style="fill:#000000;fill-opacity:1" /> style="fill:#000000;fill-opacity:1" />
<rect
transform="matrix(-1,0,0,1,-58.240009,-22.851658)"
height="21.044893"
width="2.8273764"
y="16.700802"
x="-44.06535"
id="rect48-3"
style="fill:#000000;fill-opacity:1" />
<g
transform="matrix(2.8273762,0,0,2.1044893,-56.585111,-16.747836)"
id="g50-4"
style="opacity:0.18292685;filter:url(#filter3750)">
<rect
height="16"
width="16"
y="0"
x="0"
id="rect52-6"
style="fill-opacity:0" />
</g>
<path
d="m -40.920163,-8.7675962 2.9e-5,-10.5970738 2.827376,0 5.654752,5.335946 2.8e-5,-5.335946 2.827377,0 -2.9e-5,10.5970738 -2.827377,0 0,-2.1044888 -5.654752,-5.335947 -2.8e-5,7.4403398 -2.827472,0 z"
id="path54-3"
style="fill-rule:evenodd" />
</g>
<g
id="g3661"
transform="translate(0.61016949,0)">
<path
d="M 5.1268763,23.897549 40.811927,23.83536"
id="path44"
style="fill:none;stroke:#000000;stroke-width:1.9916749px;marker-start:url(#h);marker-end:url(#g)" />
<rect
height="21.044893"
width="2.8273764"
y="16.700802"
x="1.6548979"
id="rect46"
style="fill:#2c2cff;fill-opacity:1" />
<rect <rect
transform="scale(-1,1)" transform="scale(-1,1)"
height="21.044893" height="12.104957"
width="2.8273764" width="2"
y="16.700802" y="-4.0000091"
x="-44.06535" x="-63.945843"
id="rect48" id="rect48-7"
style="fill:#2c2cff;fill-opacity:1" /> style="fill:#000000;fill-opacity:1" />
<g <g
transform="matrix(2.8273762,0,0,2.1044893,1.6548979,6.1038224)" transform="matrix(1.6262979,0,0,1.2104957,39.948771,-9.234896)"
id="g50"> id="g50-5"
style="fill:#000000">
<rect <rect
height="16" height="16"
width="16" width="16"
y="0" y="0"
x="0" x="0"
id="rect52" id="rect52-9"
style="fill-opacity:0" /> style="fill:#000000;fill-opacity:0" />
</g> </g>
<path <path
d="m 17.319846,14.084062 2.9e-5,-10.5970739 2.827376,0 5.654752,5.3359462 2.8e-5,-5.3359462 2.827377,0 -2.9e-5,10.5970739 -2.827377,0 0,-2.104489 -5.654752,-5.3359466 -2.8e-5,7.4403396 -2.827472,0 z" d="M 48.027058,-2.995341 48.027078,-12 50,-12 l 3.945842,4.534122 2e-5,-4.534122 1.97292,0 -2e-5,9.004659 -1.972921,0 0,-1.788241 -3.945842,-4.534122 -1.9e-5,6.322281 -1.972989,0 z"
id="path54" id="path54-6"
style="fill-rule:evenodd" /> style="fill:#000000;fill-rule:evenodd"
inkscape:connector-curvature="0" />
</g> </g>
<path
inkscape:connector-curvature="0"
style="fill:none;stroke:#000000;stroke-width:1.07280254px;marker-start:url(#h);marker-end:url(#g)"
id="path44"
d="m 4,15.628994 18,-0.03577" />
<rect
style="fill:#2c2cff;fill-opacity:1"
id="rect46"
x="1.0029286"
y="10.016941"
width="1.9970714"
height="12.965411" />
<rect
style="fill:#2c2cff;fill-opacity:1"
id="rect48"
x="-25"
y="10.016941"
width="2"
height="12.104957"
transform="scale(-1,1)" />
<g
id="g50"
transform="matrix(1.6262979,0,0,1.2104957,1.0029289,4.782054)">
<rect
style="fill-opacity:0"
id="rect52"
x="0"
y="0"
width="16"
height="16" />
</g>
<path
inkscape:connector-curvature="0"
style="fill-rule:evenodd"
id="path54"
d="m 9.0812157,11.021609 2.02e-5,-9.004659 1.9729221,0 L 15,6.5510724 l 2e-5,-4.5341224 1.97292,0 -2e-5,9.004659 -1.972921,0 0,-1.7882411 -3.945842,-4.5341223 -1.9e-5,6.3222814 -1.9729891,0 z" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

@ -12,7 +12,7 @@
version="1.1" version="1.1"
id="svg2" id="svg2"
inkscape:version="0.48.2 r9819" inkscape:version="0.48.2 r9819"
sodipodi:docname="cursor_shape.svg"> sodipodi:docname="add_glabel.svg">
<metadata <metadata
id="metadata22"> id="metadata22">
<rdf:RDF> <rdf:RDF>
@ -69,9 +69,9 @@
inkscape:window-height="941" inkscape:window-height="941"
id="namedview18" id="namedview18"
showgrid="true" showgrid="true"
inkscape:zoom="19.666667" inkscape:zoom="13.906434"
inkscape:cx="10.431707" inkscape:cx="10.262268"
inkscape:cy="15.520137" inkscape:cy="9.3355265"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="30" inkscape:window-y="30"
inkscape:window-maximized="1" inkscape:window-maximized="1"
@ -88,9 +88,10 @@
</sodipodi:namedview> </sodipodi:namedview>
<path <path
id="path42-7" id="path42-7"
d="m 2.4818918,21.985094 14.6687772,0 6.286616,-8.524527 -6.286616,-8.524532 -14.6687772,0 0,17.049059 z" d="m 2.6852818,22.764766 14.6687752,0 6.286616,-8.524527 -6.286616,-8.524544 -14.6687752,0 0,17.049071 z"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="opacity:0.40740739;fill:none;stroke:#070022;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3896)" /> style="opacity:0.40740739;fill:none;stroke:#070022;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3896)"
transform="matrix(0.9773047,0,0,0.89946299,0.58637423,1.1799882)" />
<path <path
id="path40-6" id="path40-6"
d="m 9.4746744,16.0533 -0.704805,1.666551 H 5.9506184 L 10.17957,8.831271 h 2.819257 l 4.228953,8.88858 H 14.408529 L 13.703724,16.0533 m -0.704805,-1.666553 -1.28573,-3.2768 -1.533528,3.2768" d="m 9.4746744,16.0533 -0.704805,1.666551 H 5.9506184 L 10.17957,8.831271 h 2.819257 l 4.228953,8.88858 H 14.408529 L 13.703724,16.0533 m -0.704805,-1.666553 -1.28573,-3.2768 -1.533528,3.2768"
@ -105,15 +106,15 @@
y="12.850391" y="12.850391"
transform="matrix(0.58598448,0,0,1,9.6840692,0.10169491)" /> transform="matrix(0.58598448,0,0,1,9.6840692,0.10169491)" />
<path <path
d="m 26.03653,12.996433 -3.87531,0" d="m 26.03653,12.466897 -3.87531,0"
id="path14" id="path14"
style="opacity:1;fill:#55d400;stroke:#078c22;stroke-width:2.06497622000000014;stroke-opacity:1" style="fill:#55d400;stroke:#078c22;stroke-width:3.0773325;stroke-opacity:1"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
<path <path
id="path42" id="path42"
d="m 1.4914063,21.526703 14.6687767,0 6.286616,-8.524527 -6.286616,-8.5245292 -14.6687767,0 0,17.0490562 z" d="m 2.0092396,20.031927 14.7060114,0 6.302574,-7.472486 -6.302574,-7.472487 -14.7060114,0 0,14.944973 z"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:none;stroke:#d50000;stroke-width:1;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" /> style="fill:none;stroke:#d50000;stroke-width:1.87489915;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
@ -129,5 +130,5 @@
id="path40" id="path40"
d="M 8.3824939,15.289827 7.6776886,16.956378 H 4.8584381 L 9.0873905,8.0677978 H 11.906647 L 16.1356,16.956378 h -2.819251 l -0.704805,-1.666551 m -0.704805,-1.666553 -1.28573,-3.2768 -1.5335278,3.2768" d="M 8.3824939,15.289827 7.6776886,16.956378 H 4.8584381 L 9.0873905,8.0677978 H 11.906647 L 16.1356,16.956378 h -2.819251 l -0.704805,-1.666551 m -0.704805,-1.666553 -1.28573,-3.2768 -1.5335278,3.2768"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:#d50000;fill-opacity:1" /> style="fill:#000000;fill-opacity:1" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@ -28,14 +28,6 @@
</metadata> </metadata>
<defs <defs
id="defs20"> id="defs20">
<filter
inkscape:collect="always"
id="filter3872">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.18369603"
id="feGaussianBlur3874" />
</filter>
<filter <filter
inkscape:collect="always" inkscape:collect="always"
id="filter3896"> id="filter3896">
@ -56,52 +48,6 @@
stdDeviation="0.093050845" stdDeviation="0.093050845"
id="feGaussianBlur3916" /> id="feGaussianBlur3916" />
</filter> </filter>
<filter
id="r"
height="2.1508"
width="1.1114"
color-interpolation-filters="sRGB"
y="-0.57538003"
x="-0.055682">
<feGaussianBlur
stdDeviation="0.35961538"
id="feGaussianBlur13" />
</filter>
<filter
id="q"
height="1.2466"
width="1.1726"
color-interpolation-filters="sRGB"
y="-0.1233"
x="-0.086308002">
<feGaussianBlur
stdDeviation="0.35961538"
id="feGaussianBlur10" />
</filter>
<filter
id="p"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.27692308"
id="feGaussianBlur7" />
</filter>
<linearGradient
id="t"
y2="12.267"
gradientUnits="userSpaceOnUse"
x2="6.0408001"
gradientTransform="matrix(1.2247,0,0,0.8165,-61.732,9.7935)"
y1="17.051001"
x1="11.431">
<stop
stop-color="#8787ff"
offset="0"
id="stop75" />
<stop
stop-color="#fff"
offset="1"
id="stop77" />
</linearGradient>
<filter <filter
id="k" id="k"
color-interpolation-filters="sRGB"> color-interpolation-filters="sRGB">
@ -241,34 +187,6 @@
offset="1" offset="1"
id="stop72" /> id="stop72" />
</linearGradient> </linearGradient>
<radialGradient
r="139.56"
cy="112.3"
cx="102"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
gradientUnits="userSpaceOnUse"
id="radialGradient3486"
xlink:href="#n"
inkscape:collect="always" />
<radialGradient
r="139.56"
cy="109.33"
cx="99.081001"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
gradientUnits="userSpaceOnUse"
id="radialGradient3488"
xlink:href="#o"
inkscape:collect="always" />
<linearGradient
y2="94.103996"
x2="86.571999"
y1="104"
x1="96"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
gradientUnits="userSpaceOnUse"
id="linearGradient3490"
xlink:href="#m"
inkscape:collect="always" />
<radialGradient <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#n" xlink:href="#n"
@ -297,44 +215,6 @@
y1="104" y1="104"
x2="86.571999" x2="86.571999"
y2="94.103996" /> y2="94.103996" />
<radialGradient
inkscape:collect="always"
xlink:href="#n"
id="radialGradient4118"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#o"
id="radialGradient4120"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#m"
id="linearGradient4122"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
<linearGradient
inkscape:collect="always"
xlink:href="#m"
id="linearGradient4125"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.19357466,0,0,0.17069179,3.2473171,4.4700813)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
<radialGradient <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#o" xlink:href="#o"
@ -361,16 +241,7 @@
id="feGaussianBlur16-4" /> id="feGaussianBlur16-4" />
</filter> </filter>
<radialGradient <radialGradient
inkscape:collect="always" id="n-7"
xlink:href="#n-6"
id="radialGradient4099-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
id="n-6"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
cy="112.3" cy="112.3"
cx="102" cx="102"
@ -379,51 +250,42 @@
<stop <stop
stop-color="#00537d" stop-color="#00537d"
offset="0" offset="0"
id="stop22-3" /> id="stop22-6" />
<stop <stop
stop-color="#186389" stop-color="#186389"
offset=".0151" offset=".0151"
id="stop24-1" /> id="stop24-3" />
<stop <stop
stop-color="#558ca8" stop-color="#558ca8"
offset=".0558" offset=".0558"
id="stop26-7" /> id="stop26-1" />
<stop <stop
stop-color="#89afc3" stop-color="#89afc3"
offset=".0964" offset=".0964"
id="stop28-5" /> id="stop28-7" />
<stop <stop
stop-color="#b3ccd8" stop-color="#b3ccd8"
offset=".1357" offset=".1357"
id="stop30-9" /> id="stop30-5" />
<stop <stop
stop-color="#d4e2e9" stop-color="#d4e2e9"
offset=".1737" offset=".1737"
id="stop32-6" /> id="stop32-9" />
<stop <stop
stop-color="#ecf2f5" stop-color="#ecf2f5"
offset=".20990" offset=".20990"
id="stop34-2" /> id="stop34-6" />
<stop <stop
stop-color="#fafcfd" stop-color="#fafcfd"
offset=".24350" offset=".24350"
id="stop36-1" /> id="stop36-2" />
<stop <stop
stop-color="#fff" stop-color="#fff"
offset=".27220" offset=".27220"
id="stop38-7" /> id="stop38-1" />
</radialGradient> </radialGradient>
<radialGradient <radialGradient
inkscape:collect="always" id="o-7"
xlink:href="#o-5"
id="radialGradient4101-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<radialGradient
id="o-5"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
cy="109.33" cy="109.33"
cx="99.081001" cx="99.081001"
@ -432,41 +294,41 @@
<stop <stop
stop-color="#7a7d80" stop-color="#7a7d80"
offset="0" offset="0"
id="stop41-7" /> id="stop41-8" />
<stop <stop
stop-color="#c2c2c2" stop-color="#c2c2c2"
offset=".12618" offset=".12618"
id="stop43-4" /> id="stop43-5" />
<stop <stop
stop-color="#fafafa" stop-color="#fafafa"
offset=".23251" offset=".23251"
id="stop45-1" /> id="stop45-7" />
<stop <stop
stop-color="#fff" stop-color="#fff"
offset=".27220" offset=".27220"
id="stop47-8" /> id="stop47-4" />
<stop <stop
stop-color="#fafafa" stop-color="#fafafa"
offset=".53130" offset=".53130"
id="stop49-5" /> id="stop49-1" />
<stop <stop
stop-color="#ebecec" stop-color="#ebecec"
offset=".84490" offset=".84490"
id="stop51-9" /> id="stop51-8" />
<stop <stop
stop-color="#e1e2e3" stop-color="#e1e2e3"
offset="1" offset="1"
id="stop53-7" /> id="stop53-5" />
</radialGradient> </radialGradient>
<filter <filter
id="l-5" id="l-9"
color-interpolation-filters="sRGB"> color-interpolation-filters="sRGB">
<feGaussianBlur <feGaussianBlur
stdDeviation="1.2065414" stdDeviation="1.2065414"
id="feGaussianBlur19-3" /> id="feGaussianBlur19-7" />
</filter> </filter>
<linearGradient <linearGradient
id="m-8" id="m-5"
y2="94.103996" y2="94.103996"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
x2="86.571999" x2="86.571999"
@ -480,7 +342,7 @@
<stop <stop
stop-color="#8c8e89" stop-color="#8c8e89"
offset=".0072" offset=".0072"
id="stop58-1" /> id="stop58-8" />
<stop <stop
stop-color="#abaca9" stop-color="#abaca9"
offset=".0673" offset=".0673"
@ -488,28 +350,324 @@
<stop <stop
stop-color="#c5c6c4" stop-color="#c5c6c4"
offset=".1347" offset=".1347"
id="stop62-9" /> id="stop62-3" />
<stop <stop
stop-color="#dbdbda" stop-color="#dbdbda"
offset=".2115" offset=".2115"
id="stop64-6" /> id="stop64-1" />
<stop <stop
stop-color="#ebebeb" stop-color="#ebebeb"
offset=".3012" offset=".3012"
id="stop66-4" /> id="stop66-8" />
<stop <stop
stop-color="#f7f7f6" stop-color="#f7f7f6"
offset=".4122" offset=".4122"
id="stop68-3" /> id="stop68-9" />
<stop <stop
stop-color="#fdfdfd" stop-color="#fdfdfd"
offset=".5679" offset=".5679"
id="stop70-3" /> id="stop70-6" />
<stop <stop
stop-color="#fff" stop-color="#fff"
offset="1" offset="1"
id="stop72-3" /> id="stop72-4" />
</linearGradient> </linearGradient>
<filter
id="filter3091"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.89955545"
id="feGaussianBlur3093" />
</filter>
<radialGradient
id="radialGradient3095"
gradientUnits="userSpaceOnUse"
cy="112.3"
cx="102"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
r="139.56">
<stop
stop-color="#00537d"
offset="0"
id="stop3097" />
<stop
stop-color="#186389"
offset=".0151"
id="stop3099" />
<stop
stop-color="#558ca8"
offset=".0558"
id="stop3101" />
<stop
stop-color="#89afc3"
offset=".0964"
id="stop3103" />
<stop
stop-color="#b3ccd8"
offset=".1357"
id="stop3105" />
<stop
stop-color="#d4e2e9"
offset=".1737"
id="stop3107" />
<stop
stop-color="#ecf2f5"
offset=".20990"
id="stop3109" />
<stop
stop-color="#fafcfd"
offset=".24350"
id="stop3111" />
<stop
stop-color="#fff"
offset=".27220"
id="stop3113" />
</radialGradient>
<radialGradient
id="radialGradient3115"
gradientUnits="userSpaceOnUse"
cy="109.33"
cx="99.081001"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
r="139.56">
<stop
stop-color="#7a7d80"
offset="0"
id="stop3117" />
<stop
stop-color="#c2c2c2"
offset=".12618"
id="stop3119" />
<stop
stop-color="#fafafa"
offset=".23251"
id="stop3121" />
<stop
stop-color="#fff"
offset=".27220"
id="stop3123" />
<stop
stop-color="#fafafa"
offset=".53130"
id="stop3125" />
<stop
stop-color="#ebecec"
offset=".84490"
id="stop3127" />
<stop
stop-color="#e1e2e3"
offset="1"
id="stop3129" />
</radialGradient>
<filter
id="filter3131"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="1.2065414"
id="feGaussianBlur3133" />
</filter>
<linearGradient
id="linearGradient3135"
y2="94.103996"
gradientUnits="userSpaceOnUse"
x2="86.571999"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
y1="104"
x1="96">
<stop
stop-color="#888a85"
offset="0"
id="stop3137" />
<stop
stop-color="#8c8e89"
offset=".0072"
id="stop3139" />
<stop
stop-color="#abaca9"
offset=".0673"
id="stop3141" />
<stop
stop-color="#c5c6c4"
offset=".1347"
id="stop3143" />
<stop
stop-color="#dbdbda"
offset=".2115"
id="stop3145" />
<stop
stop-color="#ebebeb"
offset=".3012"
id="stop3147" />
<stop
stop-color="#f7f7f6"
offset=".4122"
id="stop3149" />
<stop
stop-color="#fdfdfd"
offset=".5679"
id="stop3151" />
<stop
stop-color="#fff"
offset="1"
id="stop3153" />
</linearGradient>
<filter
id="filter3155"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.89955545"
id="feGaussianBlur3157" />
</filter>
<radialGradient
id="radialGradient3159"
gradientUnits="userSpaceOnUse"
cy="112.3"
cx="102"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
r="139.56">
<stop
stop-color="#00537d"
offset="0"
id="stop3161" />
<stop
stop-color="#186389"
offset=".0151"
id="stop3163" />
<stop
stop-color="#558ca8"
offset=".0558"
id="stop3165" />
<stop
stop-color="#89afc3"
offset=".0964"
id="stop3167" />
<stop
stop-color="#b3ccd8"
offset=".1357"
id="stop3169" />
<stop
stop-color="#d4e2e9"
offset=".1737"
id="stop3171" />
<stop
stop-color="#ecf2f5"
offset=".20990"
id="stop3173" />
<stop
stop-color="#fafcfd"
offset=".24350"
id="stop3175" />
<stop
stop-color="#fff"
offset=".27220"
id="stop3177" />
</radialGradient>
<radialGradient
id="radialGradient3179"
gradientUnits="userSpaceOnUse"
cy="109.33"
cx="99.081001"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
r="139.56">
<stop
stop-color="#7a7d80"
offset="0"
id="stop3181" />
<stop
stop-color="#c2c2c2"
offset=".12618"
id="stop3183" />
<stop
stop-color="#fafafa"
offset=".23251"
id="stop3185" />
<stop
stop-color="#fff"
offset=".27220"
id="stop3187" />
<stop
stop-color="#fafafa"
offset=".53130"
id="stop3189" />
<stop
stop-color="#ebecec"
offset=".84490"
id="stop3191" />
<stop
stop-color="#e1e2e3"
offset="1"
id="stop3193" />
</radialGradient>
<filter
id="filter3195"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="1.2065414"
id="feGaussianBlur3197" />
</filter>
<linearGradient
id="linearGradient3199"
y2="94.103996"
gradientUnits="userSpaceOnUse"
x2="86.571999"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
y1="104"
x1="96">
<stop
stop-color="#888a85"
offset="0"
id="stop3201" />
<stop
stop-color="#8c8e89"
offset=".0072"
id="stop3203" />
<stop
stop-color="#abaca9"
offset=".0673"
id="stop3205" />
<stop
stop-color="#c5c6c4"
offset=".1347"
id="stop3207" />
<stop
stop-color="#dbdbda"
offset=".2115"
id="stop3209" />
<stop
stop-color="#ebebeb"
offset=".3012"
id="stop3211" />
<stop
stop-color="#f7f7f6"
offset=".4122"
id="stop3213" />
<stop
stop-color="#fdfdfd"
offset=".5679"
id="stop3215" />
<stop
stop-color="#fff"
offset="1"
id="stop3217" />
</linearGradient>
<radialGradient
r="139.56"
cy="112.3"
cx="102"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
gradientUnits="userSpaceOnUse"
id="radialGradient3239"
xlink:href="#n-7"
inkscape:collect="always" />
<radialGradient
r="139.56"
cy="109.33"
cx="99.081001"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
gradientUnits="userSpaceOnUse"
id="radialGradient3241"
xlink:href="#o-7"
inkscape:collect="always" />
<linearGradient <linearGradient
y2="94.103996" y2="94.103996"
x2="86.571999" x2="86.571999"
@ -517,9 +675,121 @@
x1="96" x1="96"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)" gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
id="linearGradient4188" id="linearGradient3243"
xlink:href="#m-8" xlink:href="#m-5"
inkscape:collect="always" /> inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#n"
id="radialGradient3347"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#o"
id="radialGradient3349"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#m"
id="linearGradient3351"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
<radialGradient
inkscape:collect="always"
xlink:href="#n-7"
id="radialGradient3365"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#o-7"
id="radialGradient3367"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#m-5"
id="linearGradient3369"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
<radialGradient
inkscape:collect="always"
xlink:href="#n-7"
id="radialGradient3392"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#o-7"
id="radialGradient3394"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#m-5"
id="linearGradient3396"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
<radialGradient
inkscape:collect="always"
xlink:href="#n-7"
id="radialGradient3404"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#o-7"
id="radialGradient3406"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081001"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#m-5"
id="linearGradient3408"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.571999"
y2="94.103996" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
@ -534,15 +804,17 @@
inkscape:window-height="941" inkscape:window-height="941"
id="namedview18" id="namedview18"
showgrid="true" showgrid="true"
inkscape:zoom="4.9166668" inkscape:zoom="27.812867"
inkscape:cx="13.191228" inkscape:cx="13.075538"
inkscape:cy="34.866481" inkscape:cy="10.42187"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="30" inkscape:window-y="30"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg2" inkscape:current-layer="svg2"
inkscape:snap-grids="false" inkscape:snap-grids="false"
inkscape:snap-to-guides="false"> inkscape:snap-to-guides="false"
showguides="true"
inkscape:guide-bbox="true">
<inkscape:grid <inkscape:grid
type="xygrid" type="xygrid"
id="grid2992" id="grid2992"
@ -551,6 +823,78 @@
enabled="true" enabled="true"
snapvisiblegridlinesonly="true" /> snapvisiblegridlinesonly="true" />
</sodipodi:namedview> </sodipodi:namedview>
<g
id="g85"
transform="matrix(0.22172869,0,0,0.1991505,-0.70077145,0.27545079)">
<use
id="use87-3"
x="0"
y="0"
width="128"
height="128"
transform="translate(-12,-12)"
xlink:href="#s-3" />
<g
transform="translate(-4,-8)"
id="s-3">
<path
id="path90-3"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z"
inkscape:connector-curvature="0"
style="opacity:0.6;filter:url(#k-4)" />
<path
id="path92-8"
d="m 24,24 v 96 H 77.525 C 77.989,120 108,90.602 108,90.147 V 24 H 24 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3404)" />
<path
id="path94-6"
d="m 26.606,25.714 c -0.47187,0 -0.85638,0.37786 -0.85638,0.84156 v 90.888 c 0,0.46455 0.38452,0.84157 0.85638,0.84157 H 77.28 c 0.22523,0 0.44618,-0.0892 0.60546,-0.24658 l 28.115,-27.618 c 0.16013,-0.15737 0.25092,-0.37365 0.25092,-0.59498 v -63.262 c 0,-0.4637 -0.38366,-0.84156 -0.85639,-0.84156 h -78.787 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3406)" />
<path
id="path96-0"
d="m 76.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
inkscape:connector-curvature="0"
style="opacity:0.5;filter:url(#l-9)" />
<path
id="path98-4"
d="m 77.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
inkscape:connector-curvature="0"
style="fill:url(#linearGradient3408)" />
</g>
<g
id="g100"
transform="translate(8,4)">
<path
id="path102-8"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z"
inkscape:connector-curvature="0"
style="opacity:0.6;filter:url(#k-4)" />
<path
id="path104-8"
d="m 24,24 v 96 H 77.525 C 77.989,120 108,90.602 108,90.147 V 24 H 24 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3392)" />
<path
id="path106-8"
d="m 26.606,25.714 c -0.47187,0 -0.85638,0.37786 -0.85638,0.84156 v 90.888 c 0,0.46455 0.38452,0.84157 0.85638,0.84157 H 77.28 c 0.22523,0 0.44618,-0.0892 0.60546,-0.24658 l 28.115,-27.618 c 0.16013,-0.15737 0.25092,-0.37365 0.25092,-0.59498 v -63.262 c 0,-0.4637 -0.38366,-0.84156 -0.85639,-0.84156 h -78.787 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3394)" />
<path
id="path108"
d="m 76.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
inkscape:connector-curvature="0"
style="opacity:0.5;filter:url(#l-9)" />
<path
id="path110"
d="m 77.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
inkscape:connector-curvature="0"
style="fill:url(#linearGradient3396)" />
</g>
</g>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
@ -562,100 +906,34 @@
id="tspan3842" id="tspan3842"
x="-5.4915252" x="-5.4915252"
y="28.288136" /></text> y="28.288136" /></text>
<g
id="g4281"
style="opacity:0.45679012">
<use
xlink:href="#s"
transform="translate(-2.6547382,-2.3896931)"
height="128"
width="128"
y="0"
x="0"
id="use87" />
<g
id="s"
transform="matrix(0.22122818,0,0,0.19914109,-1.6197029,-1.3334875)">
<path <path
style="opacity:0.59999999999999998;filter:url(#k)" id="path42-7"
inkscape:connector-curvature="0"
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
id="path90" />
<path
style="fill:url(#radialGradient4099)"
inkscape:connector-curvature="0"
d="m 24,24 v 96 H 77.525 C 77.989,120 108,90.602 108,90.147 V 24 H 24 z"
id="path92" />
<path
style="fill:url(#radialGradient4101)"
inkscape:connector-curvature="0"
d="m 26.606,25.714 c -0.47187,0 -0.85638,0.37786 -0.85638,0.84156 v 90.888 c 0,0.46455 0.38452,0.84157 0.85638,0.84157 H 77.28 c 0.22523,0 0.44618,-0.0892 0.60546,-0.24658 l 28.115,-27.618 c 0.16013,-0.15737 0.25092,-0.37365 0.25092,-0.59498 v -63.262 c 0,-0.4637 -0.38366,-0.84156 -0.85639,-0.84156 h -78.787 z"
id="path94" />
<path
style="opacity:0.50000000000000000;filter:url(#l)"
inkscape:connector-curvature="0"
d="m 76.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
id="path96" />
<path
style="fill:url(#linearGradient4103)"
inkscape:connector-curvature="0"
d="m 77.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z"
id="path98" />
</g>
<path
id="path102"
transform="matrix(0.23175864,0,0,0.20744527,0.57151802,0.25133706)"
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z"
inkscape:connector-curvature="0"
style="opacity:0.59999999999999998;filter:url(#k)" />
<path
id="path104"
d="M 6.3445116,5.8355918 V 24.953136 H 18.18575 c 0.10265,0 6.741929,-5.854349 6.741929,-5.944959 V 5.8355918 H 6.3445116 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient4132)" />
<path
id="path106"
d="m 6.9210323,6.1769196 c -0.104391,0 -0.1894554,0.075247 -0.1894554,0.1675892 V 24.444044 c 0,0.09251 0.085067,0.167591 0.1894554,0.167591 H 18.131549 c 0.04983,0 0.09871,-0.01776 0.133945,-0.0491 l 6.21983,-5.499879 c 0.03543,-0.03134 0.05551,-0.07441 0.05551,-0.118484 V 6.3461039 c 0,-0.092342 -0.08488,-0.1675892 -0.189458,-0.1675892 H 6.9214725 z"
inkscape:connector-curvature="0"
style="fill:url(#radialGradient4129)" />
</g>
<g
id="g4307"
transform="translate(31.568123,-1.2224558)">
<path
transform="matrix(0.51530325,0,0,0.99345808,-3.8763504,0.92423676)"
style="opacity:0.40740739;fill:none;stroke:#070022;stroke-width:1.3976351;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3896)"
inkscape:connector-curvature="0"
d="m -28.738447,25.442721 14.668778,0 6.2866156,-8.524527 -6.2866156,-8.5245319 -14.668778,0 0,17.0490589 z" d="m -28.738447,25.442721 14.668778,0 6.2866156,-8.524527 -6.2866156,-8.5245319 -14.668778,0 0,17.0490589 z"
id="path42-7" />
<path
style="opacity:0.39917698;filter:url(#filter3872)"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="m -27.526811,20.034606 -0.704805,1.666551 h -2.819251 l 4.228952,-8.88858 h 2.819257 l 4.228953,8.88858 h -2.819251 l -0.704805,-1.666551 m -0.704805,-1.666553 -1.28573,-3.2768 -1.533528,3.2768" style="opacity:0.40740739;fill:none;stroke:#070022;stroke-width:1.3976351;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3896)"
id="path40-6" /> transform="matrix(0.52216887,0,0,0.69978906,28.35902,4.6447059)" />
<rect <rect
transform="matrix(0.58598448,0,0,1,-21.620517,4.067797)" style="opacity:0.2057613;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3914)"
y="12.850391"
x="23.613916"
height="1.9830508"
width="4.2203388"
id="rect3900" id="rect3900"
style="opacity:0.2057613;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3914)" /> width="4.2203388"
height="1.9830508"
x="23.613916"
y="12.850391"
transform="matrix(0.54785147,0,0,1,10.83956,2.8453412)" />
<path <path
inkscape:connector-curvature="0" d="m 26.031377,15.007738 -3.47452,0"
style="fill:#55d400;stroke:#078c22;stroke-width:2.06497622;stroke-opacity:1"
id="path14" id="path14"
d="m -4.9804184,16.96253 -3.87531,0" /> style="fill:#55d400;stroke:#078c22;stroke-width:3.94319606;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path <path
style="fill:none;stroke:#d50000;stroke-width:1.00112653;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path42"
d="m 12.030832,21.080758 7.978779,0 3.419474,-6.034091 -3.419474,-6.0340911 -7.978779,0 0,12.0681821 z"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="m -19.526566,25.510768 7.771055,0 3.3304502,-8.50436 -3.3304502,-8.5043578 -7.771055,0 0,17.0087178 z" style="fill:none;stroke:#d50000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
id="path42" />
<path <path
style="fill:#d50000;fill-opacity:1" sodipodi:nodetypes="ccccccccccc"
id="path40"
d="m 3.2966173,19.435437 -0.6642189,2.64263 -2.63204911709,0 L 4.1349204,7.9835521 l 2.7563373,0 4.1345703,14.0945149 -2.5574793,0 -0.7636442,-2.64263 M 7.0653419,16.818555 5.5845997,11.004522 3.9610151,16.818555"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
d="m -28.618992,19.328337 -0.704805,1.685618 h -2.81925 l 4.228952,-8.990275 h 2.819257 l 4.228953,8.990275 h -2.819251 l -0.704805,-1.685618 m -0.704805,-1.685621 -1.28573,-3.314289 -1.533528,3.314289" style="fill:#000000;fill-opacity:1" />
id="path40" />
</g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -11,7 +11,7 @@
width="26" width="26"
version="1.1" version="1.1"
id="svg2" id="svg2"
inkscape:version="0.47 r22583" inkscape:version="0.48.2 r9819"
sodipodi:docname="add_junction.svg"> sodipodi:docname="add_junction.svg">
<metadata <metadata
id="metadata54"> id="metadata54">
@ -34,16 +34,18 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1280" inkscape:window-width="1280"
inkscape:window-height="949" inkscape:window-height="941"
id="namedview52" id="namedview52"
showgrid="true" showgrid="true"
inkscape:zoom="1.2291667" inkscape:zoom="19.666667"
inkscape:cx="-242.32399" inkscape:cx="-2.1923002"
inkscape:cy="-0.69109567" inkscape:cy="10.361289"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="25" inkscape:window-y="30"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg2"> inkscape:current-layer="svg2"
inkscape:snap-grids="false"
inkscape:snap-to-guides="false">
<inkscape:grid <inkscape:grid
type="xygrid" type="xygrid"
id="grid2837" id="grid2837"
@ -79,13 +81,14 @@
</defs> </defs>
<g <g
id="g3654" id="g3654"
transform="translate(-18.178314,-29.012604)" transform="matrix(0.98929803,0,0,0.9588585,-18.379466,-27.788064)"
style="opacity:0.48373984;filter:url(#filter3660)"> style="opacity:0.48373988;filter:url(#filter3660)">
<path <path
transform="matrix(0.58304281,0,0,0.55020984,88.293773,44.817991)" transform="matrix(0.58304281,0,0,0.55020984,88.293773,44.817991)"
id="path32-7" id="path32-7"
d="m -88.8,-6.6671 c -2.3569,0 -4.2698,1.7466 -4.2698,3.8987 0,2.1521 1.9129,3.8987 4.2698,3.8987 2.3569,0 4.2698,-1.7466 4.2698,-3.8987 0,-2.1521 -1.9129,-3.8987 -4.2698,-3.8987 z" d="m -88.8,-6.6671 c -2.3569,0 -4.2698,1.7466 -4.2698,3.8987 0,2.1521 1.9129,3.8987 4.2698,3.8987 2.3569,0 4.2698,-1.7466 4.2698,-3.8987 0,-2.1521 -1.9129,-3.8987 -4.2698,-3.8987 z"
style="opacity:0.71094000999999996;fill:#000000;fill-opacity:1;filter:url(#c-1)" /> style="opacity:0.71094001;fill:#000000;fill-opacity:1;filter:url(#c-1)"
inkscape:connector-curvature="0" />
<rect <rect
transform="scale(1,-1)" transform="scale(1,-1)"
height="24" height="24"
@ -105,7 +108,8 @@
<path <path
d="m 36.359553,36.784272 c 3.165126,0 5.733998,2.566301 5.733998,5.728333 0,3.162033 -2.568804,5.728332 -5.733998,5.728332 -3.165128,0 -5.733999,-2.566299 -5.733999,-5.728332 0,-3.162032 2.568804,-5.728333 5.733999,-5.728333 z" d="m 36.359553,36.784272 c 3.165126,0 5.733998,2.566301 5.733998,5.728333 0,3.162033 -2.568804,5.728332 -5.733998,5.728332 -3.165128,0 -5.733999,-2.566299 -5.733999,-5.728332 0,-3.162032 2.568804,-5.728333 5.733999,-5.728333 z"
id="path38-0" id="path38-0"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
</g> </g>
<g <g
transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)" transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)"
@ -138,9 +142,9 @@
style="fill:#007d00;fill-opacity:1" style="fill:#007d00;fill-opacity:1"
id="rect34" id="rect34"
x="15.00337" x="15.00337"
y="-25" y="-24"
width="3" width="3"
height="24" height="23"
transform="scale(1,-1)" /> transform="scale(1,-1)" />
<rect <rect
style="fill:#007d00;fill-opacity:1" style="fill:#007d00;fill-opacity:1"

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@ -12,7 +12,7 @@
width="48" width="48"
version="1.1" version="1.1"
id="svg2" id="svg2"
inkscape:version="0.48.1 r9760" inkscape:version="0.48.2 r9819"
sodipodi:docname="config.svg"> sodipodi:docname="config.svg">
<metadata <metadata
id="metadata223"> id="metadata223">
@ -22,6 +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>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -34,15 +35,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="876" inkscape:window-height="969"
id="namedview221" id="namedview221"
showgrid="false" showgrid="false"
inkscape:zoom="6.6666667" inkscape:zoom="6.6666667"
inkscape:cx="20.268593" inkscape:cx="-4.3362124"
inkscape:cy="24" inkscape:cy="40.604773"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="24" inkscape:window-y="26"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg2" /> inkscape:current-layer="svg2" />
<defs <defs
@ -69,50 +70,6 @@
offset="1" offset="1"
id="stop14" /> id="stop14" />
</linearGradient> </linearGradient>
<clipPath
id="an">
<path
display="block"
fill="url(#linearGradient3774)"
d="m30.916 135.97c-0.93726 0.54113-1.2283 1.7475-0.67792 2.7008l1.9375 3.3558c-1.4181 1.4141-2.6223 3.012-3.5955 4.71l-3.7836-0.99094c-0.53163-0.14245-1.0379-0.11751-1.4762 0.13061-0.43816 0.24835-0.79654 0.66758-0.9366 1.1903l-1.9788 7.3851c-0.2801 1.0454 0.36595 2.0654 1.4291 2.3503l3.7722 1.0336c-0.0062 1.9571 0.23771 3.943 0.75875 5.8767l-3.3558 1.9375c-0.95328 0.55038-1.3044 1.7407-0.7633 2.6779l3.8125 6.6034c0.54113 0.93726 1.7475 1.2283 2.7008 0.67792l3.3558-1.9375c1.4141 1.4181 3.012 2.6223 4.71 3.5954l-0.99094 3.7836c-0.2849 1.0632 0.27544 2.1327 1.3209 2.4128l7.3851 1.9788c1.0454 0.28012 2.0654-0.36588 2.3503-1.4291l1.0336-3.7722c1.9571 0.006 3.943-0.2377 5.8767-0.75875l1.9375 3.3558c0.55038 0.95327 1.7407 1.3044 2.6779 0.7633l6.6034-3.8125c0.93726-0.54113 1.2283-1.7475 0.67792-2.7008l-1.9375-3.3558c1.4181-1.4141 2.6223-3.012 3.5955-4.71l3.7836 0.99095c1.0632 0.28489 2.1327-0.2755 2.4128-1.3209l1.9788-7.3851c0.2801-1.0454-0.36595-2.0654-1.4291-2.3503l-3.7722-1.0336c0.0062-1.9571-0.2377-3.943-0.75876-5.8767l3.3558-1.9375c0.95327-0.55037 1.3044-1.7407 0.7633-2.6779l-3.8125-6.6034c-0.54113-0.93727-1.7475-1.2283-2.7008-0.67793l-3.3558 1.9375c-1.4141-1.4181-3.012-2.6223-4.71-3.5954l0.99094-3.7836c0.2849-1.0632-0.27542-2.1328-1.3209-2.4128l-7.3851-1.9788c-1.0454-0.28011-2.0654 0.36588-2.3503 1.4291l-1.0336 3.7722c-1.9571-0.006-3.943 0.23771-5.8767 0.75876l-1.9375-3.3558c-0.55038-0.95329-1.7407-1.3044-2.6779-0.7633l-6.6034 3.8125zm13.052 14.981c3.8263-2.2091 8.7191-0.89814 10.928 2.9282 2.2091 3.8263 0.89814 8.7191-2.9282 10.928-3.8263 2.2091-8.7191 0.89814-10.928-2.9282-2.2091-3.8264-0.89814-8.7191 2.9282-10.928z"
id="path17" />
</clipPath>
<radialGradient
id="al"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="41.5"
cx="5"
gradientTransform="matrix(.99002 0 0 1.1 32.115 -5.15)"
r="5" />
<radialGradient
id="am"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="41.5"
cx="5"
gradientTransform="matrix(.99001 0 0 1.1 -14.885 -86.15)"
r="5" />
<linearGradient
id="aj"
y2="35"
gradientUnits="userSpaceOnUse"
x2="17.554"
gradientTransform="matrix(1.1795,0,0,1,-4.2194,0)"
y1="46"
x1="17.554">
<stop
stop-opacity="0"
offset="0"
id="stop22" />
<stop
offset=".5"
id="stop24" />
<stop
stop-opacity="0"
offset="1"
id="stop26" />
</linearGradient>
<radialGradient <radialGradient
id="ak" id="ak"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
@ -157,135 +114,6 @@
offset="1" offset="1"
id="stop42" /> id="stop42" />
</linearGradient> </linearGradient>
<linearGradient
id="ao"
y2="36.049"
gradientUnits="userSpaceOnUse"
x2="18.938"
gradientTransform="matrix(1.2963 0 0 1.1069 67.324 .35705)"
y1="33.95"
x1="18.938">
<stop
offset="0"
id="stop45" />
<stop
stop-opacity="0"
offset="1"
id="stop47" />
</linearGradient>
<linearGradient
id="ae"
y2="48.125"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="50.5"
gradientTransform="matrix(1.2963 0 0 1.1069 15.473 .35705)"
y1="33.75"
x1="48.25" />
<linearGradient
id="ap"
y2="40.006"
gradientUnits="userSpaceOnUse"
x2="71.562"
gradientTransform="matrix(1.2963 0 0 1.1069 15.473 .35705)"
y1="18.675"
x1="66.84">
<stop
stop-color="#eeeeec"
offset="0"
id="stop51" />
<stop
stop-color="#e9b96e"
offset="1"
id="stop53" />
</linearGradient>
<linearGradient
id="aq"
y2="21.5"
gradientUnits="userSpaceOnUse"
x2="12.11"
gradientTransform="matrix(1.2963,0,0,-1.1069,67.324,53.489)"
y1="21.5"
x1="10.749">
<stop
stop-color="#8f5902"
offset="0"
id="stop56" />
<stop
stop-color="#8f5902"
stop-opacity="0"
offset="1"
id="stop58" />
</linearGradient>
<linearGradient
id="ar"
y2="21.562"
gradientUnits="userSpaceOnUse"
x2="13.168"
gradientTransform="matrix(-1.2963,0,0,-1.1069,128.15,53.489)"
y1="21.562"
x1="11.124">
<stop
stop-color="#e9b96e"
offset="0"
id="stop61" />
<stop
stop-color="#e9b96e"
stop-opacity="0"
offset="1"
id="stop63" />
</linearGradient>
<linearGradient
id="as"
y2="37.447"
gradientUnits="userSpaceOnUse"
x2="17.38"
gradientTransform="matrix(1.2987,0,0,-1.4846,67.306,63.438)"
y1="20.096"
x1="17.38">
<stop
stop-color="#eaba6f"
offset="0"
id="stop66" />
<stop
stop-color="#b97a1b"
offset="1"
id="stop68" />
</linearGradient>
<linearGradient
id="at"
y2="23.531"
gradientUnits="userSpaceOnUse"
x2="20.812"
gradientTransform="matrix(1.2929 0 0 1.087 67.324 .34217)"
y1="24.594"
x1="20.781">
<stop
offset="0"
id="stop71" />
<stop
stop-opacity="0"
offset="1"
id="stop73" />
</linearGradient>
<linearGradient
id="au"
y2="24.08"
gradientUnits="userSpaceOnUse"
x2="22.188"
gradientTransform="matrix(1.2963 0 0 1.1069 67.324 .35705)"
y1="20"
x1="22.188">
<stop
stop-color="#e9b96e"
offset="0"
id="stop76" />
<stop
stop-color="#e9b96e"
stop-opacity="0"
offset="1"
id="stop78" />
</linearGradient>
<linearGradient <linearGradient
id="av" id="av"
y2="45.017" y2="45.017"
@ -372,7 +200,7 @@
xlink:href="#ad" xlink:href="#ad"
id="linearGradient3207" id="linearGradient3207"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.0770005,0,0,1.0219719,-1.2120675,-1.5986851)" gradientTransform="matrix(1.1425865,0,0,1.0842068,-2.8415057,-4.2295659)"
x1="14.463" x1="14.463"
y1="12.285" y1="12.285"
x2="34.534" x2="34.534"
@ -382,235 +210,29 @@
xlink:href="#ak" xlink:href="#ak"
id="radialGradient3210" id="radialGradient3210"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.86722,0,0,0.25947998,2.3816922,28.434979)" gradientTransform="matrix(1.1061101,0,0,0.25947998,-3.8119922,33.384979)"
cx="25.456" cx="25.456"
cy="39.161" cy="39.161"
r="19.622" /> r="19.622" />
</defs> </defs>
<g
transform="matrix(.90016 0 0 .87207 -91.511 -47.243)"
id="g121">
<g
transform="translate(-60,16)"
id="g123">
<path
opacity=".05"
d="m126 38.469c-1.8584 0-3.2812 1.5681-3.2812 3.3438v1.1875c-0.36268 0.13513-0.71008 0.30878-1.0625 0.46875l-0.875-0.875c-0.5657-0.56571-1.3669-0.99198-2.3125-1-0.82395-0.007-1.699 0.29275-2.375 0.96875l-3.5312 3.5312c-1.3106 1.3106-1.2411 3.415 0.0313 4.6875l0.875 0.875c-0.15997 0.35242-0.33362 0.69982-0.46875 1.0625h-1.1875c-1.7756 0-3.3438 1.4228-3.3438 3.2812v5c0 1.8584 1.5681 3.2812 3.3438 3.2812h1.1875c0.13513 0.36268 0.30878 0.71008 0.46875 1.0625l-0.875 0.875c-1.2725 1.2725-1.3419 3.377-0.0313 4.6875l3.5312 3.5312c1.3105 1.3105 3.415 1.2413 4.6875-0.03125l0.875-0.875c0.35242 0.15997 0.69982 0.33362 1.0625 0.46875v1.1875c0 1.7756 1.4228 3.3438 3.2812 3.3438h5c1.8584 0 3.2812-1.5681 3.2812-3.3438v-1.1875c0.36268-0.13513 0.71008-0.30878 1.0625-0.46875l0.875 0.875c1.2726 1.2725 3.377 1.3418 4.6875 0.03125l3.5312-3.5312c1.3106-1.3106 1.2411-3.415-0.0313-4.6875l-0.875-0.875c0.15997-0.35242 0.33362-0.69982 0.46875-1.0625h1.1875c1.7756 0 3.3438-1.4228 3.3438-3.2812v-5c0-1.8584-1.5681-3.2812-3.3438-3.2812h-1.1875c-0.13513-0.36268-0.30878-0.71008-0.46875-1.0625l0.875-0.875c1.2725-1.2725 1.342-3.3769 0.0313-4.6875l-3.5312-3.5312c-1.3105-1.3105-3.415-1.2413-4.6875 0.03125l-0.875 0.875c-0.35-0.16-0.7-0.334-1.06-0.469v-1.1875c0-1.7756-1.4228-3.3438-3.2812-3.3438h-5zm2.5 16.812c1.7874 0 3.2188 1.4313 3.2188 3.2188 0 1.7874-1.4313 3.2188-3.2188 3.2188-1.7874 0-3.2188-1.4313-3.2188-3.2188 0-1.7874 1.4313-3.2188 3.2188-3.2188z"
transform="translate(-.5 .5)"
display="block"
id="path125" />
<path
opacity=".15"
d="m126 39.5c-1.2683 0-2.25 1.0884-2.25 2.3125v1.875c-0.81272 0.26478-1.5968 0.58312-2.3438 0.96875l-1.35-1.344c-0.38667-0.38668-0.96689-0.68219-1.5938-0.6875-0.5946-0.005-1.1882 0.18823-1.6562 0.65625l-3.5312 3.5312c-0.89095 0.89096-0.84049 2.3782 0.0313 3.25l1.3438 1.3438c-0.38563 0.74697-0.70397 1.531-0.96875 2.3438h-1.875c-1.2241 0-2.3125 0.98174-2.3125 2.25v5c0 1.2683 1.0884 2.25 2.3125 2.25h1.875c0.26478 0.81272 0.58312 1.5968 0.96875 2.3438l-1.3438 1.3438c-0.87182 0.87182-0.92228 2.3591-0.0313 3.25l3.5312 3.5312c0.89093 0.89094 2.3782 0.8406 3.25-0.03125l1.3438-1.3438c0.74697 0.38563 1.531 0.70397 2.3438 0.96875v1.875c0 1.2241 0.98174 2.3125 2.25 2.3125h5c1.2683 0 2.25-1.0884 2.25-2.3125v-1.875c0.81272-0.26478 1.5968-0.58312 2.3438-0.96875l1.3438 1.3438c0.87184 0.87184 2.3591 0.92218 3.25 0.03125l3.5312-3.5312c0.89095-0.89096 0.84047-2.3782-0.0313-3.25l-1.3438-1.3438c0.38563-0.74696 0.70397-1.531 0.96875-2.3438h1.875c1.2241 0 2.3125-0.98172 2.3125-2.25v-5c0-1.2683-1.0884-2.25-2.3125-2.25h-1.875c-0.26478-0.81272-0.58312-1.5968-0.96875-2.3438l1.3438-1.3438c0.87182-0.87181 0.9223-2.3591 0.0313-3.25l-3.5312-3.5312c-0.89093-0.89094-2.3782-0.84059-3.25 0.03125l-1.3438 1.3438c-0.73-0.385-1.52-0.704-2.33-0.968v-1.875c0-1.225-0.98-2.313-2.25-2.313h-5zm2.5 14.75c2.3457 0 4.25 1.9043 4.25 4.25s-1.9043 4.25-4.25 4.25-4.25-1.9043-4.25-4.25 1.9043-4.25 4.25-4.25z"
transform="translate(-.5 .5)"
display="block"
id="path127" />
<path
opacity=".3"
display="block"
d="m125.5 41c-0.70838 0-1.2682 0.5886-1.2682 1.3091v2.5364c-1.2666 0.33748-2.4722 0.84915-3.5795 1.4932l-1.8205-1.8c-0.25473-0.25473-0.54989-0.4063-0.87954-0.40909-0.32965-0.0028-0.67001 0.11773-0.92046 0.36818l-3.5386 3.5386c-0.5009 0.5009-0.46851 1.2905 0.0409 1.8l1.8 1.8205c-0.64403 1.1074-1.1557 2.3129-1.4932 3.5795h-2.5364c-0.72049 0-1.3091 0.5598-1.3091 1.2682v4.9909c0 0.70838 0.5886 1.2682 1.3091 1.2682h2.5364c0.33749 1.2666 0.84916 2.4722 1.4932 3.5795l-1.8 1.8205c-0.50947 0.50946-0.54186 1.2991-0.0409 1.8l3.5386 3.5386c0.5009 0.5009 1.2905 0.46856 1.8-0.04091l1.8205-1.8c1.1074 0.64403 2.3129 1.1557 3.5795 1.4932v2.5364c0 0.72049 0.5598 1.3091 1.2682 1.3091h4.9909c0.70838 0 1.2682-0.5886 1.2682-1.3091v-2.5364c1.2666-0.33748 2.4722-0.84915 3.5796-1.4932l1.8204 1.8c0.50947 0.50947 1.2991 0.54181 1.8 0.04091l3.5386-3.5386c0.5009-0.5009 0.4685-1.2905-0.0409-1.8l-1.8-1.8205c0.64403-1.1074 1.1557-2.3129 1.4932-3.5795h2.5364c0.72048 0 1.3091-0.5598 1.3091-1.2682v-4.9909c0-0.70838-0.58861-1.2682-1.3091-1.2682h-2.54c-0.33748-1.2666-0.84915-2.4722-1.4932-3.5795l1.8-1.8205c0.50947-0.50947 0.54187-1.2991 0.0409-1.8l-3.5386-3.5386c-0.5009-0.5009-1.2905-0.46856-1.8 0.04091l-1.8204 1.8c-1.1074-0.64403-2.3129-1.1557-3.5796-1.4932v-2.536c0-0.72-0.56-1.309-1.27-1.309h-4.99zm2.5 12.764c2.892 0 5.2364 2.3444 5.2364 5.2364s-2.3444 5.2364-5.2364 5.2364-5.2364-2.3444-5.2364-5.2364 2.3444-5.2364 5.2364-5.2364z"
id="path129" />
<path
display="block"
fill="url(#av)"
d="m125.5 40c-0.70838 0-1.2682 0.5886-1.2682 1.3091v2.5364c-1.2666 0.33748-2.4722 0.84915-3.5795 1.4932l-1.8205-1.8c-0.25473-0.25473-0.54989-0.4063-0.87954-0.40909-0.32965-0.0028-0.67001 0.11773-0.92046 0.36818l-3.5386 3.5386c-0.5009 0.5009-0.46851 1.2905 0.0409 1.8l1.8 1.8205c-0.64403 1.1074-1.1557 2.3129-1.4932 3.5795h-2.5364c-0.72049 0-1.3091 0.5598-1.3091 1.2682v4.9909c0 0.70838 0.5886 1.2682 1.3091 1.2682h2.5364c0.33749 1.2666 0.84916 2.4722 1.4932 3.5795l-1.8 1.8205c-0.50947 0.50946-0.54186 1.2991-0.0409 1.8l3.5386 3.5386c0.5009 0.5009 1.2905 0.46856 1.8-0.04091l1.8205-1.8c1.1074 0.64403 2.3129 1.1557 3.5795 1.4932v2.5364c0 0.72049 0.5598 1.3091 1.2682 1.3091h4.9909c0.70838 0 1.2682-0.5886 1.2682-1.3091v-2.5364c1.2666-0.33748 2.4722-0.84915 3.5796-1.4932l1.8204 1.8c0.50947 0.50947 1.2991 0.54181 1.8 0.04091l3.5386-3.5386c0.5009-0.5009 0.4685-1.2905-0.0409-1.8l-1.8-1.8205c0.64403-1.1074 1.1557-2.3129 1.4932-3.5795h2.5364c0.72048 0 1.3091-0.5598 1.3091-1.2682v-4.9909c0-0.70838-0.58861-1.2682-1.3091-1.2682h-2.54c-0.33748-1.2666-0.84915-2.4722-1.4932-3.5795l1.8-1.8205c0.50947-0.50947 0.54187-1.2991 0.0409-1.8l-3.5386-3.5386c-0.5009-0.5009-1.2905-0.46856-1.8 0.04091l-1.8204 1.8c-1.1074-0.64403-2.3129-1.1557-3.5796-1.4932v-2.536c0-0.72-0.56-1.309-1.27-1.309h-4.99zm2.5 12.764c2.892 0 5.2364 2.3444 5.2364 5.2364s-2.3444 5.2364-5.2364 5.2364-5.2364-2.3444-5.2364-5.2364 2.3444-5.2364 5.2364-5.2364z"
id="path131" />
<g
transform="matrix(.56685 .32727 -.32727 .56685 152.48 -47.194)"
clip-path="url(#an)"
id="g133">
<g
opacity=".9"
transform="matrix(.14137 .99272 -1.1652 .12045 96.937 104.81)"
id="g135">
<path
opacity=".05"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -6.5462 27.467l-54.338-27.467z"
transform="matrix(.99411 -.10837 .10837 .99411 -5.1582 5.4919)"
fill="url(#ac)"
id="path137" />
<path
opacity="0.07"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -4.4572 22.869l-56.431-22.869z"
transform="matrix(.99786 -.065374 .065374 .99786 -3.094 3.2416)"
fill="url(#z)"
id="path139" />
<path
opacity=".1"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -3.1299 19.272l-57.77-19.272z"
transform="matrix(.99945 -.033121 .033121 .99945 -1.5635 1.6161)"
fill="url(#aa)"
id="path141" />
<path
opacity=".05"
style="color:#000000"
fill="url(#ab)"
d="m108.9 48a60.896 60.896 0 0 1 -2.075 15.761l-58.805-15.761z"
id="path143" />
</g>
<g
opacity=".9"
transform="matrix(1.0628 -.13088 -.7401 3.2275 32.525 9.3323)"
id="g145">
<path
opacity=".2"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -6.5462 27.467l-54.338-27.467z"
transform="matrix(.99411 -.10837 .10837 .99411 -5.1582 5.4919)"
fill="url(#af)"
id="path147" />
<path
opacity=".4"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -4.4572 22.869l-56.431-22.869z"
transform="matrix(.99786 -.065374 .065374 .99786 -3.094 3.2416)"
fill="url(#ag)"
id="path149" />
<path
opacity=".6"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -3.1299 19.272l-57.77-19.272z"
transform="matrix(.99945 -.033121 .033121 .99945 -1.5635 1.6161)"
fill="url(#ah)"
id="path151" />
<path
opacity=".8"
style="color:#000000"
fill="url(#ai)"
d="m108.9 48a60.896 60.896 0 0 1 -2.075 15.761l-58.805-15.761z"
id="path153" />
</g>
<g
opacity=".5"
transform="matrix(-.61679 .78713 -.78713 -.61679 115 150.01)"
id="g155">
<path
opacity=".05"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -6.5462 27.467l-54.338-27.467z"
transform="matrix(.99411 -.10837 .10837 .99411 -5.1582 5.4919)"
fill="url(#ac)"
id="path157" />
<path
opacity="0.07"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -4.4572 22.869l-56.431-22.869z"
transform="matrix(.99786 -.065374 .065374 .99786 -3.094 3.2416)"
fill="url(#z)"
id="path159" />
<path
opacity=".1"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -3.1299 19.272l-57.77-19.272z"
transform="matrix(.99945 -.033121 .033121 .99945 -1.5635 1.6161)"
fill="url(#aa)"
id="path161" />
<path
opacity=".1"
style="color:#000000"
fill="url(#ab)"
d="m108.9 48a60.896 60.896 0 0 1 -2.075 15.761l-58.805-15.761z"
id="path163" />
</g>
<g
opacity=".8"
transform="matrix(-.068172 -1.046 2.7107 .60163 -79.095 179.08)"
id="g165">
<path
opacity=".05"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -6.5462 27.467l-54.338-27.467z"
transform="matrix(.99411 -.10837 .10837 .99411 -5.1582 5.4919)"
fill="url(#ac)"
id="path167" />
<path
opacity="0.07"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -4.4572 22.869l-56.431-22.869z"
transform="matrix(.99786 -.065374 .065374 .99786 -3.094 3.2416)"
fill="url(#z)"
id="path169" />
<path
opacity=".1"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -3.1299 19.272l-57.77-19.272z"
transform="matrix(.99945 -.033121 .033121 .99945 -1.5635 1.6161)"
fill="url(#aa)"
id="path171" />
<path
opacity=".1"
style="color:#000000"
fill="url(#ab)"
d="m108.9 48a60.896 60.896 0 0 1 -2.075 15.761l-58.805-15.761z"
id="path173" />
</g>
<g
opacity=".9"
transform="matrix(-1.0628 .13088 .7401 -3.2275 62.997 306.67)"
id="g175">
<path
opacity=".2"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -6.5462 27.467l-54.338-27.467z"
transform="matrix(.99411 -.10837 .10837 .99411 -5.1582 5.4919)"
fill="url(#af)"
id="path177" />
<path
opacity=".4"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -4.4572 22.869l-56.431-22.869z"
transform="matrix(.99786 -.065374 .065374 .99786 -3.094 3.2416)"
fill="url(#ag)"
id="path179" />
<path
opacity=".6"
style="color:#000000"
d="m108.9 48a60.896 60.896 0 0 1 -3.1299 19.272l-57.77-19.272z"
transform="matrix(.99945 -.033121 .033121 .99945 -1.5635 1.6161)"
fill="url(#ah)"
id="path181" />
<path
opacity=".8"
style="color:#000000"
fill="url(#ai)"
d="m108.9 48a60.896 60.896 0 0 1 -2.075 15.761l-58.805-15.761z"
id="path183" />
</g>
</g>
<path
display="block"
fill="url(#linearGradient4407)"
d="m125.5 40c-0.70838-0.000001-1.2682 0.5886-1.2682 1.3091v2.5364c-1.2666 0.33748-2.4722 0.84915-3.5795 1.4932l-1.8205-1.8c-0.25473-0.25474-0.54989-0.4063-0.87954-0.40909-0.32965-0.0026-0.67 0.11773-0.92046 0.36818l-3.5386 3.5386c-0.5009 0.50091-0.4685 1.2905 0.0409 1.8l1.8 1.8205c-0.64403 1.1074-1.1557 2.3129-1.4932 3.5796h-2.5364c-0.72049-0.000004-1.3091 0.55979-1.3091 1.2682v4.9909c0 0.70839 0.5886 1.2682 1.3091 1.2682h2.5364c0.33749 1.2666 0.84916 2.4722 1.4932 3.5795l-1.8 1.8205c-0.50947 0.50947-0.54186 1.2991-0.0409 1.8l3.5386 3.5386c0.5009 0.5009 1.2905 0.46856 1.8-0.04091l1.8205-1.8c1.1074 0.64391 2.3129 1.1557 3.5795 1.4932v2.5364c0 0.72049 0.5598 1.3091 1.2682 1.3091l4.9909 0.000001c0.70839-0.000003 1.2682-0.5886 1.2682-1.3091v-2.5364c1.2666-0.33749 2.4722-0.84915 3.5796-1.4932l1.8204 1.8c0.50947 0.50947 1.2991 0.54182 1.8 0.04091l3.5386-3.5386c0.5009-0.5009 0.4685-1.2905-0.0409-1.8l-1.8-1.8205c0.64403-1.1074 1.1557-2.3129 1.4932-3.5795h2.5364c0.72048 0.000001 1.3091-0.55979 1.3091-1.2682v-4.9909c0-0.70838-0.5886-1.2682-1.3091-1.2682h-2.54c-0.33747-1.2666-0.84915-2.4722-1.4932-3.5796l1.8-1.8205c0.50947-0.50946 0.54187-1.2991 0.0409-1.8l-3.5386-3.5386c-0.5009-0.50091-1.2905-0.46856-1.8 0.0409l-1.8204 1.8c-1.1074-0.64391-2.3129-1.1557-3.5796-1.4932v-2.5364c0-0.72049-0.5598-1.3091-1.2682-1.3091h-4.99zm2.5 8.836c5.0609-0.000004 9.1636 4.1027 9.1636 9.1636s-4.1027 9.1636-9.1636 9.1636c-5.0609-0.000001-9.1636-4.1027-9.1636-9.1636s4.1027-9.1636 9.1636-9.1636z"
id="path185" />
<path
opacity=".7"
d="m125.5 40c-0.70838 0-1.25 0.59201-1.25 1.3125v0.71875c0.12-0.595 0.63-1.031 1.25-1.031h5c0.61983 0 1.1332 0.43591 1.25 1.0312v-0.718c0-0.72-0.54-1.312-1.25-1.312h-5zm-7.5312 3.125c-0.32965-0.0028-0.68705 0.12455-0.9375 0.375l-3.53 3.531c-0.37568 0.37568-0.45054 0.91451-0.25 1.375 0.059-0.12899 0.14211-0.26711 0.25-0.375l3.53-3.531c0.25045-0.25045 0.60785-0.3778 0.9375-0.375s0.62027 0.15152 0.875 0.40625l1.8125 1.8125c1.1074-0.64403 2.3271-1.1625 3.5938-1.5v-1c-1.2666 0.33748-2.4864 0.85597-3.5938 1.5l-1.8125-1.8125c-0.25473-0.25473-0.54535-0.40346-0.875-0.40625zm20.094 0c-0.3237 0.0092-0.65151 0.15152-0.90625 0.40625l-1.8125 1.8125c-1.1074-0.64403-2.3271-1.1625-3.5938-1.5v1c1.2666 0.33748 2.4864 0.85597 3.5938 1.5l1.8125-1.8125c0.50947-0.50947 1.3116-0.53215 1.8125-0.03125l3.54 3.53c0.1079 0.10789 0.19102 0.24601 0.25 0.375 0.20056-0.46049 0.12573-0.99932-0.25-1.375l-3.53-3.531c-0.25-0.25-0.58-0.384-0.91-0.375zm-23.06 8.187c-0.47821 0.92428-0.8835 1.9138-1.1562 2.9375h-2.5312c-0.72 0-1.31 0.542-1.31 1.25v1c0-0.70839 0.59201-1.25 1.3125-1.25h2.5312c0.33749-1.2666 0.85597-2.4864 1.5-3.5938l-0.34-0.344zm26 0-0.34375 0.34375c0.64403 1.1074 1.1625 2.3271 1.5 3.5938h2.5312c0.72048 0 1.3125 0.54162 1.3125 1.25v-1c0-0.70838-0.59202-1.25-1.3125-1.25h-2.5312c-0.28-1.024-0.68-2.013-1.16-2.938zm-18.219 7.2188c-0.014 0.15592-0.0313 0.30919-0.0313 0.46875 0 2.892 2.358 5.25 5.25 5.25s5.25-2.358 5.25-5.25c0-0.15956-0.0173-0.31283-0.0313-0.46875-0.27 2.641-2.51 4.719-5.22 4.719-2.7112 0-4.9506-2.0783-5.2188-4.7188zm-7.78 7.157-1.4688 1.4688c-0.39974 0.39973-0.49609 0.9676-0.28125 1.4375 0.0669-0.1535 0.15388-0.31013 0.28125-0.4375l1.8125-1.8125c-0.12-0.213-0.23-0.437-0.34-0.656zm26 0c-0.1135 0.21938-0.22021 0.44383-0.34375 0.65625l1.8125 1.8125c0.12735 0.12737 0.2144 0.284 0.28125 0.4375 0.21481-0.4699 0.11843-1.0378-0.28125-1.4375l-1.47-1.468z"
display="block"
fill="#fff"
id="path187" />
</g>
</g>
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path213" id="path213"
d="m 41.474235,38.596272 a 17.016591,5.0915088 0 0 1 -34.0331813,0 17.016591,5.0915088 0 1 1 34.0331813,0 z" d="m 46.049235,43.546272 a 21.704091,5.0915088 0 0 1 -43.4081813,0 21.704091,5.0915088 0 1 1 43.4081813,0 z"
style="opacity:0.40909005;color:#000000;fill:url(#radialGradient3210)" /> style="opacity:0.40909005;color:#000000;fill:url(#radialGradient3210)" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path215" id="path215"
d="m 23.31118,4.719371 c -0.403639,0.026206 -0.795961,0.085525 -1.192428,0.1285797 h -0.0271 L 21.143086,9.7597359 C 19.597093,10.093829 18.142592,10.660822 16.834044,11.431231 L 12.579462,8.5258646 C 11.428661,9.3731328 10.382794,10.361448 9.4626736,11.432054 l 2.9539244,4.088793 c -0.896879,1.300609 -1.571402,2.785714 -1.951245,4.345952 -6.5e-5,0.0074 -5.3e-5,0.02443 0,0.02572 l -5.1491184,0.771478 c -0.094137,0.729617 -0.1355031,1.483624 -0.1355031,2.237328 0,0.616606 0.017943,1.224983 0.081302,1.825872 l 5.1491185,0.874342 c 0.36621,1.696758 1.061911,3.281354 2.03259,4.680301 l -3.0623267,3.986011 c 0.8770197,1.033164 1.8895857,1.973832 2.9810687,2.802996 l 4.3361,-2.828753 c 1.51538,0.917298 3.207066,1.560567 5.040716,1.877222 l 0.813019,4.860271 c 0.577724,0.0499 1.17014,0.05143 1.761497,0.05143 0.834855,0 1.632282,-0.03002 2.439056,-0.128579 l 0.975623,-4.963135 c 1.741031,-0.411126 3.376521,-1.124342 4.796767,-2.08295 l 4.173496,2.880185 c 1.082291,-0.873766 2.072049,-1.878127 2.926868,-2.957374 l -3.03527,-4.165982 c 0.821994,-1.347103 1.391541,-2.833361 1.680239,-4.423141 l 5.121801,-0.771067 c 0.04491,-0.5072 0.0542,-0.999095 0.0542,-1.517281 0,-0.900428 -0.110293,-1.783328 -0.243905,-2.648783 l -5.20332,-0.900099 C 37.591612,17.924075 36.922543,16.591043 36.075183,15.392557 L 39.13751,11.406628 C 38.188772,10.306395 37.106482,9.2884553 35.913187,8.424729 l -4.417445,2.880185 C 30.226132,10.592406 28.859827,10.045697 27.376447,9.736283 L 26.563862,4.8504194 c -0.740606,-0.08262 -1.486415,-0.1286208 -2.249569,-0.1286208 -0.206286,0 -0.41859,-0.00616 -0.623314,0 -0.0998,0.003 -0.198568,-0.00551 -0.298107,0 -0.02696,0.00149 -0.05439,-0.00174 -0.0813,0 z m 0.704616,12.497534 c 0.09901,-0.0048 0.197856,0 0.298107,0 3.207933,0 5.826678,2.484859 5.826678,5.528968 0,3.044026 -2.618658,5.503211 -5.826678,5.503211 -3.207934,0 -5.799534,-2.459185 -5.799534,-5.503211 1e-6,-2.948898 2.432205,-5.381173 5.50147,-5.528968 z" d="m 23.175132,2.4732404 c -0.42822,0.027802 -0.844433,0.090733 -1.265043,0.1364098 h -0.02875 l -1.00633,5.2108977 c -1.64014,0.3544384 -3.183215,0.9559595 -4.57145,1.773284 L 11.789885,6.5115377 C 10.569004,7.4104019 9.459447,8.4589024 8.4832941,9.594705 l 3.1338089,4.337788 c -0.951496,1.379812 -1.667095,2.955355 -2.070069,4.610607 -6.9e-5,0.0079 -5.7e-5,0.02592 0,0.02729 l -5.4626842,0.818459 c -0.09987,0.774048 -0.1437548,1.573972 -0.1437548,2.373574 0,0.654156 0.019036,1.299581 0.086253,1.937062 l 5.462684,0.927587 c 0.388511,1.800085 1.126578,3.481178 2.156368,4.965317 l -3.2488125,4.228747 c 0.9304275,1.09608 2.0046555,2.094032 3.1626065,2.973689 l 4.600155,-3.001015 c 1.607662,0.973159 3.402367,1.655601 5.34768,1.991539 l 0.86253,5.156247 c 0.612905,0.05294 1.241397,0.05456 1.868766,0.05456 0.885695,0 1.731683,-0.03185 2.587587,-0.13641 l 1.035036,-5.265374 c 1.847054,-0.436162 3.58214,-1.192811 5.088875,-2.209795 l 4.427649,3.055579 c 1.148199,-0.926976 2.19823,-1.992499 3.105105,-3.137469 L 37.262969,28.88301 c 0.872051,-1.429138 1.476281,-3.005904 1.78256,-4.692497 l 5.433703,-0.818023 c 0.04764,-0.538087 0.0575,-1.059936 0.0575,-1.609678 0,-0.955262 -0.11701,-1.891928 -0.258759,-2.810086 L 38.757788,17.997812 C 38.325198,16.48207 37.615385,15.067861 36.716423,13.79639 L 39.965236,9.5677307 C 38.958723,8.4004969 37.810525,7.3205678 36.544562,6.4042432 L 31.858108,9.4598226 C 30.511183,8.7039251 29.061674,8.1239232 27.487961,7.7956668 L 26.625892,2.6122692 c -0.785706,-0.087651 -1.576933,-0.1364534 -2.386561,-0.1364534 -0.218848,0 -0.444081,-0.00654 -0.661272,0 -0.105877,0.00318 -0.21066,-0.00585 -0.31626,0 -0.0286,0.00158 -0.0577,-0.00185 -0.08625,0 z m 0.747525,13.2585956 c 0.105039,-0.0051 0.209905,0 0.316261,0 3.403286,0 6.181504,2.636179 6.181504,5.865665 0,3.229397 -2.778126,5.838339 -6.181504,5.838339 -3.403288,0 -6.152708,-2.608942 -6.152708,-5.838339 10e-7,-3.128477 2.580319,-5.70887 5.836492,-5.865665 z"
style="color:#000000;fill:url(#linearGradient3207);stroke:#766a6a;stroke-width:1.14500000000000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> style="color:#000000;fill:url(#linearGradient3207);stroke:#766a6a;stroke-width:1.21472692;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path217" id="path217"
d="m 31.011814,22.735224 a 6.6947532,6.3526895 0 0 1 -13.389506,0 6.6947532,6.3526895 0 1 1 13.389506,0 z" d="m 31.344711,21.586203 a 7.102443,6.7395487 0 0 1 -14.204886,0 7.102443,6.7395487 0 1 1 14.204886,0 z"
style="opacity:0.64772997;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.84480006" /> style="opacity:0.64772997;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.89624578" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path219" id="path219"
d="M 22.711063,5.6915569 21.94948,10.447154 c -1.449125,0.31315 -4.114699,1.270902 -5.341208,1.993088 L 12.55662,9.57059 c -1.078128,0.79424 -1.152015,0.848091 -2.014119,1.851383 l 2.929556,4.122779 c -0.8407,1.219141 -1.850474,3.391624 -2.213059,4.944126 0,0 -5.1334217,0.821132 -5.1334217,0.821132 -0.08824,0.683896 -0.045832,2.147631 0.013555,2.71083 l 4.9034347,0.838216 c 0.343255,1.590439 1.627772,4.150429 2.537659,5.461654 l -3.100831,3.887427 c 0.822072,0.9684 0.986636,1.057028 2.009695,1.834266 l 4.146353,-2.882489 c 1.420419,0.859859 4.239838,1.905777 5.958581,2.202601 l 0.680499,4.695771 c 0.541518,0.04677 2.037534,0.177979 2.793663,0.0856 l 0.763153,-4.888908 c 1.631848,-0.38536 4.451614,-1.483707 5.782884,-2.382242 l 4.141929,2.839698 c 1.014474,-0.819001 1.02358,-0.942397 1.824804,-1.954 L 35.51169,29.61862 c 0.770482,-1.262673 1.766701,-3.732062 2.037273,-5.222187 l 5.025194,-0.791195 c 0.04423,-0.476465 0.04596,-1.802173 -0.07892,-2.613562 L 37.375346,20.15346 c -0.38221,-1.339204 -1.693854,-3.75247 -2.488054,-4.875825 l 3.254156,-3.887426 C 37.25168,10.357703 36.920923,10.215998 35.802729,9.4062549 l -4.286061,2.9124431 c -1.188959,-0.668203 -3.56254,-1.686143 -4.952694,-1.97663 L 25.806891,5.6891704 c -0.693619,-0.077423 -2.694799,-0.043043 -3.091205,0 z" d="m 22.53847,3.5046294 -0.807961,5.0451983 c -1.537373,0.3322198 -4.365272,1.348296 -5.666472,2.1144613 L 11.765652,7.6198836 C 10.62187,8.4624904 10.543483,8.5196208 9.62888,9.5840101 l 3.107957,4.3738439 c -0.891896,1.293383 -1.963163,3.598163 -2.347828,5.245208 0,0 -5.4460311,0.871136 -5.4460311,0.871136 -0.093614,0.725543 -0.048623,2.278415 0.01438,2.875911 l 5.2020391,0.889261 c 0.364158,1.687292 1.726898,4.403177 2.692195,5.794252 L 9.56193,33.757781 c 0.872133,1.027373 1.046719,1.121398 2.132079,1.945967 l 4.398852,-3.058023 c 1.506918,0.912221 4.498031,2.021833 6.32144,2.336732 l 0.721939,4.981729 c 0.574495,0.04962 2.161614,0.188818 2.963789,0.09081 l 0.809627,-5.186627 c 1.731222,-0.408828 4.722703,-1.574061 6.135043,-2.527314 l 4.39416,3.012627 c 1.076252,-0.868875 1.085913,-0.999786 1.935929,-2.072992 l -3.256174,-4.391916 c 0.817402,-1.339566 1.874288,-3.959333 2.161338,-5.540202 l 5.331212,-0.839377 c 0.04692,-0.50548 0.04876,-1.911919 -0.08373,-2.772719 L 38.095762,18.847218 C 37.690277,17.42646 36.298758,14.866234 35.456193,13.67447 L 38.908517,9.5503118 C 37.964565,8.4549294 37.613666,8.304595 36.427378,7.445541 l -4.547069,3.089802 C 30.618946,9.8264484 28.100821,8.746519 26.626011,8.4383423 L 25.822824,3.5020976 c -0.735858,-0.082138 -2.858904,-0.045664 -3.27945,0 z"
style="opacity:0.34659005;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.84477454" /> style="opacity:0.34659005;color:#000000;fill:none;stroke:#ffffff;stroke-width:0.89621872" />
</svg> </svg>

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

View File

@ -14,7 +14,7 @@
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"
inkscape:version="0.47 r22583" inkscape:version="0.48.2 r9819"
sodipodi:version="0.32" sodipodi:version="0.32"
id="svg249" id="svg249"
height="26" height="26"
@ -59,18 +59,6 @@
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
@ -97,66 +85,6 @@
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"
@ -371,19 +299,565 @@
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="25" inkscape:window-y="26"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-height="949" inkscape:window-height="969"
inkscape:window-width="1280" inkscape:window-width="1280"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
showgrid="true" showgrid="true"
inkscape:current-layer="layer5" inkscape:current-layer="layer5"
inkscape:cy="13.694933" inkscape:cy="0.68895602"
inkscape:cx="19.492108" inkscape:cx="57.513012"
inkscape:zoom="22.627416" inkscape:zoom="5.656854"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
borderopacity="0.25490196" borderopacity="0.25490196"
@ -410,7 +884,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>
<dc:subject> <dc:subject>
<rdf:Bag> <rdf:Bag>
<rdf:li>edit</rdf:li> <rdf:li>edit</rdf:li>
@ -644,66 +1118,81 @@
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
id="g1772" style="display:inline"
transform="matrix(0.39105747,0,0,0.37162201,7.9100602,31.393184)"> id="g2711"
<path transform="matrix(-0.70929483,0,0,0.70095374,27.327841,24.978833)"
sodipodi:type="arc" inkscape:r_cx="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" inkscape:r_cy="true">
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" id="path2844-9"
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(#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" /> 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"
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" /> id="path4430-3"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
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" inkscape:connector-curvature="0"
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" id="path4438-0"
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(#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" 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"
id="path4450" id="path4450-2"
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(1.245743,0,0,1.245743,-3.425346,-6.177033)" /> transform="matrix(-0.801358,0,0,0.801358,33.70147,0.855159)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<rect <rect
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" 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"
id="rect4495" id="rect4495-7"
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.2112026" rx="3.3215265"
ry="2.837393" ry="2.9348745"
transform="matrix(0.752986,0.658037,-0.648902,0.760872,0,0)" /> transform="matrix(-0.484379,0.4233,0.417423,0.489452,31.49802,4.828704)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
sodipodi:type="arc" sodipodi:type="arc"
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" 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"
id="path4452" id="path4452-9"
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(1.398614,0,0,1.398614,-6.224338,-8.298958)" /> transform="matrix(-0.899697,0,0,0.899697,35.502,-0.509826)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
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" inkscape:connector-curvature="0"
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" /> id="path4462-9"
inkscape:r_cx="true"
inkscape:r_cy="true" />
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -13,8 +13,8 @@
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-replace.svg" sodipodi:docname="find_replace.svg"
inkscape:version="0.47 r22583" inkscape:version="0.48.2 r9819"
sodipodi:version="0.32" sodipodi:version="0.32"
id="svg249" id="svg249"
height="26" height="26"
@ -293,121 +293,6 @@
offset="1" offset="1"
style="stop-color:#c9c9c9;stop-opacity:1;" /> style="stop-color:#c9c9c9;stop-opacity:1;" />
</linearGradient> </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 <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#linearGradient4477-0" xlink:href="#linearGradient4477-0"
@ -431,19 +316,134 @@
offset="1" offset="1"
style="stop-color:#000000;stop-opacity:0;" /> style="stop-color:#000000;stop-opacity:0;" />
</linearGradient> </linearGradient>
<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
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" />
<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>
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
inkscape:window-y="25" inkscape:window-y="26"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-height="949" inkscape:window-height="969"
inkscape:window-width="1280" inkscape:window-width="1280"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
showgrid="true" showgrid="true"
inkscape:current-layer="layer1" inkscape:current-layer="layer5"
inkscape:cy="20.160592" inkscape:cy="13.454817"
inkscape:cx="40.343721" inkscape:cx="70.249125"
inkscape:zoom="5.6568542" inkscape:zoom="4"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
borderopacity="0.25490196" borderopacity="0.25490196"
@ -470,7 +470,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>
<dc:subject> <dc:subject>
<rdf:Bag> <rdf:Bag>
<rdf:li>edit</rdf:li> <rdf:li>edit</rdf:li>
@ -620,6 +620,83 @@
d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z" d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
id="path15577" /> id="path15577" />
</g> </g>
<g
style="display:inline"
id="g2711-8"
transform="matrix(0.70929483,0,0,0.70095374,-1.4054413,20.905114)"
inkscape:r_cx="true"
inkscape:r_cy="true">
<path
inkscape:connector-curvature="0"
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)"
sodipodi:nodetypes="csscccscccscczzzz"
id="path2844-9-9"
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-7);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"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<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"
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-6"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
inkscape:connector-curvature="0"
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)"
style="color:#000000;fill:url(#linearGradient2732-2);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"
id="path4438-0-4"
sodipodi:nodetypes="ccccc"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:url(#linearGradient2734-7);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"
id="path4450-2-3"
sodipodi:cx="17.500893"
sodipodi:cy="18.920233"
sodipodi:rx="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"
transform="matrix(-0.801358,0,0,0.801358,33.70147,0.855159)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<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"
id="rect4495-7-3"
width="19.048439"
height="4.4404783"
x="40.373337"
y="0.14086054"
rx="3.3215265"
ry="2.9348745"
transform="matrix(-0.484379,0.4233,0.417423,0.489452,31.49802,4.828704)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
sodipodi:type="arc"
style="color:#000000;fill:url(#radialGradient2736-9);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"
id="path4452-9-3"
sodipodi:cx="17.589281"
sodipodi:cy="18.478292"
sodipodi:rx="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"
transform="matrix(-0.899697,0,0,0.899697,35.502,-0.509826)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
inkscape:connector-curvature="0"
transform="matrix(0.643277,0,0,0.643277,7.855933,4.828704)"
style="opacity:0.83422457;color:#000000;fill:url(#radialGradient3411);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"
id="path4462-9-8"
inkscape:r_cx="true"
inkscape:r_cy="true" />
</g>
</g> </g>
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
@ -627,26 +704,9 @@
inkscape:label="Magnifying Glass" inkscape:label="Magnifying Glass"
style="display:inline" style="display:inline"
transform="translate(0,-22)"> transform="translate(0,-22)">
<path
style="fill:none;stroke:#000000;stroke-width:0.5538497;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.01754384;display:inline"
d="m 6.2485326,26.884809 0,20.221684"
id="path15672"
sodipodi:nodetypes="cc" />
<path
inkscape:r_cy="true"
inkscape:r_cx="true"
transform="matrix(0.5663003,0,0,0.53952421,-4.7173942,19.737774)"
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"
sodipodi:ry="3.9332814"
sodipodi:rx="16.528622"
sodipodi:cy="37.967922"
sodipodi:cx="24.130018"
id="path4475-9"
style="opacity:0.17112301;color:#000000;fill:url(#radialGradient2504);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
sodipodi:type="arc" />
<g <g
id="g3895" id="g3895"
transform="translate(-25.024563,0)"> transform="translate(-3.5870629,-0.56250016)">
<rect <rect
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"
id="rect15686" id="rect15686"
@ -720,83 +780,27 @@
rx="0.082502544" rx="0.082502544"
ry="0.065390877" /> ry="0.065390877" />
</g> </g>
<g
style="display:inline"
id="g2711"
transform="matrix(0.57099031,0,0,0.56427564,-0.89771882,22.127929)"
inkscape:r_cx="true"
inkscape:r_cy="true">
<path <path
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)" style="fill:none;stroke:#000000;stroke-width:0.5538497;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.01754384;display:inline"
sodipodi:nodetypes="csscccscccscczzzz" d="m 6.2485326,26.884809 0,20.221684"
id="path2844-9" id="path15672"
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" sodipodi:nodetypes="cc" />
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"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path <path
transform="matrix(-0.643277,0,0,0.643277,31.49802,4.828704)" inkscape:r_cy="true"
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"
id="path4430-3"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> transform="matrix(0.5663003,0,0,0.53952421,-4.7173942,19.737774)"
<path 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(-0.643277,0,0,0.643277,31.49802,4.828704)" sodipodi:ry="3.9332814"
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" sodipodi:rx="16.528622"
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" sodipodi:cy="37.967922"
id="path4438-0" sodipodi:cx="24.130018"
sodipodi:nodetypes="ccccc" id="path4475-9"
inkscape:r_cx="true" style="opacity:0.17112301;color:#000000;fill:url(#radialGradient2504);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cy="true" /> sodipodi:type="arc" />
<path
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"
id="path4450-2"
sodipodi:cx="17.500893"
sodipodi:cy="18.920233"
sodipodi:rx="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"
transform="matrix(-0.801358,0,0,0.801358,33.70147,0.855159)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<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"
id="rect4495-7"
width="19.048439"
height="4.4404783"
x="40.373337"
y="0.14086054"
rx="3.3215265"
ry="2.9348745"
transform="matrix(-0.484379,0.4233,0.417423,0.489452,31.49802,4.828704)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
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"
id="path4452-9"
sodipodi:cx="17.589281"
sodipodi:cy="18.478292"
sodipodi:rx="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"
transform="matrix(-0.899697,0,0,0.899697,35.502,-0.509826)"
inkscape:r_cx="true"
inkscape:r_cy="true" />
<path
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"
id="path4462-9"
inkscape:r_cx="true"
inkscape:r_cy="true" />
</g>
<g <g
style="display:inline" style="display:inline"
id="g1574" id="g1574"
transform="matrix(0.60824051,-0.14775747,0.16297766,0.55143799,8.9331942,16.192915)" transform="matrix(0.60824051,-0.14775747,0.16297766,0.55143799,9.0581942,17.192915)"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true"> inkscape:r_cy="true">
<path <path
@ -806,7 +810,8 @@
d="m 17.34116,32.5 5.625,-5.625 20.093749,-9.75 c 3.25,-1.25 5.1875,3.375 2.3125,5 L 25.34116,31.5 l -8,1 z" d="m 17.34116,32.5 5.625,-5.625 20.093749,-9.75 c 3.25,-1.25 5.1875,3.375 2.3125,5 L 25.34116,31.5 l -8,1 z"
style="color:#000000;fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:0.93443578;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:#cb9022;fill-opacity:1;fill-rule:evenodd;stroke:#5c410c;stroke-width:0.93443578;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
style="color:#000000;fill:url(#linearGradient2554);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:url(#linearGradient2554);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
@ -814,7 +819,8 @@
id="path2964" id="path2964"
sodipodi:nodetypes="czcczcc" sodipodi:nodetypes="czcczcc"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
sodipodi:nodetypes="czcczcc" sodipodi:nodetypes="czcczcc"
@ -822,7 +828,8 @@
d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 2,-1 c 0,0 0.827032,-1.318867 0.21875,-2.6875 C 41.924458,18.90625 40.330708,19 40.330708,19 l -2,1 z" d="m 38.330708,20 c 0,0 1.4375,0.09375 2,1.34375 0.579493,1.287761 0,2.65625 0,2.65625 l 2,-1 c 0,0 0.827032,-1.318867 0.21875,-2.6875 C 41.924458,18.90625 40.330708,19 40.330708,19 l -2,1 z"
style="color:#000000;fill:url(#linearGradient2556);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:url(#linearGradient2556);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
@ -830,7 +837,8 @@
d="m 18.768208,31.78125 4.5,-4.5 c 1.5,0.8125 2.28125,2.15625 1.875,3.71875 l -6.375,0.78125 z" d="m 18.768208,31.78125 4.5,-4.5 c 1.5,0.8125 2.28125,2.15625 1.875,3.71875 l -6.375,0.78125 z"
style="color:#000000;fill:url(#radialGradient2558);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:url(#radialGradient2558);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
@ -838,7 +846,8 @@
d="m 20.111958,30.375 -1.625,1.59375 2.34375,-0.3125 c 0.21875,-0.71875 -0.1875,-1.0625 -0.71875,-1.28125 z" d="m 20.111958,30.375 -1.625,1.59375 2.34375,-0.3125 c 0.21875,-0.71875 -0.1875,-1.0625 -0.71875,-1.28125 z"
style="color:#000000;fill:url(#linearGradient2560);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:url(#linearGradient2560);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
sodipodi:nodetypes="ccccc" sodipodi:nodetypes="ccccc"
@ -846,7 +855,8 @@
d="m 23.268208,27.25 1.5625,1.25 15.38734,-7.31867 C 39.773616,20.325286 38.976281,20.096733 38.314669,20.019068 L 23.268208,27.25 z" d="m 23.268208,27.25 1.5625,1.25 15.38734,-7.31867 C 39.773616,20.325286 38.976281,20.096733 38.314669,20.019068 L 23.268208,27.25 z"
style="color:#000000;fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:#ffffff;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
<path <path
transform="translate(-29.75546,19)" transform="translate(-29.75546,19)"
sodipodi:nodetypes="ccccc" sodipodi:nodetypes="ccccc"
@ -854,7 +864,8 @@
d="m 25.143208,31.0625 0.1875,-0.75 15.23109,-7.1296 c 0,0 -0.11016,0.613627 -0.215879,0.74935 L 25.143208,31.0625 z" d="m 25.143208,31.0625 0.1875,-0.75 15.23109,-7.1296 c 0,0 -0.11016,0.613627 -0.215879,0.74935 L 25.143208,31.0625 z"
style="color:#000000;fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" style="color:#000000;fill:#000000;fill-opacity:0.36363639;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
inkscape:r_cx="true" inkscape:r_cx="true"
inkscape:r_cy="true" /> inkscape:r_cy="true"
inkscape:connector-curvature="0" />
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -1,12 +1,93 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<rect opacity="0" height="48" width="48" y="-42.45" x="-50.85"/> <svg
<path fill="#007d00" d="m4.2714 3.6928v39.347l39.817-0.04825-15.409-18.011c-2.1476 3.3861-5.6989 5.7637-9.9438 5.7637-6.6533 0-12.053-5.5086-12.053-12.296s5.3998-12.296 12.053-12.296c4.4029 0 8.0664 2.549 10.17 6.148h4.2939c3.5932 4.705 7.4151 9.2225 10.893 14.022 0.024-0.749-0.045-22.63-0.045-22.63z"/> xmlns:dc="http://purl.org/dc/elements/1.1/"
<path fill="#007d00" d="m23.556 15.989 8.4371-0.000003 12.081 15.235c0.06887 3.0938-0.07166 5.5043 0 7.7883l-14.492-18.105-6.0265-0.000002v-2.4592z"/> xmlns:cc="http://creativecommons.org/ns#"
<path fill="#007d00" d="m18.735 11.07c-3.992 0-7.2318 3.3052-7.2318 7.3776s3.2399 7.3776 7.2318 7.3776c3.992 0 7.2318-3.3051 7.2318-7.3776 0-4.0724-3.2399-7.3776-7.2318-7.3776zm0 4.2158c1.7108 0 3.0994 1.4165 3.0994 3.1618s-1.3885 3.1618-3.0994 3.1618c-1.7108 0-3.0994-1.4165-3.0994-3.1618s1.3885-3.1618 3.0994-3.1618z"/> xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
<g transform="matrix(.82404 0 0 .79493 -.54219 13.342)"> xmlns:svg="http://www.w3.org/2000/svg"
<path fill-rule="evenodd" d="m5.8694 32.598s15.515-20.825 31.114 0.08214c-15.599 19.414-31.114-0.082-31.114-0.082z"/> xmlns="http://www.w3.org/2000/svg"
<path fill-rule="evenodd" fill="#fff" d="m10.452 32.553s10.86-13.986 21.78 0.05516c-10.92 13.038-21.78-0.05516-21.78-0.05516z"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<path fill="#a39aff" d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<path d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(1.778,0,0,1.9912,36.01,25.358)"/> height="48"
width="48"
version="1.0"
id="svg2"
inkscape:version="0.48.2 r9819"
sodipodi:docname="show_zone.svg">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="969"
id="namedview22"
showgrid="false"
inkscape:zoom="9.8333333"
inkscape:cx="20.304274"
inkscape:cy="18.953481"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<rect
opacity="0"
height="48"
width="48"
y="-42.45"
x="-50.85"
id="rect4" />
<path
fill="#007d00"
d="m4.2714 3.6928v39.347l39.817-0.04825-15.409-18.011c-2.1476 3.3861-5.6989 5.7637-9.9438 5.7637-6.6533 0-12.053-5.5086-12.053-12.296s5.3998-12.296 12.053-12.296c4.4029 0 8.0664 2.549 10.17 6.148h4.2939c3.5932 4.705 7.4151 9.2225 10.893 14.022 0.024-0.749-0.045-22.63-0.045-22.63z"
id="path6" />
<path
fill="#007d00"
d="m23.556 15.989 8.4371-0.000003 12.081 15.235c0.06887 3.0938-0.07166 5.5043 0 7.7883l-14.492-18.105-6.0265-0.000002v-2.4592z"
id="path8" />
<path
fill="#007d00"
d="m18.735 11.07c-3.992 0-7.2318 3.3052-7.2318 7.3776s3.2399 7.3776 7.2318 7.3776c3.992 0 7.2318-3.3051 7.2318-7.3776 0-4.0724-3.2399-7.3776-7.2318-7.3776zm0 4.2158c1.7108 0 3.0994 1.4165 3.0994 3.1618s-1.3885 3.1618-3.0994 3.1618c-1.7108 0-3.0994-1.4165-3.0994-3.1618s1.3885-3.1618 3.0994-3.1618z"
id="path10" />
<g
transform="matrix(0.82404,0,0,0.79493,-48.74558,13.13861)"
id="g12">
<path
d="m 5.8694,32.598 c 0,0 15.515,-20.825 31.114,0.08214 -15.599,19.414 -31.114,-0.082 -31.114,-0.082 z"
id="path14"
inkscape:connector-curvature="0"
style="fill-rule:evenodd" />
<path
d="m 10.452,32.553 c 0,0 10.86,-13.986 21.78,0.05516 -10.92,13.038 -21.78,-0.05516 -21.78,-0.05516 z"
id="path16"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-rule:evenodd" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"
id="path18"
inkscape:connector-curvature="0"
style="fill:#a39aff" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(1.778,0,0,1.9912,36.01,25.358)"
id="path20"
inkscape:connector-curvature="0" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -11,7 +11,7 @@
width="48" width="48"
version="1.0" version="1.0"
id="svg2" id="svg2"
inkscape:version="0.48.1 " inkscape:version="0.48.2 r9819"
sodipodi:docname="show_zone_disable.svg"> sodipodi:docname="show_zone_disable.svg">
<metadata <metadata
id="metadata26"> id="metadata26">
@ -35,58 +35,55 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="920" inkscape:window-width="1280"
inkscape:window-height="583" inkscape:window-height="969"
id="namedview22" id="namedview22"
showgrid="false" showgrid="false"
inkscape:zoom="5.4791667" inkscape:zoom="5.4791667"
inkscape:cx="24" inkscape:cx="24"
inkscape:cy="24" inkscape:cy="24"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="26"
inkscape:window-maximized="0" inkscape:window-maximized="1"
inkscape:current-layer="svg2" /> inkscape:current-layer="svg2" />
<g
id="g3797">
<path <path
d="m 4.2714,3.6928 v 39.347 l 39.817,-0.04825 -15.409,-18.011 c -2.1476,3.3861 -5.6989,5.7637 -9.9438,5.7637 -6.6533,0 -12.053,-5.5086 -12.053,-12.296 0,-6.7874 5.3998,-12.296 12.053,-12.296 4.4029,0 8.0664,2.549 10.17,6.148 h 4.2939 c 3.5932,4.705 7.4151,9.2225 10.893,14.022 0.024,-0.749 -0.045,-22.63 -0.045,-22.63 z" style="opacity:0.30858998;fill:#007d00"
inkscape:connector-curvature="0"
id="path6" id="path6"
inkscape:connector-curvature="0" d="m 4.2714,3.6928 v 39.347 l 39.817,-0.04825 -15.409,-18.011 c -2.1476,3.3861 -5.6989,5.7637 -9.9438,5.7637 -6.6533,0 -12.053,-5.5086 -12.053,-12.296 0,-6.7874 5.3998,-12.296 12.053,-12.296 4.4029,0 8.0664,2.549 10.17,6.148 h 4.2939 c 3.5932,4.705 7.4151,9.2225 10.893,14.022 0.024,-0.749 -0.045,-22.63 -0.045,-22.63 z" />
style="opacity:0.30858998;fill:#007d00" />
<path <path
d="m 23.556,15.989 8.4371,-3e-6 12.081,15.235 c 0.06887,3.0938 -0.07166,5.5043 0,7.7883 l -14.492,-18.105 -6.0265,-2e-6 v -2.4592 z" style="fill:#007d00"
inkscape:connector-curvature="0"
id="path8" id="path8"
inkscape:connector-curvature="0" d="m 23.556,15.989 8.4371,-3e-6 12.081,15.235 c 0.06887,3.0938 -0.07166,5.5043 0,7.7883 l -14.492,-18.105 -6.0265,-2e-6 v -2.4592 z" />
style="opacity:1;fill:#007d00" />
<path <path
d="m 18.735,11.07 c -3.992,0 -7.2318,3.3052 -7.2318,7.3776 0,4.0724 3.2399,7.3776 7.2318,7.3776 3.992,0 7.2318,-3.3051 7.2318,-7.3776 0,-4.0724 -3.2399,-7.3776 -7.2318,-7.3776 z m 0,4.2158 c 1.7108,0 3.0994,1.4165 3.0994,3.1618 0,1.7453 -1.3885,3.1618 -3.0994,3.1618 -1.7108,0 -3.0994,-1.4165 -3.0994,-3.1618 0,-1.7453 1.3885,-3.1618 3.0994,-3.1618 z" style="fill:#007d00"
inkscape:connector-curvature="0"
id="path10" id="path10"
inkscape:connector-curvature="0" d="m 18.735,11.07 c -3.992,0 -7.2318,3.3052 -7.2318,7.3776 0,4.0724 3.2399,7.3776 7.2318,7.3776 3.992,0 7.2318,-3.3051 7.2318,-7.3776 0,-4.0724 -3.2399,-7.3776 -7.2318,-7.3776 z m 0,4.2158 c 1.7108,0 3.0994,1.4165 3.0994,3.1618 0,1.7453 -1.3885,3.1618 -3.0994,3.1618 -1.7108,0 -3.0994,-1.4165 -3.0994,-3.1618 0,-1.7453 1.3885,-3.1618 3.0994,-3.1618 z" />
style="opacity:1;fill:#007d00" />
<g <g
transform="matrix(0.82404,0,0,0.79493,-0.54219,13.342)" id="g12"
id="g12"> transform="matrix(0.82404,0,0,0.79493,-35.036486,13.52451)">
<path <path
d="m 5.8694,32.598 c 0,0 15.515,-20.825 31.114,0.08214 -15.599,19.414 -31.114,-0.082 -31.114,-0.082 z" style="fill-rule:evenodd"
inkscape:connector-curvature="0"
id="path14" id="path14"
inkscape:connector-curvature="0" d="m 5.8694,32.598 c 0,0 15.515,-20.825 31.114,0.08214 -15.599,19.414 -31.114,-0.082 -31.114,-0.082 z" />
style="fill-rule:evenodd" />
<path <path
d="m 10.452,32.553 c 0,0 10.86,-13.986 21.78,0.05516 -10.92,13.038 -21.78,-0.05516 -21.78,-0.05516 z" style="fill:#ffffff;fill-rule:evenodd"
inkscape:connector-curvature="0"
id="path16" id="path16"
inkscape:connector-curvature="0" d="m 10.452,32.553 c 0,0 10.86,-13.986 21.78,0.05516 -10.92,13.038 -21.78,-0.05516 -21.78,-0.05516 z" />
style="fill:#ffffff;fill-rule:evenodd" />
<path <path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z" style="fill:#a39aff"
transform="matrix(3.5559,0,0,3.9824,50.678,18.388)" inkscape:connector-curvature="0"
id="path18" id="path18"
inkscape:connector-curvature="0" transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"
style="fill:#a39aff" /> d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z" />
<path <path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z" inkscape:connector-curvature="0"
transform="matrix(1.778,0,0,1.9912,36.01,25.358)"
id="path20" id="path20"
inkscape:connector-curvature="0" /> transform="matrix(1.778,0,0,1.9912,36.01,25.358)"
</g> d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -1,12 +1,99 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<path opacity=".45703" fill="#007d00" d="m4.2714 3.6928v39.347l39.817-0.04825-15.409-18.011c-2.1476 3.3861-5.6989 5.7637-9.9438 5.7637-6.6533 0-12.053-5.5086-12.053-12.296s5.3998-12.296 12.053-12.296c4.4029 0 8.0664 2.549 10.17 6.148h4.2939c3.5932 4.705 7.4151 9.2225 10.893 14.022 0.024-0.749-0.045-22.63-0.045-22.63z"/> <svg
<path opacity=".45703" fill="#007d00" d="m23.556 15.989 8.4371-0.000003 12.081 15.235c0.06887 3.0938-0.07166 5.5043 0 7.7883l-14.492-18.105-6.0265-0.000002v-2.4592z"/> xmlns:dc="http://purl.org/dc/elements/1.1/"
<path opacity=".45703" fill="#007d00" d="m18.735 11.07c-3.992 0-7.2318 3.3052-7.2318 7.3776s3.2399 7.3776 7.2318 7.3776c3.992 0 7.2318-3.3051 7.2318-7.3776 0-4.0724-3.2399-7.3776-7.2318-7.3776zm0 4.2158c1.7108 0 3.0994 1.4165 3.0994 3.1618s-1.3885 3.1618-3.0994 3.1618c-1.7108 0-3.0994-1.4165-3.0994-3.1618s1.3885-3.1618 3.0994-3.1618z"/> xmlns:cc="http://creativecommons.org/ns#"
<rect ry="0.825" height="39.375" width="39.525" stroke="#03f" y="3.675" x="4.425" stroke-width="2" fill="none"/> xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
<g transform="matrix(.82404 0 0 .79493 -.54219 13.342)"> xmlns:svg="http://www.w3.org/2000/svg"
<path fill-rule="evenodd" d="m5.8694 32.598s15.515-20.825 31.114 0.08214c-15.599 19.414-31.114-0.082-31.114-0.082z"/> xmlns="http://www.w3.org/2000/svg"
<path fill-rule="evenodd" fill="#fff" d="m10.452 32.553s10.86-13.986 21.78 0.05516c-10.92 13.038-21.78-0.05516-21.78-0.05516z"/> xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
<path fill="#a39aff" d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"/> xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
<path d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(1.778,0,0,1.9912,36.01,25.358)"/> height="48"
width="48"
version="1.0"
id="svg2"
inkscape:version="0.48.2 r9819"
sodipodi:docname="show_zone_outline_only.svg">
<metadata
id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs24" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1280"
inkscape:window-height="969"
id="namedview22"
showgrid="false"
inkscape:zoom="4.9166667"
inkscape:cx="24"
inkscape:cy="24"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<path
opacity=".45703"
fill="#007d00"
d="m4.2714 3.6928v39.347l39.817-0.04825-15.409-18.011c-2.1476 3.3861-5.6989 5.7637-9.9438 5.7637-6.6533 0-12.053-5.5086-12.053-12.296s5.3998-12.296 12.053-12.296c4.4029 0 8.0664 2.549 10.17 6.148h4.2939c3.5932 4.705 7.4151 9.2225 10.893 14.022 0.024-0.749-0.045-22.63-0.045-22.63z"
id="path4" />
<path
opacity=".45703"
fill="#007d00"
d="m23.556 15.989 8.4371-0.000003 12.081 15.235c0.06887 3.0938-0.07166 5.5043 0 7.7883l-14.492-18.105-6.0265-0.000002v-2.4592z"
id="path6" />
<path
opacity=".45703"
fill="#007d00"
d="m18.735 11.07c-3.992 0-7.2318 3.3052-7.2318 7.3776s3.2399 7.3776 7.2318 7.3776c3.992 0 7.2318-3.3051 7.2318-7.3776 0-4.0724-3.2399-7.3776-7.2318-7.3776zm0 4.2158c1.7108 0 3.0994 1.4165 3.0994 3.1618s-1.3885 3.1618-3.0994 3.1618c-1.7108 0-3.0994-1.4165-3.0994-3.1618s1.3885-3.1618 3.0994-3.1618z"
id="path8" />
<rect
ry="0.825"
height="39.375"
width="39.525"
stroke="#03f"
y="3.675"
x="4.425"
stroke-width="2"
fill="none"
id="rect10" />
<g
transform="matrix(0.82404,0,0,0.79493,-36.3388,12.93522)"
id="g12">
<path
d="m 5.8694,32.598 c 0,0 15.515,-20.825 31.114,0.08214 -15.599,19.414 -31.114,-0.082 -31.114,-0.082 z"
id="path14"
inkscape:connector-curvature="0"
style="fill-rule:evenodd" />
<path
d="m 10.452,32.553 c 0,0 10.86,-13.986 21.78,0.05516 -10.92,13.038 -21.78,-0.05516 -21.78,-0.05516 z"
id="path16"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-rule:evenodd" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"
id="path18"
inkscape:connector-curvature="0"
style="fill:#a39aff" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(1.778,0,0,1.9912,36.01,25.358)"
id="path20"
inkscape:connector-curvature="0" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -1,15 +1,102 @@
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<g transform="matrix(2.4812,0,0,2.35,136.55,-2.79)"> <svg
<path fill="#007d00" d="m-43.3 19.4-0.000001-16h1.5l0.000001 16h-1.5z"/> xmlns:dc="http://purl.org/dc/elements/1.1/"
<path fill="#007d00" d="m-40.3 19.4-0.000001-16h1.5l0.000001 16h-1.5z"/> xmlns:cc="http://creativecommons.org/ns#"
<path fill="#d72e2e" d="m-37.3 13.9h-7.5l-3.5-8h-5v-1.5l6 0.000001 3.5 8h6.5v1.5z"/> xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
<path fill="#d72e2e" d="m-37.3 16.9-9.5-0.000001-3.5-8-3 0.000001v-1.5h4l3.5 8 8.5 0.000001v1.5z"/> xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48"
width="48"
version="1.0"
id="svg2"
inkscape:version="0.48.2 r9819"
sodipodi:docname="showtrack.svg">
<metadata
id="metadata30">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs28" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1172"
inkscape:window-height="797"
id="namedview26"
showgrid="false"
inkscape:zoom="4.9166667"
inkscape:cx="23.937596"
inkscape:cy="23.840825"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<g
transform="matrix(2.4812,0,0,2.35,136.55,-2.79)"
id="g4">
<path
fill="#007d00"
d="m-43.3 19.4-0.000001-16h1.5l0.000001 16h-1.5z"
id="path6" />
<path
fill="#007d00"
d="m-40.3 19.4-0.000001-16h1.5l0.000001 16h-1.5z"
id="path8" />
<path
fill="#d72e2e"
d="m-37.3 13.9h-7.5l-3.5-8h-5v-1.5l6 0.000001 3.5 8h6.5v1.5z"
id="path10" />
<path
fill="#d72e2e"
d="m-37.3 16.9-9.5-0.000001-3.5-8-3 0.000001v-1.5h4l3.5 8 8.5 0.000001v1.5z"
id="path12" />
</g> </g>
<rect opacity="0" height="48" width="48" y="-42.45" x="-50.85"/> <rect
<g transform="matrix(.82404 0 0 .79493 -.54219 13.342)"> opacity="0"
<path fill-rule="evenodd" d="m5.8694 32.598s15.515-20.825 31.114 0.08214c-15.599 19.414-31.114-0.082-31.114-0.082z"/> height="48"
<path fill-rule="evenodd" fill="#fff" d="m10.452 32.553s10.86-13.986 21.78 0.05516c-10.92 13.038-21.78-0.05516-21.78-0.05516z"/> width="48"
<path fill="#a39aff" d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"/> y="-42.45"
<path d="m-6.5 3.5a1.75 1.5 0 1 1 -3.5 0 1.75 1.5 0 1 1 3.5 0z" transform="matrix(1.778,0,0,1.9912,36.01,25.358)"/> x="-50.85"
id="rect14" />
<g
transform="matrix(0.82404,0,0,0.79493,-36.74558,13.54539)"
id="g16">
<path
d="m 5.8694,32.598 c 0,0 15.515,-20.825 31.114,0.08214 -15.599,19.414 -31.114,-0.082 -31.114,-0.082 z"
id="path18"
inkscape:connector-curvature="0"
style="fill-rule:evenodd" />
<path
d="m 10.452,32.553 c 0,0 10.86,-13.986 21.78,0.05516 -10.92,13.038 -21.78,-0.05516 -21.78,-0.05516 z"
id="path20"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-rule:evenodd" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(3.5559,0,0,3.9824,50.678,18.388)"
id="path22"
inkscape:connector-curvature="0"
style="fill:#a39aff" />
<path
d="m -6.5,3.5 a 1.75,1.5 0 1 1 -3.5,0 1.75,1.5 0 1 1 3.5,0 z"
transform="matrix(1.778,0,0,1.9912,36.01,25.358)"
id="path24"
inkscape:connector-curvature="0" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -11,7 +11,7 @@
width="48" width="48"
version="1.1" version="1.1"
id="svg2" id="svg2"
inkscape:version="0.48.1 " inkscape:version="0.48.2 r9819"
sodipodi:docname="via_sketch.svg"> sodipodi:docname="via_sketch.svg">
<metadata <metadata
id="metadata16"> id="metadata16">
@ -21,6 +21,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>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -44,8 +45,8 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="552" inkscape:window-width="1280"
inkscape:window-height="544" inkscape:window-height="969"
id="namedview12" id="namedview12"
showgrid="false" showgrid="false"
inkscape:snap-grids="false" inkscape:snap-grids="false"
@ -53,9 +54,9 @@
inkscape:zoom="5.0595999" inkscape:zoom="5.0595999"
inkscape:cx="25.399999" inkscape:cx="25.399999"
inkscape:cy="22.398101" inkscape:cy="22.398101"
inkscape:window-x="718" inkscape:window-x="0"
inkscape:window-y="192" inkscape:window-y="26"
inkscape:window-maximized="0" inkscape:window-maximized="1"
inkscape:current-layer="svg2" /> inkscape:current-layer="svg2" />
<g <g
id="g3007" id="g3007"
@ -125,7 +126,7 @@
d="m 34.262967,19.039341 a 5.7326025,5.8850077 0 1 1 -11.465205,0 5.7326025,5.8850077 0 1 1 11.465205,0 z" /> d="m 34.262967,19.039341 a 5.7326025,5.8850077 0 1 1 -11.465205,0 5.7326025,5.8850077 0 1 1 11.465205,0 z" />
</g> </g>
<g <g
transform="matrix(0.82404,0,0,0.79493,-4.4140572,14.791779)" transform="matrix(0.82404,0,0,0.79493,-36.234755,13.605914)"
id="g16"> id="g16">
<path <path
style="fill-rule:evenodd" style="fill-rule:evenodd"

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View File

@ -14,6 +14,7 @@ footprints
fp fp
lib lib
libpart libpart
libparts
libraries libraries
library library
libsource libsource

View File

@ -26,9 +26,11 @@ set(CVPCB_DIALOGS
) )
set(CVPCB_SRCS set(CVPCB_SRCS
../pcbnew/netlist_reader_common.cpp
../pcbnew/netlist_reader_kicad.cpp
../pcbnew/netlist_reader_firstformat.cpp
autosel.cpp autosel.cpp
cfg.cpp cfg.cpp
class_cvpcb.cpp
class_components_listbox.cpp class_components_listbox.cpp
class_DisplayFootprintsFrame.cpp class_DisplayFootprintsFrame.cpp
class_footprints_listbox.cpp class_footprints_listbox.cpp
@ -43,7 +45,6 @@ set(CVPCB_SRCS
savecmp.cpp savecmp.cpp
setvisu.cpp setvisu.cpp
tool_cvpcb.cpp tool_cvpcb.cpp
writenetlistpcbnew.cpp
) )
### ###

View File

@ -126,12 +126,12 @@ found in the default search paths." ),
ii = 0; ii = 0;
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
bool found = false; bool found = false;
m_ListCmp->SetSelection( ii++, true ); m_ListCmp->SetSelection( ii++, true );
if( !component.m_Module.IsEmpty() ) if( !component.m_Footprint.IsEmpty() )
continue; continue;
BOOST_FOREACH( FOOTPRINT_ALIAS& alias, aliases ) BOOST_FOREACH( FOOTPRINT_ALIAS& alias, aliases )

View File

@ -1,21 +0,0 @@
/**
* @file class_cvpcb.cpp
*/
#include <fctsys.h>
#include <kicad_string.h>
#include <cvpcb.h>
#include <footprint_info.h>
bool operator<( const PIN& item1, const PIN& item2 )
{
return StrNumCmp( item1.m_Number, item2.m_Number, 4, true ) < 0;
}
bool operator<( const COMPONENT& item1, const COMPONENT& item2 )
{
return StrNumCmp( item1.m_Reference, item2.m_Reference, INT_MAX, true ) < 0;
}

View File

@ -133,7 +133,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list )
} }
void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT* Component, void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component,
FOOTPRINT_LIST& list ) FOOTPRINT_LIST& list )
{ {
wxString msg; wxString msg;

8
cvpcb/common_help_msg.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef HELP_MESSAGE_FILE_H
#define HELP_MESSAGE_FILE_H
#define LOAD_FILE_HELP _( "Open a net list file" )
#define SAVE_HLP_MSG _( "Save the component/footprint link file (.cmp file)" )
#define SAVE_AS_HLP_MSG _( "Save the component/footprint link file (.cmp file) with a new name" )
#endif // HELP_MESSAGE_FILE_H

View File

@ -334,9 +334,9 @@ void CVPCB_MAINFRAME::ToFirstNA( wxCommandEvent& event )
if( selection < 0 ) if( selection < 0 )
selection = 0; selection = 0;
BOOST_FOREACH( COMPONENT & component, m_components ) BOOST_FOREACH( COMPONENT_INFO & component, m_components )
{ {
if( component.m_Module.IsEmpty() && ii > selection ) if( component.m_Footprint.IsEmpty() && ii > selection )
{ {
m_ListCmp->SetSelection( ii ); m_ListCmp->SetSelection( ii );
SendMessageToEESCHEMA(); SendMessageToEESCHEMA();
@ -364,9 +364,9 @@ void CVPCB_MAINFRAME::ToPreviousNA( wxCommandEvent& event )
if( selection < 0 ) if( selection < 0 )
selection = m_ListCmp->GetCount() - 1; selection = m_ListCmp->GetCount() - 1;
BOOST_REVERSE_FOREACH( COMPONENT & component, m_components ) BOOST_REVERSE_FOREACH( COMPONENT_INFO & component, m_components )
{ {
if( component.m_Module.IsEmpty() && ii < selection ) if( component.m_Footprint.IsEmpty() && ii < selection )
{ {
m_ListCmp->SetSelection( ii ); m_ListCmp->SetSelection( ii );
SendMessageToEESCHEMA(); SendMessageToEESCHEMA();
@ -403,9 +403,9 @@ void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event )
{ {
m_ListCmp->SetSelection( 0 ); m_ListCmp->SetSelection( 0 );
BOOST_FOREACH( COMPONENT & component, m_components ) BOOST_FOREACH( COMPONENT_INFO & component, m_components )
{ {
component.m_Module.Empty(); component.m_Footprint.Empty();
SetNewPkg( wxEmptyString ); SetNewPkg( wxEmptyString );
} }
@ -538,7 +538,7 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
// Preview of the already assigned footprint. // Preview of the already assigned footprint.
// Find the footprint that was already choosen for this component and select it. // Find the footprint that was already choosen for this component and select it.
wxString module = *(&m_components[ selection ].m_Module); wxString module = *(&m_components[ selection ].m_Footprint);
bool found = false; bool found = false;
for( int ii = 0; ii < m_FootprintList->GetCount(); ii++ ) for( int ii = 0; ii < m_FootprintList->GetCount(); ii++ )
@ -696,7 +696,7 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
{ {
char cmd[1024]; char cmd[1024];
int selection; int selection;
COMPONENT* Component; COMPONENT_INFO* Component;
if( m_components.empty() ) if( m_components.empty() )
return; return;

View File

@ -19,42 +19,9 @@
#define FILTERFOOTPRINTKEY "FilterFootprint" #define FILTERFOOTPRINTKEY "FilterFootprint"
class PIN #include <netlist_reader.h>
{
public:
wxString m_Net; /* Name of net. */
wxString m_Number;
wxString m_Name;
PIN() {};
~PIN() {};
};
typedef boost::ptr_vector< PIN > PIN_LIST;
/* PIN object list sort function. */
extern bool operator<( const PIN& item1, const PIN& item2 );
class COMPONENT
{
public:
wxString m_Reference; // Reference designator: U3, R5
wxString m_Value; // Value: 7400, 47K
wxString m_TimeStamp; // Time stamp ( default value = "00000000")
wxString m_Module; // Footprint (module) name.
wxArrayString m_FootprintFilter;// List of allowed footprints (wildcards
// allowed ). If empty: no filtering
PIN_LIST m_Pins; // List of component pins.
COMPONENT() {};
~COMPONENT() {};
};
typedef boost::ptr_vector< COMPONENT > COMPONENT_LIST;
/* COMPONENT object list sort function. */
extern bool operator<( const COMPONENT& item1, const COMPONENT& item2 );
typedef boost::ptr_vector< COMPONENT_INFO > COMPONENT_LIST;
extern const wxString FootprintAliasFileExtension; extern const wxString FootprintAliasFileExtension;
extern const wxString RetroFileExtension; extern const wxString RetroFileExtension;

View File

@ -52,7 +52,7 @@ public:
void SetString( unsigned linecount, const wxString& text ); void SetString( unsigned linecount, const wxString& text );
void AppendLine( const wxString& text ); void AppendLine( const wxString& text );
void SetFootprintFullList( FOOTPRINT_LIST& list ); void SetFootprintFullList( FOOTPRINT_LIST& list );
void SetFootprintFilteredList( COMPONENT* Component, void SetFootprintFilteredList( COMPONENT_INFO* Component,
FOOTPRINT_LIST& list ); FOOTPRINT_LIST& list );
void SetActiveFootprintList( bool FullList, bool Redraw = false ); void SetActiveFootprintList( bool FullList, bool Redraw = false );

View File

@ -38,14 +38,14 @@ void CVPCB_MAINFRAME::WriteStuffList( wxCommandEvent& event )
return; return;
} }
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
if( component.m_Module.empty() ) if( component.m_Footprint.empty() )
continue; continue;
fprintf( FileEquiv, "comp = %s module = %s\n", fprintf( FileEquiv, "comp = %s module = %s\n",
EscapedUTF8( component.m_Reference ).c_str(), EscapedUTF8( component.m_Reference ).c_str(),
EscapedUTF8( component.m_Module ).c_str() ); EscapedUTF8( component.m_Footprint ).c_str() );
} }
fclose( FileEquiv ); fclose( FileEquiv );

View File

@ -18,7 +18,7 @@
void CVPCB_MAINFRAME::SetNewPkg( const wxString& package ) void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
{ {
COMPONENT* Component; COMPONENT_INFO* Component;
bool isUndefined = false; bool isUndefined = false;
int NumCmp; int NumCmp;
wxString msg; wxString msg;
@ -39,14 +39,14 @@ void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
if( Component == NULL ) if( Component == NULL )
return; return;
isUndefined = Component->m_Module.IsEmpty(); isUndefined = Component->m_Footprint.IsEmpty();
Component->m_Module = package; Component->m_Footprint = package;
msg.Printf( CMP_FORMAT, NumCmp + 1, msg.Printf( CMP_FORMAT, NumCmp + 1,
GetChars( Component->m_Reference ), GetChars( Component->m_Reference ),
GetChars( Component->m_Value ), GetChars( Component->m_Value ),
GetChars( Component->m_Module ) ); GetChars( Component->m_Footprint ) );
m_modified = true; m_modified = true;
if( isUndefined ) if( isUndefined )
@ -94,15 +94,15 @@ bool CVPCB_MAINFRAME::ReadNetList()
m_ListCmp->Clear(); m_ListCmp->Clear();
m_undefinedComponentCnt = 0; m_undefinedComponentCnt = 0;
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1, msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,
GetChars( component.m_Reference ), GetChars( component.m_Reference ),
GetChars( component.m_Value ), GetChars( component.m_Value ),
GetChars( component.m_Module ) ); GetChars( component.m_Footprint ) );
m_ListCmp->AppendLine( msg ); m_ListCmp->AppendLine( msg );
if( component.m_Module.IsEmpty() ) if( component.m_Footprint.IsEmpty() )
m_undefinedComponentCnt += 1; m_undefinedComponentCnt += 1;
} }
@ -151,7 +151,7 @@ int CVPCB_MAINFRAME::SaveNetList( const wxString& aFullFileName )
DisplayError( this, _( "Unable to create component file (.cmp)" ) ); DisplayError( this, _( "Unable to create component file (.cmp)" ) );
return 0; return 0;
} }
#if 0
FILE* netlist = wxFopen( fn.GetFullPath(), wxT( "wt" ) ); FILE* netlist = wxFopen( fn.GetFullPath(), wxT( "wt" ) );
if( netlist == 0 ) if( netlist == 0 )
@ -161,6 +161,6 @@ int CVPCB_MAINFRAME::SaveNetList( const wxString& aFullFileName )
} }
GenNetlistPcbnew( netlist, m_isEESchemaNetlist ); GenNetlistPcbnew( netlist, m_isEESchemaNetlist );
#endif
return 1; return 1;
} }

View File

@ -88,11 +88,11 @@ void CVPCB_MAINFRAME::BuildCmpListBox()
m_ListCmp->m_ComponentList.Clear(); m_ListCmp->m_ComponentList.Clear();
BOOST_FOREACH( COMPONENT & component, m_components ) { BOOST_FOREACH( COMPONENT_INFO & component, m_components ) {
msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1, msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,
GetChars(component.m_Reference), GetChars(component.m_Reference),
GetChars(component.m_Value), GetChars(component.m_Value),
GetChars(component.m_Module) ); GetChars(component.m_Footprint) );
m_ListCmp->m_ComponentList.Add( msg ); m_ListCmp->m_ComponentList.Add( msg );
} }

View File

@ -35,6 +35,8 @@
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>
#include <common_help_msg.h>
/** /**
* @brief (Re)Create the menubar for the CvPcb mainframe * @brief (Re)Create the menubar for the CvPcb mainframe
@ -63,9 +65,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
// Open // Open
AddMenuItem( filesMenu, AddMenuItem( filesMenu,
ID_LOAD_PROJECT, ID_LOAD_PROJECT,
_( "&Open" ), _( "&Open" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
_( "Open a net list file" ),
KiBitmap( open_document_xpm ) );
// Open Recent submenu // Open Recent submenu
static wxMenu* openRecentMenu; static wxMenu* openRecentMenu;
@ -86,19 +86,15 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
// Separator // Separator
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
// Save // Save the .cmp file
AddMenuItem( filesMenu, AddMenuItem( filesMenu,
wxID_SAVE, wxID_SAVE,
_( "&Save\tCtrl+S" ), _( "&Save\tCtrl+S" ), SAVE_HLP_MSG, KiBitmap( save_xpm ) );
_( "Save net list and footprint files" ),
KiBitmap( save_xpm ) );
// Save as // Save as the .cmp file
AddMenuItem( filesMenu, AddMenuItem( filesMenu,
wxID_SAVEAS, wxID_SAVEAS,
_( "Save &As..." ), _( "Save &As..." ), SAVE_AS_HLP_MSG, KiBitmap( save_xpm ) );
_( "Save new net list and footprint list files" ),
KiBitmap( save_xpm ) );
// Separator // Separator
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
@ -116,7 +112,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
// Libraries to load // Libraries to load
AddMenuItem( preferencesMenu, wxID_PREFERENCES, AddMenuItem( preferencesMenu, wxID_PREFERENCES,
_( "&Libraries" ), _( "&Libraries" ),
_( "Set footprint libraries lo load and library search paths" ), _( "Set footprint libraries to load and library search paths" ),
KiBitmap( config_xpm ) ); KiBitmap( config_xpm ) );
// Language submenu // Language submenu
@ -156,7 +152,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
// About // About
AddMenuItem( helpMenu, wxID_ABOUT, AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About CvPcb" ), _( "&About CvPcb" ),
_( "About CvPcb schematic to pcb converter" ), _( "About CvPcb footprint selector" ),
KiBitmap( info_xpm ) ); KiBitmap( info_xpm ) );
// Create the menubar and append all submenus // Create the menubar and append all submenus

View File

@ -1,8 +1,33 @@
/****************************/ /**
/* readschematicnetlist.cpp */ * @file cvpcb/readschematicnetlist.cpp
/****************************/ */
/* Read a nelist type Eeschema or OrcadPCB2 and build the component list /*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2012 Jean-Pierre Charras.
* Copyright (C) 2012 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* Read a nelist type Eeschema (New and Old format)
* or OrcadPCB2 and build the component list
*/ */
#include <fctsys.h> #include <fctsys.h>
@ -11,348 +36,72 @@
#include <kicad_string.h> #include <kicad_string.h>
#include <macros.h> #include <macros.h>
#include <cvpcb.h>
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <richio.h> #include <richio.h>
static int ReadPinConnection( FILE_LINE_READER& aNetlistReader, COMPONENT* CurrentCmp ); #include <netlist_reader.h>
static int ReadFootprintFilterList( FILE_LINE_READER& aNetlistReader, COMPONENT_LIST& aComponentsList );
// COMPONENT_INFO object list sort function:
bool operator < ( const COMPONENT_INFO& item1, const COMPONENT_INFO& item2 )
{
return StrNumCmp( item1.m_Reference, item2.m_Reference, INT_MAX, true ) < 0;
}
/* Sort the list alphabetically by component and and returns
* a pointer to the 1st element of list */
#define BUFFER_CHAR_SIZE 1024 // Size of buffers used to store netlist data
/**
* Function ReadSchematicNetlist
* Read a Eeschema (or OrcadPCB) netlist
* like:
* # EESchema Netlist Version 1.1 created 15/5/2008-12:09:21
* (
* ( /32568D1E $noname JP1 CONN_8X2 {Lib=CONN_8X2}
* ( 1 GND )
* ( 2 /REF10 )
* ( 3 GND )
* ( 4 /REF11 )
* ( 5 GND )
* ( 6 /REF7 )
* ( 7 GND )
* ( 8 /REF9 )
* ( 9 GND )
* ( 10 /REF6 )
* ( 11 GND )
* ( 12 /REF8 )
* ( 13 GND )
* ( 14 /REF4 )
* ( 15 GND )
* ( 16 /REF5 )
* )
* ( /325679C1 $noname RR1 9x1K {Lib=RR9}
* ( 1 VCC )
* ( 2 /REF5 )
* ( 3 /REF4 )
* ( 4 /REF8 )
* ( 5 /REF6 )
* ( 6 /REF9 )
* ( 7 /REF7 )
* ( 8 /REF11 )
* ( 9 /REF10 )
* ( 10 ? )
* )
* )
* *
* { Allowed footprints by component:
* $component R5
* R?
* SM0603
* SM0805
* $endlist
* $component C2
* SM*
* C?
* C1-1
* $endlist
* $endfootprintlist
* }
*/
int CVPCB_MAINFRAME::ReadSchematicNetlist() int CVPCB_MAINFRAME::ReadSchematicNetlist()
{ {
int idx, jj, k; FILE* netfile = wxFopen( m_NetlistFileName.GetFullPath(), wxT( "rt" ) );
char cbuffer[BUFFER_CHAR_SIZE]; /* temporary storage */
char* ptchar;
COMPONENT* Cmp;
FILE* source;
m_modified = false; if( netfile == NULL )
m_isEESchemaNetlist = false;
/* Clear components buffer */
if( !m_components.empty() )
{ {
m_components.clear(); wxString msg;
} msg.Printf( _( "Could not open file <%>" ),
GetChars( m_NetlistFileName.GetFullPath() ) );
source = wxFopen( m_NetlistFileName.GetFullPath(), wxT( "rt" ) ); wxMessageBox( msg );
if( source == 0 )
{
DisplayError( this, _( "File <" ) + m_NetlistFileName.GetFullPath() +
_( "> not found" ) );
return -1; return -1;
} }
// FILE_LINE_READER will close the file. NETLIST_READER netList_Reader( NULL, NULL );
FILE_LINE_READER netlistReader( source, m_NetlistFileName.GetFullPath() ); netList_Reader.m_UseTimeStamp = false;
netList_Reader.m_ChangeFootprints = false;
netList_Reader.m_UseCmpFile = false;
netList_Reader.SetFilesnames( m_NetlistFileName.GetFullPath(), wxEmptyString );
/* Read the file header (must be "( { OrCAD PCB" or "({ OrCAD PCB" ) // True to read footprint filters section: true for CvPcb, false pro Pcbnew
* or "# EESchema Netlist" netList_Reader.ReadLibpartSectionSetOpt( true );
*/
netlistReader.ReadLine();
const char* Line = netlistReader.Line();
/* test for netlist type PCB2 */ bool success = netList_Reader.ReadNetList( netfile );
idx = strnicmp( Line, "( {", 3 ); if( !success )
if( idx != 0 )
idx = strnicmp( Line, "({", 2 );
if( idx != 0 )
{ {
idx = strnicmp( Line, "# EESchema", 7 ); /* net type EESchema */ wxMessageBox( _("Netlist read error") );
if( idx == 0 ) return false;
m_isEESchemaNetlist = true;
} }
if( idx != 0 ) // Now copy footprints info into Cvpcb list:
COMPONENT_INFO_LIST& cmpInfo = netList_Reader.GetComponentInfoList();
for( unsigned ii = 0; ii < cmpInfo.size(); ii++ )
m_components.push_back( cmpInfo[ii] );
cmpInfo.clear(); // cmpInfo is no more owner of the list.
// Sort components by reference:
sort( m_components.begin(), m_components.end() );
// Now copy filters in m_components, if netlist type is KICAD
// ( when the format is the "old" PCBNEW format, filters are already in
// m_component list
if( NETLIST_TYPE_KICAD == netList_Reader.GetNetlistType() )
{ {
wxString msg, Lineconv = FROM_UTF8( Line ); for( unsigned ii = 0; ii < m_components.size(); ii++ )
msg.Printf( _( "Unknown file format <%s>" ), Lineconv.GetData() );
DisplayError( this, msg );
return -3;
}
SetStatusText( _( "Netlist Format: Eeschema" ), 0 );
/* Read the netlist */
for( ; ; )
{ {
/* Search the beginning of a component description */ LIPBART_INFO* libpart = netList_Reader.GetLibpart(m_components[ii].m_Libpart);
if( libpart == NULL )
if( netlistReader.ReadLine( ) == 0 )
break;
Line = netlistReader.Line();
/* Remove blanks */
idx = 0;
while( Line[idx] == ' ' )
idx++;
/* remove empty lines : */
if( Line[idx] < ' ' )
continue; continue;
if( strnicmp( &Line[idx], "{ Allowed footprints", 20 ) == 0 ) // now copy filter list
{ m_components[ii].m_FootprintFilter = libpart->m_FootprintFilter;
ReadFootprintFilterList( netlistReader, m_components );
continue;
} }
if( strnicmp( &Line[idx], "( ", 2 ) != 0 )
continue;
/*******************************/
/* Component description found */
/*******************************/
Cmp = new COMPONENT(); // Creates the new component storage
while( Line[idx] != ' ' )
idx++;
while( Line[idx] == ' ' )
idx++;
/* idx points the beginning of the schematic time stamp */
jj = 0;
while( Line[idx] != ' ' && Line[idx] )
cbuffer[jj++] = Line[idx++];
cbuffer[jj] = 0;
Cmp->m_TimeStamp = FROM_UTF8( cbuffer );
/* search val/ref.lib */
while( Line[idx] == ' ' )
idx++;
/* idx points the component value.
* Read value */
ptchar = strstr( (char*) &Line[idx], " " ); // Search end of value field (space)
if( ptchar == 0 )
{
wxString msg = _( "Netlist error: " );
msg << FROM_UTF8( Line );
DisplayError( this, msg );
k = 0;
} }
else
k = ptchar - Line;
for( jj = 0; idx < k; idx++ )
{
cbuffer[jj++] = Line[idx];
}
cbuffer[jj] = 0;
// Copy footprint name:
if( m_isEESchemaNetlist && strnicmp( cbuffer, "$noname", 7 ) != 0 )
Cmp->m_Module = FROM_UTF8(cbuffer);
/* Search component reference */
while( Line[idx] != ' ' && Line[idx] )
idx++;
/* goto end of value field */
while( Line[idx] == ' ' && Line[idx] )
idx++;
/* goto beginning of reference */
for( jj = 0; ; idx++ )
{
if( Line[idx] == ' ' || Line[idx] == 0)
break;
cbuffer[jj++] = Line[idx];
}
cbuffer[jj] = 0;
Cmp->m_Reference = FROM_UTF8(cbuffer);
/* Search component value */
while( Line[idx] == ' ' && Line[idx] )
idx++;
// goto beginning of value
for( jj = 0 ; ; idx++ )
{
if( (Line[idx] == ' ') || (Line[idx] == '\n') || (Line[idx] == '\r') || Line[idx] == 0)
break;
cbuffer[jj++] = Line[idx];
}
cbuffer[jj] = 0;
Cmp->m_Value = FROM_UTF8(cbuffer);
m_components.push_back( Cmp );
ReadPinConnection( netlistReader, Cmp );
}
m_components.sort();
return 0; return 0;
} }
int ReadFootprintFilterList( FILE_LINE_READER& aNetlistReader, COMPONENT_LIST& aComponentsList )
{
const char* Line = aNetlistReader;
wxString CmpRef;
COMPONENT* Cmp = NULL;
for( ; ; )
{
if( aNetlistReader.ReadLine( ) == 0 )
break;
if( strnicmp( Line, "$endlist", 8 ) == 0 )
{
Cmp = NULL;
continue;
}
if( strnicmp( Line, "$endfootprintlist", 4 ) == 0 )
return 0;
if( strnicmp( Line, "$component", 10 ) == 0 ) // New component ref found
{
CmpRef = FROM_UTF8( Line + 11 );
CmpRef.Trim( true );
CmpRef.Trim( false );
/* Search the new component in list */
BOOST_FOREACH( COMPONENT & component, aComponentsList )
{
Cmp = &component;
if( Cmp->m_Reference == CmpRef )
break;
}
}
else if( Cmp )
{
wxString fp = FROM_UTF8( Line + 1 );
fp.Trim( false );
fp.Trim( true );
Cmp->m_FootprintFilter.Add( fp );
}
}
return 1;
}
int ReadPinConnection( FILE_LINE_READER& aNetlistReader, COMPONENT* Cmp )
{
int i, jj;
char cbuffer[BUFFER_CHAR_SIZE];
for( ; ; )
{
/* Find beginning of description. */
for( ; ; )
{
if( aNetlistReader.ReadLine() == 0 )
return -1;
char* Line = aNetlistReader.Line();
/* Remove blanks from the beginning of the line. */
i = 0; while( Line[i] == ' ' )
i++;
while( Line[i] == '(' )
i++;
while( Line[i] == ' ' )
i++;
/* remove empty lines : */
if( Line[i] < ' ' )
continue;
/* End of description? */
if( Line[i] == ')' )
return 0;
PIN * Pin = new PIN();
/* Read pin name, usually 4 letters */
for( jj = 0; ; i++ )
{
if( Line[i] == ' ' || Line[i] == 0 )
break;
cbuffer[jj++] = Line[i];
}
cbuffer[jj] = 0;
Pin->m_Number = FROM_UTF8(cbuffer);
/* Read netname */
while( Line[i] == ' ' )
i++;
for( jj = 0; ; i++ )
{
if( Line[i] == ' ' || Line[i] == '\n' || Line[i] == '\r' || Line[i] == 0 )
break;
cbuffer[jj++] = Line[i];
}
cbuffer[jj] = 0;
Pin->m_Net = FROM_UTF8(cbuffer);
Cmp->m_Pins.push_back( Pin );
}
}
}

View File

@ -39,13 +39,13 @@ int CVPCB_MAINFRAME::SaveComponentList( const wxString& aFullFileName )
fprintf( dest, " Created by %s", TO_UTF8( Title ) ); fprintf( dest, " Created by %s", TO_UTF8( Title ) );
fprintf( dest, " date = %s\n", TO_UTF8( DateAndTime() ) ); fprintf( dest, " date = %s\n", TO_UTF8( DateAndTime() ) );
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
fprintf( dest, "\nBeginCmp\n" ); fprintf( dest, "\nBeginCmp\n" );
fprintf( dest, "TimeStamp = %s;\n", TO_UTF8( component.m_TimeStamp ) ); fprintf( dest, "TimeStamp = %s;\n", TO_UTF8( component.m_TimeStamp ) );
fprintf( dest, "Reference = %s;\n", TO_UTF8( component.m_Reference ) ); fprintf( dest, "Reference = %s;\n", TO_UTF8( component.m_Reference ) );
fprintf( dest, "ValeurCmp = %s;\n", TO_UTF8( component.m_Value ) ); fprintf( dest, "ValeurCmp = %s;\n", TO_UTF8( component.m_Value ) );
fprintf( dest, "IdModule = %s;\n", TO_UTF8( component.m_Module ) ); fprintf( dest, "IdModule = %s;\n", TO_UTF8( component.m_Footprint ) );
fprintf( dest, "EndCmp\n" ); fprintf( dest, "EndCmp\n" );
} }
@ -159,13 +159,13 @@ bool CVPCB_MAINFRAME::LoadComponentFile( const wxString& aFileName )
} /* End reading component description. */ } /* End reading component description. */
/* Search corresponding component and NetList Update its parameters. */ /* Search corresponding component and NetList Update its parameters. */
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
if( namecmp != component.m_Reference ) if( namecmp != component.m_Reference )
continue; continue;
/* Copy the name of the corresponding module. */ /* Copy the name of the corresponding module. */
component.m_Module = ilib; component.m_Footprint = ilib;
} }
} }

View File

@ -36,6 +36,8 @@
#include <cvpcb_mainframe.h> #include <cvpcb_mainframe.h>
#include <cvpcb_id.h> #include <cvpcb_id.h>
#include <common_help_msg.h>
void CVPCB_MAINFRAME::ReCreateHToolbar() void CVPCB_MAINFRAME::ReCreateHToolbar()
{ {
@ -48,11 +50,10 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_HORZ_LAYOUT ); wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_HORZ_LAYOUT );
m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString, m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
KiBitmap( open_document_xpm ), KiBitmap( open_document_xpm ), LOAD_FILE_HELP );
_( "Open a net list file" ) );
m_mainToolBar->AddTool( wxID_SAVE, wxEmptyString, KiBitmap( save_xpm ), m_mainToolBar->AddTool( wxID_SAVE, wxEmptyString, KiBitmap( save_xpm ),
_( "Save net list and footprint files" ) ); SAVE_HLP_MSG );
m_mainToolBar->AddSeparator(); m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_CVPCB_CREATE_CONFIGWINDOW, wxEmptyString, m_mainToolBar->AddTool( ID_CVPCB_CREATE_CONFIGWINDOW, wxEmptyString,

View File

@ -32,12 +32,12 @@ int CVPCB_MAINFRAME::GenNetlistPcbnew( FILE* file,bool isEESchemaNetlist )
fprintf( file, "( { netlist created %s }\n", TO_UTF8( DateAndTime() ) ); fprintf( file, "( { netlist created %s }\n", TO_UTF8( DateAndTime() ) );
BOOST_FOREACH( COMPONENT& component, m_components ) BOOST_FOREACH( COMPONENT_INFO& component, m_components )
{ {
fprintf( file, " ( %s ", TO_UTF8( component.m_TimeStamp ) ); fprintf( file, " ( %s ", TO_UTF8( component.m_TimeStamp ) );
if( !component.m_Module.IsEmpty() ) if( !component.m_Footprint.IsEmpty() )
fprintf( file, "%s", TO_UTF8( component.m_Module ) ); fprintf( file, "%s", TO_UTF8( component.m_Footprint ) );
else else
fprintf( file, "$noname$" ); fprintf( file, "$noname$" );
@ -67,7 +67,6 @@ int CVPCB_MAINFRAME::GenNetlistPcbnew( FILE* file,bool isEESchemaNetlist )
return 0; return 0;
} }
/* /*
* Write the allowed footprint list for each component * Write the allowed footprint list for each component
*/ */
@ -75,7 +74,7 @@ void WriteFootprintFilterInfos( FILE* file, COMPONENT_LIST& list )
{ {
bool WriteHeader = false; bool WriteHeader = false;
BOOST_FOREACH( COMPONENT& component, list ) BOOST_FOREACH( COMPONENT_INFO& component, list )
{ {
unsigned int FilterCount; unsigned int FilterCount;
FilterCount = component.m_FootprintFilter.GetCount(); FilterCount = component.m_FootprintFilter.GetCount();
@ -101,4 +100,3 @@ void WriteFootprintFilterInfos( FILE* file, COMPONENT_LIST& list )
if( WriteHeader ) if( WriteHeader )
fprintf( file, "$endfootprintlist\n}\n" ); fprintf( file, "$endfootprintlist\n}\n" );
} }

View File

@ -151,6 +151,7 @@ set(PCBNEW_SRCS
muonde.cpp muonde.cpp
muwave_command.cpp muwave_command.cpp
netlist.cpp netlist.cpp
netlist_reader_common.cpp
netlist_reader_firstformat.cpp netlist_reader_firstformat.cpp
netlist_reader_kicad.cpp netlist_reader_kicad.cpp
onleftclick.cpp onleftclick.cpp

View File

@ -167,13 +167,15 @@ bool PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFullFilename,
netList_Reader.m_UseTimeStamp = aSelect_By_Timestamp; netList_Reader.m_UseTimeStamp = aSelect_By_Timestamp;
netList_Reader.m_ChangeFootprints = aChangeFootprint; netList_Reader.m_ChangeFootprints = aChangeFootprint;
netList_Reader.m_UseCmpFile = useCmpfile; netList_Reader.m_UseCmpFile = useCmpfile;
netList_Reader.ReadFootprintFilterSetOpt( true );
netList_Reader.SetFilesnames( aNetlistFullFilename, aCmpFullFileName ); netList_Reader.SetFilesnames( aNetlistFullFilename, aCmpFullFileName );
// True to read footprint filters section: true for CvPcb, false pro Pcbnew
netList_Reader.ReadLibpartSectionSetOpt( false );
bool success = netList_Reader.ReadNetList( netfile ); bool success = netList_Reader.ReadNetList( netfile );
if( !success ) if( !success )
{ {
wxMessageBox( _("Netlist read error (unrecognized format)") ); wxMessageBox( _("Netlist read error") );
return false; return false;
} }
@ -201,281 +203,6 @@ bool PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFullFilename,
return true; return true;
} }
/*
* Function ReadNetList
* The main function to detect the netlist format,and run the right netlist reader
* aFile = the already opened file (will be closed by the netlist reader)
*/
bool NETLIST_READER::ReadNetList( FILE* aFile )
{
// Try to determine the netlist type:
// Beginning of the first line of known formats, without spaces
#define HEADERS_COUNT 3
#define HEADER_ORCADPCB "({EESchemaNetlist"
#define HEADER_PCB1 "#EESchemaNetlist"
#define HEADER_KICAD_NETFMT "(export"
const std::string headers[HEADERS_COUNT] =
{
HEADER_ORCADPCB, HEADER_PCB1, HEADER_KICAD_NETFMT
};
int format = -1;
for ( int jj = 0; jj < HEADERS_COUNT; jj++ )
{
int imax = headers[jj].size();
int ii = 0;
for( ; ii < imax; ii++ )
{
int data;
// Read header, and skip blanks to avoid errors if an header changes
do
{
data = fgetc( aFile );
} while ( ( data == ' ' ) &&( EOF != data ) ) ;
if( (int)headers[jj][ii] == data )
continue;
break;
}
if( ii == imax ) // header found
{
format = jj;
break;
}
rewind( aFile );
}
rewind( aFile );
bool success = false;
switch( format )
{
case 0:
m_typeNetlist = NETLIST_TYPE_ORCADPCB2;
success = ReadOldFmtdNetList( aFile );
break;
case 1:
m_typeNetlist = NETLIST_TYPE_PCB1;
success = ReadOldFmtdNetList( aFile );
break;
case 2:
m_typeNetlist = NETLIST_TYPE_KICAD;
success = ReadKicadNetList( aFile );
break;
default: // Unrecognized format:
break;
}
return success;
}
bool NETLIST_READER::InitializeModules()
{
if( m_UseCmpFile ) // Try to get footprint name from .cmp file
{
readModuleComponentLinkfile();
}
if( m_pcbframe == NULL )
return true;
for( unsigned ii = 0; ii < m_modulesInNetlist.size(); ii++ )
{
MODULE_INFO* currmod_info = m_modulesInNetlist[ii];
// Test if module is already loaded.
wxString * idMod = m_UseTimeStamp?
&currmod_info->m_TimeStamp : &currmod_info->m_Reference;
MODULE* module = FindModule( *idMod );
if( module == NULL ) // not existing, load it
{
m_newModulesList.push_back( currmod_info );
}
}
bool success = loadNewModules();
// Update modules fields
for( unsigned ii = 0; ii < m_modulesInNetlist.size(); ii++ )
{
MODULE_INFO* currmod_info = m_modulesInNetlist[ii];
// Test if module is already loaded.
wxString * idMod = m_UseTimeStamp?
&currmod_info->m_TimeStamp : &currmod_info->m_Reference;
MODULE* module = FindModule( *idMod );
if( module )
{
// Update current module ( reference, value and "Time Stamp")
module->m_Reference->m_Text = currmod_info->m_Reference;
module->m_Value->m_Text = currmod_info->m_Value;
module->SetPath( currmod_info->m_TimeStamp );
}
else // not existing
{
}
}
// clear pads netnames
for( MODULE* module = m_pcbframe->GetBoard()->m_Modules; module; module = module->Next() )
{
for( D_PAD* pad = module->m_Pads; pad; pad = pad->Next() )
pad->SetNetname( wxEmptyString );
}
return success;
}
void NETLIST_READER::TestFootprintsMatchingAndExchange()
{
if( m_pcbframe == NULL )
return;
for( MODULE* module = m_pcbframe->GetBoard()->m_Modules; module; module = module->Next() )
{
// Search for the corresponding module info
MODULE_INFO * mod_info = NULL;
for( unsigned ii = 0; ii < m_modulesInNetlist.size(); ii++ )
{
MODULE_INFO * candidate = m_modulesInNetlist[ii];
// Test if mod_info matches the current module:
if( candidate->m_Reference.CmpNoCase( module->GetReference() ) == 0 )
{
mod_info = candidate;
break;
}
}
if( mod_info == NULL ) // not found in netlist
continue;
if( module->GetLibRef().CmpNoCase( mod_info->m_Footprint ) != 0 )
{
if( m_ChangeFootprints ) // footprint exchange allowed.
{
MODULE* newModule = m_pcbframe->GetModuleLibrary( wxEmptyString,
mod_info->m_Footprint,
false );
if( newModule )
{
// Change old module to the new module (and delete the old one)
m_pcbframe->Exchange_Module( module, newModule, NULL );
module = newModule;
}
else if( m_messageWindow )
{
wxString msg;
msg.Printf( _( "Component \"%s\": module [%s] not found\n" ),
GetChars( mod_info->m_Reference ),
GetChars( mod_info->m_Footprint ) );
m_messageWindow->AppendText( msg );
}
}
else if( m_messageWindow )
{
wxString msg;
msg.Printf( _( "Component \"%s\": Mismatch! module is [%s] and netlist said [%s]\n" ),
GetChars( mod_info->m_Reference ),
GetChars( module->GetLibRef() ),
GetChars( mod_info->m_Footprint ) );
m_messageWindow->AppendText( msg );
}
}
}
}
/**
* Function SetPadNetName
* Update a pad netname
* @param aModule = module reference
* @param aPadname = pad name (pad num)
* @param aNetname = new net name of the pad
* @return a pointer to the pad or NULL if the pad is not found
*/
D_PAD* NETLIST_READER::SetPadNetName( const wxString & aModule, const wxString & aPadname,
const wxString & aNetname )
{
MODULE* module = m_pcbframe->GetBoard()->FindModuleByReference( aModule );
if( module )
{
D_PAD * pad = module->FindPadByName( aPadname );
if( pad )
{
pad->SetNetname( aNetname );
return pad;
}
if( m_messageWindow )
{
wxString msg;
msg.Printf( _( "Module [%s]: Pad [%s] not found" ),
GetChars( aModule ), GetChars( aPadname ) );
m_messageWindow->AppendText( msg + wxT( "\n" ) );
}
}
return NULL;
}
/* function RemoveExtraFootprints
* Remove (delete) not locked footprints found on board, but not in netlist
*/
void NETLIST_READER::RemoveExtraFootprints()
{
MODULE* nextModule;
MODULE* module = m_pcbframe->GetBoard()->m_Modules;
for( ; module != NULL; module = nextModule )
{
unsigned ii;
nextModule = module->Next();
if( module->m_ModuleStatus & MODULE_is_LOCKED )
continue;
for( ii = 0; ii < m_modulesInNetlist.size(); ii++ )
{
MODULE_INFO* mod_info = m_modulesInNetlist[ii];
if( module->m_Reference->m_Text.CmpNoCase( mod_info->m_Reference ) == 0 )
break; // Module is found in net list.
}
if( ii == m_modulesInNetlist.size() ) // Module not found in netlist.
module->DeleteStructure();
}
}
/* Search for a module id the modules existing in the current BOARD.
* aId is a key to identify the module to find:
* The reference or the full time stamp, according to m_UseTimeStamp
* Returns the module is found, NULL otherwise.
*/
MODULE* NETLIST_READER::FindModule( const wxString& aId )
{
MODULE* module = m_pcbframe->GetBoard()->m_Modules;
for( ; module != NULL; module = module->Next() )
{
if( m_UseTimeStamp ) // identification by time stamp
{
if( aId.CmpNoCase( module->m_Path ) == 0 )
return module;
}
else // identification by Reference
{
if( aId.CmpNoCase( module->m_Reference->m_Text ) == 0 )
return module;
}
}
return NULL;
}
/** /**
* build and shows a list of existing modules on board * build and shows a list of existing modules on board
@ -552,7 +279,7 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
if( ! netList_Reader.ReadNetList( netfile ) ) if( ! netList_Reader.ReadNetList( netfile ) )
return; // error return; // error
std::vector <MODULE_INFO*>& moduleInfoList = netList_Reader.GetModuleInfoList(); COMPONENT_INFO_LIST& moduleInfoList = netList_Reader.GetComponentInfoList();
if( moduleInfoList.size() == 0 ) if( moduleInfoList.size() == 0 )
{ {
@ -592,12 +319,12 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
for( unsigned ii = 0; ii < moduleInfoList.size(); ii++ ) for( unsigned ii = 0; ii < moduleInfoList.size(); ii++ )
{ {
MODULE_INFO* mod_info = moduleInfoList[ii]; COMPONENT_INFO* cmp_info = moduleInfoList[ii];
module = GetBoard()->FindModuleByReference( mod_info->m_Reference ); module = GetBoard()->FindModuleByReference( cmp_info->m_Reference );
if( module == NULL ) // Module missing, not found in board if( module == NULL ) // Module missing, not found in board
{ {
list << wxT("<br>") << mod_info->m_Reference; list << wxT("<br>") << cmp_info->m_Reference;
list << wxT(" (<i>") << mod_info->m_Value << wxT("</i>)"); list << wxT(" (<i>") << cmp_info->m_Value << wxT("</i>)");
err_cnt++; err_cnt++;
} }
if( ERR_CNT_MAX < err_cnt ) if( ERR_CNT_MAX < err_cnt )
@ -613,8 +340,8 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
unsigned ii; unsigned ii;
for( ii = 0; ii < moduleInfoList.size(); ii++ ) for( ii = 0; ii < moduleInfoList.size(); ii++ )
{ {
MODULE_INFO* mod_info = moduleInfoList[ii]; COMPONENT_INFO* cmp_info = moduleInfoList[ii];
if( module->m_Reference->m_Text.CmpNoCase( mod_info->m_Reference ) == 0 ) if( module->m_Reference->m_Text.CmpNoCase( cmp_info->m_Reference ) == 0 )
break; // Module is in net list. break; // Module is in net list.
} }
@ -641,215 +368,3 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
dlg.AddHTML_Text(list); dlg.AddHTML_Text(list);
dlg.ShowModal(); dlg.ShowModal();
} }
/*
* function readModuleComponentLinkfile
* read the *.cmp file ( filename in m_cmplistFullName )
* giving the equivalence Footprint_names / components
* to find the footprint name corresponding to aCmpIdent
* return true if the file can be read
*
* Sample file:
*
* Cmp-Mod V01 Genere by Pcbnew 29/10/2003-13: 11:6 *
* BeginCmp
* TimeStamp = /32307DE2/AA450F67;
* Reference = C1;
* ValeurCmp = 47uF;
* IdModule = CP6;
* EndCmp
*
*/
bool NETLIST_READER::readModuleComponentLinkfile()
{
wxString refcurrcmp; // Stores value read from line like Reference = BUS1;
wxString timestamp; // Stores value read from line like TimeStamp = /32307DE2/AA450F67;
wxString footprint; // Stores value read from line like IdModule = CP6;
FILE* cmpFile = wxFopen( m_cmplistFullName, wxT( "rt" ) );
if( cmpFile == NULL )
{
wxString msg;
msg.Printf( _( "File <%s> not found, use Netlist for footprints selection" ),
GetChars( m_cmplistFullName ) );
if( m_messageWindow )
m_messageWindow->AppendText( msg );
return false;
}
// netlineReader dtor will close cmpFile
FILE_LINE_READER netlineReader( cmpFile, m_cmplistFullName );
wxString buffer;
wxString value;
while( netlineReader.ReadLine() )
{
buffer = FROM_UTF8( netlineReader.Line() );
if( ! buffer.StartsWith( wxT("BeginCmp") ) )
continue;
// Begin component description.
refcurrcmp.Empty();
footprint.Empty();
timestamp.Empty();
while( netlineReader.ReadLine() )
{
buffer = FROM_UTF8( netlineReader.Line() );
if( buffer.StartsWith( wxT("EndCmp") ) )
break;
// store string value, stored between '=' and ';' delimiters.
value = buffer.AfterFirst( '=' );
value = value.BeforeLast( ';');
value.Trim(true);
value.Trim(false);
if( buffer.StartsWith( wxT("Reference") ) )
{
refcurrcmp = value;
continue;
}
if( buffer.StartsWith( wxT("IdModule =" ) ) )
{
footprint = value;
continue;
}
if( buffer.StartsWith( wxT("TimeStamp =" ) ) )
{
timestamp = value;
continue;
}
}
// Find the corresponding item in module info list:
for( unsigned ii = 0; ii < m_modulesInNetlist.size(); ii++ )
{
MODULE_INFO * mod_info = m_modulesInNetlist[ii];
if( m_UseTimeStamp ) // Use schematic timestamp to locate the footprint
{
if( mod_info->m_TimeStamp.CmpNoCase( timestamp ) == 0 &&
!timestamp.IsEmpty() )
{ // Found
if( !footprint.IsEmpty() )
mod_info->m_Footprint = footprint;
break;
}
}
else // Use schematic reference to locate the footprint
{
if( mod_info->m_Reference.CmpNoCase( refcurrcmp ) == 0 ) // Found!
{
if( !footprint.IsEmpty() )
mod_info->m_Footprint = footprint;
break;
}
}
}
}
return true;
}
/* Function to sort the footprint list, used by loadNewModules.
* the given list is sorted by name
*/
static bool SortByLibName( MODULE_INFO* ref, MODULE_INFO* cmp )
{
int ii = ref->m_Footprint.CmpNoCase( cmp->m_Footprint );
return ii > 0;
}
/* Load new modules from library.
* If a new module is already loaded it is duplicated, which avoids multiple
* unnecessary disk or net access to read libraries.
* return false if a footprint is not found, true if OK
*/
bool NETLIST_READER::loadNewModules()
{
MODULE_INFO* ref, * cmp;
MODULE* Module = NULL;
wxPoint ModuleBestPosition;
BOARD* pcb = m_pcbframe->GetBoard();
bool success = true;
if( m_newModulesList.size() == 0 )
return true;
sort( m_newModulesList.begin(), m_newModulesList.end(), SortByLibName );
// Calculate the footprint "best" position:
EDA_RECT bbbox = pcb->ComputeBoundingBox( true );
if( bbbox.GetWidth() || bbbox.GetHeight() )
{
ModuleBestPosition = bbbox.GetEnd();
ModuleBestPosition.y += 5000;
}
ref = cmp = m_newModulesList[0];
for( unsigned ii = 0; ii < m_newModulesList.size(); ii++ )
{
cmp = m_newModulesList[ii];
if( (ii == 0) || ( ref->m_Footprint != cmp->m_Footprint) )
{
// New footprint : must be loaded from a library
Module = m_pcbframe->GetModuleLibrary( wxEmptyString, cmp->m_Footprint, false );
ref = cmp;
if( Module == NULL )
{
success = false;
if( m_messageWindow )
{
wxString msg;
msg.Printf( _( "Component [%s]: footprint <%s> not found" ),
GetChars( cmp->m_Reference ),
GetChars( cmp->m_Footprint ) );
msg += wxT("\n");
m_messageWindow->AppendText( msg );
}
continue;
}
Module->SetPosition( ModuleBestPosition );
/* Update schematic links : reference "Time Stamp" and schematic
* hierarchical path */
Module->m_Reference->m_Text = cmp->m_Reference;
Module->SetTimeStamp( GetNewTimeStamp() );
Module->SetPath( cmp->m_TimeStamp );
}
else
{
// Footprint already loaded from a library, duplicate it (faster)
if( Module == NULL )
continue; // Module does not exist in library.
MODULE* newmodule = new MODULE( *Module );
newmodule->SetParent( pcb );
pcb->Add( newmodule, ADD_APPEND );
Module = newmodule;
Module->m_Reference->m_Text = cmp->m_Reference;
Module->SetTimeStamp( GetNewTimeStamp() );
Module->SetPath( cmp->m_TimeStamp );
}
}
return success;
}

View File

@ -30,6 +30,7 @@
*/ */
#include <algorithm> #include <algorithm>
#include <boost/ptr_container/ptr_vector.hpp>
#include <fctsys.h> #include <fctsys.h>
#include <kicad_string.h> #include <kicad_string.h>
@ -41,21 +42,47 @@
#include <class_module.h> #include <class_module.h>
#include <pcbnew.h> #include <pcbnew.h>
/* /*
* Helper class, to store new footprints info found in netlist. * Helper class, to store for a footprint the footprint filter info,
* New footprints are footprints relative to new components found in netlist * found in new format KiCad netlist.
* For CvPcb only
* Note: features for CvPcb are for a temporary use.
* They could be removed when CvPcb is modified
* (perhaps when it does not use anumore a netlist to build the component to footprint link)
*/ */
class MODULE_INFO class LIPBART_INFO
{ {
public: public:
wxString m_Footprint; wxString m_Libpart; // the libpart name.
wxString m_Reference; wxArrayString m_FootprintFilter; // an array of footprint filters found in netlist,
wxString m_Value; // for this footprint
wxString m_TimeStamp;
wxArrayString m_FootprintFilter;
public: MODULE_INFO( const wxString& libname, public:
LIPBART_INFO( const wxString& aLibpart )
{
m_Libpart = aLibpart;
}
};
typedef std::vector <LIPBART_INFO *> LIPBART_INFO_LIST;
/*
* Helper class, to store components and footprints info found in netlist.
* (component reference and time stamp, footprint name ...
*/
class COMPONENT_INFO
{
public:
wxString m_Footprint; // the footprint name found in netlist, the in .cmp file
wxString m_Reference; // the schematic reference found in netlist
wxString m_Value; // the schematic value found in netlist
wxString m_TimeStamp; // the schematic full time stamp found in netlist
wxString m_Libpart; // the schematic libpart found in netlist
wxArrayString m_FootprintFilter; // a footprint filters list found in old format netlist
public: COMPONENT_INFO( const wxString& libname,
const wxString& cmpname, const wxString& cmpname,
const wxString& value, const wxString& value,
const wxString& timestamp ) const wxString& timestamp )
@ -66,37 +93,42 @@ public: MODULE_INFO( const wxString& libname,
m_TimeStamp = timestamp; m_TimeStamp = timestamp;
} }
~MODULE_INFO() { }; ~COMPONENT_INFO() { };
}; };
enum typenetlist enum typenetlist
{ {
NETLIST_TYPE_UNSPECIFIED = 0, NETLIST_TYPE_UNSPECIFIED = 0,
NETLIST_TYPE_ORCADPCB2, // the basic format used by pcbnew NETLIST_TYPE_ORCADPCB2, // the basic format used by pcbnew
NETLIST_TYPE_PCB1, // the format used by pcbnew, basic format + more info NETLIST_TYPE_PCBNEW, // the format used by pcbnew, basic format + more info
NETLIST_TYPE_KICAD NETLIST_TYPE_KICAD // new format using common S expression
}; };
typedef std::vector <COMPONENT_INFO*> COMPONENT_INFO_LIST;
/* /*
* Helper class, to read a netlist. * Helper class, to read a netlist.
*/ */
class NETLIST_READER class NETLIST_READER
{ {
private: private:
PCB_EDIT_FRAME* m_pcbframe; // the main Pcbnew frame PCB_EDIT_FRAME* m_pcbframe; // the main Pcbnew frame (or NULL for CvPcb)
wxTextCtrl* m_messageWindow; // a textctrl to show messages (can be NULL) wxTextCtrl* m_messageWindow; // a textctrl to show messages (can be NULL)
wxString m_netlistFullName; // The full netlist filename wxString m_netlistFullName; // The full netlist filename
wxString m_cmplistFullName; // The full component/footprint association filename wxString m_cmplistFullName; // The full component/footprint association filename
MODULE* m_currModule; // The footprint currently being read in netlist MODULE* m_currModule; // The footprint currently being read in netlist
std::vector <MODULE_INFO*> m_modulesInNetlist; // The list of footprints, found in netlist COMPONENT_INFO_LIST m_componentsInNetlist; // The list of footprints, found in netlist
// (must be loaded from libraries) // (must be loaded from libraries)
std::vector <MODULE_INFO*> m_newModulesList; // The list of new footprints, COMPONENT_INFO_LIST m_newModulesList; // The list of new footprints,
// found in netlist, but not on board // found in netlist, but not on board
// (must be loaded from libraries) // (must be loaded from libraries)
bool m_buildModuleListOnly; // if true read netlist, populates m_modulesInNetlist LIPBART_INFO_LIST m_libpartList; // For Kicad new netlist format:
// list of libpart found in netlist
// A libpart contains the footprint filters for CvPcb
bool m_buildModuleListOnly; // if true read netlist, populates m_componentsInNetlist
// but do not read and change nets and modules on board // but do not read and change nets and modules on board
bool m_readFootprintFilter; // if true read footprint filter section bool m_readLibpartSection; // if true read Libparts section,
// and therefore the footprints filters
enum typenetlist m_typeNetlist; // type opt the netlist currently read enum typenetlist m_typeNetlist; // type opt the netlist currently read
public: public:
@ -107,7 +139,9 @@ public:
bool m_ChangeFootprints; // Set to true to change existing footprints to new ones bool m_ChangeFootprints; // Set to true to change existing footprints to new ones
// when netlist gives a different footprint name // when netlist gives a different footprint name
public: NETLIST_READER( PCB_EDIT_FRAME* aFrame, wxTextCtrl* aMessageWindow = NULL ) public:
NETLIST_READER( PCB_EDIT_FRAME* aFrame, wxTextCtrl* aMessageWindow = NULL )
{ {
m_pcbframe = aFrame; m_pcbframe = aFrame;
m_messageWindow = aMessageWindow; m_messageWindow = aMessageWindow;
@ -115,7 +149,7 @@ public: NETLIST_READER( PCB_EDIT_FRAME* aFrame, wxTextCtrl* aMessageWindow = NUL
m_ChangeFootprints = false; m_ChangeFootprints = false;
m_UseCmpFile = true; m_UseCmpFile = true;
m_buildModuleListOnly = false; m_buildModuleListOnly = false;
m_readFootprintFilter = false; m_readLibpartSection = false;
m_typeNetlist = NETLIST_TYPE_UNSPECIFIED; m_typeNetlist = NETLIST_TYPE_UNSPECIFIED;
} }
@ -123,40 +157,97 @@ public: NETLIST_READER( PCB_EDIT_FRAME* aFrame, wxTextCtrl* aMessageWindow = NUL
{ {
// Free modules info list: // Free modules info list:
for( unsigned ii = 0; ii < m_newModulesList.size(); ii++ ) for( unsigned ii = 0; ii < m_newModulesList.size(); ii++ )
delete m_modulesInNetlist[ii]; delete m_componentsInNetlist[ii];
m_modulesInNetlist.clear(); m_componentsInNetlist.clear();
m_newModulesList.clear(); m_newModulesList.clear();
// Free libpart info list:
for( unsigned ii = 0; ii < m_libpartList.size(); ii++ )
delete m_libpartList[ii];
m_libpartList.clear();
} }
std::vector <MODULE_INFO*>& GetModuleInfoList() /**
* Function GetNetlistType
* @return the type of netlist read:
* NETLIST_TYPE_UNSPECIFIED: Unknown format
* NETLIST_TYPE_ORCADPCB2: the basic format used by pcbnew
* NETLIST_TYPE_PCBNEW: the format used by pcbnew, basic format + more info
* NETLIST_TYPE_KICAD: the new format
*/
int GetNetlistType()
{ {
return m_modulesInNetlist; return m_typeNetlist;
} }
/**
* Function GetComponentInfoList
* @return the component info list built from the netlist
*/
COMPONENT_INFO_LIST& GetComponentInfoList()
{
return m_componentsInNetlist;
}
/**
* Function GetComponentInfoList
* @return a reference to the libpart info corresponding to a given part
* @param aPartname = the name of the libpart
*/
LIPBART_INFO* GetLibpart(const wxString & aPartname);
/**
* Function IsCvPcbMode
* @return true if the netlist is read by CvPcb
* In cvpcb mode, nets are stored in module info,
* and the footprint filters list is read.
* There is also no board in CvPcb
*/
bool IsCvPcbMode() { return m_pcbframe == 0; }
/** /**
* Function AddModuleInfo * Function AddModuleInfo
* Add a new module info to the main list of modules ifo * Add a new module info to the main list of modules ifo
* @param aModInfo = a reference to the item to add * @param aModInfo = a reference to the item to add
*/ */
void AddModuleInfo( MODULE_INFO* aModInfo ) void AddModuleInfo( COMPONENT_INFO* aModInfo )
{ {
m_modulesInNetlist.push_back( aModInfo ); m_componentsInNetlist.push_back( aModInfo );
} }
/** /**
* Function ReadFootprintFilterSetOpt * Function AddLibpartInfo
* Set to true or false the read footprint filter option * LIPBART_INFO items (and therefore footprint filter strings) are stored in
* When this option is false, the footprint filter section is ignored * m_libpartList
* When this option is true, the footprint filter section is read, * @param aPartInfo = a refernce to the LIPBART_INFO to add in list
* an filter strings are stored in module info */
void AddLibpartInfo( LIPBART_INFO * aPartInfo )
{
m_libpartList.push_back( aPartInfo );
}
/**
* Function ReadLibpartSectionSetOpt
* Set to true or false the read Partlists section.
* footprint filters are found in this section
* When this option is false, the Partlists section is ignored
* When this option is true, the Partlists section is read,
* Libpart items (and therefore footprint filter strings) are stored in
* m_libpartList
* @param aOpt = the value of option * @param aOpt = the value of option
*/ */
void ReadFootprintFilterSetOpt( bool aOpt ) void ReadLibpartSectionSetOpt( bool aOpt )
{ {
m_readFootprintFilter = aOpt; m_readLibpartSection = aOpt;
} }
/**
* Function ReadLibpartSectionOpt
* @return the readPartlist option
*/
bool ReadLibpartSectionOpt() { return m_readLibpartSection; }
/** /**
* Function BuildModuleListOnlySetOpt * Function BuildModuleListOnlySetOpt
* Set to true or false the Build Module List Only option * Set to true or false the Build Module List Only option
@ -330,7 +421,7 @@ private:
/** /**
* function readModuleComponentLinkfile * function readModuleComponentLinkfile
* read the *.cmp file ( filename in m_cmplistFullName ) * read the *.cmp file ( filename in m_cmplistFullName )
* and initialize the m_Footprint member of each item in m_modulesInNetlist, * and initialize the m_Footprint member of each item in m_componentsInNetlist,
* when it is found in file, and with a non empty footprint value * when it is found in file, and with a non empty footprint value
* giving the equivalence between footprint names and components * giving the equivalence between footprint names and components
* to find the footprint name corresponding to aCmpIdent * to find the footprint name corresponding to aCmpIdent

View File

@ -30,7 +30,7 @@
/* /*
* Netlist reader using the first format of pcbnew netlist. * Netlist reader using the first format of pcbnew netlist.
* This netlist reader build the list of modules found in netlist * This netlist reader build the list of modules found in netlist
* (list in m_modulesInNetlist) * (list in m_componentsInNetlist)
* and update pads netnames * and update pads netnames
*/ */
@ -98,7 +98,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
if( *line == '{' ) // Start Comment or Pcbnew info section if( *line == '{' ) // Start Comment or Pcbnew info section
{ {
is_comment = true; is_comment = true;
if( m_readFootprintFilter && state == 0 && if( ReadLibpartSectionOpt() && state == 0 &&
(strnicmp( line, "{ Allowed footprints", 20 ) == 0) ) (strnicmp( line, "{ Allowed footprints", 20 ) == 0) )
{ {
ReadOldFmtFootprintFilterList( netlineReader ); ReadOldFmtFootprintFilterList( netlineReader );
@ -126,6 +126,24 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
} }
} }
if( IsCvPcbMode() )
{
for( ; ; )
{
/* Search the beginning of Allowed footprints section */
if( netlineReader.ReadLine( ) == 0 )
break;
char* line = StrPurge( netlineReader.Line() );
if( strnicmp( line, "{ Allowed footprints", 20 ) == 0 )
{
ReadOldFmtFootprintFilterList( netlineReader );
return true;
}
}
return true;
}
if( BuildModuleListOnlyOpt() ) if( BuildModuleListOnlyOpt() )
return true; // at this point, the module list is read and built. return true; // at this point, the module list is read and built.
@ -191,7 +209,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
/* Function ReadOldFmtNetlistModuleDescr /* Function ReadOldFmtNetlistModuleDescr
* Read the beginning of a footprint description, from the netlist * Read the beginning of a footprint description, from the netlist
* and add a module info to m_modulesInNetlist * and add a module info to m_componentsInNetlist
* Analyze the first line of a component description in netlist like: * Analyze the first line of a component description in netlist like:
* ( /40C08647 $noname R20 4.7K {Lib=R} * ( /40C08647 $noname R20 4.7K {Lib=R}
* (1 VCC) * (1 VCC)
@ -243,9 +261,9 @@ MODULE* NETLIST_READER::ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildLi
if( aBuildList ) if( aBuildList )
{ {
MODULE_INFO* mod_info = new MODULE_INFO( footprintName, cmpReference, COMPONENT_INFO* cmp_info = new COMPONENT_INFO( footprintName, cmpReference,
cmpValue, timeStampPath ); cmpValue, timeStampPath );
AddModuleInfo( mod_info ); AddModuleInfo( cmp_info );
return NULL; return NULL;
} }
@ -344,7 +362,7 @@ bool NETLIST_READER::SetPadNetName( char* aText )
bool NETLIST_READER::ReadOldFmtFootprintFilterList( FILE_LINE_READER& aNetlistReader ) bool NETLIST_READER::ReadOldFmtFootprintFilterList( FILE_LINE_READER& aNetlistReader )
{ {
wxString cmpRef; wxString cmpRef;
MODULE_INFO* mod_info = NULL; COMPONENT_INFO* cmp_info = NULL;
while( aNetlistReader.ReadLine() ) while( aNetlistReader.ReadLine() )
{ {
@ -352,7 +370,7 @@ bool NETLIST_READER::ReadOldFmtFootprintFilterList( FILE_LINE_READER& aNetlistR
if( strnicmp( Line, "$endlist", 8 ) == 0 ) // end of list for the current component if( strnicmp( Line, "$endlist", 8 ) == 0 ) // end of list for the current component
{ {
mod_info = NULL; cmp_info = NULL;
continue; continue;
} }
if( strnicmp( Line, "$endfootprintlist", 4 ) == 0 ) if( strnicmp( Line, "$endfootprintlist", 4 ) == 0 )
@ -366,22 +384,22 @@ bool NETLIST_READER::ReadOldFmtFootprintFilterList( FILE_LINE_READER& aNetlistR
cmpRef.Trim( false ); cmpRef.Trim( false );
// Search the current component in module info list: // Search the current component in module info list:
BOOST_FOREACH( MODULE_INFO * &component, m_modulesInNetlist ) BOOST_FOREACH( COMPONENT_INFO * &component, m_componentsInNetlist )
{ {
if( component->m_Reference == cmpRef ) if( component->m_Reference == cmpRef )
{ {
mod_info = component; cmp_info = component;
break; break;
} }
} }
} }
else if( mod_info ) else if( cmp_info )
{ {
// Add new filter to list // Add new filter to list
wxString fp = FROM_UTF8( Line + 1 ); wxString fp = FROM_UTF8( Line + 1 );
fp.Trim( false ); fp.Trim( false );
fp.Trim( true ); fp.Trim( true );
mod_info->m_FootprintFilter.Add( fp ); cmp_info->m_FootprintFilter.Add( fp );
} }
} }

View File

@ -60,11 +60,11 @@ public:
* (sheetpath (names /) (tstamps /)) * (sheetpath (names /) (tstamps /))
* (tstamp 3256759C)) * (tstamp 3256759C))
*/ */
MODULE_INFO* ParseComp() throw( IO_ERROR, PARSE_ERROR ); COMPONENT_INFO* ParseComp() throw( IO_ERROR, PARSE_ERROR );
/** /**
* Function ParseKicadFootprintFilterList * Function ParseKicadLibpartList
* Read the section "libparts" like: * Read the section "libparts" like:
* (libparts * (libparts
* (libpart (lib device) (part C) * (libpart (lib device) (part C)
@ -85,7 +85,7 @@ public:
* <p>This section is used by CvPcb, and is not useful in Pcbnew, * <p>This section is used by CvPcb, and is not useful in Pcbnew,
* therefore it it not always read </p> * therefore it it not always read </p>
*/ */
bool ParseKicadFootprintFilterList() throw( IO_ERROR, PARSE_ERROR ); void ParseKicadLibpartList() throw( IO_ERROR, PARSE_ERROR );
/** /**
* Function ParseNet * Function ParseNet
@ -116,7 +116,7 @@ public:
bool NETLIST_READER::ReadKicadNetList( FILE* aFile ) bool NETLIST_READER::ReadKicadNetList( FILE* aFile )
{ {
BOARD * brd = m_pcbframe->GetBoard(); BOARD * brd = m_pcbframe ? m_pcbframe->GetBoard() : NULL;
// netlineReader dtor will close aFile // netlineReader dtor will close aFile
FILE_LINE_READER netlineReader( aFile, m_netlistFullName ); FILE_LINE_READER netlineReader( aFile, m_netlistFullName );
@ -188,8 +188,8 @@ void NETLIST_READER_KICAD_PARSER::Parse( BOARD * aBrd )
if( token == T_comp ) if( token == T_comp )
{ {
// A comp section if found. Read it // A comp section if found. Read it
MODULE_INFO* mod_info = ParseComp(); COMPONENT_INFO* cmp_info = ParseComp();
netlist_reader->AddModuleInfo( mod_info ); netlist_reader->AddModuleInfo( cmp_info );
} }
} }
if( netlist_reader->BuildModuleListOnlyOpt() ) if( netlist_reader->BuildModuleListOnlyOpt() )
@ -213,6 +213,21 @@ void NETLIST_READER_KICAD_PARSER::Parse( BOARD * aBrd )
} }
} }
} }
if( token == T_libparts && netlist_reader->ReadLibpartSectionOpt() )
{
// The section libparts starts here.
while( ( token = NextTok() ) != T_RIGHT )
{
if( token == T_LEFT )
token = NextTok();
if( token == T_libpart )
{
// A libpart section if found. Read it
ParseKicadLibpartList();
}
}
}
} }
} }
@ -293,7 +308,7 @@ void NETLIST_READER_KICAD_PARSER::ParseNet( BOARD * aBrd )
} }
MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp() COMPONENT_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
throw( IO_ERROR, PARSE_ERROR ) throw( IO_ERROR, PARSE_ERROR )
{ {
/* Parses a section like /* Parses a section like
@ -311,6 +326,7 @@ MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
wxString ref; wxString ref;
wxString value; wxString value;
wxString footprint; wxString footprint;
wxString libpart;
wxString pathtimestamp, timestamp; wxString pathtimestamp, timestamp;
// The token comp was read, so the next data is (ref P1) // The token comp was read, so the next data is (ref P1)
@ -339,8 +355,20 @@ MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
break; break;
case T_libsource: case T_libsource:
// Currently not used data, skip it // Read libsource
while( (token = NextTok()) != T_RIGHT )
{
if( token == T_LEFT )
token = NextTok();
if( token == T_part )
{
NeedSYMBOLorNUMBER();
libpart = FROM_UTF8( CurText() );
NeedRIGHT();
}
else
SkipCurrent(); SkipCurrent();
}
break; break;
case T_sheetpath: case T_sheetpath:
@ -364,9 +392,10 @@ MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
} }
} }
pathtimestamp += timestamp; pathtimestamp += timestamp;
MODULE_INFO* mod_info = new MODULE_INFO( footprint, ref, value, pathtimestamp ); COMPONENT_INFO* cmp_info = new COMPONENT_INFO( footprint, ref, value, pathtimestamp );
cmp_info->m_Libpart = libpart;
return mod_info; return cmp_info;
} }
/* Read the section "libparts" like: /* Read the section "libparts" like:
@ -387,8 +416,66 @@ MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
* And add the strings giving the footprint filter (subsection footprints) * And add the strings giving the footprint filter (subsection footprints)
* of the corresponding module info * of the corresponding module info
*/ */
bool NETLIST_READER_KICAD_PARSER::ParseKicadFootprintFilterList() throw( IO_ERROR, PARSE_ERROR ) void NETLIST_READER_KICAD_PARSER::ParseKicadLibpartList() throw( IO_ERROR, PARSE_ERROR )
{ {
// TODO /* Parses a section like
return true; * (libpart (lib device) (part C)
* (description "Condensateur non polarise")
* (footprints
* (fp SM*)
* (fp C?)
* (fp C1-1))
* (fields
* (field (name Reference) C)
* (field (name Value) C))
* (pins
* (pin (num 1) (name ~) (type passive))
* (pin (num 2) (name ~) (type passive))))
*
* Currently footprints section/fp are read and data stored
* other fields (unused) are skipped
*/
wxString device;
wxString filter;
LIPBART_INFO* libpart_info = NULL;
// The last token read was libpart, so read the next token
while( (token = NextTok()) != T_RIGHT )
{
if( token == T_LEFT )
token = NextTok();
switch( token )
{
case T_part:
NeedSYMBOLorNUMBER();
device = FROM_UTF8( CurText() );
NeedRIGHT();
libpart_info = new LIPBART_INFO( device );
netlist_reader->AddLibpartInfo( libpart_info );
break;
case T_footprints:
// Ensure "(part C)" was already read
if( libpart_info == NULL )
Expecting( T_part );
// Read all fp elements (footprint filter item)
while( (token = NextTok()) != T_RIGHT )
{
if( token == T_LEFT )
token = NextTok();
if( token != T_fp )
Expecting( T_fp );
NeedSYMBOLorNUMBER();
filter = FROM_UTF8( CurText() );
NeedRIGHT();
libpart_info->m_FootprintFilter.Add( filter );
}
break;
default:
// Skip not used data (i.e all other tokens)
SkipCurrent();
break;
}
}
} }