From bdada70ee7097762df05db3faca2415515387bdd Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 12 Apr 2020 10:29:28 +0200 Subject: [PATCH] Cosmetic enhancements: add bitmaps to a few context menus. Fix also a minor compil warning. --- bitmaps_png/CMakeLists.txt | 2 + bitmaps_png/cpp_16/question_mark.cpp | 17 +- bitmaps_png/cpp_26/flag.cpp | 88 +-- bitmaps_png/cpp_26/flag_remove.cpp | 91 +++ .../cpp_26/switch_corner_rounding_shape.cpp | 82 +++ .../include/bitmaps_png/bitmaps_list.h | 2 + bitmaps_png/sources/flag.svg | 649 +++++++++++++++--- bitmaps_png/sources/flag_remove.svg | 629 +++++++++++++++++ .../sources/switch_corner_rounding_shape.svg | 223 ++++++ common/tool/actions.cpp | 120 ++-- .../dialogs/panel_eeschema_color_settings.cpp | 4 +- pcbnew/router/router_tool.cpp | 7 +- 12 files changed, 1708 insertions(+), 206 deletions(-) create mode 100644 bitmaps_png/cpp_26/flag_remove.cpp create mode 100644 bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp create mode 100644 bitmaps_png/sources/flag_remove.svg create mode 100644 bitmaps_png/sources/switch_corner_rounding_shape.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 229008e941..c6259f5693 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -233,6 +233,7 @@ set( BMAPS_MID find find_replace flag + flag_remove flip_board fonts footprint_text @@ -475,6 +476,7 @@ set( BMAPS_MID spreadsheet svg_file swap_layer + switch_corner_rounding_shape text text_sketch three_d diff --git a/bitmaps_png/cpp_16/question_mark.cpp b/bitmaps_png/cpp_16/question_mark.cpp index ec20e250c7..fc3c17556f 100644 --- a/bitmaps_png/cpp_16/question_mark.cpp +++ b/bitmaps_png/cpp_16/question_mark.cpp @@ -7,14 +7,15 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0xb5, 0xfa, 0x37, - 0xea, 0x00, 0x00, 0x00, 0x4c, 0x49, 0x44, 0x41, 0x54, 0x28, 0xcf, 0x63, 0x60, 0x18, 0x6c, 0xc0, - 0x83, 0x21, 0x8c, 0xa1, 0x8c, 0x21, 0x88, 0x81, 0x11, 0xbb, 0xb4, 0x09, 0x43, 0x1b, 0x90, 0x94, - 0x63, 0xf8, 0xc1, 0x60, 0x83, 0x5d, 0x01, 0x3b, 0x83, 0x0b, 0x90, 0x14, 0x66, 0xf8, 0xce, 0xa0, - 0x80, 0xcf, 0x9a, 0x44, 0x86, 0x6e, 0xfc, 0xee, 0x98, 0xc6, 0xc0, 0x8c, 0x4f, 0x5a, 0x98, 0xc1, - 0x02, 0xbf, 0x7e, 0x0d, 0x06, 0x69, 0xfc, 0x0a, 0x9a, 0x18, 0xf2, 0x06, 0x5d, 0xe0, 0x33, 0x00, - 0x00, 0x29, 0xbc, 0x07, 0xec, 0x3c, 0xd3, 0xa9, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff, + 0x61, 0x00, 0x00, 0x00, 0x5b, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0x18, 0x05, 0xb8, + 0x00, 0x33, 0x10, 0x87, 0x02, 0x71, 0x04, 0x10, 0xf7, 0x02, 0x71, 0x16, 0x10, 0x33, 0x92, 0x62, + 0x40, 0x08, 0x10, 0xb7, 0x43, 0xd9, 0xec, 0x40, 0xfc, 0x11, 0x88, 0x03, 0x48, 0x31, 0x40, 0x1a, + 0x88, 0x83, 0xa0, 0x6c, 0x56, 0x20, 0xfe, 0x0a, 0xc4, 0x36, 0xe4, 0x7a, 0x27, 0x0a, 0x88, 0xa7, + 0x91, 0xab, 0x19, 0xe4, 0xef, 0x2e, 0x20, 0x66, 0x22, 0xd7, 0x00, 0x79, 0x20, 0xd6, 0xa1, 0x24, + 0x36, 0xf4, 0x81, 0x58, 0x85, 0x12, 0x03, 0x26, 0x01, 0x71, 0xe5, 0x68, 0xaa, 0xc6, 0x0f, 0x00, + 0x99, 0x0e, 0x08, 0x95, 0x88, 0xbc, 0x99, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, + 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE question_mark_xpm[1] = {{ png, sizeof( png ), "question_mark_xpm" }}; diff --git a/bitmaps_png/cpp_26/flag.cpp b/bitmaps_png/cpp_26/flag.cpp index ebab46b00a..227a64f8db 100644 --- a/bitmaps_png/cpp_26/flag.cpp +++ b/bitmaps_png/cpp_26/flag.cpp @@ -8,46 +8,54 @@ 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, 0x02, 0x67, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x95, 0x3d, 0x68, 0x54, - 0x41, 0x10, 0xc7, 0x7f, 0xf3, 0xde, 0xbb, 0x7b, 0xe7, 0xbd, 0x5c, 0x2e, 0xa7, 0x82, 0xb1, 0x30, - 0xd8, 0x24, 0x22, 0x16, 0x8a, 0x11, 0x04, 0xbf, 0x82, 0xbd, 0x95, 0x8d, 0x20, 0x82, 0x85, 0xd5, - 0x15, 0x76, 0xda, 0xd9, 0xda, 0xa4, 0x4a, 0xa5, 0x85, 0x5d, 0x6c, 0xa3, 0x8d, 0x85, 0x44, 0x09, - 0x88, 0x10, 0xd0, 0xa0, 0x42, 0x20, 0x24, 0x48, 0x04, 0x13, 0xc5, 0x8f, 0x9c, 0x51, 0x63, 0x2e, - 0xe6, 0xde, 0xd7, 0xee, 0x58, 0x9c, 0x9a, 0x13, 0x62, 0x12, 0xcf, 0x1c, 0x3a, 0x30, 0x0c, 0xbb, - 0xc3, 0xee, 0x9f, 0xff, 0x7f, 0x66, 0x77, 0xe0, 0x3f, 0xb0, 0x42, 0xb9, 0x5c, 0x1e, 0x04, 0x82, - 0xcd, 0xb8, 0xcc, 0x59, 0x23, 0xd7, 0xd5, 0xd9, 0xd9, 0x79, 0x16, 0xd8, 0xd5, 0x72, 0x4a, 0xa5, - 0x52, 0xe9, 0x21, 0x20, 0x2d, 0xc7, 0xe9, 0xe9, 0xe9, 0xd1, 0xf2, 0x19, 0xbf, 0x7f, 0xf0, 0xd2, - 0xdf, 0xcb, 0xf7, 0x5b, 0xe9, 0x82, 0x20, 0xf0, 0x7d, 0xdf, 0x67, 0xfe, 0x93, 0xb9, 0xfc, 0x3e, - 0x61, 0xee, 0xce, 0x00, 0x77, 0xa6, 0x86, 0x38, 0xbf, 0xf4, 0x88, 0x1d, 0xcd, 0x00, 0x79, 0x6b, - 0x25, 0x33, 0x99, 0x0c, 0xaa, 0x8a, 0xb1, 0x04, 0x49, 0xca, 0x29, 0x71, 0xf3, 0xa7, 0x20, 0x60, - 0x69, 0x2c, 0xfb, 0x4e, 0xf0, 0xc6, 0xad, 0xb8, 0x33, 0x9e, 0x78, 0xaf, 0x0c, 0xf1, 0x5b, 0xd1, - 0xf0, 0x03, 0xa0, 0xe2, 0x75, 0x7c, 0x51, 0x6b, 0xb6, 0x52, 0x9b, 0xb6, 0xd6, 0xf0, 0xb2, 0xd0, - 0xc7, 0xd4, 0xba, 0x40, 0xd9, 0x6c, 0x16, 0x50, 0x00, 0x44, 0x1c, 0xc4, 0xf5, 0x11, 0x37, 0x00, - 0xb7, 0x63, 0xa7, 0x78, 0xc5, 0x9d, 0x9e, 0x5b, 0x04, 0xaf, 0x88, 0xe7, 0xb6, 0x23, 0x6e, 0x3b, - 0x78, 0x05, 0xc4, 0x09, 0xb0, 0xd1, 0xeb, 0xd0, 0xc8, 0xfd, 0xab, 0x6d, 0x2f, 0xc6, 0x87, 0x37, - 0xcc, 0xe8, 0x67, 0x2f, 0x88, 0x03, 0xe2, 0xd6, 0x8f, 0xc8, 0x8a, 0x8b, 0x64, 0xc0, 0xf1, 0xc1, - 0xc9, 0x81, 0x0d, 0xd5, 0x2c, 0x3c, 0xb8, 0x6b, 0xe6, 0xef, 0x5d, 0x68, 0x3b, 0xc9, 0xfb, 0x0d, - 0x4b, 0x27, 0x22, 0x88, 0xac, 0xd6, 0x74, 0xfa, 0x93, 0x69, 0x7d, 0x69, 0x88, 0x16, 0x9e, 0x7e, - 0x31, 0x8b, 0xa3, 0x17, 0x4b, 0xc7, 0x3f, 0xde, 0xfc, 0xa3, 0x1a, 0xa9, 0xaa, 0x44, 0x51, 0x04, - 0xfe, 0xf7, 0xb5, 0x35, 0xa0, 0x06, 0x48, 0xeb, 0x51, 0x0d, 0x60, 0x48, 0xc3, 0x37, 0x3c, 0x9d, - 0xa8, 0x92, 0x6b, 0xdf, 0x57, 0xdc, 0xbf, 0xe7, 0xf4, 0x60, 0x38, 0xad, 0x37, 0x34, 0x7e, 0x37, - 0x67, 0x16, 0x47, 0x6f, 0xb9, 0x66, 0x61, 0x60, 0xcb, 0x31, 0x5e, 0xad, 0x07, 0xe4, 0xd4, 0x6a, - 0x35, 0xb4, 0xb0, 0xc2, 0x42, 0x6d, 0x8c, 0xda, 0x04, 0x71, 0x62, 0x6c, 0xf2, 0x99, 0xc9, 0xe7, - 0x15, 0x12, 0xa7, 0x8b, 0xc3, 0x87, 0xf6, 0x02, 0x09, 0x36, 0xaa, 0xcc, 0x92, 0x56, 0x6e, 0x27, - 0xcb, 0x4f, 0xae, 0x15, 0x8f, 0xf0, 0x62, 0xa3, 0xd2, 0x49, 0x18, 0x86, 0xe8, 0x2f, 0x0a, 0x45, - 0xc4, 0x51, 0x95, 0xb1, 0x67, 0x09, 0x92, 0x29, 0x70, 0xac, 0x37, 0xff, 0x09, 0x7d, 0xfb, 0xd8, - 0x2e, 0x4e, 0x8e, 0x48, 0xf4, 0x7a, 0x28, 0x7f, 0x94, 0xd9, 0x66, 0xda, 0x5b, 0xac, 0xb5, 0x28, - 0x20, 0x8a, 0x2e, 0x87, 0x84, 0x63, 0x13, 0x69, 0x65, 0x5b, 0xe9, 0xeb, 0x48, 0xdf, 0xc1, 0x70, - 0x18, 0x5b, 0x99, 0xc8, 0x1f, 0x60, 0x4a, 0xa4, 0xb1, 0x58, 0xcd, 0xbd, 0x23, 0x11, 0x11, 0x0a, - 0x81, 0x5c, 0xdf, 0xb1, 0x9d, 0xfe, 0x73, 0x57, 0x98, 0xa9, 0x6f, 0x9b, 0xef, 0xbe, 0x49, 0x96, - 0xcb, 0xe5, 0x76, 0x77, 0x77, 0x77, 0x6b, 0xb1, 0x58, 0xec, 0x6d, 0xf5, 0xef, 0x5d, 0x97, 0x4e, - 0xd5, 0x69, 0x29, 0x90, 0xaa, 0x3a, 0x71, 0x1c, 0x93, 0xc9, 0x64, 0x5a, 0x0b, 0x14, 0x45, 0x91, - 0x24, 0x49, 0x82, 0xaa, 0xba, 0x9b, 0x01, 0xf4, 0xdb, 0x66, 0xf0, 0x7d, 0xdf, 0x89, 0xa2, 0x88, - 0xcd, 0x9a, 0x47, 0x6b, 0xd6, 0x28, 0x4d, 0xd3, 0xd6, 0x33, 0x52, 0x55, 0x49, 0xd3, 0x94, 0x6a, - 0xb5, 0xaa, 0x2d, 0x05, 0x8a, 0xe3, 0xf8, 0x87, 0x64, 0xad, 0x65, 0x04, 0x74, 0x01, 0x35, 0xe0, - 0x04, 0xd0, 0x06, 0xd8, 0xfa, 0x8f, 0x4a, 0x0a, 0x24, 0x0d, 0xb1, 0xd1, 0x57, 0xdb, 0x4b, 0x80, - 0xa4, 0xd9, 0x42, 0x4b, 0x83, 0x37, 0xce, 0x0d, 0xe5, 0x5f, 0xdb, 0x37, 0xfd, 0x78, 0x11, 0x32, - 0xa3, 0xe2, 0x32, 0x37, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x02, 0xe4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0xdf, 0x6b, 0x1c, + 0x55, 0x14, 0xc7, 0x3f, 0xe7, 0xde, 0xd9, 0x49, 0xb2, 0xdd, 0xd9, 0x8e, 0xda, 0x22, 0x44, 0xc2, + 0xda, 0xa7, 0x20, 0x86, 0x80, 0x52, 0x82, 0x8a, 0x0a, 0x45, 0xb0, 0xcf, 0x29, 0xd2, 0x37, 0x5f, + 0x2c, 0xf8, 0x20, 0xbe, 0xf4, 0x0f, 0xe8, 0xab, 0xe0, 0x1f, 0x20, 0xe2, 0x93, 0xe8, 0x83, 0x3e, + 0xa8, 0x6f, 0x42, 0x04, 0x51, 0xab, 0xb4, 0x10, 0x6a, 0x7f, 0xf8, 0x2b, 0x46, 0x13, 0xa5, 0x4d, + 0x1b, 0xa2, 0x4d, 0x42, 0xec, 0xee, 0xce, 0xec, 0xec, 0xce, 0xcc, 0x9d, 0xe3, 0xc3, 0x6e, 0xea, + 0x76, 0xd3, 0x5a, 0x2c, 0x1d, 0x0f, 0x7c, 0x19, 0x66, 0x0e, 0xdc, 0xcf, 0x9c, 0x73, 0xee, 0xb9, + 0xe7, 0x02, 0x30, 0x39, 0x39, 0x79, 0x62, 0x7e, 0x7e, 0xfe, 0x0a, 0x50, 0xa3, 0x24, 0x33, 0x00, + 0x1b, 0x1b, 0x1b, 0x36, 0x0c, 0xc3, 0x03, 0x80, 0x47, 0x99, 0x36, 0x3b, 0x3b, 0x3b, 0x2d, 0x22, + 0x8b, 0x65, 0x32, 0x0c, 0x40, 0xa5, 0x52, 0x39, 0xda, 0x68, 0x34, 0xe6, 0x4e, 0x9d, 0xe0, 0xb5, + 0x77, 0x5e, 0xa5, 0x52, 0x1a, 0x28, 0x4d, 0x53, 0x2f, 0xcf, 0x73, 0xb9, 0xfc, 0x07, 0x6f, 0x6d, + 0x55, 0xd8, 0xfe, 0xe8, 0x4d, 0x3e, 0x59, 0x7c, 0x9f, 0x97, 0xd7, 0x3e, 0xe5, 0x81, 0xfb, 0x05, + 0xf2, 0x00, 0x8c, 0x31, 0x52, 0xab, 0xf5, 0xf7, 0x81, 0x16, 0xd4, 0x7b, 0x19, 0xc7, 0xb4, 0xb0, + 0xc7, 0xc6, 0x27, 0xc6, 0x5c, 0xb4, 0x38, 0xfe, 0x9b, 0x22, 0x3f, 0xaa, 0x16, 0x97, 0x24, 0xef, + 0xae, 0xaa, 0x49, 0xd6, 0x3d, 0xe1, 0xea, 0x04, 0xec, 0xc8, 0x33, 0x24, 0xa3, 0x0b, 0x6e, 0x7e, + 0x45, 0xed, 0x60, 0x40, 0x4f, 0x0e, 0x93, 0xed, 0x01, 0xc5, 0x71, 0xec, 0x76, 0x41, 0xbb, 0x26, + 0xc6, 0x47, 0x6c, 0xcd, 0x8a, 0x0d, 0xa6, 0xfb, 0xaa, 0xbd, 0x84, 0x0d, 0x10, 0x33, 0x01, 0x52, + 0xa1, 0x2b, 0x42, 0xb2, 0xac, 0x88, 0x17, 0xe6, 0x62, 0xab, 0x29, 0xaa, 0x95, 0xa2, 0xf3, 0x43, + 0x92, 0xdf, 0xf8, 0xf2, 0x14, 0xf0, 0xf6, 0x6d, 0x23, 0xea, 0x74, 0x3a, 0xce, 0xf7, 0xfd, 0x11, + 0x90, 0x07, 0x32, 0x24, 0xe3, 0x23, 0xc6, 0x07, 0x5b, 0x45, 0x6c, 0x80, 0xd8, 0x00, 0x6c, 0x0d, + 0xb1, 0x81, 0xa7, 0xd9, 0xb6, 0x71, 0x37, 0x4e, 0x7f, 0xec, 0x5a, 0x67, 0x5f, 0x0f, 0x9e, 0x67, + 0xeb, 0x8e, 0xa9, 0xf3, 0x7d, 0x5f, 0xda, 0xed, 0xf6, 0x88, 0x4b, 0x6e, 0x4a, 0xc4, 0x0c, 0xbd, + 0x1b, 0xc0, 0xf6, 0xe5, 0x62, 0xf2, 0xe6, 0xe9, 0x73, 0xae, 0x79, 0xe6, 0x95, 0xe0, 0xd9, 0x74, + 0xe9, 0xae, 0x35, 0xaa, 0xd7, 0xeb, 0x7e, 0xab, 0xd5, 0x1a, 0x71, 0x15, 0x03, 0x29, 0xaa, 0x05, + 0x82, 0x02, 0xda, 0xff, 0xa6, 0x29, 0xcd, 0xcd, 0x73, 0x7a, 0xe1, 0xe2, 0xf2, 0x1a, 0xc6, 0x9e, + 0x7d, 0x7a, 0x66, 0xe2, 0xb1, 0xd6, 0xd7, 0xe9, 0x7e, 0x57, 0xb0, 0x11, 0xc2, 0x9f, 0x72, 0x84, + 0xee, 0x6d, 0x41, 0x59, 0x96, 0x99, 0x6a, 0xb5, 0x7a, 0x8b, 0x43, 0x0b, 0x07, 0xea, 0x40, 0xf3, + 0xbe, 0x8a, 0x0c, 0x95, 0x94, 0x34, 0xb9, 0xcc, 0xa5, 0xe5, 0x9c, 0xb1, 0xfd, 0x33, 0x72, 0xe4, + 0xe8, 0x13, 0x8f, 0x8a, 0x0d, 0x4e, 0x22, 0xe6, 0xa4, 0x76, 0x7f, 0x6f, 0x15, 0xed, 0xf3, 0x0b, + 0xed, 0xf8, 0xa7, 0x0f, 0x75, 0x89, 0x05, 0x79, 0x9c, 0x74, 0x0f, 0xa8, 0xd9, 0x6c, 0x6a, 0x18, + 0x86, 0xb7, 0x82, 0x34, 0x03, 0xcd, 0x50, 0xcd, 0x10, 0x4d, 0xe9, 0x75, 0x36, 0xf9, 0x6e, 0xe5, + 0x3a, 0x63, 0xb5, 0x43, 0x3c, 0x75, 0xf8, 0x00, 0xd0, 0xa5, 0xe8, 0xfc, 0xba, 0xa9, 0xae, 0xb9, + 0x50, 0xc4, 0x17, 0xdf, 0xad, 0xad, 0x47, 0x67, 0xe4, 0x38, 0xee, 0x5f, 0x53, 0xd7, 0xeb, 0xf5, + 0x4c, 0x14, 0x45, 0xa8, 0x0e, 0x47, 0x94, 0xa3, 0xae, 0xcb, 0xd6, 0x76, 0xce, 0xf7, 0xab, 0x1d, + 0xea, 0x61, 0xc8, 0xdc, 0x8c, 0xf7, 0x97, 0xb0, 0xf6, 0x6d, 0xd1, 0xfc, 0xf9, 0x1b, 0xd2, 0x6b, + 0x9f, 0xed, 0x7b, 0x8e, 0x0b, 0xff, 0xa9, 0x8f, 0x82, 0x20, 0x18, 0x8f, 0xe3, 0xf8, 0x9f, 0xea, + 0x28, 0xd9, 0xca, 0x15, 0x7a, 0xab, 0xeb, 0xc9, 0x2f, 0x87, 0x1e, 0xf6, 0x3e, 0x7f, 0x61, 0xae, + 0x77, 0x5e, 0xdd, 0xf6, 0xd2, 0xbe, 0x27, 0x59, 0x91, 0x7e, 0xb1, 0xee, 0xad, 0x61, 0xad, 0xb5, + 0xbe, 0xef, 0xfb, 0x3c, 0x72, 0x90, 0xf7, 0x26, 0x1f, 0xe2, 0x83, 0xf1, 0x69, 0xbe, 0x38, 0x7e, + 0x33, 0x0d, 0xf9, 0xfd, 0x3b, 0x87, 0xa6, 0xa6, 0xa6, 0xde, 0x68, 0x34, 0x1a, 0x0a, 0x3c, 0x58, + 0xea, 0xa1, 0x1a, 0x45, 0x11, 0x59, 0x96, 0x51, 0xfa, 0xe9, 0x2d, 0x22, 0x5e, 0x92, 0x24, 0xbb, + 0x5d, 0x5a, 0x1e, 0xa8, 0x5a, 0xad, 0x8e, 0x39, 0xe7, 0xca, 0x07, 0x15, 0x45, 0x61, 0xad, 0xb5, + 0xe5, 0x83, 0x92, 0x24, 0x11, 0x4a, 0x36, 0x0f, 0xc0, 0x39, 0x67, 0xfe, 0x97, 0xd4, 0x79, 0x9e, + 0xe7, 0x0f, 0x36, 0x43, 0xb9, 0x11, 0xed, 0xec, 0xec, 0xb8, 0xa1, 0xd9, 0x50, 0x1e, 0x68, 0x70, + 0x9f, 0x8b, 0x80, 0x17, 0x81, 0xf5, 0x41, 0xa4, 0x83, 0x99, 0x80, 0x1b, 0x28, 0x1f, 0x7a, 0xde, + 0x4d, 0xd9, 0x40, 0x6e, 0xb0, 0xc6, 0x1d, 0x23, 0xf0, 0x86, 0x64, 0x77, 0x53, 0x3c, 0x32, 0xac, + 0xdc, 0xc8, 0xcf, 0x14, 0x43, 0xda, 0x63, 0x7f, 0x03, 0x12, 0xc8, 0x45, 0x50, 0xd6, 0x68, 0xd7, + 0xc9, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE flag_xpm[1] = {{ png, sizeof( png ), "flag_xpm" }}; diff --git a/bitmaps_png/cpp_26/flag_remove.cpp b/bitmaps_png/cpp_26/flag_remove.cpp new file mode 100644 index 0000000000..e81d3ac9c8 --- /dev/null +++ b/bitmaps_png/cpp_26/flag_remove.cpp @@ -0,0 +1,91 @@ + +/* 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, 0x04, 0xa1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x6d, 0x4c, 0x5b, + 0x65, 0x14, 0xc7, 0x2f, 0x2f, 0x96, 0x16, 0x5a, 0xde, 0xa1, 0xe5, 0xa5, 0xa5, 0xbc, 0x14, 0x18, + 0xa1, 0x92, 0xad, 0x16, 0x8a, 0x68, 0x6a, 0x36, 0x12, 0x37, 0x30, 0x29, 0xd9, 0x26, 0x31, 0x8b, + 0x08, 0x51, 0xb7, 0x64, 0x64, 0x9b, 0x1a, 0x13, 0x3f, 0x21, 0x1f, 0xe6, 0x92, 0x29, 0x59, 0x82, + 0x68, 0xc2, 0x10, 0xd9, 0x92, 0x99, 0xa1, 0x4c, 0xf4, 0x0b, 0x66, 0x41, 0x0d, 0x31, 0x41, 0x90, + 0xd6, 0x51, 0x5a, 0x2c, 0x03, 0x2d, 0x63, 0x1b, 0x52, 0x5a, 0xde, 0x97, 0x42, 0x7b, 0xdb, 0xdb, + 0x42, 0x76, 0x3c, 0x4f, 0xbd, 0x74, 0x6d, 0xd8, 0x5c, 0x13, 0xd3, 0x27, 0xf9, 0xe7, 0x3e, 0x37, + 0xb7, 0xcf, 0xf9, 0x3d, 0xe7, 0x9c, 0xff, 0x7d, 0x6e, 0x29, 0x0a, 0x47, 0x63, 0x63, 0xa3, 0xa2, + 0xa1, 0xa1, 0x61, 0x1f, 0x15, 0xee, 0xa1, 0x56, 0xab, 0xd7, 0xe4, 0x72, 0xf9, 0xfd, 0xb0, 0x83, + 0x24, 0x12, 0xc9, 0xa7, 0x78, 0xb9, 0x10, 0x76, 0x50, 0x65, 0x65, 0xe5, 0xf7, 0x51, 0x51, 0x91, + 0x57, 0xc2, 0x0e, 0xaa, 0xa9, 0xa9, 0x99, 0x94, 0x49, 0x05, 0x4c, 0xcb, 0x5b, 0x94, 0xb6, 0xe7, + 0x43, 0xaa, 0xb9, 0xf7, 0x22, 0x95, 0x14, 0x16, 0x90, 0x52, 0xa9, 0xd4, 0x23, 0xc8, 0xdb, 0xfc, + 0x2a, 0x05, 0x6d, 0xef, 0x50, 0xd0, 0xdf, 0x46, 0xed, 0x8c, 0x7f, 0x45, 0x19, 0x1e, 0xfc, 0xc2, + 0x69, 0x73, 0x8c, 0x46, 0xd5, 0x6f, 0x8d, 0x51, 0xc5, 0xf0, 0x2d, 0x15, 0xf5, 0xbf, 0x41, 0x65, + 0x65, 0x65, 0xb7, 0xf2, 0xc4, 0xb1, 0x8f, 0x40, 0x9f, 0x50, 0x30, 0xf1, 0x35, 0x17, 0x36, 0x7e, + 0x4d, 0x05, 0x7a, 0x5c, 0x0a, 0xb4, 0xbe, 0x10, 0xe8, 0x89, 0x22, 0x0f, 0xad, 0x2f, 0xbd, 0x47, + 0x1b, 0xf7, 0xdf, 0xa2, 0x0d, 0xe5, 0x03, 0xce, 0x49, 0xd5, 0x55, 0xb7, 0x51, 0xd1, 0xe9, 0xfa, + 0xe3, 0xf9, 0x0e, 0xd7, 0xf4, 0x91, 0x4b, 0xae, 0xa9, 0x97, 0x2f, 0xd1, 0x93, 0xaa, 0xcb, 0x8e, + 0x11, 0xea, 0x02, 0x3d, 0x42, 0x29, 0x1e, 0x0b, 0xaa, 0xae, 0xae, 0x36, 0x4a, 0xb3, 0x62, 0x02, + 0x40, 0x11, 0x60, 0xe8, 0x13, 0xc0, 0xc6, 0x68, 0xe6, 0xbf, 0x10, 0xa3, 0x02, 0x5c, 0xa6, 0x97, + 0xc0, 0x3d, 0xfd, 0x0a, 0xb8, 0xff, 0x7a, 0x0d, 0x98, 0x3b, 0x27, 0x81, 0xb9, 0xfb, 0x2e, 0x78, + 0xe6, 0x5b, 0xc0, 0x63, 0xb9, 0x08, 0x5e, 0x6b, 0x07, 0x78, 0x16, 0xce, 0x83, 0x6b, 0xea, 0xd0, + 0xef, 0xce, 0x31, 0x8e, 0xfc, 0x89, 0x19, 0x69, 0x34, 0x1a, 0x53, 0x6e, 0x36, 0xcf, 0x0f, 0xfa, + 0xae, 0x2d, 0x0a, 0x0c, 0x37, 0x12, 0x11, 0x94, 0x8d, 0x99, 0xec, 0x03, 0xd7, 0x64, 0x39, 0x06, + 0x39, 0x08, 0xee, 0x99, 0x3a, 0x70, 0x9b, 0x5f, 0x07, 0x66, 0xee, 0x34, 0x78, 0xee, 0x7f, 0xe0, + 0x0b, 0xee, 0xf9, 0xbb, 0x15, 0x9f, 0x1d, 0x99, 0x70, 0x69, 0x79, 0x15, 0xa1, 0x9a, 0x21, 0x18, + 0xd4, 0x97, 0xe0, 0x07, 0xd1, 0x46, 0x65, 0x10, 0x68, 0x7b, 0xb5, 0x17, 0xc6, 0x7e, 0x1b, 0x01, + 0x7a, 0xf9, 0x47, 0xe6, 0x81, 0x2e, 0xbd, 0x79, 0x37, 0x0e, 0x00, 0xa4, 0x5b, 0xad, 0xd6, 0x49, + 0x93, 0xc9, 0xb4, 0x8e, 0xf3, 0xbd, 0x60, 0x85, 0x42, 0x61, 0x28, 0xc8, 0x11, 0x04, 0xf7, 0xe8, + 0x1b, 0x3e, 0x6c, 0x8c, 0x64, 0x04, 0x94, 0x4e, 0xed, 0x2b, 0x9d, 0x77, 0xa9, 0x07, 0x3a, 0xda, + 0xdb, 0x21, 0x32, 0x22, 0x02, 0x8e, 0xd6, 0xd6, 0x82, 0x7b, 0x63, 0x14, 0x4b, 0xf9, 0x26, 0xc3, + 0xcc, 0x9d, 0x5b, 0xb5, 0xce, 0x4f, 0x30, 0xc5, 0x52, 0x29, 0xc4, 0xf3, 0x78, 0x30, 0x3c, 0x3c, + 0xec, 0xd8, 0x03, 0x2b, 0x29, 0x29, 0x31, 0x48, 0xb3, 0x78, 0x4f, 0x30, 0x43, 0x2e, 0xd0, 0x06, + 0x39, 0x96, 0xaf, 0x02, 0xec, 0xb3, 0xe7, 0xa1, 0xab, 0xb3, 0x13, 0xd2, 0x63, 0x63, 0x61, 0x38, + 0x27, 0x07, 0xd4, 0xc9, 0xc9, 0x3e, 0x18, 0x63, 0xd7, 0xaf, 0x59, 0x2d, 0x7f, 0xae, 0x94, 0xe4, + 0xe5, 0xc1, 0xd9, 0xb4, 0x34, 0xb8, 0x9e, 0x99, 0x09, 0x09, 0x08, 0x1b, 0x1a, 0x1a, 0x72, 0x06, + 0xc1, 0x54, 0x2a, 0xd5, 0x74, 0x96, 0x90, 0xb3, 0x1d, 0x08, 0x1a, 0xbf, 0x1e, 0x09, 0xeb, 0xc3, + 0xf1, 0xe0, 0xd4, 0xa5, 0x81, 0xb1, 0x5f, 0x08, 0x3f, 0x5d, 0x3d, 0x00, 0x03, 0x03, 0x03, 0xc0, + 0x8d, 0x8e, 0x86, 0x89, 0x5c, 0x84, 0x17, 0x16, 0xc2, 0x0a, 0xee, 0xbe, 0x2a, 0x31, 0x11, 0x34, + 0x87, 0x0f, 0x03, 0xc9, 0xe4, 0x2c, 0x82, 0x1d, 0x78, 0x75, 0xe6, 0xe7, 0xc3, 0xe5, 0x8c, 0x0c, + 0x10, 0x20, 0x6c, 0x61, 0x61, 0xe1, 0x76, 0xe0, 0x59, 0x37, 0x9b, 0x25, 0xe4, 0x06, 0x81, 0x6e, + 0x76, 0x50, 0x70, 0xed, 0xa3, 0x48, 0xef, 0x8d, 0x8f, 0x63, 0xee, 0xcd, 0xdd, 0x4c, 0xe8, 0x73, + 0xe8, 0x44, 0xad, 0x4b, 0x16, 0xf3, 0x9c, 0x5c, 0x26, 0x83, 0x93, 0xb8, 0x6b, 0x07, 0xee, 0xde, + 0x21, 0x91, 0xc0, 0x12, 0x06, 0x3c, 0x98, 0x90, 0x00, 0xef, 0x21, 0x70, 0x0b, 0xe7, 0x8e, 0xec, + 0x6c, 0xb0, 0x61, 0xb6, 0x4a, 0xbc, 0x3f, 0x71, 0xfc, 0x38, 0xec, 0xec, 0xec, 0x7c, 0xe6, 0x07, + 0x55, 0x54, 0x54, 0xcc, 0x4a, 0x32, 0x63, 0x99, 0x96, 0xb7, 0xa9, 0xf1, 0x2b, 0xad, 0x54, 0xdb, + 0x0f, 0xed, 0x54, 0xe5, 0xe3, 0x4c, 0x83, 0x65, 0x48, 0xb1, 0xd9, 0x6c, 0x53, 0x04, 0xd6, 0x84, + 0xbb, 0xb7, 0x63, 0x89, 0x36, 0x11, 0xba, 0x89, 0x73, 0x9f, 0xd2, 0xd3, 0x61, 0x51, 0x24, 0x82, + 0xf2, 0xf8, 0x78, 0xa8, 0xd7, 0x68, 0xc0, 0xe3, 0xf1, 0x5c, 0xc3, 0x35, 0x91, 0xfe, 0x00, 0x05, + 0x05, 0x05, 0xb3, 0x7c, 0x3e, 0xdf, 0x14, 0xca, 0xcb, 0x1d, 0x08, 0x3b, 0x93, 0x94, 0xe4, 0x03, + 0xd8, 0x05, 0x02, 0xb0, 0x63, 0x56, 0xeb, 0xa9, 0xa9, 0x50, 0x8e, 0xf3, 0x13, 0xc7, 0x8e, 0x81, + 0xd7, 0xeb, 0x0d, 0x86, 0x90, 0x21, 0x16, 0x8b, 0xef, 0x70, 0xb9, 0xdc, 0xdb, 0x21, 0x82, 0x84, + 0x58, 0x77, 0x73, 0x11, 0x96, 0xe7, 0xfd, 0x5d, 0x10, 0x42, 0xec, 0x38, 0xdf, 0xc0, 0xec, 0xaa, + 0x30, 0x9b, 0xa3, 0x35, 0x35, 0xc0, 0x30, 0x4c, 0x3f, 0xfe, 0x36, 0x3a, 0x68, 0x71, 0x71, 0x71, + 0xf1, 0x3c, 0x87, 0xc3, 0x99, 0x09, 0x05, 0xb2, 0xb8, 0xb8, 0x68, 0x26, 0xee, 0x3a, 0x83, 0x00, + 0xd2, 0x13, 0x5f, 0xe9, 0x30, 0x13, 0x72, 0x25, 0xf7, 0x2b, 0xd8, 0x23, 0x35, 0x42, 0x6b, 0xab, + 0xab, 0x81, 0xa6, 0xe9, 0x60, 0x58, 0x69, 0x69, 0xe9, 0x22, 0x82, 0xcc, 0x4f, 0x81, 0x3c, 0x83, + 0x99, 0xcc, 0x90, 0x4c, 0xce, 0x11, 0x33, 0xa0, 0xbb, 0x48, 0xe3, 0x49, 0x4f, 0x54, 0x98, 0xc5, + 0x69, 0x0c, 0xbe, 0x25, 0x16, 0x83, 0x13, 0x1d, 0xb9, 0x8a, 0xae, 0x7b, 0x61, 0xd7, 0xfa, 0x0c, + 0xd3, 0xed, 0x0f, 0x22, 0x93, 0xc9, 0xac, 0x58, 0xba, 0xbb, 0x4f, 0x01, 0x25, 0x0f, 0x0e, 0x0e, + 0x6e, 0xf3, 0xd0, 0xde, 0x3a, 0x84, 0x11, 0x0b, 0xdb, 0xd0, 0x75, 0x4a, 0x2c, 0x5b, 0x7d, 0x5d, + 0x1d, 0x94, 0x62, 0xcf, 0x4e, 0x61, 0x66, 0x4e, 0xbc, 0xd2, 0x45, 0x45, 0xf0, 0x39, 0x6e, 0x20, + 0x31, 0x2e, 0x0e, 0x2c, 0x16, 0xcb, 0xa3, 0xde, 0x0b, 0x85, 0x42, 0x1b, 0x82, 0xe6, 0x43, 0x28, + 0x5d, 0xd3, 0x97, 0xdd, 0xdd, 0x0f, 0xd3, 0xf0, 0x85, 0xfd, 0x99, 0x85, 0xb0, 0x8d, 0xef, 0xdd, + 0x35, 0xc8, 0x29, 0x74, 0x5e, 0x0f, 0x96, 0x30, 0x85, 0xcf, 0x07, 0x9d, 0x4e, 0xb7, 0x89, 0x6b, + 0xf6, 0xfb, 0x03, 0xa4, 0xa4, 0xa4, 0x2c, 0x61, 0xe9, 0x2c, 0x21, 0x9a, 0xa1, 0xa9, 0xbb, 0xab, + 0xeb, 0x61, 0x04, 0x1e, 0x41, 0xe4, 0x3d, 0xd9, 0x75, 0x57, 0xa0, 0x1b, 0x49, 0x26, 0x5a, 0xad, + 0x96, 0x40, 0x0e, 0x04, 0x2d, 0x16, 0x89, 0x44, 0x6b, 0xb8, 0xd0, 0x1a, 0xea, 0xf7, 0x0b, 0x03, + 0xbc, 0xa1, 0xd7, 0xeb, 0x1d, 0x08, 0xf9, 0x22, 0xd0, 0xc2, 0x04, 0xb6, 0xbc, 0xbc, 0xac, 0x35, + 0x9b, 0xcd, 0xd6, 0x3d, 0x10, 0x76, 0xac, 0xa0, 0x96, 0xc2, 0xfd, 0x97, 0x21, 0x16, 0x35, 0xcf, + 0x8a, 0xec, 0xa2, 0x8a, 0x9c, 0x4a, 0xac, 0x5e, 0x64, 0xef, 0x55, 0xa8, 0xe7, 0x50, 0xa4, 0xde, + 0xcf, 0x92, 0x73, 0x18, 0x55, 0x88, 0xca, 0x47, 0xe5, 0xa0, 0xb2, 0x48, 0xab, 0x51, 0xa9, 0xa8, + 0x44, 0x54, 0x1c, 0x8a, 0x83, 0xfa, 0xcf, 0xcf, 0x3f, 0x29, 0x45, 0x0c, 0x8a, 0xcf, 0x2e, 0x4a, + 0x26, 0x6d, 0x64, 0x83, 0xa4, 0xb2, 0xf3, 0x24, 0xf6, 0x99, 0x80, 0x0d, 0xca, 0x65, 0x03, 0x47, + 0xb3, 0xeb, 0xf7, 0x8c, 0x7f, 0x00, 0x5e, 0xe9, 0xf4, 0xf9, 0x31, 0x07, 0x79, 0x54, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE flag_remove_xpm[1] = {{ png, sizeof( png ), "flag_remove_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp b/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp new file mode 100644 index 0000000000..df191d07a2 --- /dev/null +++ b/bitmaps_png/cpp_26/switch_corner_rounding_shape.cpp @@ -0,0 +1,82 @@ + +/* 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, 0x04, 0x0f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x0d, 0x4c, 0x94, + 0x75, 0x1c, 0xc7, 0x1f, 0x08, 0xee, 0xed, 0xb9, 0xe3, 0x4e, 0x3a, 0x5e, 0xf4, 0x9e, 0x3b, 0xe0, + 0xd0, 0x0b, 0xba, 0xb0, 0x04, 0x93, 0x76, 0xb3, 0xe4, 0x70, 0x2a, 0xe8, 0x9c, 0x9b, 0xcc, 0x1c, + 0x15, 0xd5, 0x5a, 0x63, 0x8a, 0xa4, 0x2d, 0xd6, 0x10, 0x23, 0xe7, 0xcb, 0xe8, 0x62, 0x91, 0xe5, + 0x38, 0x24, 0xdb, 0x11, 0xf7, 0x32, 0x60, 0x39, 0x0f, 0x44, 0x64, 0x20, 0x19, 0x57, 0x2c, 0x9b, + 0x2b, 0xbd, 0x31, 0xa2, 0xc4, 0x68, 0x6b, 0x6b, 0x2d, 0x6c, 0x34, 0x45, 0x06, 0x8c, 0xeb, 0xe4, + 0xbe, 0xfd, 0x1e, 0x88, 0xdb, 0x1d, 0x43, 0x39, 0x84, 0xff, 0xf6, 0xd9, 0xed, 0xd9, 0x73, 0xff, + 0xdf, 0xe7, 0xff, 0xf2, 0xfb, 0xfd, 0xff, 0x0f, 0xc3, 0x2c, 0x53, 0x6b, 0x92, 0xa8, 0x57, 0xd9, + 0x85, 0xea, 0x3f, 0x08, 0xcc, 0xc7, 0xb2, 0x48, 0xea, 0x18, 0xa5, 0x8c, 0x82, 0xf5, 0x3e, 0x48, + 0x12, 0xb2, 0x08, 0x80, 0x8c, 0x78, 0x8a, 0xd8, 0x40, 0x24, 0x10, 0xe1, 0xb3, 0xef, 0x5c, 0x0c, + 0x13, 0x41, 0x81, 0x3a, 0x1e, 0x26, 0x79, 0xa8, 0x88, 0x0f, 0x46, 0xe4, 0x13, 0x57, 0x09, 0x2f, + 0x81, 0xf1, 0xf1, 0x71, 0xfc, 0xdf, 0x46, 0x09, 0x2b, 0x91, 0x69, 0x17, 0x72, 0x67, 0x03, 0x03, + 0x3a, 0x84, 0xea, 0x9a, 0x06, 0x91, 0x46, 0x3b, 0x97, 0x07, 0x49, 0xd2, 0x88, 0xbe, 0xe1, 0xe1, + 0x61, 0x94, 0x94, 0x95, 0x21, 0x51, 0xaf, 0x47, 0x78, 0x44, 0x04, 0x84, 0x32, 0x29, 0x24, 0x2b, + 0x14, 0xd8, 0x90, 0x9d, 0x0d, 0x9b, 0xcd, 0x86, 0xbe, 0x4a, 0xb3, 0x2f, 0x78, 0xe4, 0x9a, 0x76, + 0x7e, 0x86, 0xa1, 0x2e, 0xd3, 0xf3, 0xc4, 0xdd, 0xd3, 0x66, 0x33, 0x58, 0xa5, 0x12, 0xa2, 0xd7, + 0x0b, 0xc0, 0x9c, 0x73, 0x80, 0xe9, 0xbd, 0x06, 0xa6, 0xef, 0x07, 0x30, 0xdf, 0xbb, 0xc0, 0x54, + 0x7f, 0x8c, 0x17, 0xd2, 0x32, 0x60, 0x0b, 0x9c, 0x09, 0x9b, 0xd8, 0x7b, 0x8e, 0x89, 0x91, 0x86, + 0x2a, 0xe1, 0x88, 0x91, 0x77, 0x8f, 0x1c, 0x81, 0x2c, 0x35, 0x05, 0x4c, 0x57, 0xdb, 0x4c, 0xf0, + 0x39, 0x68, 0x9b, 0x1a, 0x61, 0x91, 0xaf, 0xf6, 0x4b, 0x1a, 0x55, 0x4f, 0x63, 0xe4, 0xe6, 0xaf, + 0xe7, 0x43, 0xce, 0x1e, 0x92, 0xb4, 0x5f, 0x68, 0x6d, 0x85, 0x54, 0xb7, 0x86, 0x46, 0xde, 0x3d, + 0x13, 0xf8, 0xc7, 0xef, 0x10, 0x5e, 0x5e, 0x0a, 0xf9, 0xb6, 0x2d, 0x50, 0x3c, 0xbb, 0x1e, 0x09, + 0xb9, 0x3b, 0x60, 0x56, 0xa6, 0xf8, 0x25, 0x9f, 0x8b, 0x39, 0x9c, 0x29, 0x3f, 0xc6, 0xef, 0x5b, + 0x6f, 0xa8, 0x92, 0x4d, 0x1e, 0x8f, 0x07, 0xd1, 0x2a, 0x15, 0x98, 0x46, 0xeb, 0x8c, 0xe4, 0xeb, + 0x76, 0x48, 0x9f, 0xd0, 0x61, 0x7b, 0x5e, 0x1e, 0x5a, 0x5a, 0x5a, 0xd0, 0xd3, 0x71, 0x19, 0x56, + 0xf5, 0x33, 0x7e, 0x49, 0xbd, 0x90, 0x83, 0xe5, 0x9d, 0xc3, 0xa8, 0x39, 0x53, 0xc3, 0x8b, 0xc6, + 0x88, 0xf8, 0x85, 0x24, 0xa5, 0x84, 0xaf, 0xad, 0xad, 0x0d, 0xf2, 0x8d, 0x06, 0xff, 0x12, 0x49, + 0xd7, 0x67, 0xe0, 0x83, 0xca, 0x4a, 0x3e, 0x88, 0xc7, 0x3b, 0x36, 0xf1, 0x51, 0xb3, 0xce, 0x70, + 0x2b, 0x70, 0xf3, 0x3b, 0x0e, 0x1f, 0xc7, 0xfe, 0x43, 0x45, 0x08, 0x0b, 0x0f, 0x83, 0xcb, 0xe5, + 0xe2, 0xff, 0x57, 0xb7, 0x90, 0xe8, 0xa7, 0xfd, 0xc5, 0xc5, 0x7c, 0xae, 0x23, 0xcc, 0x74, 0x62, + 0x46, 0xd4, 0xde, 0x4c, 0x01, 0xc2, 0x91, 0xb5, 0x75, 0x2b, 0x0d, 0xc1, 0xe7, 0x75, 0x88, 0x34, + 0x8e, 0x40, 0x89, 0xfb, 0x3d, 0xd3, 0xe4, 0xe0, 0xe0, 0x20, 0x24, 0x31, 0x2c, 0x98, 0xf7, 0x05, + 0x58, 0xad, 0x4f, 0xc6, 0xf0, 0x8d, 0xbe, 0xa9, 0x9e, 0x97, 0xf6, 0x15, 0xdb, 0x05, 0x9a, 0x3d, + 0x73, 0x61, 0x28, 0x40, 0xe1, 0xf5, 0xd2, 0x93, 0x97, 0xaf, 0x1c, 0x35, 0x21, 0xe7, 0x71, 0x15, + 0x8c, 0xb4, 0xde, 0xc6, 0xe3, 0x15, 0x30, 0x1e, 0xab, 0x40, 0xae, 0x36, 0x15, 0x8e, 0xc2, 0x43, + 0x70, 0xed, 0x79, 0x33, 0xe8, 0x68, 0x69, 0x8a, 0x7d, 0xf2, 0x02, 0xc9, 0xc7, 0x36, 0xe5, 0x64, + 0x21, 0xfa, 0x00, 0x8b, 0xfc, 0x57, 0x63, 0x50, 0x2b, 0xe1, 0xa6, 0xdf, 0x35, 0x28, 0xd6, 0xdc, + 0x9f, 0xb7, 0x60, 0x17, 0xaa, 0xe8, 0x79, 0xe8, 0xf9, 0x77, 0x6c, 0xa2, 0xb1, 0xb3, 0xb3, 0x13, + 0x06, 0x55, 0x34, 0x6a, 0x63, 0xb8, 0x90, 0xfa, 0x2d, 0x56, 0x74, 0xeb, 0xea, 0x81, 0x12, 0xfe, + 0x08, 0x9a, 0x7a, 0x39, 0x49, 0x17, 0x54, 0x47, 0x3c, 0x56, 0xa2, 0x2e, 0x5e, 0x8f, 0xd6, 0xb5, + 0x59, 0xa3, 0x0e, 0x91, 0xfa, 0x7a, 0x20, 0x8c, 0xff, 0x41, 0xac, 0xb9, 0x71, 0x31, 0x7d, 0xf3, + 0x44, 0x5d, 0x52, 0x3a, 0x4e, 0x8a, 0x57, 0xa1, 0x3a, 0x3e, 0x15, 0xcd, 0xe9, 0x9b, 0x61, 0xd7, + 0x65, 0xe2, 0x52, 0x66, 0xce, 0x7d, 0xa7, 0x36, 0xf3, 0xf7, 0x9f, 0x4f, 0x7d, 0xb6, 0x8b, 0x24, + 0x05, 0x7f, 0x5d, 0xe9, 0xf1, 0xd9, 0xc4, 0x1a, 0xbf, 0xc0, 0x12, 0xc5, 0xe1, 0xc5, 0x84, 0x38, + 0x7c, 0x5a, 0x61, 0xc2, 0xd0, 0xd0, 0x10, 0x9f, 0x14, 0xa7, 0x17, 0x4a, 0x8a, 0xac, 0xc9, 0xc9, + 0x49, 0xe4, 0xee, 0xdc, 0x09, 0xa7, 0xd3, 0x09, 0x79, 0x9c, 0x1c, 0x92, 0x64, 0x16, 0xbb, 0xf3, + 0x77, 0xa3, 0xbf, 0xbf, 0x1f, 0x5e, 0xaf, 0x17, 0xfd, 0x5d, 0xdd, 0xa8, 0x8f, 0xd2, 0xfa, 0x25, + 0x35, 0xb1, 0x1c, 0xd4, 0x1f, 0x4a, 0xa1, 0x88, 0x57, 0x4c, 0xbf, 0xa7, 0x56, 0x48, 0x44, 0x86, + 0x52, 0x4f, 0x7f, 0x36, 0x34, 0x36, 0x80, 0x8d, 0xa5, 0x6c, 0xaa, 0x15, 0x81, 0xf9, 0x46, 0x82, + 0x88, 0x22, 0x31, 0x64, 0x5a, 0x39, 0x56, 0x08, 0x05, 0x38, 0x25, 0x51, 0xf9, 0x25, 0x5f, 0x48, + 0x39, 0xa4, 0x9a, 0xa3, 0x20, 0xd5, 0x47, 0x81, 0xef, 0x43, 0xad, 0x7b, 0x31, 0xa7, 0x83, 0xdb, + 0x54, 0x65, 0x02, 0xab, 0x93, 0x81, 0xb9, 0x28, 0x06, 0x73, 0x4d, 0x32, 0x8d, 0xe0, 0x5b, 0x16, + 0x47, 0xd7, 0xad, 0xf4, 0x4b, 0x6c, 0x22, 0x35, 0x0c, 0xe5, 0x0a, 0xb0, 0xcf, 0x45, 0x61, 0xef, + 0x6b, 0x7b, 0x67, 0x0b, 0x36, 0x79, 0x31, 0x22, 0xfe, 0xce, 0xb9, 0x57, 0xf5, 0x49, 0x15, 0x58, + 0xaa, 0x91, 0xc7, 0xde, 0x16, 0x21, 0xac, 0x4b, 0x8c, 0x83, 0x5b, 0xe2, 0x82, 0x36, 0x7e, 0x57, + 0x76, 0x34, 0xa4, 0x9c, 0x14, 0x6f, 0x95, 0x1c, 0xa4, 0x4c, 0xf7, 0x4d, 0x52, 0x9f, 0xbc, 0x45, + 0xdf, 0x98, 0xd4, 0x69, 0x1d, 0x31, 0x38, 0x30, 0x30, 0x80, 0xbc, 0x57, 0xf2, 0x50, 0xc0, 0x2a, + 0x83, 0x24, 0xfb, 0xc4, 0x31, 0x30, 0xee, 0xc8, 0x86, 0xdb, 0xed, 0xe6, 0x67, 0xf2, 0x0f, 0x61, + 0x7c, 0xe4, 0xeb, 0x99, 0x3a, 0x4b, 0x88, 0xb2, 0x5f, 0xaa, 0x2d, 0x77, 0x02, 0x25, 0x4e, 0xc3, + 0x76, 0x8c, 0xde, 0xb9, 0xcb, 0x0b, 0x46, 0x88, 0x13, 0x84, 0x7c, 0xc9, 0xdf, 0x02, 0xb4, 0x0f, + 0x6f, 0x50, 0xf0, 0xa9, 0x59, 0xc9, 0x97, 0x2b, 0xd3, 0x6e, 0xdf, 0xbb, 0xf9, 0x5b, 0x31, 0x05, + 0xdf, 0x18, 0x52, 0x66, 0x05, 0x36, 0x6b, 0xa4, 0x26, 0x63, 0x2e, 0x14, 0x74, 0x1b, 0x61, 0x21, + 0x02, 0x6f, 0xd0, 0xdb, 0x76, 0x51, 0x42, 0xd2, 0x23, 0x8f, 0x3a, 0xb4, 0x13, 0x81, 0xfb, 0xdb, + 0x26, 0xe0, 0xd6, 0x2e, 0x69, 0x79, 0x42, 0x10, 0xf5, 0xd7, 0x0b, 0x12, 0x53, 0x96, 0xbc, 0x0f, + 0xf3, 0x04, 0xf6, 0xf0, 0x33, 0xa0, 0xdf, 0xaf, 0xe8, 0x2c, 0x2b, 0x3a, 0xcb, 0x64, 0x44, 0x2e, + 0xc7, 0xb7, 0xdf, 0x7f, 0x4f, 0x67, 0x73, 0x0b, 0xa6, 0x2f, 0x30, 0x9e, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE switch_corner_rounding_shape_xpm[1] = {{ png, sizeof( png ), "switch_corner_rounding_shape_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 9784b36c49..4d3bca6354 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -160,6 +160,7 @@ EXTERN_BITMAP( fill_zone_xpm ) EXTERN_BITMAP( find_xpm ) EXTERN_BITMAP( find_replace_xpm ) EXTERN_BITMAP( flag_xpm ) +EXTERN_BITMAP( flag_remove_xpm ) EXTERN_BITMAP( flip_board_xpm ) EXTERN_BITMAP( folder_xpm ) EXTERN_BITMAP( fonts_xpm ) @@ -444,6 +445,7 @@ EXTERN_BITMAP( stroke_dot_xpm ) EXTERN_BITMAP( stroke_solid_xpm ) EXTERN_BITMAP( svg_file_xpm ) EXTERN_BITMAP( swap_layer_xpm ) +EXTERN_BITMAP( switch_corner_rounding_shape_xpm ) EXTERN_BITMAP( text_xpm ) EXTERN_BITMAP( text_sketch_xpm ) EXTERN_BITMAP( three_d_xpm ) diff --git a/bitmaps_png/sources/flag.svg b/bitmaps_png/sources/flag.svg index 549acaba1c..5690aacf8c 100644 --- a/bitmaps_png/sources/flag.svg +++ b/bitmaps_png/sources/flag.svg @@ -1,96 +1,557 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/bitmaps_png/sources/flag_remove.svg b/bitmaps_png/sources/flag_remove.svg new file mode 100644 index 0000000000..dcf6070673 --- /dev/null +++ b/bitmaps_png/sources/flag_remove.svg @@ -0,0 +1,629 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/switch_corner_rounding_shape.svg b/bitmaps_png/sources/switch_corner_rounding_shape.svg new file mode 100644 index 0000000000..7d462c07dc --- /dev/null +++ b/bitmaps_png/sources/switch_corner_rounding_shape.svg @@ -0,0 +1,223 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index e7ec6723c7..7b9d69bd97 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -36,86 +36,86 @@ #define _(s) s TOOL_ACTION ACTIONS::doNew( "common.Control.new", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'N', LEGACY_HK_NAME( "New" ), _( "New..." ), _( "Create a new document in the editor" ), new_generic_xpm ); TOOL_ACTION ACTIONS::newLibrary( "common.Control.newLibrary", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "New Library..." ), _( "Create a new library folder" ), new_generic_xpm ); TOOL_ACTION ACTIONS::addLibrary( "common.Control.addLibrary", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Add Library..." ), _( "Add an existing library folder" ), add_library_xpm ); TOOL_ACTION ACTIONS::open( "common.Control.open", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'O', LEGACY_HK_NAME( "Open" ), _( "Open..." ), _( "Open existing document" ), directory_xpm ); TOOL_ACTION ACTIONS::save( "common.Control.save", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ), _( "Save" ), _( "Save changes" ), save_xpm ); TOOL_ACTION ACTIONS::saveAs( "common.Control.saveAs", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + MD_CTRL + 'S', LEGACY_HK_NAME( "Save As" ), _( "Save As..." ), _( "Save current document to another location" ), save_as_xpm ); TOOL_ACTION ACTIONS::saveCopyAs( "common.Control.saveCopyAs", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Save Copy As..." ), _( "Save a copy of the current document to another location" ), save_as_xpm ); TOOL_ACTION ACTIONS::saveAll( "common.Control.saveAll", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Save All" ), _( "Save all changes" ), save_xpm ); TOOL_ACTION ACTIONS::revert( "common.Control.revert", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Revert" ), _( "Throw away changes" ), undo_xpm ); TOOL_ACTION ACTIONS::pageSettings( "common.Control.pageSettings", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Page Settings..." ), _( "Settings for paper size and title block info" ), sheetset_xpm ); TOOL_ACTION ACTIONS::print( "common.Control.print", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'P', LEGACY_HK_NAME( "Print" ), _( "Print..." ), _( "Print" ), print_button_xpm ); TOOL_ACTION ACTIONS::plot( "common.Control.plot", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Plot..." ), _( "Plot" ), plot_xpm ); TOOL_ACTION ACTIONS::quit( "common.Control.quit", - AS_GLOBAL, + AS_GLOBAL, 0, "", // Not currently in use due to wxWidgets crankiness _( "Quit" ), _( "Close the current editor" ), exit_xpm ); // Generic Edit Actions TOOL_ACTION ACTIONS::cancelInteractive( "common.Interactive.cancel", - AS_GLOBAL, + AS_GLOBAL, 0, "", // ESC key is handled in the dispatcher _( "Cancel" ), _( "Cancel current tool" ), cancel_xpm, AF_NONE ); @@ -130,7 +130,7 @@ TOOL_ACTION ACTIONS::updateMenu( "common.Interactive.updateMenu", AS_GLOBAL ); TOOL_ACTION ACTIONS::undo( "common.Interactive.undo", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'Z', LEGACY_HK_NAME( "Undo" ), _( "Undo" ), _( "Undo last edit" ), undo_xpm ); @@ -147,19 +147,19 @@ TOOL_ACTION ACTIONS::redo( "common.Interactive.redo", redo_xpm ); TOOL_ACTION ACTIONS::cut( "common.Interactive.cut", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'X', LEGACY_HK_NAME( "Cut" ), _( "Cut" ), _( "Cut selected item(s) to clipboard" ), cut_xpm ); TOOL_ACTION ACTIONS::copy( "common.Interactive.copy", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'C', LEGACY_HK_NAME( "Copy" ), _( "Copy" ), _( "Copy selected item(s) to clipboard" ), copy_xpm ); TOOL_ACTION ACTIONS::paste( "common.Interactive.paste", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'V', LEGACY_HK_NAME( "Paste" ), _( "Paste" ), _( "Paste clipboard into schematic" ), paste_xpm ); @@ -170,13 +170,13 @@ TOOL_ACTION ACTIONS::pasteSpecial( "common.Interactive.pasteSpecial", paste_xpm ); TOOL_ACTION ACTIONS::duplicate( "common.Interactive.duplicate", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'D', LEGACY_HK_NAME( "Duplicate" ), _( "Duplicate" ), _( "Duplicates the selected item(s)" ), duplicate_xpm ); TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete", - AS_GLOBAL, + AS_GLOBAL, WXK_DELETE, LEGACY_HK_NAME( "Delete Item" ), _( "Delete" ), _( "Deletes selected item(s)" ), delete_xpm ); @@ -190,37 +190,37 @@ TOOL_ACTION ACTIONS::activatePointEditor( "common.Control.activatePointEditor", AS_GLOBAL ); TOOL_ACTION ACTIONS::find( "common.Interactive.find", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'F', LEGACY_HK_NAME( "Find" ), _( "Find" ), _( "Find text" ), find_xpm ); TOOL_ACTION ACTIONS::findAndReplace( "common.Interactive.findAndReplace", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + MD_ALT + 'F', LEGACY_HK_NAME( "Find and Replace" ), _( "Find and Replace" ), _( "Find and replace text" ), find_replace_xpm ); TOOL_ACTION ACTIONS::findNext( "common.Interactive.findNext", - AS_GLOBAL, + AS_GLOBAL, WXK_F5, LEGACY_HK_NAME( "Find Next" ), _( "Find Next" ), _( "Find next match" ), find_xpm ); TOOL_ACTION ACTIONS::findNextMarker( "common.Interactive.findNextMarker", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + WXK_F5, LEGACY_HK_NAME( "Find Next Marker" ), _( "Find Next Marker" ), "", find_xpm ); TOOL_ACTION ACTIONS::replaceAndFindNext( "common.Interactive.replaceAndFindNext", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Replace and Find Next" ), _( "Replace current match and find next" ), find_replace_xpm ); TOOL_ACTION ACTIONS::replaceAll( "common.Interactive.replaceAll", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Replace All" ), _( "Replace all matches" ), find_replace_xpm ); @@ -256,7 +256,7 @@ TOOL_ACTION ACTIONS::zoomIn( "common.Control.zoomIn", #if defined( __WXMAC__ ) MD_CTRL + '+', #else - WXK_F1, + WXK_F1, #endif LEGACY_HK_NAME( "Zoom In" ), _( "Zoom In at Cursor" ), _( "Zoom In at Cursor" ), @@ -274,25 +274,25 @@ TOOL_ACTION ACTIONS::zoomOut( "common.Control.zoomOut", zoom_out_xpm ); TOOL_ACTION ACTIONS::zoomInCenter( "common.Control.zoomInCenter", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Zoom In" ), _( "Zoom In" ), zoom_in_xpm ); TOOL_ACTION ACTIONS::zoomOutCenter( "common.Control.zoomOutCenter", - AS_GLOBAL, + AS_GLOBAL, 0, "", _( "Zoom Out" ), _( "Zoom Out" ), zoom_out_xpm ); TOOL_ACTION ACTIONS::zoomCenter( "common.Control.zoomCenter", - AS_GLOBAL, + AS_GLOBAL, WXK_F4, LEGACY_HK_NAME( "Zoom Center" ), _( "Center" ), _( "Center" ), zoom_center_on_screen_xpm ); TOOL_ACTION ACTIONS::zoomTool( "common.Control.zoomTool", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + WXK_F5, LEGACY_HK_NAME( "Zoom to Selection" ), _( "Zoom to Selection" ), _( "Zoom to Selection" ), zoom_area_xpm, AF_ACTIVATE ); @@ -305,62 +305,62 @@ TOOL_ACTION ACTIONS::centerContents( "common.Control.centerContents", // Cursor control TOOL_ACTION ACTIONS::cursorUp( "common.Control.cursorUp", - AS_GLOBAL, + AS_GLOBAL, WXK_UP, "", _( "Cursor Up" ), "", nullptr, AF_NONE, (void*) CURSOR_UP ); TOOL_ACTION ACTIONS::cursorDown( "common.Control.cursorDown", - AS_GLOBAL, + AS_GLOBAL, WXK_DOWN, "", _( "Cursor Down" ), "" , nullptr, AF_NONE, (void*) CURSOR_DOWN ); TOOL_ACTION ACTIONS::cursorLeft( "common.Control.cursorLeft", - AS_GLOBAL, + AS_GLOBAL, WXK_LEFT, "", _( "Cursor Left" ), "" , nullptr, AF_NONE, (void*) CURSOR_LEFT ); TOOL_ACTION ACTIONS::cursorRight( "common.Control.cursorRight", - AS_GLOBAL, + AS_GLOBAL, WXK_RIGHT, "", _( "Cursor Right" ), "" , nullptr, AF_NONE, (void*) CURSOR_RIGHT ); TOOL_ACTION ACTIONS::cursorUpFast( "common.Control.cursorUpFast", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + WXK_UP, "", _( "Cursor Up Fast" ), "", nullptr, AF_NONE, (void*) ( CURSOR_UP | CURSOR_FAST_MOVE ) ); TOOL_ACTION ACTIONS::cursorDownFast( "common.Control.cursorDownFast", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + WXK_DOWN, "", _( "Cursor Down Fast" ), "" , nullptr, AF_NONE, (void*) ( CURSOR_DOWN | CURSOR_FAST_MOVE ) ); TOOL_ACTION ACTIONS::cursorLeftFast( "common.Control.cursorLeftFast", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + WXK_LEFT, "", _( "Cursor Left Fast" ), "" , nullptr, AF_NONE, (void*) ( CURSOR_LEFT | CURSOR_FAST_MOVE ) ); TOOL_ACTION ACTIONS::cursorRightFast( "common.Control.cursorRightFast", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + WXK_RIGHT, "", _( "Cursor Right Fast" ), "" , nullptr, AF_NONE, (void*) ( CURSOR_RIGHT | CURSOR_FAST_MOVE ) ); TOOL_ACTION ACTIONS::cursorClick( "common.Control.cursorClick", - AS_GLOBAL, + AS_GLOBAL, WXK_RETURN, LEGACY_HK_NAME( "Mouse Left Click" ), _( "Click" ), _( "Performs left mouse button click" ), nullptr, AF_NONE, (void*) CURSOR_CLICK ); TOOL_ACTION ACTIONS::cursorDblClick( "common.Control.cursorDblClick", - AS_GLOBAL, + AS_GLOBAL, WXK_END, LEGACY_HK_NAME( "Mouse Left Double Click" ), _( "Double-click" ), _( "Performs left mouse button double-click" ), nullptr, AF_NONE, (void*) CURSOR_DBL_CLICK ); @@ -370,49 +370,51 @@ TOOL_ACTION ACTIONS::refreshPreview( "common.Control.refreshPreview", TOOL_ACTION ACTIONS::pinLibrary( "common.Control.pinLibrary", AS_GLOBAL, 0, "", - _( "Pin Library" ), "Keep the library at the top of the list" ); + _( "Pin Library" ), "Keep the library at the top of the list", + flag_xpm ); TOOL_ACTION ACTIONS::unpinLibrary( "common.Control.unpinLibrary", AS_GLOBAL, 0, "", - _( "Unpin Library" ), "No longer keep the library at the top of the list" ); + _( "Unpin Library" ), "No longer keep the library at the top of the list", + flag_remove_xpm ); TOOL_ACTION ACTIONS::panUp( "common.Control.panUp", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + WXK_UP, "", _( "Pan Up" ), "", nullptr, AF_NONE, (void*) CURSOR_UP ); TOOL_ACTION ACTIONS::panDown( "common.Control.panDown", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + WXK_DOWN, "", _( "Pan Down" ), "" , nullptr, AF_NONE, (void*) CURSOR_DOWN ); TOOL_ACTION ACTIONS::panLeft( "common.Control.panLeft", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + WXK_LEFT, "", _( "Pan Left" ), "" , nullptr, AF_NONE, (void*) CURSOR_LEFT ); TOOL_ACTION ACTIONS::panRight( "common.Control.panRight", - AS_GLOBAL, + AS_GLOBAL, MD_SHIFT + WXK_RIGHT, "", _( "Pan Right" ), "" , nullptr, AF_NONE, (void*) CURSOR_RIGHT ); // Grid control TOOL_ACTION ACTIONS::gridFast1( "common.Control.gridFast1", - AS_GLOBAL, + AS_GLOBAL, MD_ALT + '1', LEGACY_HK_NAME( "Switch Grid To Fast Grid1" ), _( "Switch to Fast Grid 1" ), "" ); TOOL_ACTION ACTIONS::gridFast2( "common.Control.gridFast2", - AS_GLOBAL, + AS_GLOBAL, MD_ALT + '2', LEGACY_HK_NAME( "Switch Grid To Fast Grid2" ), _( "Switch to Fast Grid 2" ), "" ); TOOL_ACTION ACTIONS::gridNext( "common.Control.gridNext", - AS_GLOBAL, + AS_GLOBAL, 'N', LEGACY_HK_NAME( "Switch Grid To Next" ), _("Switch to Next Grid" ), "" ); @@ -421,13 +423,13 @@ TOOL_ACTION ACTIONS::gridPrev( "common.Control.gridPrev", _( "Switch to Previous Grid" ), "" ); TOOL_ACTION ACTIONS::gridSetOrigin( "common.Control.gridSetOrigin", - AS_GLOBAL, + AS_GLOBAL, 'S', LEGACY_HK_NAME( "Set Grid Origin" ), _( "Grid Origin" ), _( "Set the grid origin point" ), grid_select_axis_xpm ); TOOL_ACTION ACTIONS::gridResetOrigin( "common.Control.gridResetOrigin", - AS_GLOBAL, + AS_GLOBAL, 'Z', LEGACY_HK_NAME( "Reset Grid Origin" ), _( "Reset Grid Origin" ), "" ); @@ -455,7 +457,7 @@ TOOL_ACTION ACTIONS::metricUnits( "common.Control.metricUnits", unit_mm_xpm ); TOOL_ACTION ACTIONS::toggleUnits( "common.Control.toggleUnits", - AS_GLOBAL, + AS_GLOBAL, MD_CTRL + 'U', LEGACY_HK_NAME( "Switch Units" ), _( "Switch units" ), _( "Switch between inches and millimeters" ), unit_mm_xpm ); @@ -466,12 +468,12 @@ TOOL_ACTION ACTIONS::togglePolarCoords( "common.Control.togglePolarCoords", polar_coord_xpm ); TOOL_ACTION ACTIONS::resetLocalCoords( "common.Control.resetLocalCoords", - AS_GLOBAL, + AS_GLOBAL, ' ', LEGACY_HK_NAME( "Reset Local Coordinates" ), _( "Reset Local Coordinates" ), "" ); TOOL_ACTION ACTIONS::toggleCursor( "common.Control.toggleCursor", - AS_GLOBAL, + AS_GLOBAL, // Don't be tempted to remove "Modern Toolset only". It's in the legacy property name. MD_CTRL + MD_SHIFT + 'X', LEGACY_HK_NAME( "Toggle Cursor Display (Modern Toolset only)" ), _( "Always Show Cursor" ), _( "Display crosshairs even in selection tool" ), @@ -489,7 +491,7 @@ TOOL_ACTION ACTIONS::highContrastMode( "common.Control.highContrastMode", contrast_mode_xpm ); TOOL_ACTION ACTIONS::selectionTool( "common.InteractiveSelection.selectionTool", - AS_GLOBAL, 0, "", + AS_GLOBAL, 0, "", _( "Select item(s)" ), "", cursor_xpm, AF_ACTIVATE ); @@ -544,7 +546,7 @@ TOOL_ACTION ACTIONS::acceleratedGraphics( "common.Control.acceleratedGraphics", #ifdef __WXMAC__ MD_ALT + WXK_F11, #else - WXK_F11, + WXK_F11, #endif LEGACY_HK_NAME( "Switch to Modern Toolset with hardware-accelerated graphics (recommended)" ), _( "Accelerated Graphics" ), _( "Use hardware-accelerated graphics (recommended)" ), @@ -596,13 +598,13 @@ TOOL_ACTION ACTIONS::listHotKeys( "common.SuiteControl.listHotKeys", _( "List Hotkeys..." ), _( "Displays current hotkeys table and corresponding commands" ), hotkeys_xpm ); - + TOOL_ACTION ACTIONS::getInvolved( "common.SuiteControl.getInvolved", AS_GLOBAL, 0, "", _( "Get Involved" ), _( "Open \"Contribute to KiCad\" in a web browser" ), info_xpm ); - + // System-wide selection Events diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp index 510ba8b1e5..c093eba6c1 100644 --- a/eeschema/dialogs/panel_eeschema_color_settings.cpp +++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp @@ -497,14 +497,14 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::OnThemeChanged( wxCommandEvent& event ) { int idx = m_cbTheme->GetSelection(); - if( idx == m_cbTheme->GetCount() - 2 ) + if( idx == (int)m_cbTheme->GetCount() - 2 ) { // separator; re-select active theme m_cbTheme->SetStringSelection( m_currentSettings->GetName() ); return; } - if( idx == m_cbTheme->GetCount() - 1 ) + if( idx == (int)m_cbTheme->GetCount() - 1 ) { // New Theme... diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp index c76140613b..b91de953ee 100644 --- a/pcbnew/router/router_tool.cpp +++ b/pcbnew/router/router_tool.cpp @@ -148,9 +148,10 @@ static const TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPost static const TOOL_ACTION ACT_SwitchRounding( "pcbnew.InteractiveRouter.SwitchRounding", AS_CONTEXT, - 0, LEGACY_HK_NAME( "Switch Rounding" ), - _( "Switch Rounding" ), - _( "Switches the corner type of the currently routed track." ) ); + 0, LEGACY_HK_NAME( "Switch Corner Rounding" ), + _( "Switch Corner Rounding" ), + _( "Switches the corner type of the currently routed track." ), + switch_corner_rounding_shape_xpm ); #undef _ #define _(s) wxGetTranslation((s))