From eb1f07bade290be08fa4144c2318a6b12a2ebec8 Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Tue, 22 Dec 2020 23:12:32 +0000 Subject: [PATCH] Icons: standardise `export_png` to match set --- 3d-viewer/3d_viewer/3d_menubar.cpp | 2 +- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_24/export_png.cpp | 65 +++++++++ .../include/bitmaps_png/bitmaps_list.h | 1 + bitmaps_png/sources/export_png.svg | 135 ++++++++++++++++++ eeschema/tools/ee_actions.cpp | 2 +- pcbnew/menubar_footprint_editor.cpp | 2 +- 7 files changed, 205 insertions(+), 3 deletions(-) create mode 100644 bitmaps_png/cpp_24/export_png.cpp create mode 100644 bitmaps_png/sources/export_png.svg diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp index ab9edc7d2f..f15b0adcc4 100644 --- a/3d-viewer/3d_viewer/3d_menubar.cpp +++ b/3d-viewer/3d_viewer/3d_menubar.cpp @@ -49,7 +49,7 @@ void EDA_3D_VIEWER::CreateMenuBar() fileMenu->Add( _( "Export Current View as PNG..." ), "", ID_MENU_SCREENCOPY_PNG, - export_xpm ); + export_png_xpm ); fileMenu->Add( _( "Export Current View as JPEG..." ), "", diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 4811872fd6..5a1b09ebe8 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -238,6 +238,7 @@ set( BMAPS_MID export_footprint_names export_module export_part + export_png export_step export_svg export diff --git a/bitmaps_png/cpp_24/export_png.cpp b/bitmaps_png/cpp_24/export_png.cpp new file mode 100644 index 0000000000..fb6ffdf331 --- /dev/null +++ b/bitmaps_png/cpp_24/export_png.cpp @@ -0,0 +1,65 @@ + +/* 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, 0xff, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x94, 0xd9, 0x4f, 0x13, + 0x51, 0x14, 0xc6, 0x1b, 0xa3, 0x7f, 0x81, 0x31, 0x26, 0x12, 0x35, 0x18, 0x68, 0xab, 0x82, 0x89, + 0x8a, 0x44, 0x4c, 0x54, 0x3a, 0x18, 0x20, 0xa2, 0x51, 0x88, 0x3e, 0x28, 0xbe, 0xf8, 0xe0, 0x93, + 0x46, 0x7c, 0xf1, 0x45, 0x01, 0x0b, 0x95, 0x12, 0xe3, 0x52, 0x1b, 0x16, 0x4d, 0x90, 0x28, 0x09, + 0x21, 0x6a, 0xc0, 0x10, 0x49, 0x4c, 0x5b, 0xc7, 0x0e, 0x4b, 0x0b, 0xb4, 0x54, 0x04, 0xa2, 0x2c, + 0xb2, 0xb5, 0x08, 0x98, 0x40, 0x37, 0x96, 0x5a, 0xca, 0x76, 0xbc, 0xf7, 0x9a, 0x8e, 0x9d, 0x69, + 0xab, 0xd3, 0xea, 0x49, 0xbe, 0xcc, 0x9d, 0x99, 0x33, 0xdf, 0xef, 0x9c, 0x7b, 0xef, 0x5c, 0x91, + 0x28, 0x20, 0x2c, 0x16, 0xcb, 0x26, 0xad, 0x56, 0xab, 0x44, 0x9a, 0x42, 0x82, 0x08, 0x35, 0xa9, + 0xd1, 0x68, 0x4a, 0xb0, 0x87, 0x28, 0x5c, 0xa0, 0x24, 0x45, 0x14, 0xc6, 0x1c, 0xe9, 0x74, 0xba, + 0x22, 0xae, 0xab, 0x1c, 0x36, 0xf8, 0xa5, 0xd1, 0xea, 0xc6, 0x91, 0x20, 0x3a, 0xb1, 0x90, 0x51, + 0x8e, 0xff, 0xb6, 0x22, 0x03, 0xfc, 0x0f, 0x65, 0xaa, 0x5b, 0xfc, 0x00, 0x6f, 0x48, 0xc0, 0xf6, + 0x62, 0x23, 0x24, 0xa9, 0xba, 0x40, 0x7a, 0xaf, 0x13, 0x52, 0x2b, 0xbb, 0x21, 0x06, 0x3d, 0xc3, + 0x3a, 0xac, 0xb6, 0xc0, 0xae, 0x92, 0x76, 0x38, 0xf1, 0xf4, 0x13, 0xec, 0x50, 0x18, 0x49, 0xee, + 0xce, 0xbb, 0x46, 0xa0, 0x9e, 0x74, 0x93, 0xe7, 0x87, 0x1e, 0x77, 0x09, 0x03, 0x24, 0xdc, 0x37, + 0x81, 0x67, 0x79, 0x15, 0xf4, 0xc3, 0x4e, 0x18, 0xb1, 0xff, 0x80, 0x6a, 0xd3, 0x34, 0xc4, 0x22, + 0x83, 0xb5, 0x75, 0x80, 0xb7, 0x5f, 0x66, 0x61, 0x70, 0xc6, 0x03, 0xba, 0x21, 0x07, 0x81, 0x76, + 0x58, 0xe7, 0xa0, 0x67, 0x6a, 0x01, 0x8c, 0xe3, 0x6e, 0xb0, 0xb9, 0xbc, 0xc2, 0x01, 0x38, 0x70, + 0x95, 0xfb, 0x1f, 0x99, 0x61, 0x79, 0x75, 0x1d, 0x76, 0xa3, 0x6e, 0x70, 0xe0, 0xae, 0x0e, 0xaa, + 0xcc, 0xb0, 0x82, 0x68, 0x59, 0xcf, 0x7a, 0x61, 0x7a, 0xce, 0x47, 0x3a, 0x3e, 0xfb, 0xbc, 0x2f, + 0x72, 0x80, 0xff, 0xde, 0xb7, 0xba, 0x06, 0xc9, 0x68, 0x7a, 0x70, 0xc4, 0x97, 0x76, 0xb0, 0xef, + 0x2f, 0xbf, 0xec, 0x07, 0x93, 0x6d, 0x8e, 0xe4, 0x9c, 0xac, 0xea, 0x11, 0x06, 0xc8, 0x6b, 0xfc, + 0x4a, 0xaa, 0xc6, 0x71, 0xb1, 0xf6, 0x33, 0xb9, 0xff, 0x3e, 0xef, 0x83, 0x38, 0x65, 0x47, 0x10, + 0xe0, 0x58, 0xc5, 0x47, 0x70, 0x7b, 0x57, 0xc8, 0xda, 0xdc, 0x6c, 0x1a, 0x16, 0x06, 0x68, 0x42, + 0x73, 0x8c, 0x17, 0x0b, 0x87, 0xaa, 0x65, 0x02, 0x34, 0x83, 0x0e, 0xd2, 0x3e, 0x9e, 0x2e, 0xfc, + 0x0e, 0xaf, 0x85, 0x18, 0x41, 0xf0, 0x18, 0xe7, 0x2b, 0x69, 0x2b, 0x0c, 0xa1, 0x35, 0x79, 0x37, + 0x60, 0x07, 0xab, 0x33, 0xca, 0x29, 0xfa, 0x93, 0x72, 0xd5, 0x6d, 0x50, 0x9a, 0xab, 0x00, 0x8d, + 0xec, 0x12, 0x30, 0x7b, 0xd3, 0x41, 0xbb, 0x27, 0x1d, 0x5e, 0x1d, 0xb9, 0x00, 0xf4, 0xf5, 0xdb, + 0xa0, 0xad, 0x7f, 0xb3, 0x14, 0x12, 0x80, 0xa7, 0xa3, 0xdc, 0xf0, 0xed, 0xaf, 0xe6, 0xa7, 0xae, + 0x54, 0x03, 0x9d, 0x98, 0x09, 0x8c, 0x58, 0x16, 0x5a, 0xfb, 0x32, 0x40, 0x1f, 0x2f, 0xcb, 0x61, + 0x01, 0x31, 0xc5, 0xc6, 0x14, 0xbf, 0xca, 0xeb, 0xdf, 0xfb, 0x2a, 0x1b, 0x68, 0x08, 0xa7, 0xda, + 0x42, 0x35, 0xe8, 0xa5, 0x69, 0x1c, 0xc3, 0x01, 0xb9, 0x0a, 0xc6, 0xaa, 0xea, 0x80, 0x91, 0x50, + 0xec, 0x33, 0xbd, 0x58, 0xb6, 0xd6, 0x2c, 0xa6, 0xb2, 0x43, 0x9d, 0x45, 0xde, 0xb0, 0xe7, 0xcc, + 0xeb, 0x06, 0x60, 0x12, 0x33, 0x38, 0xe6, 0xfd, 0xf9, 0x0f, 0xc0, 0xe3, 0xf1, 0x10, 0x59, 0xeb, + 0x1a, 0x39, 0x10, 0x24, 0x37, 0x2d, 0x4d, 0xdb, 0x2c, 0x18, 0x40, 0x5f, 0xbb, 0x15, 0x6c, 0xbe, + 0xb8, 0xc8, 0x02, 0xb0, 0xc6, 0x6b, 0xea, 0xf9, 0x9d, 0x14, 0xf2, 0x01, 0xa3, 0xe1, 0x00, 0xfa, + 0xe3, 0xe7, 0xd9, 0x0f, 0xfb, 0xf2, 0xe4, 0xbf, 0xcc, 0x91, 0xe6, 0x67, 0x66, 0x89, 0xf9, 0x82, + 0xd3, 0x45, 0xae, 0x23, 0x15, 0x35, 0x01, 0x85, 0xa4, 0x9a, 0xf9, 0x80, 0x3b, 0xe1, 0x00, 0x4c, + 0x42, 0x3a, 0xfb, 0xe1, 0x48, 0xd9, 0x0b, 0x62, 0xde, 0x5f, 0xf0, 0x10, 0xdc, 0x13, 0x93, 0xc4, + 0xb8, 0xf7, 0x6a, 0x01, 0xcc, 0xdb, 0x9d, 0x30, 0xad, 0x6b, 0x65, 0xf3, 0x9a, 0xc5, 0x32, 0x07, + 0x07, 0xc0, 0x30, 0xcc, 0x46, 0x64, 0x26, 0x47, 0x67, 0xba, 0x35, 0xa8, 0x83, 0x03, 0x59, 0xbf, + 0x2b, 0x93, 0x52, 0x60, 0x48, 0xc9, 0x26, 0x63, 0x3f, 0xc0, 0x90, 0x92, 0x03, 0x6d, 0x49, 0xa7, + 0xa1, 0x25, 0xa0, 0x10, 0x24, 0x97, 0x48, 0x68, 0xa0, 0xe4, 0x9e, 0x50, 0xdb, 0x32, 0x10, 0xc0, + 0x7f, 0x87, 0x3a, 0x30, 0x09, 0x07, 0x48, 0x52, 0x15, 0x91, 0x02, 0x98, 0x78, 0x2a, 0x5f, 0x30, + 0x80, 0x8e, 0x4d, 0xdb, 0x8a, 0x5b, 0xe6, 0x9b, 0xb8, 0xc6, 0x6c, 0x04, 0xd0, 0x96, 0x7c, 0x86, + 0x5f, 0xbd, 0x23, 0x68, 0x9b, 0x0a, 0xe8, 0xe2, 0x1c, 0xfe, 0x89, 0x02, 0x8d, 0xf0, 0x8e, 0x1a, + 0x28, 0x29, 0xe3, 0x57, 0xbf, 0xf4, 0x41, 0x42, 0x51, 0xa2, 0x68, 0x02, 0x1f, 0x03, 0xc8, 0xc0, + 0x19, 0xee, 0xa8, 0xc0, 0x95, 0xa3, 0x9c, 0x2c, 0xd1, 0xbf, 0x44, 0x6b, 0xdc, 0xd1, 0x2d, 0xe8, + 0x87, 0xba, 0x81, 0x0c, 0x3b, 0x9b, 0x25, 0x32, 0x1b, 0xba, 0xda, 0xf1, 0x9e, 0x47, 0xe3, 0x02, + 0xfe, 0xb4, 0xfc, 0x04, 0x1a, 0x8b, 0xb7, 0xf4, 0x64, 0xfa, 0xb0, 0x67, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE export_png_xpm[1] = {{ png, sizeof( png ), "export_png_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 33d751f1a1..62c398bcff 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -161,6 +161,7 @@ EXTERN_BITMAP( export_idf_xpm ) EXTERN_BITMAP( export_footprint_names_xpm ) EXTERN_BITMAP( export_module_xpm ) EXTERN_BITMAP( export_part_xpm ) +EXTERN_BITMAP( export_png_xpm ) EXTERN_BITMAP( export_step_xpm ) EXTERN_BITMAP( export_svg_xpm ) EXTERN_BITMAP( export_xpm ) diff --git a/bitmaps_png/sources/export_png.svg b/bitmaps_png/sources/export_png.svg new file mode 100644 index 0000000000..749ed77add --- /dev/null +++ b/bitmaps_png/sources/export_png.svg @@ -0,0 +1,135 @@ + + + + + + + + + + image/svg+xml + + html + + + + + + + + + + + + + + + html + + + + + + + + + + diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index c6e2c2878d..767a62825b 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -175,7 +175,7 @@ TOOL_ACTION EE_ACTIONS::showComponentTree( "eeschema.SymbolLibraryControl.showCo TOOL_ACTION EE_ACTIONS::exportSymbolView( "eeschema.SymbolLibraryControl.exportSymbolView", AS_GLOBAL, 0, "", _( "Export View as PNG..." ), _( "Create PNG file from the current view" ), - plot_xpm ); + export_png_xpm ); TOOL_ACTION EE_ACTIONS::exportSymbolAsSVG( "eeschema.SymbolLibraryControl.exportSymbolAsSVG", AS_GLOBAL, 0, "", diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index 89e1bf5191..35b3103e04 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -89,7 +89,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() submenuExport->Add( _( "Export View as &PNG..." ), _( "Create a PNG file from the current view" ), ID_FPEDIT_SAVE_PNG, - plot_xpm ); + export_png_xpm ); fileMenu->Add( submenuExport );