From 37d2addf0ea33b2c558e35c0dd582d141c69c1c1 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Wed, 7 Sep 2022 10:16:36 -0400 Subject: [PATCH] Icons: add swap --- common/bitmap_info.cpp | 2 + eeschema/tools/ee_actions.cpp | 2 +- include/bitmaps/bitmaps_list.h | 1 + pcbnew/tools/pcb_actions.cpp | 2 +- resources/bitmaps_png/CMakeLists.txt | 1 + resources/bitmaps_png/png/swap_24.png | Bin 0 -> 495 bytes resources/bitmaps_png/png/swap_dark_24.png | Bin 0 -> 693 bytes resources/bitmaps_png/sources/dark/swap.svg | 115 +++++++++++++++++++ resources/bitmaps_png/sources/light/swap.svg | 113 ++++++++++++++++++ 9 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 resources/bitmaps_png/png/swap_24.png create mode 100644 resources/bitmaps_png/png/swap_dark_24.png create mode 100644 resources/bitmaps_png/sources/dark/swap.svg create mode 100644 resources/bitmaps_png/sources/light/swap.svg diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index 04d09d1076..ae22b181ef 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -504,6 +504,7 @@ void BuildBitmapInfo( std::unordered_map>& 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>& 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" ) ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index 75860db998..122fa1bd20 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/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, diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h index d363103324..a0f0f40c19 100644 --- a/include/bitmaps/bitmaps_list.h +++ b/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, diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index cf215103e8..12f81ffb4d 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/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, "", diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index 18d379c18c..31356b2442 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/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 diff --git a/resources/bitmaps_png/png/swap_24.png b/resources/bitmaps_png/png/swap_24.png new file mode 100644 index 0000000000000000000000000000000000000000..54a368a8d8a60d5abc91820877826bf0de158ddb GIT binary patch literal 495 zcmVN6kvHvk+MzB}B&gPG(3p5~ZYw1!W;A%F?4K$^xNC9)ps+%CkuF zNM1#j7L1y4=078&&{gi;+nR8K82!z)EIifalr5E0|GC zH%H=)Yq=IyW7y9k5-`TIY{51+P#x@?$(gWIm54jy1FU0_vcCd_u*K9n{b9h(cr7+qXQe}@DIIc7AeX4 z)6?YMMrX7ji2Zn)h8^J)T>bJmw~_CUW8`Ru1ztjKv5L#H9VLjm4Rs7 zXjowU!7?)%7h^l!ThWr|MHyPFCzjB|d7r{CAx^UJ6zW}dmr?1%fmo(Kr+31!hBw?I z)df7^4g=VeezZCEWdZ2M9Gzm2y*{)h>&<`V8W*rE{RxrCsGMctLRL1I+|(H(D3_|x zP9t0`5})uOHrT}@Wupt10vuxJm*VTdxOnuLE7kg`OKSC`Yn-S8`;^7iusZCm1~`Ai lfiY3d0C8j>LqX8@r|)elxvejBCz1dF002ovPDHLkV1kQ%>3;wK literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/png/swap_dark_24.png b/resources/bitmaps_png/png/swap_dark_24.png new file mode 100644 index 0000000000000000000000000000000000000000..c15c142aa40953e7a838caa78c4ddc6e9016468d GIT binary patch literal 693 zcmV;m0!safP)xuU3U+=WWk1_lS-vtrBd}$D*Z2C9LIBwG*>91 z%LC!SEbjnT>U}1npOD`qX|Hzx6Y0lr{tPF0iGR0e=VmdS{;?4qVc}EsS1Jp}o@W)W zHj=vFvv+x);2RUt4ki@(f^EdcEwbE`KJ;`2)A2f2E*&}&)X1oX`wE^S;OHFTtx`36Y( zk|kUy4Dglf+&i^|@lq}t26$qW*)>7b(p|EV-pvhFE|;hJBt|rzPNd$%Jun${`y7{j z39@6Pbiw#;*4fNO_hEBvNS$Y25CqeppN;Z;!OWX4aQ$QRYvvm`=*OjR7{*24(Oh2u zbj=9!vE8-$OlO_x8;y1mYmX3Y4R+VL`G!V`Mk>(2FBl�&rBW$pV^}0o-K@c);g-kf*49B5FV?UIF0n6X%=L#t%-1u6+U&--2G;*&2TUeP#u}3oJ~@ bW7+!`F|3Eo=Kl4%00000NkvXXu0mjfEr3Nl literal 0 HcmV?d00001 diff --git a/resources/bitmaps_png/sources/dark/swap.svg b/resources/bitmaps_png/sources/dark/swap.svg new file mode 100644 index 0000000000..83c56173d9 --- /dev/null +++ b/resources/bitmaps_png/sources/dark/swap.svg @@ -0,0 +1,115 @@ + + + + + + + + + + image/svg+xml + + swap_layer + + + + + + + + + + + + + + + swap_layer + + + B + A + diff --git a/resources/bitmaps_png/sources/light/swap.svg b/resources/bitmaps_png/sources/light/swap.svg new file mode 100644 index 0000000000..275bbe1276 --- /dev/null +++ b/resources/bitmaps_png/sources/light/swap.svg @@ -0,0 +1,113 @@ + + + + + + + + + + image/svg+xml + + swap_layer + + + + + + + + + + + + + + + swap_layer + + + B + A +