From 73080998524ab4d8d847fdbaf35609a7bc6ed176 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 23 Apr 2020 12:24:40 +0100 Subject: [PATCH] Add an icon and put Schematic Setup in the toolbar. --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/options_schematic.cpp | 99 ++ .../include/bitmaps_png/bitmaps_list.h | 1 + bitmaps_png/sources/options_schematic.svg | 850 ++++++++++++++++++ eeschema/toolbars_sch_editor.cpp | 3 + eeschema/tools/ee_actions.cpp | 2 +- 6 files changed, 955 insertions(+), 1 deletion(-) create mode 100644 bitmaps_png/cpp_26/options_schematic.cpp create mode 100644 bitmaps_png/sources/options_schematic.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 993a07b3f9..2106006d86 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -372,6 +372,7 @@ set( BMAPS_MID options_board options_generic options_pad + options_schematic opt_show_polygon ortho pad_sketch diff --git a/bitmaps_png/cpp_26/options_schematic.cpp b/bitmaps_png/cpp_26/options_schematic.cpp new file mode 100644 index 0000000000..1c6b25ce6b --- /dev/null +++ b/bitmaps_png/cpp_26/options_schematic.cpp @@ -0,0 +1,99 @@ + +/* 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, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 0x45, 0x00, 0x00, 0x07, + 0x45, 0x01, 0xf8, 0x16, 0x1e, 0x30, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x04, 0xda, 0x49, + 0x44, 0x41, 0x54, 0x48, 0x89, 0xb5, 0x96, 0x6d, 0x4c, 0x53, 0x67, 0x14, 0xc7, 0x7f, 0xf7, 0xf6, + 0xd6, 0xd2, 0x96, 0x96, 0x97, 0x81, 0x1a, 0x7c, 0x21, 0xba, 0x3a, 0x6a, 0x10, 0xab, 0x2e, 0xc8, + 0xa4, 0x98, 0xa0, 0x21, 0xc8, 0x66, 0x22, 0x73, 0x80, 0x68, 0x58, 0x16, 0x2b, 0x90, 0xb8, 0xe9, + 0x92, 0xcd, 0x37, 0xfc, 0x60, 0x36, 0x93, 0xc9, 0x16, 0x67, 0xc8, 0x92, 0x7d, 0xc0, 0xe9, 0xdc, + 0x8c, 0x2f, 0x73, 0x63, 0x33, 0xce, 0xa1, 0x82, 0x69, 0x58, 0x42, 0x36, 0x89, 0x23, 0x93, 0x18, + 0xd4, 0x62, 0x10, 0x84, 0x98, 0x30, 0x50, 0x1b, 0xa0, 0xb4, 0x70, 0x6b, 0x4b, 0x7b, 0xef, 0x3e, + 0x2c, 0x63, 0x76, 0x43, 0x5e, 0xb2, 0xed, 0x7c, 0x7c, 0xee, 0x39, 0xff, 0xdf, 0xf3, 0x7f, 0x9e, + 0x93, 0xe7, 0x1e, 0xe1, 0xe0, 0xc1, 0x83, 0xa2, 0xcb, 0xe5, 0xd2, 0x99, 0xcd, 0x66, 0xbd, 0xa2, + 0x28, 0x1a, 0xfe, 0xc3, 0x10, 0x45, 0x31, 0xec, 0xf5, 0x7a, 0xfd, 0xa9, 0xa9, 0xa9, 0x01, 0xc9, + 0xe5, 0x72, 0xe9, 0x06, 0x07, 0x07, 0x6b, 0x87, 0x86, 0x86, 0x96, 0x0a, 0x82, 0x20, 0x3e, 0xab, + 0x48, 0x27, 0xcb, 0x92, 0xc9, 0x64, 0xd4, 0xe8, 0x12, 0xe3, 0x19, 0xba, 0xd7, 0x85, 0x6c, 0x30, + 0x06, 0x15, 0x49, 0x52, 0x27, 0x02, 0xa9, 0xaa, 0xaa, 0x28, 0x8a, 0x72, 0xcb, 0xe5, 0x72, 0x6d, + 0x90, 0xcc, 0x66, 0xb3, 0xde, 0xe3, 0xf1, 0xa4, 0x9d, 0x3f, 0x7f, 0x7e, 0xe6, 0x44, 0x45, 0xad, + 0x7b, 0xf7, 0xa2, 0x8d, 0x0a, 0x90, 0xba, 0xaf, 0x9c, 0x2b, 0x2f, 0xbe, 0x4a, 0xe6, 0x77, 0x17, + 0x88, 0xb5, 0xd9, 0x26, 0x75, 0x55, 0x50, 0x50, 0x90, 0x66, 0x36, 0x9b, 0xf5, 0xa2, 0xa2, 0x28, + 0x9a, 0x89, 0x9c, 0xfc, 0xdb, 0x10, 0x04, 0x41, 0x54, 0x14, 0x45, 0x33, 0x2d, 0xc0, 0xe8, 0x90, + 0x8f, 0x91, 0x07, 0xbd, 0x10, 0x56, 0xa6, 0x0d, 0x9c, 0x32, 0x48, 0x3f, 0x27, 0x89, 0xee, 0x0b, + 0x57, 0xa9, 0x5f, 0x57, 0x82, 0x8a, 0xc0, 0x8c, 0xf8, 0xf8, 0xff, 0x07, 0xf4, 0xc2, 0x3b, 0xef, + 0x12, 0xfb, 0xd3, 0x11, 0xae, 0x7e, 0x6a, 0x66, 0xfd, 0xfd, 0x2e, 0x0c, 0xf3, 0xe6, 0x4d, 0x0b, + 0x24, 0x8d, 0xb7, 0x28, 0xcb, 0x32, 0x1f, 0x7e, 0x54, 0x89, 0xaa, 0xfe, 0xd1, 0x54, 0x9b, 0x8a, + 0x36, 0x61, 0xb3, 0x2d, 0x9b, 0x96, 0xf0, 0xa4, 0xa0, 0x6b, 0xd7, 0x7e, 0xc6, 0xe7, 0xf3, 0x61, + 0xcf, 0xb4, 0x8f, 0xad, 0x25, 0x26, 0x26, 0x8e, 0x5b, 0x1c, 0x7e, 0xfc, 0x18, 0x51, 0x92, 0x18, + 0xee, 0xe9, 0xc1, 0xdf, 0xdf, 0x1f, 0xf1, 0x4d, 0x90, 0x24, 0x12, 0xb3, 0xb2, 0x9e, 0x0d, 0x32, + 0x1a, 0x8d, 0x63, 0x4e, 0xfe, 0x0c, 0xad, 0x76, 0x06, 0x00, 0x2d, 0x3d, 0x75, 0x04, 0x42, 0x32, + 0xbf, 0x0d, 0xb5, 0xb3, 0x20, 0x61, 0x09, 0x4d, 0x0f, 0x1e, 0x50, 0x5f, 0x5f, 0xcf, 0x7b, 0x07, + 0x0e, 0xf0, 0x6b, 0xb6, 0x1d, 0x94, 0xbf, 0x9a, 0x64, 0xa8, 0xed, 0x1e, 0x39, 0xd7, 0x7f, 0x79, + 0x36, 0x68, 0xf9, 0xf2, 0x15, 0xe3, 0xee, 0xfe, 0xd1, 0x48, 0x17, 0xe5, 0xf6, 0x2a, 0x4c, 0x51, + 0xcf, 0x51, 0x7d, 0xed, 0x2d, 0x0a, 0x6d, 0xfb, 0x38, 0x77, 0xee, 0x1c, 0x69, 0x69, 0x69, 0x5c, + 0x6f, 0x6e, 0x66, 0x5d, 0xc3, 0xb7, 0x48, 0x86, 0x99, 0x48, 0x51, 0xf1, 0x8c, 0x8e, 0xf4, 0xf1, + 0xf5, 0xdc, 0x45, 0x54, 0x5c, 0xc9, 0x24, 0x6c, 0x5c, 0x11, 0x05, 0x73, 0xa6, 0xde, 0x0c, 0x0b, + 0x12, 0x97, 0x70, 0xfc, 0x93, 0xaf, 0x28, 0x7b, 0xe3, 0x4d, 0xd6, 0xcf, 0x3a, 0x80, 0xbb, 0x33, + 0x88, 0x2c, 0xcb, 0xa4, 0xa4, 0xa4, 0x70, 0xf2, 0xe4, 0x49, 0xbc, 0xe1, 0x04, 0x8e, 0x7d, 0x59, + 0x43, 0xee, 0xba, 0x3c, 0xee, 0x74, 0x3c, 0xe6, 0xf9, 0xd7, 0x8a, 0x29, 0x59, 0xf6, 0x01, 0xe2, + 0x13, 0xc3, 0x28, 0x4c, 0xa3, 0xeb, 0x04, 0x41, 0xa0, 0xb7, 0xb7, 0x17, 0x87, 0xc3, 0xc1, 0x89, + 0x13, 0x27, 0xb8, 0x7c, 0xf9, 0x32, 0x5b, 0xb7, 0x6e, 0x25, 0x3a, 0x3a, 0x9a, 0xfc, 0xfc, 0x7c, + 0xf6, 0xef, 0xdf, 0x8f, 0x46, 0xa3, 0x61, 0xd5, 0xaa, 0x55, 0x0c, 0x0c, 0x0c, 0x30, 0xaf, 0x68, + 0x13, 0x2f, 0xd9, 0x4b, 0x11, 0xc2, 0xda, 0xf0, 0xb8, 0x47, 0xf7, 0xf7, 0xf0, 0xb4, 0xb6, 0x12, + 0xf6, 0xfb, 0x11, 0x33, 0x33, 0xa9, 0xac, 0xac, 0x64, 0xf7, 0xee, 0xdd, 0x6c, 0xdf, 0xbe, 0x1d, + 0x41, 0x10, 0x10, 0x04, 0x01, 0x45, 0x51, 0x48, 0x4e, 0x4e, 0xa6, 0xb4, 0xb4, 0x14, 0x9f, 0xcf, + 0x47, 0x4b, 0x4b, 0x0b, 0x6b, 0xd6, 0xac, 0x61, 0x64, 0x64, 0x24, 0x42, 0x67, 0x52, 0xd0, 0xfd, + 0xcf, 0x3f, 0xc7, 0xb2, 0x79, 0x33, 0x3a, 0x8d, 0x86, 0xfb, 0x0f, 0x1f, 0x32, 0x7b, 0xf6, 0x6c, + 0x04, 0x41, 0xa0, 0xa3, 0xa3, 0x03, 0xa7, 0xd3, 0x49, 0x42, 0x42, 0x02, 0x1e, 0x8f, 0x87, 0xf2, + 0xf2, 0x72, 0x0c, 0x06, 0x03, 0x7e, 0xbf, 0x1f, 0x51, 0x14, 0x31, 0x18, 0x0c, 0x04, 0x83, 0xc1, + 0xa9, 0x83, 0xe6, 0xae, 0x5d, 0xcb, 0x5d, 0x49, 0xe2, 0xfd, 0x1d, 0x3b, 0x50, 0x55, 0x95, 0xc2, + 0xc2, 0x42, 0x04, 0x41, 0xa0, 0xa1, 0xa1, 0x81, 0xd3, 0xa7, 0x4f, 0xa3, 0xaa, 0x2a, 0x37, 0x6e, + 0xdc, 0xa0, 0xae, 0xae, 0x8e, 0xbc, 0xbc, 0x3c, 0x56, 0xae, 0x5c, 0x89, 0xc3, 0xe1, 0x40, 0x14, + 0x45, 0x8e, 0x1e, 0x3d, 0x3a, 0xa6, 0x33, 0xf9, 0x1d, 0x09, 0x02, 0xb7, 0x6f, 0xdf, 0x26, 0x26, + 0x26, 0x06, 0xbb, 0xdd, 0x8e, 0xc9, 0x64, 0x02, 0x40, 0xaf, 0xd7, 0xe3, 0x76, 0xbb, 0xf9, 0xf8, + 0xc8, 0x61, 0x16, 0x2e, 0x5c, 0x88, 0xc7, 0xe3, 0x01, 0xc0, 0x6a, 0xb5, 0x62, 0xb3, 0xd9, 0xe8, + 0xee, 0xee, 0x26, 0x10, 0x08, 0x44, 0x3a, 0x0a, 0x1b, 0x87, 0xa2, 0x5e, 0xff, 0x26, 0x21, 0x42, + 0xdf, 0xf2, 0x63, 0x98, 0xa5, 0x35, 0x61, 0xa2, 0x93, 0x93, 0xd9, 0xd9, 0xda, 0x4a, 0x4f, 0x7f, + 0x3f, 0x67, 0xcf, 0x9e, 0xc5, 0xeb, 0xf5, 0x92, 0x91, 0x91, 0x41, 0x6c, 0x6c, 0x2c, 0x17, 0x2f, + 0x5e, 0xe4, 0xe5, 0xbc, 0x57, 0xd8, 0xb5, 0x6b, 0x17, 0x85, 0x85, 0x85, 0xa8, 0xaa, 0xca, 0xa9, + 0x53, 0xa7, 0xd8, 0xb6, 0x6d, 0x1b, 0x0e, 0x87, 0x03, 0xbd, 0x5e, 0x1f, 0x09, 0x12, 0x9f, 0x18, + 0x46, 0xdf, 0xce, 0xfc, 0x22, 0x02, 0xa4, 0xa4, 0x78, 0x89, 0xcb, 0x19, 0xa5, 0xef, 0xb3, 0x33, + 0xfc, 0x60, 0xb3, 0x91, 0xd3, 0xdc, 0x4c, 0x45, 0x45, 0x05, 0x25, 0x25, 0x25, 0xa4, 0xa7, 0xa7, + 0xb3, 0x71, 0xe3, 0x46, 0xda, 0xda, 0xda, 0xb8, 0x74, 0xe9, 0x12, 0x5b, 0xb6, 0x6c, 0x21, 0x2e, + 0x2e, 0x0e, 0x8f, 0xc7, 0x43, 0x4c, 0x4c, 0x0c, 0xd9, 0xd9, 0xd9, 0xc8, 0xb2, 0x8c, 0xdf, 0xef, + 0x8f, 0x04, 0x09, 0x61, 0x6d, 0x38, 0x63, 0x7e, 0x7e, 0xe4, 0x91, 0xcd, 0x07, 0x96, 0xc3, 0xe0, + 0xf7, 0x4e, 0xbc, 0x77, 0xee, 0x30, 0xd2, 0xd2, 0xc2, 0x99, 0xce, 0x4e, 0x72, 0x73, 0x73, 0xe9, + 0xeb, 0xeb, 0xc3, 0x68, 0x34, 0x62, 0xb5, 0x5a, 0xb1, 0x5a, 0xad, 0x00, 0xb4, 0xb7, 0xb7, 0x63, + 0xb1, 0x58, 0xf0, 0xf9, 0x7c, 0xb8, 0xdd, 0x6e, 0x4c, 0x26, 0x13, 0xca, 0x53, 0x2f, 0xc5, 0xa4, + 0x77, 0xa4, 0x4f, 0x4a, 0x62, 0x56, 0x4e, 0x0e, 0x33, 0xed, 0x76, 0x1a, 0x1b, 0x1b, 0x71, 0xb9, + 0x5c, 0xdc, 0xbc, 0x79, 0x13, 0xa7, 0xd3, 0x49, 0x6d, 0x6d, 0x2d, 0xa1, 0x50, 0x88, 0xaa, 0xaa, + 0x2a, 0x06, 0x06, 0x06, 0xa8, 0xae, 0xae, 0x46, 0xa7, 0xd3, 0xe1, 0x74, 0x3a, 0xd1, 0x6a, 0xb5, + 0x11, 0x3a, 0x93, 0x76, 0x5d, 0xda, 0xa1, 0x43, 0x28, 0xa1, 0x10, 0xb7, 0x0e, 0x1f, 0xe6, 0xf8, + 0xb1, 0x63, 0x3c, 0x7c, 0xf4, 0x88, 0xc5, 0x8b, 0x17, 0x23, 0x8a, 0x22, 0x65, 0x65, 0x65, 0x74, + 0x77, 0x77, 0x53, 0x50, 0x50, 0x40, 0x71, 0x71, 0x31, 0x82, 0x20, 0xd0, 0xd4, 0xd4, 0xc4, 0xea, + 0xd5, 0xab, 0x19, 0x1e, 0x1e, 0x8e, 0xd0, 0x99, 0xd4, 0x91, 0xc6, 0x60, 0x40, 0x6b, 0x36, 0xb3, + 0x68, 0xcf, 0x1e, 0xee, 0x0e, 0x34, 0x72, 0xa6, 0x6b, 0x27, 0xb2, 0x2c, 0x13, 0x0a, 0x85, 0xb0, + 0x58, 0x2c, 0xd4, 0xd4, 0xd4, 0x90, 0x95, 0x95, 0x85, 0xdf, 0xef, 0x47, 0x96, 0x65, 0xd2, 0xd3, + 0xd3, 0xff, 0x01, 0x01, 0x10, 0x45, 0x51, 0x0c, 0xab, 0xaa, 0x3a, 0xe9, 0xbf, 0x59, 0xd4, 0x6a, + 0xf1, 0x8f, 0x8e, 0xd0, 0xe9, 0x6e, 0x01, 0x20, 0x18, 0x0c, 0x52, 0x51, 0x51, 0x41, 0x5d, 0x5d, + 0x1d, 0x49, 0x49, 0x49, 0x63, 0x79, 0xa1, 0x50, 0x28, 0xa2, 0x4e, 0x55, 0x55, 0x45, 0x14, 0xc5, + 0xb0, 0x50, 0x54, 0x54, 0xa4, 0x1f, 0x1c, 0x1c, 0xac, 0x15, 0x45, 0x71, 0xc2, 0x71, 0x0b, 0x40, + 0xd1, 0x04, 0x34, 0x8a, 0xce, 0x2f, 0x49, 0x72, 0x6c, 0x60, 0xa2, 0xbc, 0xa7, 0x21, 0x8a, 0xa2, + 0xdc, 0x8a, 0x8b, 0x8b, 0xdb, 0x20, 0xa5, 0xa6, 0xa6, 0x06, 0x5c, 0x2e, 0xd7, 0x86, 0x69, 0x0d, + 0x90, 0xb1, 0x53, 0xca, 0x8a, 0x18, 0x20, 0x7f, 0x07, 0x4b, 0x87, 0xf0, 0xfb, 0xeb, 0x92, 0x71, + 0xae, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE options_schematic_xpm[1] = {{ png, sizeof( png ), "options_schematic_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 43e913c465..b9c6736528 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -312,6 +312,7 @@ EXTERN_BITMAP( options_3drender_xpm ) EXTERN_BITMAP( options_board_xpm ) EXTERN_BITMAP( options_generic_xpm ) EXTERN_BITMAP( options_pad_xpm ) +EXTERN_BITMAP( options_schematic_xpm ) EXTERN_BITMAP( opt_show_polygon_xpm ) EXTERN_BITMAP( pad_sketch_xpm ) EXTERN_BITMAP( pad_xpm ) diff --git a/bitmaps_png/sources/options_schematic.svg b/bitmaps_png/sources/options_schematic.svg new file mode 100644 index 0000000000..0176b12719 --- /dev/null +++ b/bitmaps_png/sources/options_schematic.svg @@ -0,0 +1,850 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eeschema/toolbars_sch_editor.cpp b/eeschema/toolbars_sch_editor.cpp index 77922860fb..e42aef987c 100644 --- a/eeschema/toolbars_sch_editor.cpp +++ b/eeschema/toolbars_sch_editor.cpp @@ -55,6 +55,9 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() m_mainToolBar->Add( ACTIONS::save ); + KiScaledSeparator( m_mainToolBar, this ); + m_mainToolBar->Add( EE_ACTIONS::schematicSetup ); + KiScaledSeparator( m_mainToolBar, this ); m_mainToolBar->Add( ACTIONS::pageSettings ); m_mainToolBar->Add( ACTIONS::print ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index 51f729150b..ba5e582a39 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -545,7 +545,7 @@ TOOL_ACTION EE_ACTIONS::schematicSetup( "eeschema.EditorControl.schematicSetup", AS_GLOBAL, 0, "", _( "Schematic Setup..." ), _( "Edit schematic setup including annotation styles and electrical rules" ), - options_generic_xpm ); + options_schematic_xpm ); TOOL_ACTION EE_ACTIONS::showBusManager( "eeschema.EditorControl.showBusManager", AS_GLOBAL, 0, "",