From cf6f0b9b92e30362ceb8c3520586d79497729ba1 Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Fri, 11 Dec 2020 20:58:24 +0000 Subject: [PATCH] Use trash icon where appropriate --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_24/trash24.cpp | 45 +++++++ .../include/bitmaps_png/bitmaps_list.h | 1 + bitmaps_png/sources/trash24.svg | 122 ++++++++++++++++++ common/tool/actions.cpp | 2 +- eeschema/sim/sim_plot_frame.cpp | 2 +- eeschema/tools/ee_actions.cpp | 2 +- kicad/project_tree_pane.cpp | 2 +- pcbnew/tools/pcb_actions.cpp | 2 +- 9 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 bitmaps_png/cpp_24/trash24.cpp create mode 100755 bitmaps_png/sources/trash24.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index de10637e83..c455749e74 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -449,6 +449,7 @@ set( BMAPS_MID three_d tool_ratsnest tools + trash24 undo unit_inch unit_mil diff --git a/bitmaps_png/cpp_24/trash24.cpp b/bitmaps_png/cpp_24/trash24.cpp new file mode 100644 index 0000000000..12a9e1f304 --- /dev/null +++ b/bitmaps_png/cpp_24/trash24.cpp @@ -0,0 +1,45 @@ + +/* 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, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5, + 0x73, 0x00, 0x00, 0x01, 0xc1, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x95, 0x54, 0x3b, 0x4c, 0x42, + 0x31, 0x14, 0xad, 0x2e, 0x38, 0x18, 0x07, 0x27, 0x83, 0xc1, 0xc9, 0xc1, 0xb8, 0x09, 0xac, 0xee, + 0x02, 0x4e, 0xbc, 0xdb, 0x84, 0xe8, 0x20, 0xa0, 0x71, 0x36, 0x0e, 0x02, 0xc6, 0x81, 0xc1, 0x55, + 0x70, 0x72, 0x30, 0x9a, 0xb8, 0x08, 0x46, 0xdd, 0x18, 0x74, 0x10, 0x1d, 0x34, 0x31, 0x24, 0x4e, + 0xfe, 0x70, 0x60, 0x22, 0x1a, 0x4d, 0x48, 0x88, 0x46, 0x57, 0x7c, 0x9e, 0xf6, 0xb5, 0xe5, 0x39, + 0x01, 0xed, 0xd0, 0x73, 0xee, 0xbd, 0x87, 0x7b, 0x6e, 0xfb, 0x02, 0xa3, 0x0a, 0xd9, 0x3d, 0xec, + 0x0a, 0xa3, 0x46, 0x4f, 0x82, 0x06, 0xa3, 0x32, 0xd9, 0x3c, 0xc2, 0xd4, 0xa2, 0x1f, 0xb0, 0x41, + 0xcd, 0xb2, 0xfd, 0xf4, 0x4b, 0x2d, 0xd6, 0xa7, 0x72, 0xb3, 0x10, 0x5c, 0x30, 0xca, 0xe1, 0xc8, + 0x18, 0xc1, 0x07, 0x04, 0x23, 0x9a, 0xcd, 0x0f, 0x21, 0xf7, 0x6d, 0x72, 0xeb, 0x64, 0x5b, 0x5b, + 0x8c, 0xc7, 0x11, 0x2c, 0xea, 0xa0, 0x55, 0x83, 0x60, 0x5c, 0xb3, 0x98, 0x17, 0xb9, 0x77, 0x93, + 0x3b, 0x82, 0x60, 0x81, 0x45, 0xfd, 0xbd, 0xcc, 0x60, 0x4d, 0xb1, 0x90, 0x87, 0x5a, 0x5d, 0x0b, + 0x5a, 0xf1, 0x01, 0xe1, 0xed, 0x11, 0x36, 0x02, 0x4e, 0x5b, 0x7e, 0x0e, 0x3c, 0x63, 0x5c, 0x4f, + 0xa3, 0xe8, 0x5a, 0x19, 0x0a, 0x22, 0xf3, 0xe0, 0x84, 0x0b, 0x68, 0x95, 0x54, 0x82, 0x53, 0x84, + 0xc9, 0x08, 0x42, 0x10, 0x9c, 0xa9, 0xcc, 0x22, 0xaa, 0x0e, 0x1d, 0x98, 0x46, 0x38, 0xaf, 0x4a, + 0x0e, 0x20, 0x88, 0x1b, 0x01, 0x47, 0xe6, 0x44, 0x75, 0xd8, 0x06, 0x4e, 0x39, 0x30, 0x2c, 0x9a, + 0x21, 0x89, 0x2d, 0x2c, 0xd1, 0xbe, 0x83, 0x89, 0x5b, 0x3b, 0x60, 0x57, 0x0a, 0xc3, 0x38, 0x85, + 0x9c, 0x0e, 0xa3, 0xdd, 0x0e, 0x1d, 0xf3, 0xaa, 0xd6, 0xbc, 0x09, 0x5a, 0xa2, 0x63, 0x6c, 0xfc, + 0x8e, 0xf5, 0x2c, 0x91, 0xd8, 0xf7, 0x60, 0x55, 0x89, 0x4a, 0xa8, 0xf8, 0xd4, 0x56, 0x19, 0xbf, + 0x44, 0x22, 0x2c, 0xd1, 0x6a, 0x7b, 0x1e, 0x98, 0xdd, 0x04, 0xdb, 0x90, 0xf1, 0x08, 0x50, 0xd9, + 0x08, 0x28, 0x8f, 0x29, 0xd2, 0x32, 0xb1, 0x8c, 0xc4, 0xae, 0x11, 0x88, 0x41, 0x57, 0x64, 0x45, + 0x06, 0x28, 0x67, 0x04, 0x56, 0x12, 0xb4, 0x20, 0x05, 0x73, 0x1a, 0xc9, 0xf8, 0x1e, 0xd8, 0x92, + 0x14, 0x14, 0x81, 0x12, 0x6d, 0x4b, 0x01, 0xe1, 0x50, 0x78, 0xe5, 0x37, 0xe8, 0xf5, 0xa6, 0x67, + 0xb0, 0xea, 0x60, 0xb7, 0x12, 0x7f, 0x91, 0x1d, 0xf5, 0x1b, 0x41, 0xc8, 0xc3, 0x3b, 0x7e, 0x1e, + 0xdc, 0xf9, 0x2c, 0x4c, 0xf3, 0x2a, 0x82, 0x6b, 0xb8, 0x6f, 0x78, 0xe5, 0x35, 0xfd, 0x0e, 0xf4, + 0x84, 0x68, 0x16, 0x67, 0x0a, 0x67, 0x95, 0xb9, 0x97, 0xf0, 0x28, 0x5e, 0x98, 0x4f, 0x8a, 0x6b, + 0x35, 0xd1, 0x3b, 0xb0, 0x20, 0xce, 0x84, 0x7b, 0x32, 0xe6, 0xbe, 0x05, 0x3e, 0x86, 0x92, 0xba, + 0x89, 0xbe, 0x80, 0x4d, 0xb8, 0x6f, 0xb1, 0x3d, 0xb6, 0xba, 0x67, 0x3e, 0x8c, 0xb3, 0x69, 0x04, + 0xaf, 0x78, 0x5d, 0x9f, 0xfb, 0x9d, 0xcc, 0x8a, 0xf9, 0x3a, 0x7e, 0x16, 0x3e, 0xf6, 0x7f, 0x75, + 0xf8, 0xbb, 0xa9, 0xe8, 0xba, 0x3f, 0xb8, 0xdb, 0xba, 0x54, 0xce, 0xa7, 0xe7, 0x2c, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE trash24_xpm[1] = {{ png, sizeof( png ), "trash24_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index e86b362c34..72bc8d8f06 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -471,6 +471,7 @@ EXTERN_BITMAP( track_locked_xpm ) EXTERN_BITMAP( track_sketch_xpm ) EXTERN_BITMAP( track_unlocked_xpm ) EXTERN_BITMAP( trash_xpm ) +EXTERN_BITMAP( trash24_xpm ) EXTERN_BITMAP( tree_nosel_xpm ) EXTERN_BITMAP( tree_sel_xpm ) EXTERN_BITMAP( triangle_right_xpm ) diff --git a/bitmaps_png/sources/trash24.svg b/bitmaps_png/sources/trash24.svg new file mode 100755 index 0000000000..cf47706d5c --- /dev/null +++ b/bitmaps_png/sources/trash24.svg @@ -0,0 +1,122 @@ + + + + + + + + + + image/svg+xml + + add_arc + + + + + + + + + + + + + + + trash + + + + + + + diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index ebc26618b1..24034aedc2 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -185,7 +185,7 @@ TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete", AS_GLOBAL, WXK_DELETE, LEGACY_HK_NAME( "Delete Item" ), _( "Delete" ), _( "Deletes selected item(s)" ), - delete_xpm ); + trash24_xpm ); TOOL_ACTION ACTIONS::deleteTool( "common.Interactive.deleteTool", AS_GLOBAL, 0, "", diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index 6f25874723..75af8420eb 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -1585,7 +1585,7 @@ SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSigna AddMenuItem( this, HIDE_SIGNAL, _( "Hide Signal" ), _( "Erase the signal from plot screen" ), - KiBitmap( delete_xpm ) ); + KiBitmap( trash24_xpm ) ); TRACE* trace = plot->GetTrace( m_signal ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index c1dad34b05..39d548a57e 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -130,7 +130,7 @@ TOOL_ACTION EE_ACTIONS::duplicateSymbol( "eeschema.SymbolLibraryControl.duplicat TOOL_ACTION EE_ACTIONS::deleteSymbol( "eeschema.SymbolLibraryControl.deleteSymbol", AS_GLOBAL, 0, "", _( "Delete" ), _( "Remove the selected symbol from its library" ), - delete_xpm ); + trash24_xpm ); TOOL_ACTION EE_ACTIONS::cutSymbol( "eeschema.SymbolLibraryControl.cutSymbol", AS_GLOBAL, 0, "", diff --git a/kicad/project_tree_pane.cpp b/kicad/project_tree_pane.cpp index 0800227e1f..6fb54e0bbe 100644 --- a/kicad/project_tree_pane.cpp +++ b/kicad/project_tree_pane.cpp @@ -718,7 +718,7 @@ void PROJECT_TREE_PANE::OnRight( wxTreeEvent& Event ) } AddMenuItem( &popup_menu, ID_PROJECT_DELETE, _( "Delete" ), help_text, - KiBitmap( delete_xpm ) ); + KiBitmap( trash24_xpm ) ); } if( can_print ) diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index e1865c6d59..3b4ecbd7c1 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -351,7 +351,7 @@ TOOL_ACTION PCB_ACTIONS::editFootprint( "pcbnew.ModuleEditor.editFootprint", TOOL_ACTION PCB_ACTIONS::deleteFootprint( "pcbnew.ModuleEditor.deleteFootprint", AS_GLOBAL, 0, "", _( "Delete Footprint from Library" ), "", - delete_xpm ); + trash24_xpm ); TOOL_ACTION PCB_ACTIONS::cutFootprint( "pcbnew.ModuleEditor.cutFootprint", AS_GLOBAL, 0, "",