diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index ee79a5f1e0..a35d189c59 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -235,6 +235,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_24.png" ), 24, wxT( "light" ) ); @@ -302,6 +303,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_24.png" ), 24, wxT( "light" ) ); @@ -621,6 +623,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_24.png" ), 24, wxT( "dark" ) ); @@ -688,6 +691,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_dark_24.png" ), 24, wxT( "dark" ) ); diff --git a/include/bitmaps/bitmaps_list.h b/include/bitmaps/bitmaps_list.h index 73a5c560d5..477cb80089 100644 --- a/include/bitmaps/bitmaps_list.h +++ b/include/bitmaps/bitmaps_list.h @@ -112,6 +112,7 @@ enum class BITMAPS : unsigned int c_microstrip, calculator, cancel, + chamfer, change_entry_orient, change_glabel, change_hlabel, @@ -202,6 +203,7 @@ enum class BITMAPS : unsigned int file_pos, file_svg, fill_zone, + fillet, filter, find, find_replace, diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index c349b6e31a..e87f1d0a37 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -401,12 +401,14 @@ TOOL_ACTION PCB_ACTIONS::filletTracks( "pcbnew.InteractiveEdit.filletTracks", TOOL_ACTION PCB_ACTIONS::filletLines( "pcbnew.InteractiveEdit.filletLines", AS_GLOBAL, 0, "", - _( "Fillet Lines" ), _( "Adds arcs tangent to the selected lines" ) ); + _( "Fillet Lines" ), _( "Adds arcs tangent to the selected lines" ), + BITMAPS::fillet ); TOOL_ACTION PCB_ACTIONS::chamferLines( "pcbnew.InteractiveEdit.chamferLines", AS_GLOBAL, 0, "", _( "Chamfer Lines" ), - _( "Cut away corners between selected lines" ) ); + _( "Cut away corners between selected lines" ), + BITMAPS::chamfer ); TOOL_ACTION PCB_ACTIONS::extendLines( "pcbnew.InteractiveEdit.extendLines", AS_GLOBAL, 0, "", diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index cafb926077..5aee8b993b 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -212,6 +212,7 @@ set( BMAPS_MID bug bus_definition_tool cancel + chamfer change_entry_orient contrast_mode curved_ratsnest @@ -279,6 +280,7 @@ set( BMAPS_MID file_pos file_svg fill_zone + fillet filter find find_replace diff --git a/resources/bitmaps_png/png/chamfer_24.png b/resources/bitmaps_png/png/chamfer_24.png new file mode 100644 index 0000000000..b25ae3d64f Binary files /dev/null and b/resources/bitmaps_png/png/chamfer_24.png differ diff --git a/resources/bitmaps_png/png/chamfer_dark_24.png b/resources/bitmaps_png/png/chamfer_dark_24.png new file mode 100644 index 0000000000..95f616fea6 Binary files /dev/null and b/resources/bitmaps_png/png/chamfer_dark_24.png differ diff --git a/resources/bitmaps_png/png/fillet_24.png b/resources/bitmaps_png/png/fillet_24.png new file mode 100644 index 0000000000..0908e7647e Binary files /dev/null and b/resources/bitmaps_png/png/fillet_24.png differ diff --git a/resources/bitmaps_png/png/fillet_dark_24.png b/resources/bitmaps_png/png/fillet_dark_24.png new file mode 100644 index 0000000000..e5db95fadf Binary files /dev/null and b/resources/bitmaps_png/png/fillet_dark_24.png differ diff --git a/resources/bitmaps_png/sources/dark/chamfer.svg b/resources/bitmaps_png/sources/dark/chamfer.svg new file mode 100644 index 0000000000..563b867955 --- /dev/null +++ b/resources/bitmaps_png/sources/dark/chamfer.svg @@ -0,0 +1,104 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/dark/fillet.svg b/resources/bitmaps_png/sources/dark/fillet.svg new file mode 100644 index 0000000000..23450c18bf --- /dev/null +++ b/resources/bitmaps_png/sources/dark/fillet.svg @@ -0,0 +1,110 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/light/chamfer.svg b/resources/bitmaps_png/sources/light/chamfer.svg new file mode 100644 index 0000000000..edb4af5cb8 --- /dev/null +++ b/resources/bitmaps_png/sources/light/chamfer.svg @@ -0,0 +1,104 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/bitmaps_png/sources/light/fillet.svg b/resources/bitmaps_png/sources/light/fillet.svg new file mode 100644 index 0000000000..cecee04e92 --- /dev/null +++ b/resources/bitmaps_png/sources/light/fillet.svg @@ -0,0 +1,117 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + +