Icons: add swap

common/bitmap_info.cpp

@@ -504,6 +504,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_24.png" ), 24, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_24.png" ), 24, wxT( "light" ) );
     aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_24.png" ), 24, wxT( "light" ) );
@@ -882,6 +883,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
     aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_dark_24.png" ), 24, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_dark_24.png" ), 24, wxT( "dark" ) );
     aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_dark_24.png" ), 24, wxT( "dark" ) );

eeschema/tools/ee_actions.cpp

@@ -423,7 +423,7 @@ TOOL_ACTION EE_ACTIONS::swap( "eeschema.InteractiveEdit.swap",
         AS_GLOBAL,
         'S', "",
         _( "Swap" ), _( "Swaps selected items' positions" ),
-        BITMAPS::swap_layer );
+        BITMAPS::swap );
 
 TOOL_ACTION EE_ACTIONS::properties( "eeschema.InteractiveEdit.properties",
         AS_GLOBAL,

include/bitmaps/bitmaps_list.h

@@ -541,6 +541,7 @@ enum class BITMAPS : unsigned int
     stroke_dashdotdot,
     stroke_dot,
     stroke_solid,
+    swap,
     swap_layer,
     switch_corner_rounding_shape,
     teardrop_sizes,

pcbnew/tools/pcb_actions.cpp

@@ -329,7 +329,7 @@ TOOL_ACTION PCB_ACTIONS::swap( "pcbnew.InteractiveEdit.swap",
         AS_GLOBAL,
         'S', "",
         _( "Swap" ), _( "Swaps selected items' positions" ),
-        BITMAPS::swap_layer );
+        BITMAPS::swap );
 
 TOOL_ACTION PCB_ACTIONS::changeTrackWidth( "pcbnew.InteractiveEdit.changeTrackWidth",
         AS_GLOBAL, 0, "",

resources/bitmaps_png/CMakeLists.txt

@@ -481,6 +481,7 @@ set( BMAPS_MID
     show_back_assembly_layers
     special_tools
     spreadsheet
+    swap
     swap_layer
     switch_corner_rounding_shape
     text

resources/bitmaps_png/sources/dark/swap.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="swap.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1049"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="19.771793"
+     inkscape:cx="18.536508"
+     inkscape:cy="6.0692523"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:pagecheckerboard="0">
+    <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>swap_layer</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="defs27327">
+    <style
+       id="style27325">.cls-1{fill:#b9b9b9;}.cls-2{fill:#d8d8d8;}.cls-3{fill:#1a81c4;}.cls-4{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title27329">swap_layer</title>
+  <path
+     class="cls-4"
+     d="m 23.98,11.9784 c 0,-2.1608 -1.37,-4.1629 -3.7766,-5.6053 L 20.5197,5.3279 14.9141,5.0549 19.6382,8.24 19.8945,7.3928 c 1.9725,1.2356 3.085,2.868 3.085,4.586 0,1.7664 -1.2231,3.4855 -3.3209,4.7313 L 19.413,15.8471 14.6368,18.9455 20.2462,18.7744 19.9491,17.73 C 22.5158,16.2805 23.98,14.2246 23.98,11.9784 Z"
+     id="path27339"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ded3dd;fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
+  <path
+     class="cls-4"
+     d="m 4.2557,7.4258 0.25,0.8591 4.7577,-3.13 -5.6082,0.2081 0.304,1.0442 c -2.5091,1.4486 -3.9387,3.4854 -3.9387,5.7 a 6.3344,6.3344 0 0 0 2.9145,5.039 L 2.55,18.1705 8.1249,18.8449 3.6177,15.3288 3.3159,16.1321 A 5.2108,5.2108 0 0 1 1.0205,12.1069 c 0,-1.7669 1.1654,-3.4355 3.2352,-4.6811 z"
+     id="path27341"
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ded3dd;fill-opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:9.19109px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ded3dd;fill-opacity:1;stroke:none;stroke-width:1;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     x="8.0826015"
+     y="23.111963"
+     id="text1577-7"><tspan
+       sodipodi:role="line"
+       id="tspan1575-2"
+       x="8.0826015"
+       y="23.111963"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.0293px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#ded3dd;fill-opacity:1;stroke-width:1;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1">B</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:8.80197px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ded3dd;fill-opacity:1;stroke:none;stroke-width:1;font-variation-settings:normal;opacity:1;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     x="8.3484602"
+     y="8.9827967"
+     id="text1577"><tspan
+       sodipodi:role="line"
+       id="tspan1575"
+       x="8.3484602"
+       y="8.9827967"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.5624px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#ded3dd;fill-opacity:1;stroke-width:1;font-variation-settings:normal;vector-effect:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1">A</tspan></text>
+</svg>

resources/bitmaps_png/sources/light/swap.svg

@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 24 24"
+   version="1.1"
+   sodipodi:docname="swap.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1049"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="19.771793"
+     inkscape:cx="18.536508"
+     inkscape:cy="6.0945408"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1"
+     inkscape:pagecheckerboard="0">
+    <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>swap_layer</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="defs27327">
+    <style
+       id="style27325">.cls-1{fill:#b9b9b9;}.cls-2{fill:#d8d8d8;}.cls-3{fill:#1a81c4;}.cls-4{fill:#545454;}</style>
+  </defs>
+  <title
+     id="title27329">swap_layer</title>
+  <path
+     class="cls-4"
+     d="m 23.98,11.9784 c 0,-2.1608 -1.37,-4.1629 -3.7766,-5.6053 L 20.5197,5.3279 14.9141,5.0549 19.6382,8.24 19.8945,7.3928 c 1.9725,1.2356 3.085,2.868 3.085,4.586 0,1.7664 -1.2231,3.4855 -3.3209,4.7313 L 19.413,15.8471 14.6368,18.9455 20.2462,18.7744 19.9491,17.73 C 22.5158,16.2805 23.98,14.2246 23.98,11.9784 Z"
+     id="path27339" />
+  <path
+     class="cls-4"
+     d="m 4.2557,7.4258 0.25,0.8591 4.7577,-3.13 -5.6082,0.2081 0.304,1.0442 c -2.5091,1.4486 -3.9387,3.4854 -3.9387,5.7 a 6.3344,6.3344 0 0 0 2.9145,5.039 L 2.55,18.1705 8.1249,18.8449 3.6177,15.3288 3.3159,16.1321 A 5.2108,5.2108 0 0 1 1.0205,12.1069 c 0,-1.7669 1.1654,-3.4355 3.2352,-4.6811 z"
+     id="path27341" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:9.19109px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+     x="8.0826015"
+     y="23.111963"
+     id="text1577-7"><tspan
+       sodipodi:role="line"
+       id="tspan1575-2"
+       x="8.0826015"
+       y="23.111963"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:11.0293px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#545454;fill-opacity:1;stroke-width:1">B</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:8.80197px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+     x="8.3484602"
+     y="8.9827967"
+     id="text1577"><tspan
+       sodipodi:role="line"
+       id="tspan1575"
+       x="8.3484602"
+       y="8.9827967"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.5624px;font-family:'Noto Sans';-inkscape-font-specification:'Noto Sans Bold';fill:#545454;fill-opacity:1;stroke-width:1">A</tspan></text>
+</svg>