From 6d3c1c771668acd341405f04456d9591ec330ccb Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Thu, 24 Dec 2020 11:39:57 +0000 Subject: [PATCH] Icons: remove unused sources/duplicates + rename --- bitmaps_png/CMakeLists.txt | 7 +- .../cpp_24/{label.cpp => add_label.cpp} | 2 +- bitmaps_png/cpp_24/bom.cpp | 62 ---------- bitmaps_png/cpp_24/browse_files.cpp | 57 --------- .../{create_cmp_file.cpp => export_cmp.cpp} | 2 +- bitmaps_png/cpp_24/icon.cpp | 63 ---------- .../include/bitmaps_png/bitmaps_list.h | 7 +- .../sources/{label.svg => add_label.svg} | 0 bitmaps_png/sources/autoplace_settings.svg | 108 ------------------ bitmaps_png/sources/bom.svg | 43 ------- bitmaps_png/sources/browse_files.svg | 40 ------- bitmaps_png/sources/drc2.svg | 9 -- .../{create_cmp_file.svg => export_cmp.svg} | 0 bitmaps_png/sources/icon.svg | 45 -------- eeschema/tools/ee_actions.cpp | 4 +- kicad/menubar.cpp | 2 +- pcbnew/menubar_pcb_editor.cpp | 2 +- 17 files changed, 10 insertions(+), 443 deletions(-) rename bitmaps_png/cpp_24/{label.cpp => add_label.cpp} (95%) delete mode 100644 bitmaps_png/cpp_24/bom.cpp delete mode 100644 bitmaps_png/cpp_24/browse_files.cpp rename bitmaps_png/cpp_24/{create_cmp_file.cpp => export_cmp.cpp} (98%) delete mode 100644 bitmaps_png/cpp_24/icon.cpp rename bitmaps_png/sources/{label.svg => add_label.svg} (100%) delete mode 100755 bitmaps_png/sources/autoplace_settings.svg delete mode 100755 bitmaps_png/sources/bom.svg delete mode 100755 bitmaps_png/sources/browse_files.svg delete mode 100644 bitmaps_png/sources/drc2.svg rename bitmaps_png/sources/{create_cmp_file.svg => export_cmp.svg} (100%) delete mode 100755 bitmaps_png/sources/icon.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 4eef0c5173..041477c48c 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -138,6 +138,7 @@ set( BMAPS_MID add_hierarchical_subsheet add_junction add_keepout_area + add_label add_leader add_library add_line2bus @@ -175,9 +176,7 @@ set( BMAPS_MID axis3d_right axis3d_top axis3d - bom break_line - browse_files bug bus_definition_tool cancel @@ -185,7 +184,6 @@ set( BMAPS_MID change_lib_symbols_in_schematic contrast_mode curved_ratsnest - create_cmp_file checked_ok color_materials component_select_unit @@ -229,6 +227,7 @@ set( BMAPS_MID exit exchange export3d + export_cmp export_dsn export_idf export_footprint_names @@ -281,7 +280,6 @@ set( BMAPS_MID hotkeys hole_to_hole_clearance hole_to_copper_clearance - icon icon_cvpcb_24 icon_gerbview_24 import3d @@ -297,7 +295,6 @@ set( BMAPS_MID import info insert_module_board - label language layers_manager leave_sheet diff --git a/bitmaps_png/cpp_24/label.cpp b/bitmaps_png/cpp_24/add_label.cpp similarity index 95% rename from bitmaps_png/cpp_24/label.cpp rename to bitmaps_png/cpp_24/add_label.cpp index e202d75352..4a02f4f2c3 100644 --- a/bitmaps_png/cpp_24/label.cpp +++ b/bitmaps_png/cpp_24/add_label.cpp @@ -24,6 +24,6 @@ static const unsigned char png[] = { 0x60, 0x82, }; -const BITMAP_OPAQUE label_xpm[1] = {{ png, sizeof( png ), "label_xpm" }}; +const BITMAP_OPAQUE add_label_xpm[1] = {{ png, sizeof( png ), "add_label_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_24/bom.cpp b/bitmaps_png/cpp_24/bom.cpp deleted file mode 100644 index 19b3cf4891..0000000000 --- a/bitmaps_png/cpp_24/bom.cpp +++ /dev/null @@ -1,62 +0,0 @@ - -/* 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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d, - 0xf8, 0x00, 0x00, 0x02, 0xd4, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x95, 0xdb, 0x4f, 0x13, - 0x41, 0x18, 0xc5, 0xf7, 0x41, 0xfd, 0x0b, 0xf4, 0x05, 0x2f, 0x0f, 0xc6, 0xb4, 0x2a, 0xd1, 0x98, - 0xf0, 0x22, 0x12, 0x92, 0x16, 0xbc, 0x60, 0xa2, 0x89, 0xa8, 0x44, 0x34, 0x6a, 0x34, 0x3e, 0x8a, - 0xe8, 0x9b, 0x0a, 0x02, 0x05, 0xe5, 0x22, 0xc1, 0x88, 0x28, 0x11, 0x1e, 0x08, 0x46, 0xab, 0x92, - 0x8a, 0xa0, 0x86, 0x90, 0x76, 0x0b, 0x6c, 0xa9, 0x2d, 0x18, 0x2c, 0x41, 0x90, 0x72, 0x95, 0x42, - 0x0d, 0xa2, 0x50, 0xcb, 0xa5, 0xa5, 0x60, 0xac, 0x78, 0x9c, 0x19, 0x85, 0x76, 0x6b, 0x6b, 0x5a, - 0x90, 0x2f, 0x39, 0xe9, 0x66, 0xf7, 0x9b, 0xf3, 0x9b, 0x39, 0xbb, 0x33, 0xe5, 0x38, 0xaf, 0x32, - 0x99, 0x4c, 0x2b, 0x35, 0x1a, 0xcd, 0x0d, 0xa2, 0x61, 0x22, 0x84, 0xa8, 0x4f, 0x3c, 0xcf, 0xe7, - 0xa9, 0x54, 0xaa, 0x55, 0x5c, 0xa0, 0x22, 0x4d, 0x19, 0x8b, 0x30, 0x16, 0x49, 0xad, 0x56, 0x67, - 0xff, 0x0b, 0xd0, 0xbf, 0x54, 0x00, 0x91, 0x55, 0x64, 0x1a, 0x96, 0x69, 0xc0, 0xff, 0x50, 0xdc, - 0x9d, 0xc6, 0x79, 0x80, 0xdb, 0x2f, 0x60, 0x5d, 0x96, 0x01, 0xf7, 0x9b, 0x86, 0x97, 0x0f, 0xb0, - 0xe1, 0xba, 0x11, 0x63, 0xd3, 0xdf, 0x97, 0x17, 0xe0, 0xf8, 0xf6, 0x03, 0xaf, 0xcc, 0x36, 0xf0, - 0xbd, 0x76, 0x6c, 0xcd, 0x7f, 0x83, 0x88, 0xdb, 0x2d, 0x50, 0xf7, 0xd8, 0x61, 0xb0, 0x4c, 0x22, - 0xbe, 0xbc, 0x03, 0x51, 0x77, 0x5b, 0xf1, 0xb2, 0xd3, 0x06, 0x2d, 0x79, 0x5e, 0xd1, 0x36, 0x8a, - 0x02, 0x9d, 0x15, 0x6f, 0x3f, 0x3a, 0x10, 0x5b, 0xd2, 0x16, 0x3c, 0x40, 0x92, 0xdb, 0x8c, 0x62, - 0xe3, 0x30, 0x72, 0xea, 0x86, 0x98, 0xc9, 0xa5, 0x17, 0x7d, 0x88, 0x2c, 0x32, 0x61, 0x68, 0x7c, - 0x96, 0x19, 0xb5, 0x8f, 0x38, 0x59, 0x6f, 0x9f, 0x6d, 0x06, 0x27, 0x94, 0x9d, 0xb8, 0x5c, 0xf3, - 0x01, 0xe5, 0x2d, 0x23, 0xc1, 0x01, 0x6c, 0x7f, 0x22, 0xba, 0x48, 0x4c, 0xe9, 0x20, 0xfd, 0xc0, - 0x04, 0x0e, 0x94, 0xb5, 0x63, 0x7d, 0x96, 0x11, 0x53, 0xb3, 0x6e, 0xec, 0x26, 0x00, 0xe3, 0xe0, - 0x24, 0xeb, 0x79, 0x6d, 0x99, 0xc0, 0x9e, 0xd2, 0x36, 0x9c, 0x7e, 0xda, 0x05, 0xd5, 0xbb, 0xd1, - 0xc0, 0x00, 0x3a, 0xe3, 0x74, 0xb5, 0x85, 0x01, 0x66, 0xdd, 0x73, 0x48, 0xa9, 0x1d, 0x60, 0x26, - 0x49, 0x55, 0xbd, 0x50, 0x68, 0x2c, 0x2c, 0x12, 0x1a, 0x85, 0x86, 0x44, 0x15, 0xbb, 0x18, 0xc0, - 0xc6, 0xec, 0x26, 0xd6, 0xb4, 0x96, 0x0c, 0x3a, 0xf6, 0xa8, 0x13, 0x27, 0x1f, 0x9b, 0x71, 0xa6, - 0xa2, 0x6b, 0xe1, 0xe5, 0x9d, 0x7a, 0x62, 0x46, 0x72, 0x75, 0x1f, 0x68, 0x9f, 0x34, 0xaf, 0x19, - 0x47, 0x1e, 0xbc, 0xc7, 0x96, 0x2b, 0x6a, 0x14, 0x9c, 0xcd, 0x85, 0x72, 0xe7, 0x71, 0xf0, 0xe1, - 0x7b, 0xa1, 0x25, 0x52, 0x45, 0x26, 0xa2, 0xfe, 0x42, 0x2a, 0xf8, 0xca, 0x6a, 0xf7, 0x92, 0xf6, - 0x41, 0xfc, 0xb9, 0x52, 0xd4, 0x86, 0xc7, 0x41, 0x90, 0xc8, 0xfd, 0xaa, 0x61, 0xdb, 0x3e, 0xe8, - 0xa4, 0x31, 0x09, 0x1e, 0x80, 0xa2, 0x69, 0x57, 0x58, 0x96, 0x3e, 0x8a, 0xaa, 0xe8, 0x99, 0x76, - 0xe6, 0x5e, 0xa5, 0x16, 0x81, 0xf4, 0x50, 0x51, 0x04, 0x41, 0x1a, 0x23, 0x32, 0xec, 0x4e, 0xbf, - 0x05, 0x4b, 0x59, 0x05, 0x84, 0xcd, 0xa2, 0xfb, 0x3f, 0x05, 0xa9, 0xec, 0xa8, 0xbf, 0xa3, 0xc2, - 0x19, 0xe8, 0x08, 0xe0, 0x9f, 0x57, 0xb3, 0xd9, 0x79, 0x9b, 0x9b, 0x53, 0xf2, 0xe1, 0x72, 0xb9, - 0x98, 0xac, 0xaa, 0x1a, 0x11, 0x44, 0x27, 0x91, 0x4f, 0xe9, 0x37, 0x45, 0xaf, 0x09, 0x1a, 0x50, - 0x97, 0x7c, 0x4d, 0x6c, 0x7e, 0xf5, 0x26, 0x5c, 0xd3, 0xd3, 0x0b, 0x00, 0xaa, 0x21, 0x65, 0x95, - 0x2f, 0x24, 0x53, 0x04, 0x20, 0x27, 0x61, 0x6f, 0x20, 0x40, 0x43, 0x6c, 0xe2, 0xc2, 0xc0, 0xf6, - 0xf3, 0x69, 0xbf, 0xcd, 0x89, 0x1c, 0x5f, 0xc6, 0x98, 0xb9, 0xd3, 0x3e, 0xce, 0x7e, 0x07, 0x4a, - 0x94, 0x1e, 0x80, 0x54, 0xde, 0xea, 0xbb, 0x82, 0xd4, 0x40, 0x00, 0x61, 0xbb, 0x27, 0x9e, 0xfe, - 0xc2, 0x32, 0x66, 0xde, 0xad, 0x28, 0xc4, 0x84, 0xc5, 0xca, 0x8c, 0x29, 0xd4, 0xf1, 0xd5, 0x8e, - 0xcf, 0xf5, 0x46, 0x51, 0x4c, 0x22, 0x80, 0x20, 0x08, 0x2b, 0xc8, 0x9f, 0x46, 0x1a, 0x31, 0x1c, - 0xfc, 0x0b, 0xb0, 0x63, 0xbf, 0x27, 0x22, 0xf2, 0xa2, 0x0d, 0x91, 0x87, 0xd9, 0xf5, 0x3c, 0xc0, - 0x18, 0x9d, 0x00, 0x7d, 0xc4, 0x41, 0x34, 0x8a, 0xdf, 0xd3, 0x24, 0x17, 0x6c, 0x91, 0x66, 0x93, - 0xbf, 0xcf, 0xd2, 0x1b, 0xe0, 0xe7, 0xb9, 0x29, 0x04, 0x80, 0x2c, 0x23, 0x74, 0x80, 0x2c, 0x23, - 0x14, 0xc0, 0x6a, 0xba, 0x64, 0x5f, 0x93, 0xf1, 0x7e, 0x0b, 0x03, 0xcc, 0x47, 0xe6, 0x1d, 0x0f, - 0x1d, 0xc3, 0x85, 0x52, 0x3a, 0x49, 0x4c, 0x7c, 0x83, 0x44, 0x3e, 0xe7, 0x6d, 0xd4, 0x91, 0x94, - 0x8e, 0x9e, 0x9c, 0x62, 0xf1, 0x6e, 0x66, 0x3d, 0xb2, 0x43, 0xdc, 0x62, 0x8a, 0x42, 0xfc, 0xad, - 0xc4, 0x7b, 0xe6, 0xb4, 0x87, 0x5b, 0x4a, 0xd1, 0xa5, 0xd3, 0x4d, 0x44, 0xbf, 0x73, 0x62, 0xe8, - 0x20, 0x72, 0xd2, 0x6b, 0x7a, 0xcf, 0x37, 0x96, 0x5f, 0xe3, 0x83, 0xa7, 0x11, 0x01, 0x8e, 0x2c, - 0xf4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE bom_xpm[1] = {{ png, sizeof( png ), "bom_xpm" }}; - -//EOF diff --git a/bitmaps_png/cpp_24/browse_files.cpp b/bitmaps_png/cpp_24/browse_files.cpp deleted file mode 100644 index cba8507d24..0000000000 --- a/bitmaps_png/cpp_24/browse_files.cpp +++ /dev/null @@ -1,57 +0,0 @@ - -/* 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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d, - 0xf8, 0x00, 0x00, 0x02, 0x83, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x94, 0x4d, 0x6b, 0x13, - 0x51, 0x14, 0x86, 0x07, 0x29, 0xe2, 0x3f, 0xf0, 0x1f, 0xa4, 0x05, 0xa5, 0x59, 0x08, 0x2e, 0x04, - 0x71, 0xac, 0xa8, 0x09, 0xc4, 0x0f, 0xec, 0x84, 0x0a, 0x8e, 0x2e, 0x2c, 0xd4, 0xa0, 0x88, 0xd6, - 0xa4, 0xa0, 0x48, 0xda, 0x18, 0x8d, 0x5a, 0x5b, 0x3a, 0xd0, 0xda, 0x4a, 0xeb, 0x47, 0x0b, 0x26, - 0x90, 0x18, 0x53, 0xdd, 0x34, 0x31, 0x33, 0xd3, 0xb9, 0x46, 0x17, 0x85, 0x06, 0x2c, 0xd2, 0x85, - 0x54, 0xab, 0x8b, 0x56, 0x0a, 0x2e, 0x45, 0x22, 0x6d, 0x93, 0xcc, 0xf1, 0xde, 0x3b, 0x35, 0xe6, - 0xbb, 0x37, 0x35, 0x07, 0x5e, 0x06, 0x66, 0xe6, 0xbc, 0xcf, 0xe1, 0xdc, 0x73, 0x2e, 0xc7, 0xe1, - 0x88, 0xc7, 0xe3, 0x36, 0x59, 0x96, 0x67, 0xf1, 0x73, 0x0d, 0x0b, 0x36, 0x94, 0xc5, 0x5a, 0xc4, - 0x72, 0x21, 0x84, 0x1a, 0xb8, 0xad, 0x06, 0x31, 0xcf, 0x33, 0xad, 0xa4, 0x84, 0xaa, 0xaa, 0x3b, - 0xb7, 0x0a, 0x48, 0x32, 0x00, 0x20, 0x12, 0x89, 0x80, 0xc3, 0xe1, 0x00, 0x41, 0x10, 0xca, 0x69, - 0x1d, 0x2b, 0x89, 0x75, 0xa2, 0x1c, 0x20, 0xcd, 0x02, 0x20, 0x8a, 0x46, 0xa3, 0xe0, 0xf5, 0x7a, - 0x41, 0x14, 0xc5, 0x4a, 0x20, 0x68, 0xc5, 0x51, 0x0c, 0x80, 0xff, 0x55, 0x2c, 0x16, 0x03, 0xbf, - 0xdf, 0x0f, 0x4e, 0xa7, 0x93, 0x40, 0x3e, 0xd4, 0x1d, 0x90, 0x2f, 0x97, 0xcb, 0x95, 0xf1, 0x78, - 0x3c, 0xdb, 0x6a, 0x07, 0x4c, 0x45, 0x41, 0x91, 0x1e, 0x81, 0x7a, 0xd5, 0x0d, 0x6a, 0x47, 0x17, - 0x28, 0xd7, 0x7a, 0x40, 0x1e, 0x79, 0x02, 0xf1, 0x37, 0x85, 0xff, 0x05, 0x02, 0x01, 0xe0, 0x79, - 0xbe, 0xa1, 0x26, 0x80, 0xe2, 0x1b, 0x00, 0xb4, 0xf7, 0x38, 0x20, 0xd3, 0xc1, 0x12, 0x69, 0x07, - 0xec, 0xa0, 0x0c, 0x3f, 0x2e, 0x68, 0x97, 0xdd, 0x6e, 0xdf, 0xce, 0x0c, 0x98, 0xbe, 0x7c, 0x33, - 0x67, 0x96, 0x3c, 0xd6, 0x0e, 0xdf, 0xa4, 0xa7, 0xb0, 0x3c, 0x1e, 0x86, 0xc5, 0x7b, 0x23, 0x30, - 0xc3, 0x9f, 0x36, 0xbe, 0x35, 0x1d, 0x02, 0xe5, 0x56, 0x5f, 0x2e, 0x07, 0xb7, 0x68, 0x07, 0x13, - 0x40, 0xbd, 0x33, 0x40, 0x0d, 0x12, 0xbb, 0x0e, 0xc3, 0x4a, 0x78, 0x0a, 0x40, 0xd7, 0x21, 0x3f, - 0xb2, 0xeb, 0x69, 0x0a, 0xfc, 0x0b, 0x91, 0x47, 0xc7, 0x6b, 0x00, 0xe0, 0x9e, 0x6b, 0x7b, 0x6c, - 0x34, 0xf9, 0xfb, 0xf3, 0x57, 0x50, 0x2d, 0x16, 0xba, 0x8d, 0x42, 0x34, 0xcb, 0x59, 0x76, 0x80, - 0xd2, 0x3f, 0x4c, 0x93, 0x66, 0x6d, 0xed, 0xb0, 0x59, 0x64, 0x52, 0xbf, 0xe1, 0x9d, 0xd9, 0x4a, - 0xff, 0x97, 0x03, 0x21, 0x36, 0x80, 0xea, 0xf4, 0xd0, 0x04, 0xd2, 0x02, 0x96, 0x98, 0x77, 0x18, - 0x67, 0xa5, 0xf8, 0x24, 0x46, 0xc0, 0xa5, 0x1b, 0x34, 0x61, 0xe9, 0xd9, 0x0b, 0x26, 0xc0, 0xa7, - 0xeb, 0xbd, 0x06, 0xc0, 0x7d, 0x9f, 0x11, 0xd0, 0xd9, 0x43, 0x13, 0x3e, 0xdf, 0x1e, 0x64, 0x02, - 0xcc, 0x9d, 0xb9, 0x62, 0x00, 0x1e, 0x0c, 0x31, 0x9e, 0x01, 0x9e, 0x6d, 0x92, 0x30, 0xc3, 0xb7, - 0x41, 0x76, 0x75, 0xad, 0xaa, 0xf9, 0xea, 0xca, 0x0f, 0x3a, 0x69, 0x5a, 0x23, 0x3e, 0x83, 0x70, - 0x84, 0x71, 0x8a, 0xf0, 0x86, 0x6a, 0xfb, 0x05, 0x0a, 0xf9, 0xda, 0x3f, 0x56, 0xd1, 0x5c, 0xcf, - 0x64, 0x73, 0xfd, 0xd7, 0x5a, 0x3b, 0x4a, 0xa7, 0x88, 0x6c, 0x5e, 0x25, 0x88, 0x3c, 0x38, 0x4a, - 0xab, 0x22, 0xc9, 0x5f, 0x7c, 0x0f, 0x21, 0xfd, 0xf3, 0x57, 0x49, 0xe5, 0xf3, 0x17, 0xdd, 0x86, - 0xf9, 0xee, 0x23, 0x78, 0x0f, 0x26, 0x20, 0x36, 0xf9, 0x9a, 0x00, 0xfe, 0x5d, 0x15, 0xc1, 0x60, - 0x30, 0x55, 0xf5, 0x9a, 0xe8, 0x1b, 0x02, 0x84, 0x93, 0x89, 0xc9, 0x7b, 0xbc, 0x17, 0x1f, 0xcf, - 0x77, 0xd1, 0x03, 0x9d, 0x13, 0x3b, 0x21, 0xb1, 0xf1, 0x1e, 0x35, 0x5b, 0x00, 0x99, 0x2d, 0xa0, - 0xed, 0x3b, 0x05, 0x9a, 0xd9, 0xa2, 0xa3, 0x46, 0x5e, 0xcc, 0x01, 0x24, 0x49, 0xf2, 0x6e, 0x76, - 0x5d, 0xc8, 0x63, 0x13, 0xa0, 0x59, 0xcf, 0x95, 0xde, 0x45, 0x4d, 0x2d, 0x30, 0x2d, 0x5c, 0xa0, - 0x95, 0x13, 0xf3, 0xbc, 0x6f, 0x99, 0x62, 0xc8, 0xdd, 0x50, 0x28, 0x94, 0xaa, 0xd6, 0x2e, 0x0a, - 0xc2, 0x4b, 0x44, 0xe6, 0x5c, 0xe9, 0xee, 0xa5, 0xd3, 0x22, 0xbf, 0x9c, 0x34, 0x2e, 0x38, 0xdc, - 0x16, 0xad, 0xf9, 0xa8, 0x5e, 0x54, 0x40, 0x1a, 0x99, 0xf8, 0x93, 0x5c, 0xbd, 0x02, 0x9b, 0xb5, - 0x19, 0xa6, 0x05, 0x90, 0x65, 0xae, 0x9e, 0x51, 0x06, 0xb2, 0xc4, 0xd5, 0x3b, 0x48, 0x5b, 0x48, - 0xe5, 0xc4, 0xfc, 0xad, 0xa9, 0xc5, 0xfa, 0x07, 0xc5, 0x4c, 0x2b, 0x49, 0x11, 0xd0, 0x8d, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE browse_files_xpm[1] = {{ png, sizeof( png ), "browse_files_xpm" }}; - -//EOF diff --git a/bitmaps_png/cpp_24/create_cmp_file.cpp b/bitmaps_png/cpp_24/export_cmp.cpp similarity index 98% rename from bitmaps_png/cpp_24/create_cmp_file.cpp rename to bitmaps_png/cpp_24/export_cmp.cpp index 6ef73b5191..2217738fa8 100644 --- a/bitmaps_png/cpp_24/create_cmp_file.cpp +++ b/bitmaps_png/cpp_24/export_cmp.cpp @@ -65,6 +65,6 @@ static const unsigned char png[] = { 0xae, 0x42, 0x60, 0x82, }; -const BITMAP_OPAQUE create_cmp_file_xpm[1] = {{ png, sizeof( png ), "create_cmp_file_xpm" }}; +const BITMAP_OPAQUE export_cmp_xpm[1] = {{ png, sizeof( png ), "export_cmp_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_24/icon.cpp b/bitmaps_png/cpp_24/icon.cpp deleted file mode 100644 index af17aeecb9..0000000000 --- a/bitmaps_png/cpp_24/icon.cpp +++ /dev/null @@ -1,63 +0,0 @@ - -/* 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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x06, 0x00, 0x00, 0x00, 0xe0, 0x77, 0x3d, - 0xf8, 0x00, 0x00, 0x02, 0xe2, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x80, 0x02, 0xc9, - 0xc6, 0xc3, 0x81, 0x52, 0x8d, 0x47, 0xfe, 0x23, 0x63, 0xa1, 0x86, 0x13, 0x7c, 0x52, 0x0d, 0x47, - 0x96, 0xa2, 0x89, 0xef, 0x02, 0xa9, 0x07, 0xd2, 0x3f, 0x90, 0xc5, 0x25, 0x1b, 0x8f, 0xa4, 0x33, - 0xe0, 0x03, 0x34, 0xb3, 0x20, 0x24, 0x24, 0x24, 0x05, 0x88, 0xcb, 0xcd, 0xb3, 0x7b, 0x16, 0xa1, - 0x5b, 0xe0, 0x1b, 0x99, 0x58, 0xa7, 0x56, 0xbe, 0xee, 0x3c, 0xb2, 0x98, 0x72, 0xf5, 0x96, 0x5b, - 0x20, 0xf5, 0x52, 0x0d, 0x87, 0x7f, 0x23, 0x8b, 0x1b, 0xe4, 0x4d, 0x5d, 0x07, 0x12, 0x0f, 0x0d, - 0x0d, 0x4d, 0x40, 0xb7, 0xe0, 0x1f, 0x10, 0x77, 0x58, 0x66, 0x75, 0xac, 0x43, 0xb7, 0xc0, 0x2f, - 0x32, 0xa1, 0x5f, 0xa3, 0x7c, 0xf5, 0x55, 0x14, 0x0b, 0x2a, 0x37, 0xde, 0x07, 0xa9, 0x97, 0x6a, - 0x38, 0xf4, 0x07, 0x59, 0xdc, 0x38, 0x77, 0xf2, 0x0e, 0xa0, 0x78, 0x27, 0x10, 0xff, 0x41, 0xb7, - 0xe0, 0x2f, 0xb5, 0x82, 0xc8, 0xc1, 0xc1, 0x81, 0x05, 0x68, 0xde, 0xef, 0x81, 0xb1, 0x40, 0xa6, - 0xef, 0x18, 0x27, 0xd0, 0x30, 0x39, 0x64, 0xcc, 0xf0, 0xff, 0x3f, 0xa3, 0x74, 0xdb, 0x49, 0x61, - 0x64, 0x31, 0x89, 0xb6, 0x43, 0xa2, 0x60, 0x0b, 0x5a, 0x0e, 0xca, 0x22, 0x8b, 0x8b, 0x36, 0xec, - 0xe7, 0xc1, 0x65, 0xc1, 0x37, 0x20, 0xb6, 0x62, 0xa0, 0x02, 0xc0, 0x65, 0x81, 0x1b, 0x10, 0xbf, - 0x04, 0x62, 0x4f, 0x9a, 0x58, 0x00, 0x02, 0xc1, 0xc1, 0xc1, 0x61, 0xc0, 0xe4, 0xb5, 0x9b, 0x52, - 0x0b, 0xd2, 0xd2, 0xd2, 0x58, 0x81, 0x16, 0xfc, 0xc2, 0x96, 0x17, 0x9c, 0x81, 0x78, 0x0f, 0xb1, - 0x06, 0xed, 0x54, 0x76, 0x13, 0xdb, 0xa7, 0xea, 0xd8, 0x74, 0x40, 0xdd, 0xf1, 0xec, 0x01, 0x35, - 0xc7, 0x8f, 0x60, 0x0c, 0x64, 0xef, 0x57, 0x77, 0x6a, 0x8e, 0x0d, 0x0c, 0x46, 0xb5, 0x20, 0x21, - 0x21, 0x81, 0x03, 0xe8, 0xfa, 0xf5, 0x40, 0x0b, 0x66, 0x11, 0x63, 0xf8, 0x01, 0x75, 0xa7, 0xd0, - 0xfd, 0x6a, 0x8e, 0x9f, 0x80, 0xf8, 0x3f, 0x36, 0xbc, 0x53, 0xc3, 0xf1, 0x3f, 0xd0, 0xf2, 0x60, - 0xb8, 0x06, 0xa0, 0xe1, 0x07, 0x81, 0x86, 0x2f, 0x03, 0xd2, 0x6c, 0x84, 0x0c, 0xdf, 0xa7, 0xee, - 0x18, 0x06, 0x34, 0xe4, 0x1f, 0x2e, 0xc3, 0x91, 0xf0, 0x3f, 0xb8, 0x25, 0xa0, 0x64, 0xda, 0xd0, - 0xd0, 0xc0, 0x44, 0xc8, 0xf0, 0x3d, 0x8a, 0xce, 0xe2, 0x40, 0x8d, 0x9f, 0xd1, 0x0d, 0x3b, 0xa8, - 0xed, 0x0a, 0xc6, 0xe8, 0xe2, 0xa0, 0x60, 0x3b, 0xa4, 0x62, 0x2b, 0x0a, 0xcf, 0x07, 0xe2, 0xdd, - 0x3b, 0xb9, 0x65, 0x9a, 0x0f, 0xaa, 0x22, 0x63, 0x86, 0x86, 0xff, 0x4c, 0x62, 0xad, 0x27, 0xc4, - 0x41, 0xec, 0x35, 0x86, 0xfe, 0xd3, 0xe1, 0x9a, 0x35, 0x5d, 0xfe, 0x5f, 0xab, 0xed, 0xfd, 0xff, - 0xe6, 0xe2, 0xd5, 0xff, 0x5f, 0x3e, 0x7c, 0x00, 0x63, 0x10, 0x1b, 0x24, 0x06, 0x92, 0x83, 0x5b, - 0xa4, 0xee, 0xd0, 0x4c, 0x74, 0x4e, 0x5e, 0x64, 0x16, 0x01, 0xd6, 0x74, 0xc2, 0x33, 0x01, 0x6c, - 0xd8, 0xd7, 0xaf, 0x5f, 0xff, 0x3f, 0x58, 0xba, 0xfe, 0xff, 0x41, 0x3d, 0x8f, 0xff, 0x87, 0xf4, - 0x3d, 0xfe, 0x3f, 0x58, 0xb6, 0x01, 0x2c, 0xf6, 0xfa, 0xc2, 0x55, 0xa0, 0x9a, 0x78, 0x98, 0x25, - 0x17, 0x88, 0xb6, 0x60, 0x87, 0x96, 0xdb, 0xff, 0x33, 0x11, 0x39, 0xff, 0x3f, 0xbd, 0x7c, 0x0d, - 0x36, 0xe8, 0xf3, 0x87, 0x8f, 0xff, 0x0f, 0xea, 0xba, 0xff, 0x7f, 0xb2, 0x6d, 0xdf, 0xff, 0xa7, - 0x3b, 0x0f, 0x82, 0x2d, 0x02, 0x89, 0x81, 0xe4, 0x3e, 0xbd, 0x78, 0xf5, 0xff, 0x4c, 0x78, 0x0e, - 0xc8, 0x82, 0xcf, 0xe0, 0xd2, 0x14, 0x98, 0x0f, 0x66, 0x5a, 0xa5, 0xb7, 0xec, 0xc4, 0x28, 0xae, - 0xc3, 0x63, 0xe7, 0x6b, 0x96, 0xad, 0xbc, 0x0d, 0xb3, 0xe0, 0x6c, 0x54, 0xde, 0xff, 0x4f, 0xaf, - 0xde, 0x40, 0x2c, 0x78, 0xff, 0x01, 0x6c, 0xc1, 0xd3, 0x1d, 0x07, 0xc0, 0x18, 0xc5, 0x02, 0xa0, - 0x23, 0xce, 0x46, 0xe6, 0x82, 0x2c, 0xf8, 0x02, 0xca, 0x64, 0x91, 0xc0, 0x14, 0x94, 0x66, 0x92, - 0x33, 0x61, 0x3a, 0x86, 0x05, 0x51, 0x29, 0x79, 0xaa, 0x95, 0x1b, 0x4e, 0x42, 0x82, 0x28, 0x12, - 0xec, 0xed, 0x93, 0xde, 0x89, 0xff, 0xdf, 0x5c, 0xba, 0x0e, 0x36, 0xe8, 0xfe, 0xa2, 0xb5, 0x60, - 0x4b, 0x40, 0xf8, 0xc1, 0x92, 0x75, 0x60, 0x31, 0x90, 0xdc, 0x09, 0xaf, 0x44, 0x44, 0x10, 0x11, - 0x5b, 0xa3, 0x15, 0x04, 0xd6, 0xff, 0x47, 0x8e, 0xe4, 0xeb, 0x0d, 0xfd, 0xff, 0xdf, 0x5c, 0xbe, - 0x01, 0xf6, 0x09, 0x08, 0x83, 0x0c, 0xbe, 0x56, 0xdf, 0x87, 0x19, 0xc9, 0x30, 0x00, 0x34, 0xc8, - 0x0f, 0x68, 0xd0, 0x4f, 0x64, 0x2c, 0xd2, 0x79, 0x84, 0x17, 0x48, 0x2f, 0x00, 0xb1, 0xb5, 0x2a, - 0xb6, 0xff, 0xda, 0xae, 0xe5, 0x8e, 0x91, 0x1c, 0x61, 0x3e, 0xc0, 0x96, 0x4c, 0x41, 0x39, 0x9e, - 0xa4, 0xb2, 0x66, 0xbf, 0x9a, 0x43, 0x38, 0xb1, 0x19, 0x0d, 0x94, 0xe3, 0xc9, 0x2a, 0xd0, 0xa0, - 0x96, 0xe0, 0x2c, 0x2a, 0x40, 0x2e, 0x07, 0x06, 0x4d, 0x08, 0x45, 0xa5, 0x26, 0x38, 0x57, 0xab, - 0x3b, 0xb5, 0x00, 0x0d, 0x3c, 0x0f, 0x2c, 0xe4, 0xbe, 0x82, 0xf0, 0x7e, 0x35, 0xa7, 0x73, 0xa0, - 0x30, 0x07, 0xe7, 0x5e, 0x24, 0x00, 0x00, 0x1d, 0x3b, 0x48, 0x04, 0xce, 0xc6, 0x3d, 0x73, 0x00, - 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE icon_xpm[1] = {{ png, sizeof( png ), "icon_xpm" }}; - -//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 48fdb66af2..36f6d8a6a8 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -49,6 +49,7 @@ EXTERN_BITMAP( add_hierarchical_subsheet_xpm ) EXTERN_BITMAP( add_hierar_pin_xpm ) EXTERN_BITMAP( add_junction_xpm ) EXTERN_BITMAP( add_keepout_area_xpm ) +EXTERN_BITMAP( add_label_xpm ) EXTERN_BITMAP( add_leader_xpm ) EXTERN_BITMAP( add_library_xpm ) EXTERN_BITMAP( add_line2bus_xpm ) @@ -87,10 +88,8 @@ EXTERN_BITMAP( axis3d_left_xpm ) EXTERN_BITMAP( axis3d_right_xpm ) EXTERN_BITMAP( axis3d_top_xpm ) EXTERN_BITMAP( axis3d_xpm ) -EXTERN_BITMAP( bom_xpm ) EXTERN_BITMAP( break_bus_xpm ) EXTERN_BITMAP( break_line_xpm ) -EXTERN_BITMAP( browse_files_xpm ) EXTERN_BITMAP( bug_xpm ) EXTERN_BITMAP( bus_definition_tool_xpm ) EXTERN_BITMAP( calculator_xpm ) @@ -111,7 +110,6 @@ EXTERN_BITMAP( convert_xpm ) EXTERN_BITMAP( copper_layers_setup_xpm ) EXTERN_BITMAP( copy_xpm ) EXTERN_BITMAP( copy_pad_settings_xpm ) -EXTERN_BITMAP( create_cmp_file_xpm ) EXTERN_BITMAP( cursor_shape_xpm ) EXTERN_BITMAP( custom_pad_to_primitives_xpm ) EXTERN_BITMAP( cursor_xpm ) @@ -154,6 +152,7 @@ EXTERN_BITMAP( erc_green_xpm ) EXTERN_BITMAP( exchange_xpm ) EXTERN_BITMAP( exit_xpm ) EXTERN_BITMAP( export3d_xpm ) +EXTERN_BITMAP( export_cmp_xpm ) EXTERN_BITMAP( export_dsn_xpm ) EXTERN_BITMAP( export_idf_xpm ) EXTERN_BITMAP( export_footprint_names_xpm ) @@ -214,7 +213,6 @@ EXTERN_BITMAP( highlight_remove_xpm ) EXTERN_BITMAP( hotkeys_xpm ) EXTERN_BITMAP( hole_to_copper_clearance_xpm ) EXTERN_BITMAP( hole_to_hole_clearance_xpm ) -EXTERN_BITMAP( icon_xpm ) EXTERN_BITMAP( icon_cvpcb_24_xpm ) EXTERN_BITMAP( icon_cvpcb_xpm ) EXTERN_BITMAP( icon_eeschema_xpm ) @@ -273,7 +271,6 @@ EXTERN_BITMAP( info_xpm ) EXTERN_BITMAP( insert_module_board_xpm ) EXTERN_BITMAP( invisible_text_xpm ) EXTERN_BITMAP( kicad_icon_small_xpm ) -EXTERN_BITMAP( label_xpm ) EXTERN_BITMAP( language_xpm ) EXTERN_BITMAP( layers_manager_xpm ) EXTERN_BITMAP( leave_sheet_xpm ) diff --git a/bitmaps_png/sources/label.svg b/bitmaps_png/sources/add_label.svg similarity index 100% rename from bitmaps_png/sources/label.svg rename to bitmaps_png/sources/add_label.svg diff --git a/bitmaps_png/sources/autoplace_settings.svg b/bitmaps_png/sources/autoplace_settings.svg deleted file mode 100755 index a515802655..0000000000 --- a/bitmaps_png/sources/autoplace_settings.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - autoplace_settings - - - - - diff --git a/bitmaps_png/sources/bom.svg b/bitmaps_png/sources/bom.svg deleted file mode 100755 index d105c49583..0000000000 --- a/bitmaps_png/sources/bom.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - bom - - - - - - - - - - diff --git a/bitmaps_png/sources/browse_files.svg b/bitmaps_png/sources/browse_files.svg deleted file mode 100755 index cd7c452f0a..0000000000 --- a/bitmaps_png/sources/browse_files.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - browse_files - - - - - - - diff --git a/bitmaps_png/sources/drc2.svg b/bitmaps_png/sources/drc2.svg deleted file mode 100644 index 0d5e06b66e..0000000000 --- a/bitmaps_png/sources/drc2.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bitmaps_png/sources/create_cmp_file.svg b/bitmaps_png/sources/export_cmp.svg similarity index 100% rename from bitmaps_png/sources/create_cmp_file.svg rename to bitmaps_png/sources/export_cmp.svg diff --git a/bitmaps_png/sources/icon.svg b/bitmaps_png/sources/icon.svg deleted file mode 100755 index 17492c6ba5..0000000000 --- a/bitmaps_png/sources/icon.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - icon - - - - - - - - - - - - diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index 6eb67d2793..ed935899eb 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -302,7 +302,7 @@ TOOL_ACTION EE_ACTIONS::placeLabel( "eeschema.InteractiveDrawing.placeLabel", AS_GLOBAL, 'L', LEGACY_HK_NAME( "Add Label" ), _( "Add Label" ), _( "Add a net label" ), - label_xpm, AF_ACTIVATE, (void*) SCH_LABEL_T ); + add_label_xpm, AF_ACTIVATE, (void*) SCH_LABEL_T ); TOOL_ACTION EE_ACTIONS::placeHierLabel( "eeschema.InteractiveDrawing.placeHierarchicalLabel", AS_GLOBAL, @@ -615,7 +615,7 @@ TOOL_ACTION EE_ACTIONS::exportNetlist( "eeschema.EditorControl.exportNetlist", TOOL_ACTION EE_ACTIONS::generateBOM( "eeschema.EditorControl.generateBOM", AS_GLOBAL, 0, "", _( "Generate BOM..." ), _( "Generate a bill of materials for the current schematic" ), - bom_xpm ); + post_bom_xpm ); TOOL_ACTION EE_ACTIONS::explicitCrossProbe( "eeschema.EditorControl.explicitCrossProbe", AS_GLOBAL, 0, "", diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index d6b217a993..a8db92466f 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -153,7 +153,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() toolsMenu->Add( _( "Edit Local File..." ), _( "Edit local file in text editor" ), ID_EDIT_LOCAL_FILE_IN_TEXT_EDITOR, - browse_files_xpm ); + editor_xpm ); //-- Preferences menu ----------------------------------------------- // diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 654d4eba35..058a8456f9 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -145,7 +145,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ID_GEN_PLOT_SVG, export_svg_xpm ); submenuExport->Add( _( "Footprint Association (.cmp) File..." ), _( "Export footprint association file (*.cmp) for schematic back annotation" ), - ID_PCB_GEN_CMP_FILE, create_cmp_file_xpm ); + ID_PCB_GEN_CMP_FILE, export_cmp_xpm ); submenuExport->Add( _( "Hyperlynx..." ), "", ID_GEN_EXPORT_FILE_HYPERLYNX, export_step_xpm );