diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index cb9087a807..bd83d17a74 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -370,7 +370,6 @@ set( BMAPS_MID pin_table pin plot - plus polar_coord post_bom post_compo diff --git a/bitmaps_png/cpp_24/plus.cpp b/bitmaps_png/cpp_24/plus.cpp deleted file mode 100644 index ad966a1d58..0000000000 --- a/bitmaps_png/cpp_24/plus.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -/* Do not modify this file, it was automatically generated by the - * PNG2cpp CMake script, using a *.png file as input. - */ - -#include <bitmaps_png/bitmaps_list.h> - -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, 0x00, 0x51, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0x60, 0x20, 0x12, 0x48, - 0x37, 0x1c, 0xf6, 0x91, 0x6a, 0x3c, 0xf2, 0x14, 0x84, 0x41, 0x6c, 0x06, 0x6a, 0x03, 0xa0, 0xc1, - 0x4f, 0x80, 0xf8, 0x3f, 0x14, 0x3f, 0xa1, 0x85, 0x05, 0xff, 0x91, 0xf1, 0xa8, 0x05, 0xa3, 0x16, - 0x0c, 0x27, 0x0b, 0x90, 0x72, 0xe8, 0x7f, 0x2a, 0x63, 0x48, 0x8e, 0x47, 0xcb, 0xa1, 0xd4, 0xc6, - 0x4f, 0x68, 0x6f, 0x01, 0xcd, 0x83, 0x68, 0x34, 0x99, 0x8e, 0x5a, 0x30, 0x6a, 0xc1, 0x20, 0xaa, - 0xf4, 0xc9, 0x6d, 0xb6, 0x00, 0x00, 0xb9, 0xf0, 0x99, 0x68, 0x8f, 0x2e, 0xb9, 0x99, 0x00, 0x00, - 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE plus_xpm[1] = {{ png, sizeof( png ), "plus_xpm" }}; - -//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 127eae5fb9..0ed9f4583e 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -388,7 +388,6 @@ EXTERN_BITMAP( pintype_openemit_xpm ) EXTERN_BITMAP( pintype_noconnect_xpm ) EXTERN_BITMAP( pin_xpm ) EXTERN_BITMAP( plot_xpm ) -EXTERN_BITMAP( plus_xpm ) EXTERN_BITMAP( polar_coord_xpm ) EXTERN_BITMAP( post_bom_xpm ) EXTERN_BITMAP( post_compo_xpm ) diff --git a/bitmaps_png/sources/plus.svg b/bitmaps_png/sources/plus.svg deleted file mode 100755 index d4deb980ec..0000000000 --- a/bitmaps_png/sources/plus.svg +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="Слой_1" - data-name="Слой 1" - viewBox="0 0 24 24" - version="1.1" - sodipodi:docname="plus.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1609" - inkscape:window-height="1286" - id="namedview30" - showgrid="true" - inkscape:zoom="27.961538" - inkscape:cx="3.3259971" - inkscape:cy="13" - inkscape:window-x="0" - inkscape:window-y="37" - inkscape:window-maximized="0" - inkscape:document-rotation="0" - inkscape:current-layer="Слой_1"> - <inkscape:grid - type="xygrid" - id="grid_kicad" - spacingx="0.5" - spacingy="0.5" - color="#9999ff" - opacity="0.13" - empspacing="2" /> - </sodipodi:namedview> - <metadata - id="metadata43"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <cc:license - rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>add_arc</dc:title> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:requires - rdf:resource="http://creativecommons.org/ns#Notice" /> - <cc:requires - rdf:resource="http://creativecommons.org/ns#Attribution" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - <cc:requires - rdf:resource="http://creativecommons.org/ns#ShareAlike" /> - </cc:License> - </rdf:RDF> - </metadata> - <defs - id="defs159291"> - <style - id="style159289">.cls-1{fill:none;stroke:#1a81c4;stroke-linecap:round;stroke-linejoin:round;stroke-width:4px;}</style> - </defs> - <title - id="title159293">plus</title> - <line - class="cls-1" - x1="22" - y1="12" - x2="2" - y2="12" - id="line159295" /> - <line - class="cls-1" - x1="12" - y1="22" - x2="12" - y2="2" - id="line159297" /> -</svg> diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp index 9d19bcdb21..c23585b6fc 100644 --- a/eeschema/tools/ee_selection_tool.cpp +++ b/eeschema/tools/ee_selection_tool.cpp @@ -1406,7 +1406,7 @@ bool EE_SELECTION_TOOL::doSelectionMenu( EE_COLLECTOR* aCollector ) } menu.AppendSeparator(); - menu.Add( _( "Select &All\tA" ), limit + 1, net_highlight_schematic_xpm ); + menu.Add( _( "Select &All\tA" ), limit + 1, nullptr ); if( !expandSelection && aCollector->HasAdditionalItems() ) menu.Add( _( "&Expand Selection\tE" ), limit + 2, nullptr ); diff --git a/pagelayout_editor/tools/pl_selection_tool.cpp b/pagelayout_editor/tools/pl_selection_tool.cpp index cbdcf52a12..a39f083a13 100644 --- a/pagelayout_editor/tools/pl_selection_tool.cpp +++ b/pagelayout_editor/tools/pl_selection_tool.cpp @@ -589,7 +589,7 @@ bool PL_SELECTION_TOOL::doSelectionMenu( COLLECTOR* aCollector ) } menu.AppendSeparator(); - menu.Add( _( "Select &All\tA" ), limit + 1, plus_xpm ); + menu.Add( _( "Select &All\tA" ), limit + 1, nullptr ); if( aCollector->m_MenuTitle.Length() ) { diff --git a/pcbnew/tools/pcb_selection_tool.cpp b/pcbnew/tools/pcb_selection_tool.cpp index ddd5bb064c..fe29dbb544 100644 --- a/pcbnew/tools/pcb_selection_tool.cpp +++ b/pcbnew/tools/pcb_selection_tool.cpp @@ -1767,7 +1767,7 @@ bool PCB_SELECTION_TOOL::doSelectionMenu( GENERAL_COLLECTOR* aCollector ) } menu.AppendSeparator(); - menu.Add( _( "Select &All\tA" ), limit + 1, plus_xpm ); + menu.Add( _( "Select &All\tA" ), limit + 1, nullptr ); if( !expandSelection && aCollector->HasAdditionalItems() ) menu.Add( _( "&Expand Selection\tE" ), limit + 2, nullptr );