From da687ebe1eff190e2c88a12476ce235065fa6761 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Fri, 1 Jan 2021 11:23:41 -0800 Subject: [PATCH] Unify zone fill/unfill/add icons --- bitmaps_png/cpp_24/fill_zone.cpp | 100 ++++++-------- bitmaps_png/cpp_24/zone_unfill.cpp | 93 ++++++------- bitmaps_png/sources/fill_zone.svg | 195 +++++++++++++++++++++------- bitmaps_png/sources/zone_unfill.svg | 173 ++++++++++++++++++------ 4 files changed, 369 insertions(+), 192 deletions(-) diff --git a/bitmaps_png/cpp_24/fill_zone.cpp b/bitmaps_png/cpp_24/fill_zone.cpp index becd196438..e0430ad966 100644 --- a/bitmaps_png/cpp_24/fill_zone.cpp +++ b/bitmaps_png/cpp_24/fill_zone.cpp @@ -8,63 +8,49 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d, - 0xf8, 0x00, 0x00, 0x03, 0x75, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x94, 0x6b, 0x48, 0x93, - 0x51, 0x18, 0xc7, 0x5f, 0xf1, 0x43, 0x99, 0x74, 0xb1, 0x3e, 0xb9, 0xcd, 0x50, 0xc9, 0xe9, 0xd2, - 0x22, 0x2f, 0x14, 0x85, 0x1f, 0x36, 0x97, 0x50, 0x98, 0x49, 0xea, 0x6a, 0xcc, 0xbc, 0xd5, 0x12, - 0x4b, 0x9d, 0xa2, 0x15, 0xe6, 0x2c, 0xde, 0x2d, 0x61, 0xf3, 0x92, 0x57, 0x2c, 0x99, 0xa8, 0x64, - 0x22, 0xe4, 0x34, 0xd4, 0xe5, 0xbc, 0xb6, 0xa5, 0xbe, 0x2b, 0x52, 0x71, 0x50, 0x12, 0x24, 0x66, - 0x66, 0x68, 0x1f, 0x0a, 0xca, 0xcb, 0x17, 0x27, 0xf3, 0x74, 0xce, 0xea, 0xcc, 0x4d, 0x6d, 0x86, - 0xae, 0x17, 0xfe, 0xf0, 0xbc, 0xcf, 0x39, 0xef, 0xff, 0x77, 0xde, 0x73, 0x9e, 0xf3, 0x10, 0x04, - 0x7c, 0xa2, 0xa3, 0xa3, 0x6b, 0x78, 0x3c, 0x5e, 0x08, 0xf1, 0xbf, 0x1e, 0x68, 0xbe, 0x17, 0x4a, - 0x03, 0x41, 0x5c, 0x9c, 0x8b, 0x8d, 0x8d, 0x75, 0x8e, 0x8b, 0x8b, 0x1b, 0x8d, 0x8f, 0x8f, 0x7f, - 0x0c, 0x5f, 0x1d, 0xec, 0x0a, 0x09, 0x0f, 0x0f, 0xdf, 0x05, 0xcd, 0x87, 0x15, 0x0a, 0xc5, 0x92, - 0x4c, 0x26, 0x5b, 0x80, 0xb0, 0x26, 0x7b, 0x42, 0xfa, 0x05, 0x02, 0xc1, 0x07, 0x64, 0xde, 0xdd, - 0xdd, 0x0d, 0x90, 0x30, 0x84, 0x47, 0xf0, 0x1c, 0xb7, 0x05, 0xf8, 0xb3, 0xf2, 0xd1, 0xa4, 0xa4, - 0x24, 0x63, 0x6d, 0x6d, 0x2d, 0xc0, 0x00, 0x0c, 0x91, 0x85, 0x5e, 0x78, 0xad, 0xf5, 0x0e, 0xc9, - 0x53, 0x1f, 0x3a, 0xbb, 0x63, 0xab, 0xe6, 0xa6, 0x6d, 0x51, 0xa9, 0x54, 0x40, 0x24, 0x12, 0x01, - 0x18, 0x83, 0xaa, 0xaa, 0x2a, 0xa0, 0x54, 0x2a, 0xcd, 0x90, 0x32, 0xf6, 0x79, 0xbd, 0xd6, 0x9b, - 0xfd, 0x4a, 0xeb, 0xce, 0xde, 0xb9, 0x25, 0x73, 0xbc, 0x62, 0x04, 0x81, 0x39, 0x50, 0x5c, 0x5c, - 0x6c, 0x82, 0x35, 0x34, 0x34, 0x98, 0xf2, 0x72, 0xb9, 0x7c, 0xa1, 0x82, 0x1d, 0xa1, 0xd7, 0x30, - 0x39, 0xc5, 0x5b, 0x36, 0x47, 0x6a, 0x6e, 0x6e, 0x06, 0x62, 0xb1, 0xd8, 0x14, 0xd7, 0xd4, 0xd4, - 0x20, 0x63, 0xf3, 0x18, 0x82, 0x3c, 0x08, 0x89, 0x18, 0x69, 0x62, 0x9c, 0x74, 0xda, 0x14, 0x00, - 0xcb, 0x50, 0x53, 0x5d, 0x5d, 0x6d, 0xb0, 0x34, 0x47, 0xea, 0xea, 0xea, 0x02, 0xe9, 0xe9, 0xe9, - 0x26, 0xe3, 0xd4, 0xd4, 0x54, 0xd0, 0xd8, 0xd8, 0x68, 0x1e, 0x43, 0x5b, 0x56, 0xc8, 0x8d, 0x32, - 0x26, 0x0a, 0x0a, 0xa6, 0x68, 0x12, 0x6a, 0xc4, 0x24, 0x92, 0x1a, 0xa4, 0x93, 0xba, 0x27, 0x30, - 0xee, 0x41, 0x31, 0x4d, 0x3a, 0x98, 0xef, 0x4e, 0x6a, 0xf7, 0x11, 0x42, 0xa1, 0x70, 0x66, 0xad, - 0x39, 0x56, 0x47, 0x47, 0x07, 0xa8, 0xab, 0xab, 0x03, 0xad, 0xad, 0xad, 0x56, 0xe6, 0xd7, 0x63, - 0xae, 0x2d, 0xf7, 0xf9, 0x70, 0x57, 0x54, 0x47, 0xc2, 0x0c, 0x5e, 0xe2, 0x5e, 0x3d, 0x8d, 0x1c, - 0xb8, 0xad, 0x2e, 0x3f, 0xc1, 0x98, 0x2b, 0x27, 0xc2, 0xbe, 0x94, 0xed, 0xf1, 0x72, 0xbd, 0x4f, - 0x45, 0xd2, 0x25, 0x83, 0x6f, 0x68, 0x12, 0x9d, 0x1c, 0xfd, 0x41, 0x43, 0x51, 0x51, 0xd1, 0xe2, - 0xdf, 0x20, 0x96, 0x42, 0xe6, 0x31, 0xc2, 0x1b, 0x86, 0x12, 0x8e, 0xf0, 0xa7, 0x96, 0xc9, 0x01, - 0x48, 0x92, 0x33, 0x99, 0x43, 0xd0, 0xf8, 0xf8, 0x7c, 0x19, 0xf1, 0x03, 0x0a, 0x40, 0x2d, 0xcf, - 0x97, 0x13, 0x57, 0x5c, 0xa5, 0x54, 0x32, 0x04, 0x0c, 0xa0, 0xda, 0x77, 0x84, 0x90, 0xf6, 0xc2, - 0xc2, 0x42, 0x9b, 0x90, 0x96, 0x96, 0x16, 0x70, 0x19, 0x9a, 0x1f, 0xbd, 0xf5, 0xf4, 0x7d, 0x9f, - 0xcf, 0x69, 0x23, 0x06, 0xa8, 0x0f, 0x73, 0xe7, 0x27, 0xf3, 0x9d, 0xf5, 0x33, 0x0a, 0x5f, 0xa0, - 0x51, 0x37, 0x81, 0xf1, 0xfa, 0x08, 0x04, 0xf9, 0xe6, 0x49, 0xf6, 0x1e, 0x44, 0x5b, 0x87, 0x2f, - 0x98, 0x4d, 0x08, 0x36, 0x67, 0x66, 0x3f, 0x1b, 0xf3, 0xce, 0xe9, 0x41, 0x15, 0xb4, 0x82, 0x01, - 0x9d, 0x2c, 0xee, 0xd2, 0xb8, 0x7c, 0xf7, 0xa7, 0xa9, 0xda, 0x53, 0x70, 0x6e, 0x17, 0x18, 0x6b, - 0x4c, 0x44, 0x80, 0x45, 0xff, 0xfc, 0x36, 0x9a, 0x19, 0x60, 0x0b, 0xb2, 0x6a, 0xde, 0x3a, 0x86, - 0x0f, 0xb4, 0x22, 0xf8, 0x9c, 0xfe, 0x85, 0x77, 0x88, 0xb1, 0x87, 0x15, 0x6a, 0xc8, 0x88, 0x24, - 0x95, 0x0b, 0xe5, 0x44, 0x24, 0x34, 0x35, 0x7e, 0xaf, 0x3c, 0x00, 0xe6, 0xca, 0x1c, 0xc0, 0x7c, - 0x29, 0x21, 0x67, 0x48, 0x74, 0x51, 0x56, 0x80, 0x8d, 0x20, 0x1b, 0x99, 0x7b, 0xe4, 0x76, 0x16, - 0x5c, 0xe2, 0xf3, 0xc7, 0xf8, 0xbc, 0x8b, 0x13, 0xcc, 0xec, 0xe7, 0x72, 0xba, 0x84, 0x1a, 0x42, - 0x87, 0xfa, 0xb9, 0xc8, 0x29, 0x58, 0x29, 0x0e, 0x32, 0x50, 0x52, 0x8f, 0x9b, 0x6e, 0xa4, 0xce, - 0x0f, 0xce, 0xd5, 0xac, 0x03, 0x60, 0x08, 0xbc, 0x17, 0xca, 0x94, 0x94, 0x94, 0xaf, 0x09, 0x09, - 0x09, 0x1f, 0xbd, 0xee, 0xb4, 0x99, 0xcd, 0x91, 0x02, 0x53, 0x4b, 0xa4, 0xb0, 0x21, 0x02, 0xa4, - 0xa0, 0xe4, 0xfc, 0x3c, 0x9c, 0x67, 0x90, 0x2f, 0x95, 0x9c, 0xac, 0x4a, 0xc0, 0xcc, 0x55, 0xa9, - 0x10, 0x14, 0xe7, 0x6d, 0x35, 0xbe, 0xfd, 0x08, 0x66, 0x69, 0x8e, 0x14, 0x90, 0xf1, 0x88, 0xc4, - 0x80, 0xc0, 0xb4, 0x52, 0x09, 0xce, 0xd3, 0xc9, 0x41, 0x3d, 0x4b, 0xdc, 0x06, 0x60, 0xed, 0x8f, - 0x5b, 0xce, 0xdf, 0xf4, 0x22, 0xae, 0x05, 0xd0, 0x48, 0x9d, 0x2a, 0x4c, 0x20, 0xf0, 0xe4, 0xf3, - 0xf9, 0xee, 0x74, 0x92, 0x6a, 0xb1, 0x3b, 0x80, 0x2e, 0xd5, 0x65, 0x42, 0x80, 0x0b, 0x6c, 0xe9, - 0x2e, 0xb0, 0xce, 0xd3, 0xec, 0x0e, 0x38, 0x96, 0xa1, 0xd0, 0xe2, 0x2d, 0x0a, 0x10, 0x55, 0xf6, - 0x9b, 0x01, 0x12, 0x6a, 0x94, 0x25, 0x6e, 0x5f, 0xf1, 0xbc, 0xdb, 0x3d, 0xbb, 0x4d, 0x40, 0xf5, - 0x04, 0x06, 0xf8, 0x8b, 0x1e, 0x4e, 0x5a, 0x8e, 0x79, 0xde, 0xeb, 0x9d, 0x46, 0x7f, 0xe1, 0x46, - 0xf6, 0xbf, 0xfb, 0x77, 0x00, 0x6a, 0x5c, 0x16, 0x26, 0xbe, 0x99, 0xf5, 0x29, 0x9c, 0xab, 0x39, - 0xd3, 0x6c, 0xa1, 0x78, 0xd6, 0x2f, 0xab, 0x2e, 0x79, 0xed, 0x02, 0x18, 0x64, 0xff, 0xdb, 0xd5, - 0x77, 0xd8, 0x2a, 0x36, 0x05, 0xc0, 0xae, 0x68, 0x7d, 0xc8, 0xd4, 0x30, 0x2a, 0x43, 0x53, 0x29, - 0xc2, 0x78, 0x5d, 0x11, 0x58, 0xcf, 0x95, 0x6d, 0x0a, 0x40, 0x2d, 0xf7, 0x37, 0x44, 0x37, 0x60, - 0xd3, 0xcc, 0x4a, 0x70, 0x2e, 0x34, 0x47, 0xdf, 0xfe, 0x02, 0x40, 0xa0, 0x6b, 0xd3, 0xfe, 0x35, - 0xdd, 0x7d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xf8, 0x00, 0x00, 0x02, 0x8c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x94, 0x5f, 0x68, 0x52, + 0x51, 0x1c, 0xc7, 0x8d, 0x3d, 0xf4, 0xef, 0x21, 0xe8, 0x71, 0x16, 0x04, 0x5b, 0xce, 0xfe, 0x50, + 0x50, 0x2f, 0xf5, 0x10, 0xe8, 0xad, 0x05, 0x11, 0x26, 0x85, 0x62, 0x58, 0xfe, 0x49, 0x9c, 0x34, + 0x14, 0x7d, 0xe9, 0x25, 0x8c, 0xc2, 0x51, 0x5d, 0x43, 0x93, 0x45, 0x05, 0xa6, 0xa8, 0x0c, 0xc4, + 0x62, 0xea, 0x92, 0x44, 0xd1, 0xc2, 0xeb, 0xdd, 0x3f, 0x7d, 0xa8, 0x1c, 0xc4, 0x1a, 0x6c, 0xc3, + 0x14, 0x72, 0x14, 0x04, 0x15, 0xd8, 0x4b, 0x45, 0xfd, 0x3a, 0xe7, 0xd6, 0xbd, 0x39, 0x71, 0x77, + 0x65, 0xeb, 0x25, 0xfa, 0xc1, 0x17, 0xce, 0x3d, 0xe7, 0xdc, 0xef, 0xe7, 0x9c, 0xdf, 0xf9, 0x9d, + 0x23, 0x10, 0xa0, 0x50, 0x28, 0x14, 0x01, 0xa5, 0x52, 0x49, 0x08, 0xfe, 0x56, 0x20, 0xf3, 0x0d, + 0x48, 0x14, 0x02, 0x1d, 0x64, 0xfb, 0x34, 0x1a, 0xcd, 0x7a, 0xad, 0x56, 0x5b, 0xd2, 0xe9, 0x74, + 0x43, 0xe8, 0x73, 0xd5, 0x8a, 0x42, 0x64, 0x32, 0xd9, 0x3a, 0x64, 0xfe, 0xd8, 0xe7, 0xf3, 0x7d, + 0x24, 0x49, 0xb2, 0x8e, 0x60, 0xc3, 0x2b, 0x09, 0x19, 0x55, 0xab, 0xd5, 0xb3, 0xd8, 0x3c, 0x9b, + 0xcd, 0x02, 0x16, 0x0b, 0x51, 0x0a, 0x94, 0x1d, 0x7f, 0x04, 0xf8, 0xb1, 0xf2, 0x92, 0xc9, 0x64, + 0xfa, 0x12, 0x0c, 0x06, 0x81, 0x05, 0xb0, 0x10, 0xb2, 0xf7, 0x78, 0x31, 0xdf, 0x43, 0x5c, 0x4e, + 0x77, 0x1f, 0x59, 0xdd, 0xae, 0x39, 0x93, 0x96, 0x64, 0x32, 0x09, 0x56, 0xab, 0x15, 0x50, 0x1b, + 0xbc, 0x5e, 0x2f, 0x44, 0xa3, 0x51, 0x0e, 0x72, 0x43, 0x72, 0x6c, 0x2a, 0xdf, 0x23, 0x29, 0xe4, + 0xb7, 0x48, 0xd6, 0xb4, 0x65, 0xce, 0xae, 0x18, 0x43, 0x50, 0x1f, 0x78, 0x3c, 0x1e, 0x06, 0x16, + 0x0e, 0x87, 0x99, 0x7e, 0xa7, 0xd3, 0x59, 0xbf, 0x29, 0x91, 0x4f, 0x51, 0x22, 0xa9, 0xa7, 0x6d, + 0x73, 0xac, 0x58, 0x2c, 0x06, 0x76, 0xbb, 0x9d, 0x69, 0x07, 0x02, 0x01, 0x6c, 0xcc, 0x8d, 0x61, + 0xc8, 0x75, 0x42, 0xfe, 0x64, 0x78, 0xd3, 0xfe, 0xb5, 0xcb, 0x02, 0x50, 0x19, 0x52, 0x7e, 0xbf, + 0xff, 0x53, 0xa3, 0x39, 0x56, 0x26, 0x93, 0x01, 0x9b, 0xcd, 0xc6, 0x18, 0x5b, 0x2c, 0x16, 0x88, + 0x44, 0x22, 0xdc, 0x18, 0x4e, 0xd9, 0xa0, 0x54, 0x5e, 0x4f, 0x8b, 0x89, 0xbe, 0x65, 0x01, 0x46, + 0xa3, 0x71, 0xa1, 0xd9, 0x9c, 0x55, 0x2a, 0x95, 0x82, 0x50, 0x28, 0x04, 0x89, 0x44, 0x62, 0x91, + 0xf9, 0xd9, 0xd3, 0x26, 0x78, 0x24, 0x3e, 0x04, 0xf7, 0x77, 0xc9, 0xa0, 0xeb, 0x42, 0x0e, 0x3a, + 0x1d, 0x13, 0x2d, 0xc5, 0xee, 0x20, 0xec, 0x76, 0xbb, 0x3f, 0x2c, 0x05, 0x69, 0x14, 0x36, 0x3f, + 0xd5, 0x67, 0xfe, 0x9c, 0x50, 0x9f, 0x83, 0xbc, 0x48, 0xca, 0xa8, 0x72, 0x6b, 0x08, 0x5a, 0x05, + 0x07, 0x40, 0x75, 0xdf, 0x81, 0x20, 0x0f, 0x5c, 0x2e, 0x17, 0x2f, 0x24, 0x1e, 0x8f, 0x83, 0xc1, + 0x60, 0x58, 0xd8, 0x7b, 0x3e, 0x56, 0xa5, 0x76, 0xf4, 0x72, 0x80, 0x22, 0xa1, 0xe6, 0x4c, 0xbf, + 0x22, 0xe5, 0xe6, 0xdf, 0x42, 0xa4, 0xf4, 0xfa, 0x27, 0xe0, 0x57, 0x20, 0xac, 0x39, 0x9a, 0xb7, + 0x7d, 0xf7, 0xa5, 0xdc, 0x3c, 0x25, 0x26, 0x38, 0xc0, 0xd8, 0xbe, 0x13, 0xe0, 0x78, 0x58, 0x01, + 0x92, 0xaa, 0xc2, 0x81, 0xdb, 0x4f, 0x41, 0x44, 0x16, 0xa1, 0xfb, 0x6a, 0x01, 0x84, 0x03, 0x0d, + 0x00, 0x3e, 0x08, 0x6b, 0xae, 0x52, 0xa9, 0xb6, 0xe1, 0x79, 0x5d, 0x57, 0x8a, 0x73, 0x23, 0x17, + 0xef, 0xc0, 0xe8, 0xce, 0xc3, 0x30, 0xbe, 0xe7, 0x28, 0x9c, 0xe9, 0xf7, 0x81, 0x3d, 0x5d, 0x86, + 0xe7, 0x2f, 0x5e, 0xc2, 0x4c, 0xa5, 0x06, 0xba, 0xbb, 0x33, 0x8b, 0xcf, 0x80, 0x0f, 0xd2, 0x6c, + 0xce, 0x00, 0xc8, 0xc2, 0x9c, 0xb7, 0x50, 0x03, 0x7a, 0xf6, 0x0d, 0x0c, 0xd2, 0x55, 0x38, 0x19, + 0x9e, 0x86, 0x3c, 0x4d, 0x03, 0xfa, 0x97, 0x51, 0x2e, 0x4f, 0xc3, 0x58, 0xf9, 0x1d, 0x23, 0x14, + 0xa6, 0x96, 0x10, 0x74, 0x2f, 0xa2, 0x66, 0xb3, 0xf9, 0x95, 0x5e, 0xaf, 0x2f, 0x23, 0x73, 0x51, + 0xe3, 0x38, 0x06, 0x6c, 0x1e, 0x98, 0x04, 0xf1, 0xb5, 0x22, 0x6c, 0x45, 0xe9, 0xc0, 0xe9, 0xc1, + 0xa5, 0x8c, 0x1e, 0x49, 0x46, 0xf8, 0x52, 0xb2, 0x6d, 0x14, 0x34, 0xdf, 0xc3, 0xb7, 0x11, 0xc3, + 0x84, 0x8e, 0xc9, 0x7b, 0x68, 0xbb, 0x23, 0xac, 0x84, 0x8e, 0x89, 0xf7, 0x9d, 0x8e, 0x71, 0x2e, + 0x0d, 0xf2, 0xe0, 0xb3, 0xdf, 0xdb, 0x41, 0x73, 0x2c, 0x55, 0xe3, 0x8d, 0xfa, 0x7e, 0x06, 0x35, + 0x98, 0x46, 0xd2, 0xf2, 0x9d, 0x41, 0xbb, 0x00, 0xde, 0x8b, 0xf6, 0x1f, 0xf0, 0xef, 0x03, 0xbe, + 0x01, 0x17, 0x33, 0x88, 0xb1, 0x21, 0xc4, 0x8d, 0xf3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, + 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE fill_zone_xpm[1] = {{ png, sizeof( png ), "fill_zone_xpm" }}; diff --git a/bitmaps_png/cpp_24/zone_unfill.cpp b/bitmaps_png/cpp_24/zone_unfill.cpp index 67e0a21f94..200e1a3df5 100644 --- a/bitmaps_png/cpp_24/zone_unfill.cpp +++ b/bitmaps_png/cpp_24/zone_unfill.cpp @@ -8,56 +8,49 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d, - 0xf8, 0x00, 0x00, 0x03, 0x03, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x55, 0x49, 0x4c, 0x13, - 0x51, 0x18, 0xee, 0x41, 0x63, 0x62, 0x3c, 0x78, 0x70, 0xa3, 0xd5, 0x04, 0x83, 0xb4, 0x5a, 0x62, - 0xe2, 0x82, 0x88, 0x70, 0xb0, 0x2d, 0x14, 0x91, 0x2a, 0xd0, 0x7d, 0x8b, 0x17, 0x14, 0x31, 0xc6, - 0x18, 0xa3, 0x18, 0x21, 0x18, 0x99, 0xa1, 0x1a, 0x2e, 0x2e, 0x71, 0x49, 0xd4, 0x83, 0x5c, 0x38, - 0xe9, 0xc9, 0x44, 0x03, 0x88, 0xc4, 0x41, 0xe6, 0x8d, 0x1a, 0xac, 0x1b, 0xd2, 0x16, 0x97, 0xbb, - 0x1a, 0xa9, 0x5a, 0xa4, 0xd2, 0x20, 0xf4, 0xf9, 0xbf, 0x61, 0xa6, 0x0e, 0x43, 0x0b, 0x65, 0x79, - 0xc9, 0x97, 0x99, 0xfc, 0xef, 0x9f, 0xef, 0xfb, 0xb7, 0xf7, 0x46, 0xa1, 0x80, 0xa5, 0xa4, 0x91, - 0x51, 0x49, 0xb3, 0x1c, 0x3c, 0xa3, 0x00, 0x3c, 0x07, 0xc4, 0x54, 0x34, 0xea, 0x55, 0x52, 0xa8, - 0x5c, 0x21, 0x5f, 0x13, 0xe4, 0x28, 0x3e, 0x47, 0x62, 0x39, 0xc6, 0x95, 0x34, 0x57, 0x21, 0x13, - 0xe0, 0x23, 0x9f, 0xee, 0xa3, 0xef, 0x00, 0x7f, 0xfa, 0x60, 0x5b, 0xe4, 0x19, 0xfc, 0x4e, 0x45, - 0x9e, 0x41, 0x71, 0x3e, 0x05, 0xc5, 0x2c, 0x52, 0xcc, 0x67, 0x01, 0xd1, 0x68, 0x32, 0x72, 0x55, - 0x13, 0x77, 0x92, 0xec, 0xbb, 0x5c, 0xae, 0x4c, 0x40, 0xad, 0xc7, 0xe3, 0x39, 0x93, 0x0e, 0xc0, - 0xb7, 0x20, 0x0d, 0x01, 0xee, 0x1e, 0xd9, 0x73, 0xbb, 0xdd, 0x39, 0x80, 0x2f, 0x00, 0x3c, 0x0b, - 0x3c, 0x9c, 0x51, 0x20, 0x83, 0x46, 0x5e, 0x41, 0x20, 0x00, 0x88, 0x03, 0xea, 0x20, 0xba, 0xe2, - 0x74, 0x60, 0xb7, 0xdb, 0xd7, 0xcc, 0x24, 0x30, 0xb4, 0xce, 0xc7, 0x65, 0x09, 0x02, 0x11, 0xc0, - 0xeb, 0x05, 0xed, 0x81, 0x8a, 0x42, 0x57, 0x88, 0xdd, 0x0a, 0xcb, 0xe1, 0x70, 0xc4, 0x9c, 0x4e, - 0xe7, 0x57, 0x8b, 0xc5, 0x52, 0x28, 0xf8, 0x76, 0xa6, 0x33, 0xae, 0xdb, 0x6f, 0xfb, 0x17, 0xa7, - 0xce, 0xa0, 0x09, 0x1d, 0x23, 0x76, 0x9b, 0xcd, 0xd6, 0x0f, 0xc0, 0x02, 0xee, 0x0a, 0xbe, 0x37, - 0x16, 0x52, 0x20, 0x30, 0x45, 0x80, 0x42, 0xd7, 0x89, 0x8f, 0xb6, 0xae, 0x1d, 0x9f, 0x30, 0x37, - 0xe2, 0xd6, 0x3c, 0x27, 0xee, 0xd0, 0x96, 0xe0, 0x07, 0x9b, 0x4d, 0xb8, 0x25, 0xdf, 0x8b, 0x8f, - 0x38, 0x9a, 0xf9, 0xbd, 0xe9, 0x05, 0x68, 0x74, 0x5a, 0x10, 0xb8, 0x2f, 0x11, 0xf0, 0x4d, 0x08, - 0x70, 0x77, 0x2c, 0x55, 0x37, 0x71, 0xbb, 0x76, 0x0f, 0x66, 0xd4, 0xfa, 0xa4, 0x68, 0xcb, 0x29, - 0xc5, 0x5d, 0xda, 0x12, 0x6f, 0xea, 0x1e, 0xd0, 0xa8, 0x2d, 0x55, 0xbf, 0x2a, 0xab, 0x6e, 0x7d, - 0xeb, 0xd2, 0x14, 0xa5, 0x24, 0x97, 0x20, 0xce, 0x68, 0x74, 0xb6, 0x64, 0x02, 0xf1, 0x0c, 0x8a, - 0x2d, 0x4d, 0x46, 0xde, 0xa9, 0x31, 0x2a, 0x1f, 0x6f, 0x2c, 0x8e, 0x11, 0x82, 0x9e, 0x6d, 0x26, - 0x1c, 0x6c, 0xbc, 0x8c, 0xd9, 0xbc, 0x8a, 0x04, 0x29, 0xbb, 0xb3, 0x92, 0xb7, 0xf5, 0x6c, 0x2d, - 0x13, 0x6d, 0x43, 0x8f, 0xb2, 0x4a, 0x56, 0xc9, 0x05, 0x9e, 0x89, 0x84, 0x50, 0x96, 0xab, 0x00, - 0xbf, 0x80, 0xa3, 0x8c, 0x5a, 0xd7, 0x2c, 0x92, 0x05, 0xcf, 0x5d, 0xc2, 0xd1, 0x68, 0x14, 0x0f, - 0xf6, 0x85, 0x30, 0xca, 0xaf, 0xc4, 0x68, 0x97, 0x19, 0x0f, 0xbe, 0x1f, 0xe0, 0x6d, 0xc1, 0xb3, - 0x17, 0xff, 0x67, 0xa2, 0x31, 0x9c, 0x9f, 0x2c, 0x40, 0xa1, 0x08, 0x3c, 0xff, 0x10, 0x98, 0x3c, - 0xd5, 0x71, 0xb1, 0x07, 0xfa, 0x83, 0xf5, 0x63, 0xad, 0xb9, 0xae, 0xf1, 0x44, 0xb4, 0x3b, 0xca, - 0x81, 0x3c, 0xc8, 0x13, 0x86, 0x83, 0x1f, 0x79, 0xf0, 0x82, 0xef, 0x02, 0x98, 0xcd, 0xdd, 0x2f, - 0x2d, 0xd5, 0x5b, 0x59, 0x06, 0x5c, 0xe2, 0x7f, 0x60, 0xf2, 0x1e, 0x16, 0x1b, 0x8c, 0x75, 0x87, - 0x1a, 0x70, 0xe7, 0x26, 0xe3, 0xa4, 0x3a, 0x93, 0x92, 0x84, 0xfb, 0x27, 0xa2, 0x26, 0xf8, 0x11, - 0xfa, 0x04, 0x99, 0x58, 0xe4, 0xbd, 0x18, 0x26, 0x02, 0xc3, 0x92, 0x11, 0x1d, 0x58, 0x49, 0x05, - 0x96, 0x29, 0x29, 0xff, 0x52, 0xab, 0xd3, 0x5d, 0x57, 0x58, 0x73, 0xe1, 0xc5, 0xee, 0xea, 0x06, - 0xd6, 0xec, 0x3c, 0xe0, 0x02, 0xe7, 0x11, 0xe9, 0xc7, 0xa4, 0x34, 0xe1, 0x80, 0x44, 0x60, 0xe0, - 0x33, 0x46, 0x05, 0xd6, 0xa4, 0x02, 0xcf, 0x65, 0xf7, 0x50, 0x8d, 0x64, 0xc2, 0x46, 0xc8, 0x3e, - 0x79, 0x67, 0xd4, 0x86, 0xbe, 0x44, 0xf4, 0xd0, 0x5c, 0xb1, 0xe6, 0xe1, 0xfe, 0x10, 0xe0, 0x43, - 0xa2, 0x27, 0xa4, 0x7c, 0x12, 0x81, 0x37, 0x8a, 0xb5, 0x14, 0x2a, 0x93, 0x9d, 0x83, 0x31, 0x15, - 0xcd, 0x9e, 0xda, 0x70, 0xad, 0x6d, 0x89, 0x28, 0x90, 0x49, 0x31, 0xcb, 0x9b, 0x8d, 0xc7, 0x7b, - 0xa7, 0x34, 0x99, 0xd4, 0x1c, 0x4a, 0x45, 0x20, 0xf6, 0x44, 0xda, 0xe4, 0x27, 0xd9, 0xfa, 0x26, - 0x3e, 0x52, 0x15, 0xc5, 0xee, 0x83, 0xfa, 0xbf, 0x02, 0xb2, 0xbf, 0x12, 0xa1, 0x30, 0x20, 0x00, - 0x87, 0x2b, 0x44, 0x7e, 0x4a, 0xda, 0xfa, 0x0e, 0xfe, 0x10, 0xf1, 0x63, 0x0a, 0xa3, 0x48, 0x88, - 0xa4, 0xd1, 0x92, 0xac, 0x88, 0xed, 0xe9, 0x96, 0xc4, 0x98, 0xfe, 0x82, 0xc9, 0x5b, 0x31, 0xab, - 0x8b, 0xb1, 0x5b, 0x6d, 0xd8, 0x0b, 0x1f, 0x8e, 0xa6, 0x73, 0xd0, 0xc0, 0xd7, 0x3c, 0xa7, 0xdb, - 0x17, 0xd2, 0xb6, 0x76, 0xab, 0xf5, 0x91, 0x69, 0xc8, 0x7f, 0x76, 0x6b, 0x0c, 0xf6, 0x79, 0x5d, - 0xf1, 0x5d, 0xeb, 0x8b, 0x56, 0xc3, 0x55, 0xe0, 0x23, 0x4d, 0x04, 0xc4, 0x84, 0x09, 0x7b, 0xc9, - 0x64, 0x1b, 0x6a, 0xc9, 0x9e, 0xd4, 0xf7, 0x1f, 0x14, 0x40, 0xd7, 0x14, 0x71, 0x74, 0x8e, 0x5d, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xf8, 0x00, 0x00, 0x02, 0x92, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x95, 0xcb, 0x6f, 0x12, + 0x51, 0x14, 0xc6, 0x89, 0x0b, 0x1f, 0x4b, 0x5d, 0x6a, 0xe2, 0xc2, 0x45, 0x8d, 0xc6, 0x17, 0x5a, + 0xad, 0xed, 0x4e, 0x53, 0x35, 0x96, 0xda, 0x97, 0x24, 0x10, 0x36, 0x44, 0xd1, 0x28, 0x1b, 0xfe, + 0x02, 0xa3, 0x31, 0xc6, 0xb8, 0x69, 0x69, 0x6d, 0x8d, 0xf1, 0xd1, 0xaa, 0xd1, 0xc4, 0x68, 0xe2, + 0x52, 0x63, 0x23, 0x11, 0x87, 0x01, 0x69, 0x04, 0x1a, 0x52, 0x29, 0x50, 0x5b, 0x21, 0xb5, 0x31, + 0xad, 0xc0, 0x0c, 0x6d, 0x54, 0x0a, 0x54, 0x86, 0xcf, 0x7b, 0x07, 0x19, 0x4a, 0x4b, 0xe3, 0x30, + 0x75, 0xe5, 0x0d, 0x1f, 0x8b, 0xe1, 0xce, 0xf9, 0x9d, 0xf3, 0x9d, 0x73, 0x2f, 0x2a, 0xd5, 0x0a, + 0x6b, 0xf3, 0x55, 0x17, 0x94, 0x48, 0x25, 0x77, 0xfd, 0xff, 0x80, 0x9a, 0x1b, 0x43, 0xd8, 0x7a, + 0xed, 0xfd, 0xbf, 0x07, 0xd4, 0x76, 0x7b, 0xc1, 0x46, 0x66, 0x21, 0xe4, 0x81, 0x9f, 0xd9, 0x1c, + 0x9e, 0xf9, 0x63, 0xa8, 0xef, 0xf5, 0x89, 0xaa, 0xbb, 0xe9, 0x5d, 0x1d, 0x60, 0x0b, 0x91, 0xff, + 0xeb, 0x0f, 0xd8, 0x6c, 0x36, 0x18, 0x8d, 0x46, 0x98, 0xcd, 0x66, 0x04, 0x02, 0x01, 0x2c, 0x59, + 0xc3, 0x44, 0x6b, 0x14, 0x01, 0x1a, 0xfa, 0x7c, 0x48, 0xa7, 0xd3, 0xd0, 0xe9, 0x74, 0xd0, 0x6a, + 0xb5, 0xcb, 0x64, 0x30, 0x18, 0x8a, 0x90, 0x4d, 0x8a, 0x00, 0xd4, 0x86, 0x4c, 0x26, 0x03, 0xbd, + 0x5e, 0xff, 0x37, 0xc0, 0x46, 0xc5, 0x16, 0x79, 0xa7, 0xbe, 0x83, 0x61, 0x18, 0x98, 0x4c, 0x26, + 0x58, 0x2c, 0x16, 0x04, 0x83, 0xc1, 0xa5, 0x16, 0x79, 0x57, 0xd5, 0x64, 0xb5, 0xd5, 0x83, 0xa1, + 0xc9, 0x39, 0xb1, 0xc9, 0x42, 0x3e, 0x0f, 0xf2, 0xc1, 0x42, 0x2e, 0x8f, 0xc9, 0x64, 0x1a, 0x2f, + 0x46, 0x62, 0x14, 0xa0, 0x56, 0x3c, 0xef, 0xdb, 0xae, 0xbb, 0xf1, 0x64, 0x78, 0x06, 0xe9, 0x18, + 0x87, 0x48, 0xd7, 0x7d, 0x78, 0x34, 0x67, 0xc0, 0xee, 0x3d, 0x09, 0xd7, 0xa1, 0x56, 0xf8, 0xda, + 0x2f, 0xe0, 0xcb, 0xdd, 0xa7, 0xc8, 0xc6, 0x39, 0x81, 0x40, 0x6e, 0x13, 0xad, 0xab, 0x0a, 0x40, + 0x83, 0xbb, 0x49, 0xe6, 0xb1, 0x57, 0x76, 0xb0, 0xfb, 0x9a, 0xf0, 0xae, 0xe6, 0x48, 0x45, 0x39, + 0xf7, 0x6b, 0x10, 0x7b, 0xf9, 0x96, 0x56, 0x42, 0xbf, 0xd6, 0xca, 0x06, 0x3c, 0xf6, 0xcd, 0x80, + 0xb3, 0xbb, 0xc1, 0xec, 0x68, 0x5c, 0x31, 0xb8, 0xa4, 0xed, 0x47, 0x11, 0x1f, 0x64, 0x28, 0xa4, + 0x4f, 0x16, 0xa0, 0xf1, 0x8e, 0x1f, 0xf3, 0xdf, 0x38, 0xb0, 0x6a, 0x8d, 0x18, 0x80, 0x25, 0x59, + 0x86, 0xae, 0x58, 0xe1, 0x24, 0xd6, 0x48, 0x99, 0xd7, 0xb5, 0x89, 0xcf, 0x58, 0x75, 0xa1, 0x3a, + 0xba, 0x37, 0xcb, 0xcd, 0xe6, 0x64, 0x01, 0x1e, 0x79, 0xa7, 0x11, 0xe9, 0xbc, 0x27, 0x05, 0x0b, + 0x5d, 0xee, 0x42, 0x2a, 0x95, 0x02, 0xf7, 0x31, 0x0c, 0xd7, 0xe1, 0x36, 0xb8, 0xea, 0xdb, 0xc1, + 0x05, 0xc6, 0xc4, 0x67, 0xa1, 0x4b, 0x9d, 0xd2, 0xbe, 0x68, 0xf7, 0x00, 0x64, 0x01, 0x26, 0x12, + 0xf3, 0xa4, 0xa1, 0x67, 0x4b, 0xd9, 0x1e, 0x6c, 0x21, 0xc1, 0x43, 0x62, 0x40, 0x3e, 0x34, 0x2e, + 0x4a, 0x04, 0x8e, 0x04, 0xe1, 0xac, 0x3d, 0x25, 0xed, 0xf3, 0xb6, 0x9c, 0x93, 0x07, 0xc8, 0xfc, + 0x12, 0xe0, 0xd8, 0x7d, 0xa2, 0xbc, 0x99, 0xc4, 0x12, 0x7e, 0xb4, 0x90, 0x35, 0x55, 0x32, 0x3c, + 0x41, 0x2a, 0xe9, 0x28, 0xdb, 0x43, 0x27, 0x4c, 0x16, 0x20, 0x5d, 0x01, 0x40, 0xad, 0xe1, 0x83, + 0x8b, 0x00, 0x63, 0x9f, 0xe1, 0x6a, 0x38, 0xad, 0x0c, 0x30, 0x4e, 0x2d, 0x6a, 0x36, 0x95, 0xb2, + 0x27, 0xcd, 0x2d, 0x7a, 0xce, 0x8f, 0x86, 0x89, 0x3e, 0x49, 0x3d, 0xa1, 0xf6, 0x49, 0x16, 0xb5, + 0x9e, 0x97, 0x07, 0x78, 0xe8, 0x99, 0x46, 0xd4, 0xda, 0xbf, 0xbc, 0xc9, 0xd4, 0x73, 0x62, 0x15, + 0x55, 0xb1, 0x27, 0x65, 0x4d, 0xee, 0x79, 0x20, 0xef, 0xfa, 0x26, 0xf3, 0xbc, 0x27, 0x9b, 0xe0, + 0x05, 0x7a, 0x88, 0x0a, 0x23, 0xd8, 0x24, 0x06, 0x5a, 0x9c, 0x2d, 0xad, 0x8a, 0x3e, 0x73, 0xfc, + 0x39, 0x84, 0xce, 0x03, 0xcd, 0x58, 0x48, 0xce, 0xe5, 0x64, 0xff, 0x3f, 0xd0, 0xe3, 0xcf, 0x3b, + 0x3e, 0x80, 0xd9, 0x79, 0x4c, 0xd6, 0x41, 0x4b, 0xbc, 0x71, 0xd2, 0x83, 0xd6, 0x5b, 0x0d, 0x60, + 0x3d, 0x91, 0x3d, 0x3e, 0xe8, 0x40, 0xb1, 0x92, 0x8a, 0x57, 0x05, 0x19, 0xd3, 0xf8, 0x6b, 0xa6, + 0x74, 0x55, 0x54, 0xb3, 0xc8, 0x0b, 0x1b, 0x68, 0x25, 0xd9, 0x44, 0x52, 0x88, 0xf6, 0x0c, 0x88, + 0x4d, 0x74, 0xec, 0x3a, 0x2e, 0x4e, 0x98, 0xaf, 0xe3, 0x22, 0xa6, 0xfa, 0x9f, 0x83, 0xfe, 0x46, + 0xf6, 0xdc, 0x2a, 0x5e, 0x76, 0xbf, 0x01, 0xd1, 0x5b, 0x89, 0xa2, 0xd5, 0x90, 0x1f, 0xe7, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE zone_unfill_xpm[1] = {{ png, sizeof( png ), "zone_unfill_xpm" }}; diff --git a/bitmaps_png/sources/fill_zone.svg b/bitmaps_png/sources/fill_zone.svg index a151b820b5..18933785b7 100755 --- a/bitmaps_png/sources/fill_zone.svg +++ b/bitmaps_png/sources/fill_zone.svg @@ -1,52 +1,159 @@ - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - - - - - - fill_zone - - - - - - - - - - - - + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="Слой_1" + data-name="Слой 1" + viewBox="0 0 24 24" + version="1.1" + sodipodi:docname="fill_zone.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + + + + + + + + image/svg+xml + + add_arc + + + + + + + + + + + + + + + + + + + + fill_zone + + + + + + + + + + diff --git a/bitmaps_png/sources/zone_unfill.svg b/bitmaps_png/sources/zone_unfill.svg index f5c72616e1..59ed110743 100755 --- a/bitmaps_png/sources/zone_unfill.svg +++ b/bitmaps_png/sources/zone_unfill.svg @@ -1,49 +1,140 @@ - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - - - - - - zone_unfill - - - - - - - - - + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="Слой_1" + data-name="Слой 1" + viewBox="0 0 24 24" + version="1.1" + sodipodi:docname="zone_unfill.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + + + + + + + + image/svg+xml + + add_arc + + + + + + + + + + + + + + + + + + + + zone_unfill + + + + + +