From eb2340bc23906e627dee5c071ca23272ac1c1e21 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 23 Oct 2017 18:48:03 +0200 Subject: [PATCH] Show/Hide icons in menus (according to Icons option) in GAL, like in Legacy mode. Cosmetic enhancement in Gerbview context menu. --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/gerbview_clear_layers.cpp | 62 +++---- bitmaps_png/cpp_26/gerbview_drill_file.cpp | 136 +++++++------- bitmaps_png/cpp_26/highlight_remove.cpp | 68 +++++++ bitmaps_png/sources/gerbview_clear_layers.svg | 16 +- bitmaps_png/sources/gerbview_drill_file.svg | 20 +- bitmaps_png/sources/highlight_remove.svg | 173 ++++++++++++++++++ .../sources/net_highlight_schematic.svg | 15 +- common/tool/context_menu.cpp | 41 ++++- gerbview/tools/gerbview_control.cpp | 2 +- gerbview/tools/selection_tool.cpp | 11 +- include/bitmaps.h | 1 + include/tool/context_menu.h | 5 +- 13 files changed, 417 insertions(+), 134 deletions(-) create mode 100644 bitmaps_png/cpp_26/highlight_remove.cpp create mode 100644 bitmaps_png/sources/highlight_remove.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 7872a51de2..56c260662c 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -260,6 +260,7 @@ set( BMAPS_MID help hidden_pin hierarchy_nav + highlight_remove hotkeys hotkeys_import hotkeys_export diff --git a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp index 3f3c14f6c8..aa552da010 100644 --- a/bitmaps_png/cpp_26/gerbview_clear_layers.cpp +++ b/bitmaps_png/cpp_26/gerbview_clear_layers.cpp @@ -8,37 +8,37 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x01, 0xd1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x41, 0x52, 0xc3, - 0x30, 0x0c, 0x45, 0xbf, 0x54, 0x33, 0xc3, 0x8a, 0x13, 0xd0, 0xc2, 0xa2, 0x65, 0x86, 0x5d, 0x4f, - 0x53, 0x6e, 0xc2, 0x19, 0xb8, 0x52, 0x2f, 0x41, 0x59, 0xb3, 0x61, 0x0b, 0x39, 0x42, 0x1d, 0xc5, - 0x2c, 0x52, 0x27, 0xb2, 0x62, 0x3b, 0x29, 0x33, 0x78, 0xea, 0x71, 0x2a, 0x67, 0xf4, 0xfc, 0x25, - 0xd9, 0x0e, 0x01, 0x78, 0x04, 0x70, 0x8f, 0xff, 0x6d, 0x5f, 0x0e, 0xc0, 0xee, 0x78, 0x3c, 0xbe, - 0x6d, 0x36, 0x0f, 0x75, 0x18, 0xc5, 0x81, 0x70, 0xf9, 0x01, 0x44, 0x6a, 0x8a, 0xd4, 0x3b, 0x63, - 0x7b, 0x3f, 0x9d, 0x3e, 0x5f, 0x0e, 0x87, 0x57, 0x07, 0x00, 0xbb, 0xdd, 0xd3, 0x76, 0xe5, 0xdc, - 0x5d, 0xd6, 0x3f, 0x01, 0x44, 0xd4, 0x23, 0x48, 0xf7, 0x68, 0xd7, 0xf3, 0x50, 0xff, 0xfb, 0xb6, - 0xdf, 0xef, 0x5b, 0x00, 0x70, 0x55, 0x11, 0x44, 0x85, 0x3e, 0xce, 0x69, 0xc7, 0xa4, 0x15, 0x1a, - 0x9b, 0xfb, 0x2b, 0x80, 0x88, 0x06, 0x87, 0x16, 0xa4, 0x61, 0x16, 0x14, 0x2c, 0x84, 0x99, 0x2a, - 0xc0, 0xd4, 0xf9, 0xe0, 0xd4, 0xe6, 0x2d, 0xda, 0xac, 0xa2, 0x11, 0xc0, 0x75, 0x98, 0x5a, 0xed, - 0x44, 0x95, 0x01, 0x30, 0x73, 0x0a, 0x2a, 0x01, 0x98, 0x19, 0x14, 0xc3, 0x92, 0x01, 0x0e, 0x76, - 0xa3, 0x8a, 0x4c, 0xbd, 0xba, 0x31, 0x5c, 0xac, 0x00, 0x3c, 0x1f, 0x3a, 0x03, 0x49, 0x80, 0x0a, - 0x96, 0xe6, 0x88, 0x30, 0x38, 0x66, 0xe6, 0x89, 0x53, 0x2e, 0xe5, 0xa8, 0x04, 0xc4, 0xb4, 0xcc, - 0x5d, 0xdc, 0x84, 0x16, 0xc2, 0x44, 0xa0, 0x0c, 0xd4, 0x2a, 0xaa, 0x95, 0xf9, 0xa4, 0xbc, 0x49, - 0xe5, 0xa7, 0x04, 0xe1, 0x05, 0xd5, 0x67, 0x21, 0x93, 0x62, 0x20, 0x20, 0xcd, 0x89, 0x55, 0x96, - 0xb1, 0xe7, 0x14, 0xd5, 0x80, 0x0e, 0xba, 0x54, 0x8d, 0x63, 0x36, 0x00, 0x2e, 0xed, 0xa3, 0x4a, - 0xc8, 0x2e, 0x63, 0x18, 0x14, 0x15, 0x73, 0x51, 0x80, 0xcc, 0x81, 0x62, 0xeb, 0xba, 0x2e, 0xaf, - 0xa8, 0xaa, 0x6c, 0x06, 0x04, 0x00, 0x21, 0x84, 0x64, 0x4c, 0x43, 0x17, 0x42, 0x5d, 0xd5, 0x82, - 0x22, 0x08, 0x21, 0x4c, 0x20, 0xda, 0xe6, 0xd4, 0x5d, 0x90, 0x4d, 0xf4, 0x5c, 0xb5, 0x69, 0x87, - 0xda, 0x71, 0xd7, 0x75, 0x08, 0x21, 0xa4, 0xa1, 0x23, 0x7b, 0x38, 0x2a, 0x30, 0x2a, 0x00, 0xed, - 0x50, 0x03, 0x62, 0x9f, 0x80, 0x90, 0xdb, 0x98, 0x1a, 0x9e, 0xb9, 0x46, 0x2c, 0x24, 0x84, 0x00, - 0x11, 0x99, 0x40, 0x44, 0x64, 0x04, 0xb1, 0x3d, 0x75, 0x17, 0xe4, 0xc6, 0x86, 0x4b, 0x44, 0x12, - 0x90, 0x06, 0xa6, 0xd7, 0x84, 0x39, 0x79, 0x73, 0xa5, 0x6a, 0x73, 0x12, 0x9f, 0x23, 0x44, 0x83, - 0xbc, 0x6f, 0x21, 0xd2, 0xa6, 0x8a, 0x72, 0xb0, 0xd2, 0x4d, 0x6b, 0x61, 0x56, 0x81, 0x88, 0xe0, - 0xec, 0x3d, 0x5a, 0xef, 0xd1, 0xb6, 0x2d, 0xbc, 0x17, 0xb3, 0x8f, 0xec, 0x07, 0x4f, 0x41, 0x91, - 0x55, 0x63, 0x41, 0xde, 0xfb, 0xbe, 0x9f, 0x3d, 0x7c, 0xeb, 0x21, 0xe2, 0x47, 0xd0, 0xcf, 0xf7, - 0x77, 0x73, 0xb3, 0x5e, 0xaf, 0x96, 0x9e, 0xc8, 0x3a, 0x37, 0x31, 0x0f, 0x31, 0x6c, 0x22, 0x82, - 0x4e, 0xfa, 0x85, 0x30, 0x11, 0x9a, 0xa6, 0x69, 0xe2, 0xe2, 0x9f, 0x01, 0x6c, 0xaf, 0xfc, 0x20, - 0xbc, 0xbd, 0xf2, 0xfd, 0x8f, 0x5f, 0xff, 0x17, 0x1f, 0x40, 0x2a, 0x6b, 0xae, 0x14, 0x00, 0x00, - 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x01, 0xd2, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x4d, 0x4e, 0xc3, + 0x30, 0x10, 0x85, 0xdf, 0x0c, 0x46, 0xb0, 0x62, 0x8b, 0x90, 0xa8, 0x04, 0x12, 0x9b, 0xb2, 0xa1, + 0xcb, 0x9e, 0xa6, 0x27, 0x61, 0xc5, 0x81, 0x2a, 0x4e, 0x52, 0xb8, 0x00, 0x3b, 0x54, 0xf1, 0x77, + 0x03, 0xdb, 0x31, 0x8b, 0xc6, 0xce, 0x78, 0x32, 0x4e, 0xc9, 0x82, 0x4a, 0xae, 0x3d, 0x91, 0x33, + 0x9f, 0xde, 0x9b, 0x89, 0x13, 0x02, 0x70, 0x0d, 0xe0, 0x12, 0xff, 0xfb, 0x7b, 0x77, 0x00, 0x96, + 0xdb, 0xed, 0xf3, 0xd3, 0xed, 0xed, 0xcd, 0xd5, 0xe4, 0x56, 0x02, 0xe8, 0xf0, 0x07, 0x2a, 0x17, + 0x19, 0xe0, 0xb2, 0xea, 0xf7, 0x51, 0x75, 0xdb, 0xcb, 0x6e, 0xf7, 0xb6, 0xd9, 0x6c, 0x1e, 0x1d, + 0x00, 0xac, 0x56, 0x0f, 0xf7, 0x27, 0xce, 0x5d, 0x98, 0xf9, 0x89, 0xc4, 0x18, 0x62, 0x60, 0x88, + 0xf3, 0x3a, 0xef, 0x97, 0xf7, 0x9e, 0xad, 0xd7, 0xa7, 0x00, 0xe0, 0x9a, 0x02, 0x1a, 0x00, 0x1b, + 0x34, 0x9e, 0x7b, 0x13, 0x4a, 0xec, 0xa6, 0x20, 0xcc, 0x34, 0x02, 0x0c, 0x20, 0x8c, 0xd6, 0x39, + 0x39, 0x94, 0x2a, 0x09, 0x4a, 0xc5, 0x75, 0x26, 0x10, 0x71, 0x95, 0x54, 0x03, 0x2d, 0x48, 0x06, + 0x50, 0xa3, 0x56, 0xce, 0xb2, 0x6a, 0x4a, 0x49, 0x35, 0x72, 0xf2, 0x09, 0x55, 0xcc, 0x2c, 0x40, + 0xbd, 0xd7, 0x03, 0x80, 0xa7, 0x61, 0x39, 0xa9, 0x06, 0xda, 0xaa, 0xa8, 0x80, 0x08, 0x54, 0x59, + 0x26, 0x21, 0x6c, 0xd5, 0xc7, 0x82, 0xb6, 0x1a, 0x42, 0xd6, 0xe8, 0x70, 0x6f, 0xad, 0x82, 0x99, + 0x8f, 0xda, 0x56, 0x81, 0x25, 0x40, 0xaa, 0xaa, 0x6a, 0xa4, 0x92, 0x68, 0x08, 0xd3, 0xfc, 0xee, + 0xd3, 0xd7, 0x5d, 0xbe, 0x90, 0xd5, 0x48, 0x48, 0x05, 0xd0, 0x0a, 0x55, 0x03, 0xb5, 0x2c, 0xab, + 0x9a, 0xc1, 0x52, 0xc2, 0x0a, 0xc0, 0x7f, 0x54, 0xa4, 0x81, 0x95, 0x75, 0x04, 0xd8, 0xd6, 0x1c, + 0x81, 0x98, 0x0f, 0xac, 0x82, 0xf4, 0x71, 0xb2, 0x6b, 0xd4, 0xaa, 0x0f, 0x73, 0x89, 0x9b, 0x27, + 0x43, 0x3f, 0xa7, 0x94, 0xaa, 0xb9, 0x56, 0x24, 0x95, 0xe9, 0x9a, 0x34, 0x20, 0x32, 0x4e, 0x29, + 0x95, 0x91, 0x21, 0x15, 0x28, 0x59, 0xd6, 0x01, 0x4d, 0x65, 0x16, 0xc8, 0x82, 0x8c, 0x14, 0xa1, + 0x51, 0x23, 0x18, 0xb5, 0xd0, 0x7b, 0x25, 0x40, 0x2b, 0x49, 0x29, 0xa1, 0xeb, 0x3a, 0x61, 0x1d, + 0xf3, 0xf8, 0x18, 0x99, 0xe8, 0xae, 0x16, 0x24, 0x27, 0xee, 0xba, 0x6e, 0x04, 0x77, 0xe5, 0xed, + 0x68, 0x3d, 0x23, 0xad, 0x6e, 0x34, 0x20, 0x19, 0x20, 0x47, 0x4a, 0x09, 0x31, 0x46, 0xc3, 0x3a, + 0x79, 0x1a, 0x2b, 0xbb, 0xf4, 0x4f, 0x43, 0x62, 0x8c, 0xd5, 0x9c, 0x41, 0x95, 0x75, 0x68, 0x9c, + 0xc0, 0x73, 0xd5, 0xc4, 0x18, 0x0b, 0x28, 0x84, 0x50, 0xe2, 0xd1, 0x1b, 0x56, 0x43, 0xa6, 0x94, + 0xe4, 0xb5, 0x04, 0xe4, 0xe1, 0xbd, 0x87, 0x0f, 0x01, 0x21, 0x04, 0x78, 0x09, 0x92, 0x2f, 0x2a, + 0x3a, 0xf2, 0xfd, 0xa0, 0x3b, 0x4b, 0x5a, 0x94, 0x95, 0x78, 0xef, 0xfb, 0x11, 0x10, 0x43, 0x18, + 0x40, 0xfb, 0xfd, 0xfe, 0x63, 0xb1, 0x58, 0xb0, 0x3a, 0xc1, 0xc9, 0x7a, 0xea, 0xa5, 0x22, 0x0d, + 0x11, 0xd6, 0xf5, 0x5f, 0x2f, 0xc0, 0xd7, 0xe7, 0xf7, 0x4f, 0x16, 0xb0, 0x04, 0x70, 0x37, 0xf3, + 0x83, 0xf0, 0x7c, 0xe6, 0xfe, 0xd7, 0x5f, 0xdc, 0x7c, 0x3b, 0x74, 0x02, 0x4c, 0x19, 0xfe, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE gerbview_clear_layers_xpm[1] = {{ png, sizeof( png ), "gerbview_clear_layers_xpm" }}; diff --git a/bitmaps_png/cpp_26/gerbview_drill_file.cpp b/bitmaps_png/cpp_26/gerbview_drill_file.cpp index e52b0bfe2f..cf118a0b73 100644 --- a/bitmaps_png/cpp_26/gerbview_drill_file.cpp +++ b/bitmaps_png/cpp_26/gerbview_drill_file.cpp @@ -8,73 +8,75 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x04, 0x16, 0x49, 0x44, 0x41, 0x54, 0x48, 0x4b, 0xb5, 0x95, 0xc9, 0x4e, 0x1b, - 0x59, 0x14, 0x86, 0xfd, 0x1e, 0xd9, 0xb4, 0x84, 0xb2, 0xc8, 0xae, 0x11, 0x0b, 0x02, 0xea, 0x1d, - 0xb3, 0x04, 0x12, 0x02, 0x5a, 0x64, 0x0b, 0x22, 0x52, 0x02, 0x48, 0x8c, 0x12, 0x3c, 0x49, 0x40, - 0x80, 0x40, 0x0c, 0x9b, 0xce, 0x0b, 0x00, 0x9d, 0x0d, 0x52, 0x33, 0x2c, 0x10, 0x02, 0x91, 0x10, - 0x8c, 0x0d, 0x76, 0xd9, 0x65, 0x97, 0x6d, 0xc6, 0x82, 0x62, 0x9e, 0x4e, 0x9f, 0xff, 0xb8, 0xee, - 0x75, 0xb9, 0xe2, 0x24, 0xca, 0x22, 0x8b, 0x5f, 0x76, 0xb9, 0xca, 0xe7, 0x3b, 0xff, 0x19, 0x6e, - 0x05, 0x02, 0x81, 0xc0, 0x1f, 0xac, 0xbf, 0x7e, 0xb3, 0x5e, 0xb0, 0x02, 0x55, 0x8b, 0x8b, 0x8b, - 0x1b, 0xbb, 0xbb, 0xc1, 0xcc, 0x0f, 0x15, 0xcc, 0x2a, 0x18, 0xdc, 0xcb, 0x04, 0xf7, 0xf6, 0x32, - 0x7b, 0x50, 0x28, 0x24, 0x0a, 0x89, 0xc2, 0x99, 0x50, 0x38, 0xab, 0xb0, 0x47, 0xff, 0x7c, 0xfc, - 0xf8, 0x1f, 0x33, 0xca, 0x04, 0x14, 0x89, 0x44, 0xcf, 0x63, 0x71, 0x93, 0x0a, 0x29, 0x6e, 0x9a, - 0x64, 0x26, 0x12, 0xac, 0x24, 0x25, 0x92, 0x16, 0x25, 0xad, 0x14, 0x59, 0xa9, 0x34, 0xa5, 0xd2, - 0x69, 0x4a, 0x67, 0x32, 0xa2, 0xcc, 0xe1, 0x21, 0xeb, 0x88, 0x0e, 0x8f, 0xb2, 0x3a, 0x3a, 0x3e, - 0xd6, 0xe2, 0x44, 0x92, 0x3f, 0x05, 0xc5, 0xcd, 0x42, 0x80, 0x5c, 0x70, 0x7f, 0xe0, 0xe3, 0x93, - 0x13, 0xd1, 0x09, 0x74, 0x7a, 0x2a, 0x62, 0x87, 0xdf, 0x07, 0xfd, 0x0c, 0xd0, 0xd5, 0xd5, 0x95, - 0x0d, 0xec, 0x06, 0x57, 0x41, 0x4f, 0xcf, 0xce, 0xb4, 0xce, 0x20, 0xdb, 0xa6, 0xf0, 0xfe, 0x7e, - 0x1e, 0xc8, 0xf6, 0x43, 0x92, 0x96, 0xc5, 0x80, 0x94, 0x2e, 0x91, 0x72, 0x00, 0x40, 0x55, 0x55, - 0x55, 0x5e, 0x70, 0x15, 0xd4, 0x86, 0xce, 0xcf, 0x45, 0xe7, 0xd0, 0xc5, 0x05, 0xed, 0x17, 0x02, - 0x01, 0x92, 0x48, 0x02, 0x92, 0x75, 0xe1, 0x07, 0xac, 0xac, 0xac, 0xd0, 0x87, 0x91, 0x11, 0x2a, - 0x2e, 0x2e, 0xa6, 0x91, 0xd1, 0x51, 0x5a, 0x5d, 0x5b, 0xd3, 0xc1, 0x11, 0x14, 0xba, 0x80, 0x1c, - 0x87, 0x1c, 0x57, 0x91, 0x48, 0x24, 0x1f, 0x84, 0x86, 0xab, 0x52, 0x79, 0x5d, 0x00, 0x30, 0x3f, - 0x3f, 0x4f, 0x15, 0x15, 0x15, 0xf4, 0xee, 0xfd, 0x7b, 0x1a, 0x1b, 0x1b, 0xa3, 0xd2, 0xd2, 0x52, - 0x1a, 0x9f, 0x98, 0x90, 0x12, 0x56, 0x56, 0x56, 0xd2, 0xbf, 0x9f, 0x3e, 0x65, 0x03, 0x5f, 0x5e, - 0xd2, 0x25, 0x74, 0x75, 0x45, 0x57, 0xae, 0x18, 0x64, 0x69, 0x50, 0x34, 0x6a, 0xd8, 0x80, 0xe4, - 0x4a, 0x95, 0x73, 0x31, 0x36, 0x3e, 0x4e, 0xcd, 0xcd, 0xcd, 0xf4, 0xf9, 0xcb, 0x97, 0x6c, 0x79, - 0x38, 0xfb, 0xea, 0xea, 0x6a, 0xc9, 0x1c, 0xc1, 0x79, 0xd4, 0xa9, 0xb5, 0xb5, 0x95, 0x26, 0x27, - 0x27, 0xe9, 0xea, 0xfa, 0x9a, 0xae, 0x95, 0x6e, 0x6e, 0xe8, 0x86, 0x15, 0x8d, 0x46, 0x3d, 0x20, - 0xc3, 0xb0, 0x15, 0xc4, 0x5b, 0xaa, 0x85, 0x85, 0x05, 0x6a, 0x69, 0x69, 0xa1, 0x23, 0xbe, 0x46, - 0x89, 0x50, 0x77, 0x00, 0x06, 0x07, 0x07, 0xf3, 0x32, 0xc7, 0x6f, 0xad, 0x6f, 0xde, 0xd0, 0xd2, - 0xd2, 0x12, 0xdd, 0xde, 0xde, 0x6a, 0xdd, 0xdd, 0xdd, 0xe5, 0x83, 0x0c, 0x23, 0x66, 0xfb, 0x21, - 0x98, 0xa8, 0xea, 0x9a, 0x1a, 0xfa, 0xba, 0xbb, 0xab, 0x7b, 0x20, 0xb5, 0xf7, 0x00, 0x90, 0x39, - 0xb2, 0x46, 0x50, 0x0e, 0x48, 0xb5, 0xb5, 0xb5, 0xf2, 0xfd, 0xfe, 0xfe, 0x5e, 0xcb, 0x30, 0x8c, - 0x1c, 0x28, 0x16, 0x8f, 0xdb, 0xde, 0x72, 0x61, 0x0f, 0x96, 0xb9, 0xf1, 0x1d, 0x6f, 0xdf, 0x6a, - 0x08, 0xca, 0x04, 0x17, 0x00, 0xf4, 0xf6, 0xf6, 0x6a, 0x00, 0xb2, 0x86, 0x10, 0xb4, 0xb3, 0xb3, - 0x93, 0x36, 0x36, 0x36, 0xe8, 0xe1, 0xe1, 0x41, 0x2b, 0x1e, 0x8f, 0xe7, 0x40, 0x7c, 0x61, 0x6b, - 0x27, 0x0c, 0xc1, 0xc8, 0x8e, 0xf2, 0x54, 0xa1, 0x3f, 0xaa, 0x17, 0x02, 0x71, 0x6b, 0x5f, 0xe3, - 0x66, 0xae, 0x00, 0x2a, 0xe8, 0xdc, 0xdc, 0x1c, 0x4d, 0xf0, 0x90, 0x3c, 0x3e, 0x3e, 0xd2, 0xd3, - 0xd3, 0x93, 0x28, 0x1f, 0x64, 0x9a, 0xb6, 0x82, 0x74, 0x77, 0x77, 0xcb, 0x9e, 0xfc, 0xc9, 0x23, - 0x8c, 0xe9, 0x42, 0xe3, 0x7b, 0x7a, 0x7a, 0x04, 0x02, 0x27, 0x35, 0x5c, 0xce, 0xa2, 0xa2, 0x22, - 0xf9, 0xec, 0xeb, 0xeb, 0x13, 0x40, 0x7f, 0x7f, 0xbf, 0x5c, 0x97, 0x97, 0x97, 0xcb, 0xe8, 0xa3, - 0x84, 0x03, 0x03, 0x03, 0xf4, 0xfc, 0xfc, 0x4c, 0xa6, 0x69, 0x02, 0xf4, 0x5a, 0x40, 0x7c, 0x61, - 0xab, 0x0d, 0xc7, 0xf2, 0xa1, 0x5c, 0xe3, 0xec, 0x06, 0xd9, 0x49, 0x3f, 0x3c, 0xbd, 0x80, 0x0b, - 0x04, 0x52, 0x2e, 0xbc, 0xd9, 0xcf, 0xce, 0xce, 0xd2, 0xd4, 0xd4, 0x94, 0x00, 0x94, 0x62, 0xb1, - 0x98, 0x07, 0x94, 0x48, 0xd8, 0x6a, 0xcb, 0x65, 0xba, 0xb8, 0x5c, 0xeb, 0xeb, 0xeb, 0xd4, 0xd1, - 0xd1, 0xf1, 0x0d, 0x04, 0xa5, 0x1a, 0x1a, 0x1a, 0x12, 0x80, 0x82, 0xa8, 0xa0, 0xe8, 0xd1, 0xd6, - 0xd6, 0x96, 0xfc, 0xa6, 0xee, 0xe7, 0x83, 0xd8, 0xd1, 0x29, 0xdc, 0xa8, 0x11, 0x76, 0x7b, 0x52, - 0x5f, 0x5f, 0x4f, 0xfc, 0x6a, 0xf8, 0xa6, 0x1f, 0x5e, 0x17, 0x0a, 0xc2, 0x8b, 0x29, 0xcf, 0xe3, - 0x9e, 0x72, 0xeb, 0x99, 0xba, 0x9c, 0x23, 0x71, 0xe3, 0xee, 0x09, 0x9a, 0x8f, 0xe9, 0x5a, 0x5e, - 0x5e, 0xa6, 0x86, 0x86, 0x06, 0x81, 0x7b, 0x21, 0xe8, 0x89, 0xb7, 0x3c, 0x18, 0xf3, 0xc6, 0xc6, - 0x46, 0x5a, 0x5d, 0x5d, 0xd5, 0x63, 0x8d, 0xe4, 0x50, 0x09, 0xf7, 0x64, 0xc8, 0x82, 0x12, 0x0c, - 0xf2, 0xbb, 0x51, 0x25, 0x9b, 0x99, 0x99, 0x91, 0x4c, 0x91, 0xb1, 0x72, 0x52, 0x57, 0x57, 0xa7, - 0x21, 0xd8, 0x1f, 0x24, 0x33, 0x3d, 0x3d, 0xad, 0x01, 0x00, 0x23, 0x06, 0x12, 0xe6, 0x43, 0xd5, - 0x03, 0xb2, 0x2c, 0x5b, 0xbb, 0x71, 0x77, 0x05, 0x0f, 0xab, 0x92, 0xad, 0xf1, 0xe1, 0xd9, 0xd4, - 0xd4, 0x44, 0x6d, 0x6d, 0x6d, 0xd2, 0xec, 0xb2, 0xb2, 0x32, 0xf9, 0x6c, 0x6f, 0x6f, 0x97, 0xdf, - 0xe1, 0x04, 0xcf, 0x29, 0x00, 0xe2, 0x20, 0x69, 0x0c, 0x16, 0xbf, 0x89, 0x73, 0x20, 0x8b, 0x41, - 0x85, 0xdc, 0xf8, 0xfb, 0xb2, 0xbd, 0xbd, 0x2d, 0x0e, 0x4b, 0x4a, 0x4a, 0xc4, 0x01, 0x1a, 0x8f, - 0xfb, 0x0a, 0x02, 0x07, 0x0a, 0x80, 0xa5, 0xc7, 0xd1, 0x15, 0x0c, 0x06, 0x7d, 0x20, 0xb5, 0x98, - 0x3e, 0x37, 0xfe, 0x01, 0x40, 0xb9, 0x50, 0x3a, 0xd5, 0x74, 0x2f, 0x04, 0x13, 0x8b, 0xa1, 0xc2, - 0xf1, 0x95, 0xe2, 0xd7, 0x0c, 0xb7, 0x84, 0x76, 0x76, 0x76, 0x0a, 0x80, 0x54, 0xd9, 0xdc, 0x71, - 0x2e, 0x04, 0x81, 0x86, 0x87, 0x87, 0xf5, 0x54, 0xc1, 0x39, 0xaa, 0x00, 0x27, 0x80, 0xc0, 0x05, - 0x5e, 0x9a, 0x3c, 0xd6, 0x74, 0x70, 0x70, 0xc0, 0xae, 0xb7, 0x3d, 0xa0, 0x54, 0xca, 0xf6, 0xf6, - 0x47, 0xf6, 0xe6, 0x3b, 0x6e, 0xd4, 0x8e, 0x28, 0x37, 0xea, 0xf4, 0x46, 0xb9, 0xe0, 0x84, 0x93, - 0x26, 0x83, 0x21, 0xe1, 0xf0, 0xbe, 0x1c, 0xc8, 0x7c, 0xf6, 0xe5, 0x40, 0x9b, 0x9b, 0x9b, 0x21, - 0x3e, 0x82, 0x1c, 0x7e, 0xd0, 0xe1, 0xda, 0x3a, 0x9c, 0x99, 0xc3, 0x7f, 0x14, 0x71, 0x39, 0x44, - 0x9c, 0xb1, 0x16, 0xae, 0x71, 0x0f, 0xcf, 0xe1, 0x3f, 0xec, 0xc2, 0x49, 0xa7, 0xd3, 0x0e, 0x43, - 0x1c, 0xde, 0x49, 0x27, 0x12, 0x31, 0x1c, 0x06, 0x39, 0xdc, 0x1f, 0x87, 0x5f, 0x9a, 0x5b, 0x0a, - 0xf4, 0x8a, 0xd5, 0xf0, 0x8b, 0xfa, 0xfb, 0x17, 0xf5, 0xf2, 0x7f, 0x07, 0x7b, 0x12, 0x44, 0x92, - 0x56, 0x86, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x04, 0x2d, 0x49, 0x44, 0x41, 0x54, 0x48, 0x4b, 0xb5, 0x95, 0x49, 0x4f, 0x1b, + 0x59, 0x10, 0xc7, 0xfd, 0x2d, 0xe6, 0x32, 0xd7, 0x20, 0xcd, 0x0d, 0x89, 0x0b, 0x70, 0x43, 0x02, + 0x04, 0x48, 0xec, 0xdb, 0x17, 0x98, 0xb0, 0x0a, 0x25, 0x62, 0xfb, 0x24, 0x70, 0x40, 0xec, 0x20, + 0x04, 0xa7, 0x68, 0x6e, 0x21, 0x91, 0x38, 0x30, 0x11, 0x04, 0x0e, 0xc4, 0x36, 0x84, 0xd8, 0x6c, + 0xde, 0x17, 0x6c, 0xb6, 0xc6, 0x8d, 0xd9, 0xa1, 0xa6, 0xfe, 0x65, 0xbf, 0xf6, 0x6b, 0x43, 0x22, + 0xe5, 0x30, 0x96, 0xfe, 0x6a, 0x75, 0xfb, 0x75, 0xfd, 0xea, 0x5f, 0x55, 0xaf, 0x9f, 0xc3, 0xe1, + 0x70, 0xfc, 0xc9, 0x2a, 0xfa, 0x9f, 0xf5, 0x07, 0xcb, 0x51, 0xf1, 0xe1, 0xc3, 0x3f, 0x5f, 0x9d, + 0x4e, 0x57, 0xe0, 0x97, 0x72, 0xb9, 0x02, 0x2e, 0x97, 0x3b, 0xe0, 0x72, 0xbb, 0x03, 0x6e, 0x4b, + 0x3b, 0x01, 0xf7, 0x4e, 0x46, 0x3b, 0x4a, 0xdf, 0xbf, 0xdb, 0x34, 0x37, 0x37, 0xb7, 0xc2, 0x8c, + 0x12, 0x01, 0xf9, 0x7c, 0xfe, 0xcb, 0x60, 0x28, 0x4c, 0xaf, 0x29, 0x14, 0x8e, 0x50, 0x38, 0x12, + 0xa5, 0x48, 0x34, 0x46, 0xd1, 0x58, 0x8c, 0x62, 0xf1, 0x38, 0xc5, 0x8f, 0x8f, 0x59, 0x09, 0x3a, + 0x4e, 0x24, 0x28, 0x91, 0x4c, 0xb2, 0x4e, 0x28, 0x79, 0x92, 0xd1, 0xc9, 0xe9, 0xa9, 0xa5, 0xd3, + 0xb3, 0x33, 0xda, 0xdf, 0xdf, 0x8f, 0xfe, 0x12, 0xf4, 0x33, 0x40, 0x7e, 0x70, 0x3d, 0x28, 0x74, + 0x76, 0x7e, 0x6e, 0xe9, 0x9c, 0x75, 0x70, 0x70, 0xf0, 0x73, 0x90, 0x82, 0xbc, 0x06, 0x40, 0xf0, + 0xce, 0xce, 0x4e, 0x2b, 0xb8, 0x15, 0xf4, 0xe2, 0x42, 0x74, 0x01, 0x19, 0x86, 0xa5, 0xc3, 0xc3, + 0x43, 0x1b, 0xc8, 0x50, 0x90, 0x70, 0x24, 0x92, 0x75, 0x11, 0x67, 0x48, 0xa6, 0x44, 0x0a, 0xa0, + 0x82, 0x57, 0x54, 0x54, 0xd8, 0x83, 0x73, 0x40, 0x03, 0xba, 0xbc, 0xa4, 0x4b, 0xa5, 0x54, 0x4a, + 0xf4, 0x02, 0xa4, 0x97, 0xea, 0x35, 0x17, 0x80, 0xfc, 0xfb, 0xe5, 0x0b, 0x8d, 0x8c, 0x8c, 0x50, + 0x61, 0x61, 0x21, 0x8d, 0x8e, 0x8e, 0xd2, 0xda, 0xda, 0x9a, 0x40, 0x54, 0xd0, 0x94, 0x69, 0x8a, + 0x4c, 0xe8, 0xea, 0x4a, 0xe4, 0xf3, 0xf9, 0x34, 0x90, 0xdf, 0x6f, 0xd8, 0x4b, 0x65, 0x07, 0x2c, + 0x2f, 0x2f, 0x53, 0x55, 0x55, 0x15, 0x75, 0x75, 0x75, 0xd1, 0xd4, 0xf4, 0x34, 0x95, 0x94, 0x94, + 0xd0, 0x34, 0x5f, 0xbb, 0xbb, 0xbb, 0xe5, 0xf9, 0xca, 0xca, 0x8a, 0x04, 0xbd, 0x82, 0xd2, 0x69, + 0x4a, 0x2b, 0x5d, 0x5f, 0x03, 0x14, 0xb3, 0x40, 0x7e, 0x7f, 0xc0, 0xc8, 0x40, 0x5e, 0x96, 0x6a, + 0x7c, 0x7c, 0x9c, 0x1a, 0x1b, 0x1b, 0xc9, 0xe3, 0xf1, 0x48, 0x79, 0x50, 0x96, 0xca, 0xca, 0xca, + 0x4c, 0xe6, 0x1c, 0x98, 0x4b, 0x43, 0x2d, 0x2d, 0x2d, 0x34, 0x35, 0x35, 0x45, 0xd7, 0x1c, 0x18, + 0xba, 0xb9, 0xb9, 0xb1, 0xe4, 0xf7, 0xfb, 0x73, 0xa0, 0x40, 0x20, 0x60, 0x00, 0xa2, 0x97, 0x0a, + 0xbd, 0xf8, 0xf4, 0xf9, 0xb3, 0x40, 0x70, 0x2f, 0xf5, 0xcf, 0x96, 0xa7, 0xa7, 0xa7, 0x47, 0xb2, + 0x47, 0xd6, 0x08, 0x8c, 0x67, 0xad, 0xad, 0xad, 0xb4, 0xba, 0xba, 0x4a, 0xb7, 0xb7, 0xb7, 0x74, + 0x7b, 0x77, 0x47, 0x77, 0x59, 0xd9, 0x41, 0xc1, 0xa0, 0xa1, 0x3b, 0x51, 0xd3, 0x54, 0x5d, 0x5d, + 0x4d, 0xbb, 0x3f, 0x7e, 0x88, 0x8b, 0x14, 0x43, 0x50, 0x7b, 0x1d, 0xa0, 0xb2, 0x46, 0x70, 0x4e, + 0x96, 0x6a, 0x6a, 0x6a, 0x24, 0xf8, 0xfd, 0xfd, 0xbd, 0xe8, 0xe1, 0xe1, 0x01, 0xcf, 0x73, 0xa0, + 0x60, 0x28, 0x64, 0xe4, 0x43, 0xbe, 0x6e, 0x6c, 0x50, 0x47, 0x47, 0x47, 0x0e, 0xa2, 0xea, 0xcf, + 0x80, 0xde, 0xde, 0x5e, 0x0b, 0xa0, 0x07, 0xee, 0xeb, 0xeb, 0x23, 0xa7, 0xd3, 0x29, 0x80, 0xc7, + 0xc7, 0x47, 0x51, 0x28, 0x14, 0xca, 0x81, 0x42, 0xe1, 0xb0, 0xa1, 0x43, 0x30, 0xb2, 0x63, 0x63, + 0x63, 0x34, 0x31, 0x31, 0x61, 0xf5, 0x42, 0x77, 0x81, 0x01, 0xc8, 0xcf, 0x1c, 0x41, 0x17, 0x16, + 0x16, 0x68, 0x72, 0x72, 0x92, 0x9e, 0x9e, 0x9e, 0x2c, 0xd9, 0x40, 0x61, 0x06, 0xa1, 0xf1, 0x80, + 0xbc, 0x7b, 0xff, 0x9e, 0x9a, 0x9b, 0x9b, 0xa9, 0xb8, 0xb8, 0x98, 0xca, 0xca, 0xca, 0xa4, 0xd1, + 0xfd, 0xfd, 0xfd, 0x02, 0x19, 0x18, 0x18, 0x90, 0x5e, 0x14, 0x14, 0x14, 0x50, 0x5b, 0x5b, 0x1b, + 0x0d, 0x0e, 0x0e, 0x0a, 0x60, 0x68, 0x68, 0x48, 0xee, 0xcb, 0xcb, 0xcb, 0x65, 0x22, 0xdb, 0xdb, + 0xdb, 0x69, 0x78, 0x78, 0x98, 0x9e, 0x9f, 0x9f, 0x89, 0x63, 0x03, 0x54, 0x9c, 0x01, 0x45, 0x22, + 0x06, 0xdc, 0xa8, 0xcd, 0x87, 0x72, 0x61, 0xda, 0x20, 0xdd, 0x09, 0x9a, 0x0c, 0x07, 0x70, 0xa4, + 0x5c, 0xa8, 0xcc, 0x11, 0x14, 0x8e, 0x66, 0x66, 0x66, 0x08, 0x3f, 0xdc, 0x43, 0x59, 0x47, 0x19, + 0x50, 0x84, 0x41, 0x70, 0x83, 0xcf, 0x07, 0xa6, 0x0b, 0x3d, 0xd9, 0xfa, 0xf6, 0x8d, 0xfe, 0x7e, + 0xfb, 0xf6, 0x05, 0x04, 0x00, 0xf4, 0x42, 0x41, 0x54, 0x40, 0xfc, 0xd0, 0x3b, 0xfe, 0x82, 0x5b, + 0x70, 0xac, 0x09, 0x06, 0x83, 0x76, 0x47, 0x70, 0x23, 0xfb, 0x44, 0x9b, 0xae, 0xda, 0xda, 0x5a, + 0xda, 0xdb, 0xdb, 0x93, 0xa6, 0xeb, 0xbd, 0xd0, 0x21, 0xea, 0xc7, 0x01, 0xa9, 0xae, 0xae, 0xce, + 0xfa, 0x1f, 0x6b, 0xb5, 0xa9, 0xcb, 0x81, 0x54, 0xc9, 0xd0, 0x7c, 0x35, 0xc2, 0x6b, 0xeb, 0xeb, + 0xd4, 0xd0, 0xd0, 0x20, 0x0e, 0xd5, 0x8b, 0x08, 0x02, 0x47, 0x0a, 0x82, 0x2b, 0x1c, 0x37, 0x35, + 0x35, 0xd1, 0x3a, 0xaf, 0xc7, 0x1a, 0x24, 0x85, 0x61, 0x41, 0x82, 0xd9, 0x2f, 0x43, 0xb6, 0x74, + 0xb1, 0x98, 0x61, 0x73, 0xa3, 0xfa, 0xc2, 0x0b, 0x97, 0x96, 0x96, 0x24, 0xc8, 0xd1, 0xd1, 0x91, + 0xe5, 0x04, 0xfb, 0x4b, 0x41, 0x38, 0x90, 0xfc, 0xbf, 0xb8, 0xb8, 0x28, 0x00, 0x04, 0xc7, 0xbb, + 0x48, 0x14, 0x09, 0xf3, 0x7b, 0x39, 0x50, 0x0c, 0xa0, 0x3c, 0x37, 0x6a, 0x9f, 0xe0, 0xe5, 0xcd, + 0xcd, 0x4d, 0xaa, 0xaf, 0xaf, 0x97, 0x7d, 0x35, 0x3b, 0x3b, 0x4b, 0xa5, 0xa5, 0xa5, 0x72, 0xc5, + 0x71, 0x81, 0x72, 0x6d, 0xf0, 0x9e, 0x83, 0x03, 0xbc, 0x83, 0x77, 0x91, 0x2c, 0xaa, 0x83, 0xe4, + 0xf9, 0xe0, 0xb3, 0x83, 0x5e, 0x73, 0xa3, 0xf6, 0x8a, 0x2a, 0xd9, 0xee, 0xee, 0x2e, 0xcd, 0xcf, + 0xcf, 0x53, 0x51, 0x51, 0x11, 0xf1, 0x11, 0x2d, 0xf7, 0xf8, 0x0f, 0xeb, 0xf0, 0x0e, 0x92, 0x04, + 0x00, 0x43, 0x75, 0x86, 0x83, 0x90, 0xb7, 0x8c, 0xd7, 0xeb, 0xd5, 0x40, 0xf1, 0xb8, 0xa1, 0x76, + 0xbf, 0x8c, 0xb3, 0xe6, 0x46, 0x1f, 0x63, 0xd5, 0x17, 0x94, 0x4e, 0x35, 0x1c, 0x6b, 0xe0, 0x44, + 0x41, 0x70, 0xaa, 0x02, 0x70, 0xcc, 0xc7, 0x4c, 0x34, 0x1a, 0x45, 0x32, 0x2f, 0x41, 0x52, 0xb6, + 0xec, 0x38, 0xe7, 0xbb, 0xd1, 0x47, 0x59, 0x8d, 0xb7, 0xea, 0x89, 0x0e, 0x39, 0xe1, 0x2f, 0x0c, + 0x57, 0x88, 0x0f, 0xd1, 0x10, 0x1d, 0x71, 0xff, 0x5c, 0xdb, 0xdb, 0x39, 0x50, 0x1c, 0xa0, 0x6c, + 0x7f, 0xd4, 0xbe, 0xd1, 0x41, 0xba, 0x1b, 0x5c, 0x71, 0xaf, 0x97, 0x0c, 0x25, 0x47, 0xb9, 0xe0, + 0x84, 0x63, 0xc9, 0xa8, 0xe3, 0xf8, 0xf0, 0x78, 0xbc, 0xd8, 0x8f, 0x39, 0xd0, 0xd6, 0xd6, 0x96, + 0x37, 0x99, 0x4c, 0xa6, 0x38, 0x9b, 0x14, 0x2f, 0x4e, 0x71, 0x7d, 0x53, 0xfc, 0xa2, 0xc9, 0xcd, + 0x14, 0x71, 0xb6, 0x22, 0x76, 0x2d, 0x57, 0xf5, 0x9c, 0x1d, 0x98, 0xbc, 0xd6, 0xe4, 0xf7, 0xcc, + 0x44, 0x22, 0x61, 0xb2, 0x13, 0x93, 0x3f, 0x39, 0x26, 0x1f, 0x0d, 0x57, 0x0c, 0x4a, 0x7b, 0xbc, + 0xde, 0xf4, 0xc7, 0x8f, 0x9f, 0xb6, 0x15, 0xe8, 0x2f, 0x56, 0xed, 0x6f, 0xaa, 0xf5, 0x37, 0xf5, + 0xe6, 0x3f, 0x0d, 0x64, 0x12, 0xea, 0x52, 0xdd, 0xb5, 0x52, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, + 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE gerbview_drill_file_xpm[1] = {{ png, sizeof( png ), "gerbview_drill_file_xpm" }}; diff --git a/bitmaps_png/cpp_26/highlight_remove.cpp b/bitmaps_png/cpp_26/highlight_remove.cpp new file mode 100644 index 0000000000..75de03315b --- /dev/null +++ b/bitmaps_png/cpp_26/highlight_remove.cpp @@ -0,0 +1,68 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x03, 0x2c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xc5, 0x95, 0x5d, 0x48, 0x93, + 0x51, 0x18, 0xc7, 0xdf, 0x39, 0x3f, 0x4a, 0x4d, 0x9d, 0x1f, 0xe1, 0x14, 0x2d, 0x2b, 0xb4, 0xd4, + 0x7c, 0x97, 0xd3, 0x72, 0x6a, 0x73, 0xa4, 0x68, 0xe9, 0xb4, 0x6d, 0x36, 0x27, 0xf4, 0x41, 0x29, + 0xde, 0x08, 0xdd, 0xa9, 0x77, 0x92, 0x23, 0xba, 0x34, 0xb4, 0x8b, 0x34, 0x99, 0xe1, 0x8d, 0x60, + 0x42, 0x37, 0x86, 0xcc, 0x72, 0x9b, 0x33, 0x21, 0xa1, 0x70, 0x3a, 0x87, 0x96, 0x20, 0x48, 0xf3, + 0x23, 0x91, 0xd4, 0xa9, 0xa9, 0x94, 0xdb, 0x9e, 0x9e, 0x57, 0x5c, 0xb8, 0xf9, 0x4e, 0xe7, 0xb0, + 0x3a, 0xf0, 0x63, 0xbc, 0xe7, 0x39, 0xe7, 0xfc, 0xf6, 0x7e, 0x9c, 0xff, 0x21, 0x88, 0x23, 0x68, + 0x1a, 0x8d, 0x46, 0x85, 0xa8, 0x29, 0xea, 0xea, 0xea, 0x3c, 0x88, 0xbf, 0xd5, 0x50, 0x00, 0x36, + 0x3a, 0x3b, 0x3b, 0x99, 0xb4, 0x83, 0xfa, 0xfa, 0xfa, 0xb0, 0xae, 0xe9, 0xb7, 0x81, 0xd7, 0xcb, + 0xf8, 0x6b, 0x42, 0x96, 0x8f, 0x54, 0x84, 0x45, 0xcb, 0xee, 0x81, 0xbb, 0xa1, 0x1b, 0xdf, 0x2a, + 0x13, 0x92, 0x9d, 0xf7, 0xc4, 0x3c, 0x67, 0x22, 0x41, 0x42, 0x82, 0xbf, 0xb2, 0x5c, 0x56, 0x8a, + 0xdd, 0x4c, 0xb7, 0x45, 0xcd, 0xe2, 0x3c, 0xd2, 0x58, 0x5e, 0x3c, 0xf7, 0xad, 0xac, 0x78, 0xb1, + 0xbd, 0xa4, 0x88, 0xef, 0x28, 0xea, 0x51, 0x2a, 0x61, 0xa4, 0x5c, 0xfa, 0xd6, 0xf4, 0x40, 0x64, + 0xe9, 0xbf, 0x2b, 0x79, 0x6c, 0x27, 0x53, 0xab, 0xd5, 0xd7, 0x70, 0x50, 0xf6, 0x2e, 0x2c, 0x74, + 0xa2, 0xe9, 0x60, 0xfd, 0xa0, 0xb1, 0xe4, 0xce, 0xcf, 0xc5, 0xe2, 0x6c, 0xa0, 0x98, 0x93, 0xc9, + 0x7e, 0xcd, 0xb0, 0x3f, 0xe8, 0x80, 0x00, 0xcd, 0x12, 0x67, 0x09, 0xe6, 0xc8, 0x59, 0xf8, 0x2c, + 0xaa, 0x85, 0xc5, 0x5b, 0x39, 0xdb, 0xf5, 0xef, 0xa5, 0xf9, 0xf0, 0x25, 0xf5, 0xf9, 0x94, 0x80, + 0x10, 0x78, 0x3a, 0x7b, 0x94, 0x66, 0x47, 0xd1, 0x13, 0x41, 0x3a, 0xc7, 0x28, 0xbe, 0x0d, 0x0b, + 0x85, 0x7c, 0x3b, 0xa6, 0xc5, 0x25, 0x30, 0x1f, 0x62, 0x80, 0x0d, 0x8f, 0x1f, 0x30, 0x99, 0x5d, + 0x0b, 0x0b, 0x45, 0x02, 0xfb, 0x31, 0x92, 0x5c, 0x78, 0x23, 0xca, 0xaf, 0xdb, 0xf3, 0x18, 0x9d, + 0x89, 0x58, 0xde, 0xde, 0x49, 0x03, 0x89, 0x52, 0xeb, 0x7c, 0x2e, 0x0f, 0x1c, 0x31, 0x0a, 0x25, + 0x30, 0x99, 0x53, 0x0d, 0xf3, 0x79, 0x19, 0x7b, 0x6a, 0x13, 0xfc, 0x2c, 0x90, 0x85, 0x87, 0x57, + 0xe2, 0x12, 0x3e, 0x2e, 0x89, 0xa8, 0x7f, 0x34, 0xc2, 0xd0, 0x99, 0xb5, 0x71, 0x12, 0x98, 0x11, + 0x70, 0x61, 0xd6, 0x05, 0xc6, 0x32, 0x92, 0xd7, 0xe5, 0xac, 0x9b, 0xcf, 0x70, 0x6e, 0xa0, 0xcb, + 0x8f, 0x8e, 0x6a, 0x66, 0xc2, 0x6c, 0xd6, 0x33, 0x86, 0x41, 0x73, 0x56, 0x04, 0x5f, 0xd3, 0x93, + 0xc0, 0xb8, 0x0f, 0x86, 0x2b, 0x09, 0xab, 0x92, 0xb0, 0xa0, 0x87, 0x38, 0x2d, 0x60, 0xbf, 0x3d, + 0x41, 0x2b, 0xc2, 0x97, 0x6e, 0x46, 0x19, 0x8c, 0x10, 0x3a, 0x78, 0x1d, 0x77, 0xfa, 0xe3, 0x14, + 0xf7, 0x02, 0xd0, 0xa1, 0x27, 0x63, 0x4d, 0x05, 0xac, 0x80, 0xca, 0x7d, 0x25, 0x07, 0x89, 0x10, + 0x58, 0x63, 0xac, 0x80, 0x36, 0x23, 0x65, 0x60, 0xf2, 0xe2, 0x39, 0xa0, 0x63, 0x94, 0x9b, 0x68, + 0x6a, 0xe0, 0x5d, 0xce, 0x73, 0x65, 0x97, 0x3b, 0x15, 0xad, 0x33, 0x56, 0xc1, 0xc0, 0xa9, 0x84, + 0x89, 0xf3, 0x31, 0x30, 0x11, 0x7b, 0xca, 0x29, 0x63, 0xa9, 0xe4, 0x8a, 0x22, 0x93, 0x77, 0xdd, + 0x2d, 0x11, 0x4a, 0xcc, 0xfa, 0xf8, 0x0a, 0x18, 0x8f, 0x89, 0x84, 0xf1, 0xd3, 0x11, 0x07, 0x32, + 0xca, 0x89, 0x5f, 0x69, 0x49, 0x4b, 0xb9, 0x41, 0x2b, 0xa1, 0x92, 0x17, 0xb3, 0xce, 0x6a, 0x13, + 0x51, 0x39, 0x48, 0xd1, 0xdd, 0xd5, 0xd5, 0x3f, 0x1c, 0x77, 0x1f, 0x0c, 0x11, 0x61, 0x60, 0x60, + 0x87, 0xda, 0xa1, 0x8d, 0x8e, 0xd8, 0xea, 0xe0, 0x72, 0x60, 0xd4, 0xa1, 0x9f, 0x62, 0x88, 0x93, + 0xb8, 0xd5, 0x94, 0x2d, 0x10, 0xe2, 0xd2, 0x0c, 0xc7, 0x80, 0xf5, 0xa4, 0x8b, 0xa2, 0xb6, 0xc6, + 0x06, 0x78, 0xcf, 0x3a, 0x03, 0xfa, 0x90, 0x40, 0x3b, 0xb4, 0x51, 0x6c, 0x78, 0x5a, 0x53, 0x03, + 0x2d, 0xcd, 0xcd, 0xd0, 0x9e, 0x9a, 0x0c, 0x23, 0x0e, 0x75, 0x5d, 0x68, 0x10, 0x3c, 0x62, 0x87, + 0x37, 0xe1, 0xd2, 0xc7, 0x5d, 0x12, 0x29, 0x31, 0xc3, 0xde, 0x31, 0x3b, 0x40, 0xe3, 0x17, 0x0d, + 0xba, 0x13, 0xbe, 0xdb, 0xa8, 0x4f, 0x86, 0x41, 0x7d, 0x75, 0x15, 0x74, 0x77, 0x77, 0x83, 0x4a, + 0xa5, 0x82, 0x97, 0xad, 0xad, 0xd0, 0xc6, 0xbd, 0x04, 0x43, 0x3b, 0xf5, 0x4f, 0x01, 0x7e, 0xd0, + 0x58, 0x28, 0x04, 0x92, 0x24, 0x63, 0xf7, 0xdc, 0x11, 0x00, 0x30, 0x30, 0xfb, 0xaa, 0x70, 0xf1, + 0x6a, 0x0a, 0x2a, 0x07, 0x6d, 0x6c, 0x30, 0x36, 0x2c, 0xbd, 0x8c, 0x57, 0xd0, 0xeb, 0x15, 0x01, + 0xbd, 0xc7, 0x7c, 0xd6, 0x2a, 0xd2, 0xd2, 0xea, 0x15, 0x0a, 0x45, 0xc1, 0x4e, 0x56, 0xfe, 0x91, + 0xbd, 0x08, 0x0e, 0x36, 0x0c, 0x7a, 0x7b, 0x59, 0x6b, 0xa3, 0xa2, 0x94, 0x72, 0xb9, 0x5c, 0x26, + 0x95, 0x4a, 0x99, 0x87, 0x3a, 0xdc, 0xa8, 0xaf, 0x6e, 0x93, 0xd8, 0x84, 0x5e, 0xa2, 0x03, 0x30, + 0xb6, 0xcb, 0xb0, 0xcb, 0xdf, 0x31, 0xbd, 0x51, 0x0a, 0x41, 0x7e, 0x7e, 0xa4, 0x04, 0x5f, 0x37, + 0x76, 0x47, 0xba, 0x75, 0x8a, 0xda, 0xf6, 0x11, 0x25, 0xc3, 0x4b, 0x5f, 0x67, 0xe7, 0x11, 0xde, + 0x81, 0x37, 0xed, 0x66, 0xc5, 0xc9, 0x3d, 0x88, 0xca, 0x05, 0xac, 0x94, 0x88, 0xc2, 0xad, 0x13, + 0x16, 0x27, 0x6e, 0xd9, 0x16, 0x70, 0x95, 0x7f, 0x25, 0xb2, 0xba, 0x2b, 0xca, 0x44, 0xf8, 0x87, + 0xe0, 0xaa, 0x5b, 0xa2, 0xa3, 0x68, 0xf8, 0xb5, 0xf1, 0x51, 0x92, 0x45, 0x41, 0xfc, 0xef, 0xf6, + 0x1b, 0x65, 0x9f, 0xc1, 0xc5, 0xe6, 0x57, 0x06, 0x90, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, + 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE highlight_remove_xpm[1] = {{ png, sizeof( png ), "highlight_remove_xpm" }}; + +//EOF diff --git a/bitmaps_png/sources/gerbview_clear_layers.svg b/bitmaps_png/sources/gerbview_clear_layers.svg index 2809b6834c..5bdcdb99c7 100644 --- a/bitmaps_png/sources/gerbview_clear_layers.svg +++ b/bitmaps_png/sources/gerbview_clear_layers.svg @@ -12,7 +12,7 @@ width="26" version="1.1" id="svg2" - inkscape:version="0.48.3.1 r9886" + inkscape:version="0.92.0 r15299" sodipodi:docname="gerbview_clear_layers.svg"> @@ -35,15 +35,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1301" - inkscape:window-height="744" + inkscape:window-width="1920" + inkscape:window-height="1033" id="namedview170" showgrid="true" inkscape:zoom="21.730769" inkscape:cx="13" inkscape:cy="13.936747" - inkscape:window-x="65" - inkscape:window-y="24" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="g4756"> + spacingx="0.5" + spacingy="0.5" + originx="0" + originy="0" /> diff --git a/bitmaps_png/sources/gerbview_drill_file.svg b/bitmaps_png/sources/gerbview_drill_file.svg index cd03f4fc64..1206ffa812 100644 --- a/bitmaps_png/sources/gerbview_drill_file.svg +++ b/bitmaps_png/sources/gerbview_drill_file.svg @@ -12,7 +12,7 @@ width="26" version="1.1" id="svg2" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.0 r15299" sodipodi:docname="gerbview_drill_file.svg"> @@ -22,7 +22,7 @@ image/svg+xml - + @@ -35,15 +35,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="744" + inkscape:window-width="1920" + inkscape:window-height="1033" id="namedview170" showgrid="true" inkscape:zoom="21.730769" inkscape:cx="21.05919" inkscape:cy="13.700887" - inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="g4756"> + spacingx="0.5" + spacingy="0.5" + originx="0" + originy="0" /> @@ -1650,7 +1652,7 @@ sodipodi:cy="13.5" sodipodi:rx="8.4938049" sodipodi:ry="8.4938049" - d="m 21.993805,13.5 a 8.4938049,8.4938049 0 1 1 -16.9876099,0 8.4938049,8.4938049 0 1 1 16.9876099,0 z" + d="M 21.993805,13.5 A 8.4938049,8.4938049 0 0 1 13.5,21.993805 8.4938049,8.4938049 0 0 1 5.0061951,13.5 8.4938049,8.4938049 0 0 1 13.5,5.0061951 8.4938049,8.4938049 0 0 1 21.993805,13.5 Z" transform="matrix(0.79837563,0,0,0.79837563,2.7929676,2.6420082)" /> + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/net_highlight_schematic.svg b/bitmaps_png/sources/net_highlight_schematic.svg index eac54572fd..d5326d7545 100644 --- a/bitmaps_png/sources/net_highlight_schematic.svg +++ b/bitmaps_png/sources/net_highlight_schematic.svg @@ -11,8 +11,9 @@ width="26" version="1.1" id="svg2" - inkscape:version="0.91 r" - sodipodi:docname="net_highlight_schematic.svg"> + inkscape:version="0.92.0 r15299" + sodipodi:docname="net_highlight_schematic.svg" + shape-rendering="crispEdges"> @@ -34,8 +35,8 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1053" + inkscape:window-width="1217" + inkscape:window-height="689" id="namedview38" showgrid="true" inkscape:snap-to-guides="false" @@ -43,9 +44,9 @@ inkscape:zoom="32.472518" inkscape:cx="10.481867" inkscape:cy="12.648642" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="1" + inkscape:window-x="261" + inkscape:window-y="175" + inkscape:window-maximized="0" inkscape:current-layer="svg2" inkscape:snap-text-baseline="false"> #include #include +#include #include using namespace std::placeholders; @@ -52,6 +53,33 @@ CONTEXT_MENU::~CONTEXT_MENU() parent->m_submenus.remove( this ); } +/* + * Helper function. + * Assigns an icon to the wxMenuItem aMenu. + * aIcon is the icon to be assigned can be NULL. + */ +static void set_wxMenuIcon( wxMenuItem* aMenu, const BITMAP_OPAQUE* aIcon ) +{ + bool useImagesInMenus = Pgm().GetUseIconsInMenus(); + + if( aIcon && useImagesInMenus ) + { + aMenu->SetBitmap( KiBitmap( aIcon ) ); + } +} + + +void CONTEXT_MENU::SetIcon( const BITMAP_OPAQUE* aIcon ) +{ + // Retrieve the global applicaton show icon option: + bool useImagesInMenus = Pgm().GetUseIconsInMenus(); + + if( useImagesInMenus ) + m_icon = aIcon; + else + m_icon = nullptr; +} + void CONTEXT_MENU::setupEvents() { @@ -113,9 +141,7 @@ wxMenuItem* CONTEXT_MENU::Add( const wxString& aLabel, int aId, const BITMAP_OPA #endif wxMenuItem* item = new wxMenuItem( this, aId, aLabel, wxEmptyString, wxITEM_NORMAL ); - - if( aIcon ) - item->SetBitmap( KiBitmap( aIcon ) ); + set_wxMenuIcon( item, aIcon ); return Append( item ); } @@ -129,8 +155,7 @@ wxMenuItem* CONTEXT_MENU::Add( const TOOL_ACTION& aAction ) wxMenuItem* item = new wxMenuItem( this, getMenuId( aAction ), aAction.GetMenuItem(), aAction.GetDescription(), wxITEM_NORMAL ); - if( icon ) - item->SetBitmap( KiBitmap( icon ) ); + set_wxMenuIcon( item, icon ); m_toolActions[getMenuId( aAction )] = &aAction; @@ -160,7 +185,7 @@ std::list CONTEXT_MENU::Add( CONTEXT_MENU* aMenu, bool aExpand ) if( aMenu->m_icon ) { wxMenuItem* newItem = new wxMenuItem( this, -1, menuCopy->m_title ); - newItem->SetBitmap( KiBitmap( aMenu->m_icon ) ); + set_wxMenuIcon( newItem, aMenu->m_icon ); newItem->SetSubMenu( menuCopy ); items.push_back( Append( newItem ) ); } @@ -423,7 +448,9 @@ wxMenuItem* CONTEXT_MENU::appendCopy( const wxMenuItem* aSource ) wxMenuItem* newItem = new wxMenuItem( this, aSource->GetId(), aSource->GetItemLabel(), aSource->GetHelp(), aSource->GetKind() ); - if( aSource->GetKind() == wxITEM_NORMAL ) + bool useImagesInMenus = Pgm().GetUseIconsInMenus(); + + if( aSource->GetKind() == wxITEM_NORMAL && useImagesInMenus ) newItem->SetBitmap( aSource->GetBitmap() ); if( aSource->IsSubMenu() ) diff --git a/gerbview/tools/gerbview_control.cpp b/gerbview/tools/gerbview_control.cpp index e806b823c8..f0d1961651 100644 --- a/gerbview/tools/gerbview_control.cpp +++ b/gerbview/tools/gerbview_control.cpp @@ -38,7 +38,7 @@ TOOL_ACTION GERBVIEW_ACTIONS::layerChanged( "gerbview.Control.layerChanged", TOOL_ACTION GERBVIEW_ACTIONS::highlightClear( "gerbview.Control.highlightClear", AS_GLOBAL, 0, - _( "Clear Highlight" ), "", gerbview_clear_layers_xpm ); + _( "Clear Highlight" ), "", highlight_remove_xpm ); TOOL_ACTION GERBVIEW_ACTIONS::highlightNet( "gerbview.Control.highlightNet", AS_GLOBAL, 0, diff --git a/gerbview/tools/selection_tool.cpp b/gerbview/tools/selection_tool.cpp index f094f12c11..cf10e9d696 100644 --- a/gerbview/tools/selection_tool.cpp +++ b/gerbview/tools/selection_tool.cpp @@ -24,9 +24,9 @@ using namespace std::placeholders; #include +#include #include -//#include #include #include @@ -80,6 +80,7 @@ class HIGHLIGHT_MENU: public CONTEXT_MENU public: HIGHLIGHT_MENU() { + SetIcon( net_highlight_schematic_xpm ); SetTitle( _( "Highlight..." ) ); } @@ -87,6 +88,8 @@ private: void update() override { + bool addSeparator = false; + const auto& selection = getToolManager()->GetTool()->GetSelection(); if( selection.Size() == 1 ) @@ -100,6 +103,7 @@ private: auto menuEntry = Add( GERBVIEW_ACTIONS::highlightComponent ); menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of component '%s'" ), GetChars( net_attr.m_Cmpref ) ) ); + addSeparator = true; } if( ( net_attr.m_NetAttribType & GBR_NETLIST_METADATA::GBR_NETINFO_NET ) ) @@ -107,6 +111,7 @@ private: auto menuEntry = Add( GERBVIEW_ACTIONS::highlightNet ); menuEntry->SetItemLabel( wxString::Format( _( "Highlight items of net '%s'" ), GetChars( net_attr.m_Netname ) ) ); + addSeparator = true; } D_CODE* apertDescr = item->GetDcodeDescr(); @@ -116,9 +121,13 @@ private: auto menuEntry = Add( GERBVIEW_ACTIONS::highlightAttribute ); menuEntry->SetItemLabel( wxString::Format( _( "Highlight aperture type '%s'" ), GetChars( apertDescr->m_AperFunction ) ) ); + addSeparator = true; } } + if( addSeparator ) + AppendSeparator(); + Add( GERBVIEW_ACTIONS::highlightClear ); } diff --git a/include/bitmaps.h b/include/bitmaps.h index a2d6dbe6a8..f5f2870f54 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -191,6 +191,7 @@ EXTERN_BITMAP( hammer_xpm ) EXTERN_BITMAP( help_xpm ) EXTERN_BITMAP( hidden_pin_xpm ) EXTERN_BITMAP( hierarchy_nav_xpm ) +EXTERN_BITMAP( highlight_remove_xpm ) EXTERN_BITMAP( hotkeys_xpm ) EXTERN_BITMAP( hotkeys_import_xpm ) EXTERN_BITMAP( hotkeys_export_xpm ) diff --git a/include/tool/context_menu.h b/include/tool/context_menu.h index 387f35273b..cdbc33576a 100644 --- a/include/tool/context_menu.h +++ b/include/tool/context_menu.h @@ -71,10 +71,7 @@ public: * Assigns an icon for the entry. * @param aIcon is the icon to be assigned. NULL is used to remove icon. */ - inline void SetIcon( const BITMAP_OPAQUE* aIcon ) - { - m_icon = aIcon; - } + void SetIcon( const BITMAP_OPAQUE* aIcon ); /** * Function Add()