diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index 81cd4becd7..48900c9bd1 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -526,9 +526,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_24.png" ), 24, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_24.png" ), 24, wxT( "light" ) ); @@ -757,10 +765,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_24.png" ), 24, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_24.png" ), 24, wxT( "dark" ) ); @@ -934,9 +938,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_24.png" ), 24, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_24.png" ), 24, wxT( "dark" ) ); @@ -1165,10 +1177,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_16.png" ), 16, wxT( "light" ) ); @@ -1342,9 +1350,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_16.png" ), 16, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_16.png" ), 16, wxT( "light" ) ); @@ -1573,10 +1589,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_16.png" ), 16, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_16.png" ), 16, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_16.png" ), 16, wxT( "dark" ) ); @@ -1750,9 +1762,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_16.png" ), 16, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_16.png" ), 16, wxT( "dark" ) ); @@ -1981,10 +2001,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_dark_16.png" ), 16, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_16.png" ), 16, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_32.png" ), 32, wxT( "light" ) ); @@ -2158,9 +2174,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_32.png" ), 32, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_32.png" ), 32, wxT( "light" ) ); @@ -2389,10 +2413,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_32.png" ), 32, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_32.png" ), 32, wxT( "dark" ) ); @@ -2566,9 +2586,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_32.png" ), 32, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_32.png" ), 32, wxT( "dark" ) ); @@ -2797,10 +2825,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_48.png" ), 48, wxT( "light" ) ); @@ -2974,9 +2998,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_48.png" ), 48, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_48.png" ), 48, wxT( "light" ) ); @@ -3205,10 +3237,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_48.png" ), 48, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_48.png" ), 48, wxT( "dark" ) ); @@ -3382,9 +3410,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_48.png" ), 48, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_48.png" ), 48, wxT( "dark" ) ); @@ -3613,10 +3649,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_dark_48.png" ), 48, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_48.png" ), 48, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_64.png" ), 64, wxT( "light" ) ); @@ -3790,9 +3822,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_64.png" ), 64, wxT( "light" ) ); @@ -4021,10 +4061,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_64.png" ), 64, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_dark_64.png" ), 64, wxT( "dark" ) ); @@ -4198,9 +4234,17 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::hole_to_hole_clearance].emplace_back( BITMAPS::hole_to_hole_clearance, wxT( "hole_to_hole_clearance_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hole_to_copper_clearance].emplace_back( BITMAPS::hole_to_copper_clearance, wxT( "hole_to_copper_clearance_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::hv45mode].emplace_back( BITMAPS::hv45mode, wxT( "hv45mode_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_footprint_browser].emplace_back( BITMAPS::icon_footprint_browser, wxT( "icon_footprint_browser_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcm_24].emplace_back( BITMAPS::icon_pcm_24, wxT( "icon_pcm_24_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::import3d].emplace_back( BITMAPS::import3d, wxT( "import3d_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::image].emplace_back( BITMAPS::image, wxT( "image_dark_64.png" ), 64, wxT( "dark" ) ); @@ -4429,10 +4473,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::zoom_center_on_screen].emplace_back( BITMAPS::zoom_center_on_screen, wxT( "zoom_center_on_screen_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_in].emplace_back( BITMAPS::zoom_in, wxT( "zoom_in_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_out].emplace_back( BITMAPS::zoom_out, wxT( "zoom_out_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_horizontally].emplace_back( BITMAPS::zoom_in_horizontally, wxT( "zoom_in_horizontally_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_horizontally].emplace_back( BITMAPS::zoom_out_horizontally, wxT( "zoom_out_horizontally_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_in_vertically].emplace_back( BITMAPS::zoom_in_vertically, wxT( "zoom_in_vertically_dark_64.png" ), 64, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::zoom_out_vertically].emplace_back( BITMAPS::zoom_out_vertically, wxT( "zoom_out_vertically_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::zoom_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component_32].emplace_back( BITMAPS::icon_bitmap2component_32, wxT( "icon_bitmap2component_32_32.png" ), 32, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema_32].emplace_back( BITMAPS::icon_eeschema_32, wxT( "icon_eeschema_32_32.png" ), 32, wxT( "light" ) ); @@ -4454,24 +4494,6 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_32].emplace_back( BITMAPS::icon_pagelayout_editor_32, wxT( "icon_pagelayout_editor_32_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator_32].emplace_back( BITMAPS::icon_pcbcalculator_32, wxT( "icon_pcbcalculator_32_dark_32.png" ), 32, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcbnew_32].emplace_back( BITMAPS::icon_pcbnew_32, wxT( "icon_pcbnew_32_dark_32.png" ), 32, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_24.png" ), 24, wxT( "light" ) ); - aBitmapInfoCache[BITMAPS::icon_bitmap2component_24].emplace_back( BITMAPS::icon_bitmap2component_24, wxT( "icon_bitmap2component_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_eeschema_24].emplace_back( BITMAPS::icon_eeschema_24, wxT( "icon_eeschema_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_gerbview_24].emplace_back( BITMAPS::icon_gerbview_24, wxT( "icon_gerbview_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_kicad_24].emplace_back( BITMAPS::icon_kicad_24, wxT( "icon_kicad_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_libedit_24].emplace_back( BITMAPS::icon_libedit_24, wxT( "icon_libedit_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_modedit_24].emplace_back( BITMAPS::icon_modedit_24, wxT( "icon_modedit_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_24].emplace_back( BITMAPS::icon_pagelayout_editor_24, wxT( "icon_pagelayout_editor_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_pcbcalculator_24].emplace_back( BITMAPS::icon_pcbcalculator_24, wxT( "icon_pcbcalculator_24_dark_24.png" ), 24, wxT( "dark" ) ); - aBitmapInfoCache[BITMAPS::icon_pcbnew_24].emplace_back( BITMAPS::icon_pcbnew_24, wxT( "icon_pcbnew_24_dark_24.png" ), 24, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_64.png" ), 64, wxT( "light" ) ); diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index b2de647797..baeb5845b0 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -327,9 +327,17 @@ set( BMAPS_MID hole_to_hole_clearance hole_to_copper_clearance hv45mode + icon_bitmap2component_24 icon_cvpcb_24 + icon_eeschema_24 icon_footprint_browser icon_gerbview_24 + icon_kicad_24 + icon_libedit_24 + icon_modedit_24 + icon_pagelayout_editor_24 + icon_pcbcalculator_24 + icon_pcbnew_24 icon_pcm_24 import3d image @@ -563,15 +571,6 @@ set( BMAPS_MID # 24 x 24 for internal icons set( BMAPS_24 - icon_bitmap2component_24 - icon_eeschema_24 - icon_gerbview_24 - icon_kicad_24 - icon_libedit_24 - icon_modedit_24 - icon_pagelayout_editor_24 - icon_pcbcalculator_24 - icon_pcbnew_24 ) # 32 x 32 for icon sets diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_16.png b/resources/bitmaps_png/png/icon_bitmap2component_24_16.png new file mode 100644 index 0000000000..2532f4aef6 Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_24.png b/resources/bitmaps_png/png/icon_bitmap2component_24_24.png index e5fd258508..959d690e07 100644 Binary files a/resources/bitmaps_png/png/icon_bitmap2component_24_24.png and b/resources/bitmaps_png/png/icon_bitmap2component_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_32.png b/resources/bitmaps_png/png/icon_bitmap2component_24_32.png new file mode 100644 index 0000000000..d832bf8bab Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_48.png b/resources/bitmaps_png/png/icon_bitmap2component_24_48.png new file mode 100644 index 0000000000..a6605c0242 Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_64.png b/resources/bitmaps_png/png/icon_bitmap2component_24_64.png new file mode 100644 index 0000000000..c32fb259ca Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_16.png b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_16.png new file mode 100644 index 0000000000..2532f4aef6 Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_24.png b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_24.png index e5fd258508..959d690e07 100644 Binary files a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_24.png and b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_32.png b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_32.png new file mode 100644 index 0000000000..d832bf8bab Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_48.png b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_48.png new file mode 100644 index 0000000000..a6605c0242 Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_bitmap2component_24_dark_64.png b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_64.png new file mode 100644 index 0000000000..c32fb259ca Binary files /dev/null and b/resources/bitmaps_png/png/icon_bitmap2component_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_16.png b/resources/bitmaps_png/png/icon_cvpcb_24_16.png index 2b88389dc2..bf6ef13aa3 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_16.png and b/resources/bitmaps_png/png/icon_cvpcb_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_24.png b/resources/bitmaps_png/png/icon_cvpcb_24_24.png index 7cbf6d9a60..70b2d5301c 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_24.png and b/resources/bitmaps_png/png/icon_cvpcb_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_32.png b/resources/bitmaps_png/png/icon_cvpcb_24_32.png index 9f95ba9bc9..f152dbc43b 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_32.png and b/resources/bitmaps_png/png/icon_cvpcb_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_48.png b/resources/bitmaps_png/png/icon_cvpcb_24_48.png index b8b380fd42..9af1d15123 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_48.png and b/resources/bitmaps_png/png/icon_cvpcb_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_64.png b/resources/bitmaps_png/png/icon_cvpcb_24_64.png index cff5d23485..765bb90973 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_64.png and b/resources/bitmaps_png/png/icon_cvpcb_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_16.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_16.png index aabba819c4..59633ee32a 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_dark_16.png and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_24.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_24.png index 2463831c24..f6a1cba3a7 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_dark_24.png and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_32.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_32.png index af5af572ba..f430c3c6a7 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_dark_32.png and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png index b9c05ee412..413db5ab7d 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_cvpcb_24_dark_64.png b/resources/bitmaps_png/png/icon_cvpcb_24_dark_64.png index a31c40dc82..5ad066fbbb 100644 Binary files a/resources/bitmaps_png/png/icon_cvpcb_24_dark_64.png and b/resources/bitmaps_png/png/icon_cvpcb_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_16.png b/resources/bitmaps_png/png/icon_eeschema_24_16.png new file mode 100644 index 0000000000..ddd048bd54 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_24.png b/resources/bitmaps_png/png/icon_eeschema_24_24.png index 0ca7e9eae5..b7288f702a 100644 Binary files a/resources/bitmaps_png/png/icon_eeschema_24_24.png and b/resources/bitmaps_png/png/icon_eeschema_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_32.png b/resources/bitmaps_png/png/icon_eeschema_24_32.png new file mode 100644 index 0000000000..ee9378ba11 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_48.png b/resources/bitmaps_png/png/icon_eeschema_24_48.png new file mode 100644 index 0000000000..f9f2954c45 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_64.png b/resources/bitmaps_png/png/icon_eeschema_24_64.png new file mode 100644 index 0000000000..fb03051fae Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_dark_16.png b/resources/bitmaps_png/png/icon_eeschema_24_dark_16.png new file mode 100644 index 0000000000..8279bb80dd Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_dark_24.png b/resources/bitmaps_png/png/icon_eeschema_24_dark_24.png index 7fef12d4a1..6ac17f20e3 100644 Binary files a/resources/bitmaps_png/png/icon_eeschema_24_dark_24.png and b/resources/bitmaps_png/png/icon_eeschema_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_dark_32.png b/resources/bitmaps_png/png/icon_eeschema_24_dark_32.png new file mode 100644 index 0000000000..5fa3fa5c68 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_dark_48.png b/resources/bitmaps_png/png/icon_eeschema_24_dark_48.png new file mode 100644 index 0000000000..668dabe7e3 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_eeschema_24_dark_64.png b/resources/bitmaps_png/png/icon_eeschema_24_dark_64.png new file mode 100644 index 0000000000..db9e15f3d2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_eeschema_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_24.png b/resources/bitmaps_png/png/icon_gerbview_24_24.png index fe412327dc..9e24e78224 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_24.png and b/resources/bitmaps_png/png/icon_gerbview_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_32.png b/resources/bitmaps_png/png/icon_gerbview_24_32.png index 2c002fc44b..167a2d73ad 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_32.png and b/resources/bitmaps_png/png/icon_gerbview_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_48.png b/resources/bitmaps_png/png/icon_gerbview_24_48.png index 7d06387495..27cf37b7e7 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_48.png and b/resources/bitmaps_png/png/icon_gerbview_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_64.png b/resources/bitmaps_png/png/icon_gerbview_24_64.png index 7a0fd1661c..29506fe90b 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_64.png and b/resources/bitmaps_png/png/icon_gerbview_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_dark_24.png b/resources/bitmaps_png/png/icon_gerbview_24_dark_24.png index fe412327dc..9e24e78224 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_dark_24.png and b/resources/bitmaps_png/png/icon_gerbview_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_dark_32.png b/resources/bitmaps_png/png/icon_gerbview_24_dark_32.png index 2c002fc44b..167a2d73ad 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_dark_32.png and b/resources/bitmaps_png/png/icon_gerbview_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png b/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png index 7d06387495..27cf37b7e7 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png and b/resources/bitmaps_png/png/icon_gerbview_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_gerbview_24_dark_64.png b/resources/bitmaps_png/png/icon_gerbview_24_dark_64.png index 7a0fd1661c..29506fe90b 100644 Binary files a/resources/bitmaps_png/png/icon_gerbview_24_dark_64.png and b/resources/bitmaps_png/png/icon_gerbview_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_16.png b/resources/bitmaps_png/png/icon_kicad_24_16.png new file mode 100644 index 0000000000..32c8a92e04 Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_24.png b/resources/bitmaps_png/png/icon_kicad_24_24.png index 37fbb9dd31..674ff5d079 100644 Binary files a/resources/bitmaps_png/png/icon_kicad_24_24.png and b/resources/bitmaps_png/png/icon_kicad_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_32.png b/resources/bitmaps_png/png/icon_kicad_24_32.png new file mode 100644 index 0000000000..f68bf0ed1c Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_48.png b/resources/bitmaps_png/png/icon_kicad_24_48.png new file mode 100644 index 0000000000..88a7c6159f Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_64.png b/resources/bitmaps_png/png/icon_kicad_24_64.png new file mode 100644 index 0000000000..c47f07c95a Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_dark_16.png b/resources/bitmaps_png/png/icon_kicad_24_dark_16.png new file mode 100644 index 0000000000..32c8a92e04 Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_dark_24.png b/resources/bitmaps_png/png/icon_kicad_24_dark_24.png index 37fbb9dd31..674ff5d079 100644 Binary files a/resources/bitmaps_png/png/icon_kicad_24_dark_24.png and b/resources/bitmaps_png/png/icon_kicad_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_dark_32.png b/resources/bitmaps_png/png/icon_kicad_24_dark_32.png new file mode 100644 index 0000000000..f68bf0ed1c Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_dark_48.png b/resources/bitmaps_png/png/icon_kicad_24_dark_48.png new file mode 100644 index 0000000000..88a7c6159f Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_kicad_24_dark_64.png b/resources/bitmaps_png/png/icon_kicad_24_dark_64.png new file mode 100644 index 0000000000..c47f07c95a Binary files /dev/null and b/resources/bitmaps_png/png/icon_kicad_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_16.png b/resources/bitmaps_png/png/icon_libedit_24_16.png new file mode 100644 index 0000000000..3ada339bf3 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_24.png b/resources/bitmaps_png/png/icon_libedit_24_24.png index fc654b0e8b..4fc6f4a091 100644 Binary files a/resources/bitmaps_png/png/icon_libedit_24_24.png and b/resources/bitmaps_png/png/icon_libedit_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_32.png b/resources/bitmaps_png/png/icon_libedit_24_32.png new file mode 100644 index 0000000000..062230eb22 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_48.png b/resources/bitmaps_png/png/icon_libedit_24_48.png new file mode 100644 index 0000000000..7b6a72abe1 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_64.png b/resources/bitmaps_png/png/icon_libedit_24_64.png new file mode 100644 index 0000000000..db040d2ef0 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_dark_16.png b/resources/bitmaps_png/png/icon_libedit_24_dark_16.png new file mode 100644 index 0000000000..5c026a73b9 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_dark_24.png b/resources/bitmaps_png/png/icon_libedit_24_dark_24.png index 13ea931084..cec355b2cc 100644 Binary files a/resources/bitmaps_png/png/icon_libedit_24_dark_24.png and b/resources/bitmaps_png/png/icon_libedit_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_dark_32.png b/resources/bitmaps_png/png/icon_libedit_24_dark_32.png new file mode 100644 index 0000000000..46437494cc Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_dark_48.png b/resources/bitmaps_png/png/icon_libedit_24_dark_48.png new file mode 100644 index 0000000000..91a8b7b739 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_libedit_24_dark_64.png b/resources/bitmaps_png/png/icon_libedit_24_dark_64.png new file mode 100644 index 0000000000..7f0b25d692 Binary files /dev/null and b/resources/bitmaps_png/png/icon_libedit_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_16.png b/resources/bitmaps_png/png/icon_modedit_24_16.png new file mode 100644 index 0000000000..3c5618a1c6 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_24.png b/resources/bitmaps_png/png/icon_modedit_24_24.png index 69a8264f8d..92cd655a52 100644 Binary files a/resources/bitmaps_png/png/icon_modedit_24_24.png and b/resources/bitmaps_png/png/icon_modedit_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_32.png b/resources/bitmaps_png/png/icon_modedit_24_32.png new file mode 100644 index 0000000000..f28e3358c0 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_48.png b/resources/bitmaps_png/png/icon_modedit_24_48.png new file mode 100644 index 0000000000..335691c7b2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_64.png b/resources/bitmaps_png/png/icon_modedit_24_64.png new file mode 100644 index 0000000000..628388dc3b Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_dark_16.png b/resources/bitmaps_png/png/icon_modedit_24_dark_16.png new file mode 100644 index 0000000000..8c0472e26b Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_dark_24.png b/resources/bitmaps_png/png/icon_modedit_24_dark_24.png index 3537f690e3..5eb5a735b1 100644 Binary files a/resources/bitmaps_png/png/icon_modedit_24_dark_24.png and b/resources/bitmaps_png/png/icon_modedit_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_dark_32.png b/resources/bitmaps_png/png/icon_modedit_24_dark_32.png new file mode 100644 index 0000000000..72876d5678 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_dark_48.png b/resources/bitmaps_png/png/icon_modedit_24_dark_48.png new file mode 100644 index 0000000000..3a5a710be1 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_modedit_24_dark_64.png b/resources/bitmaps_png/png/icon_modedit_24_dark_64.png new file mode 100644 index 0000000000..0aa1e2b4a0 Binary files /dev/null and b/resources/bitmaps_png/png/icon_modedit_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_16.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_16.png new file mode 100644 index 0000000000..881ec4d5b3 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_24.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_24.png index 09b4e772da..a659866b42 100644 Binary files a/resources/bitmaps_png/png/icon_pagelayout_editor_24_24.png and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_32.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_32.png new file mode 100644 index 0000000000..4c6328e105 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_48.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_48.png new file mode 100644 index 0000000000..b9145fbf23 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_64.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_64.png new file mode 100644 index 0000000000..2dc4086f64 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_16.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_16.png new file mode 100644 index 0000000000..881ec4d5b3 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_24.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_24.png index 09b4e772da..a659866b42 100644 Binary files a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_24.png and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_32.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_32.png new file mode 100644 index 0000000000..4c6328e105 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_48.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_48.png new file mode 100644 index 0000000000..b9145fbf23 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_64.png b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_64.png new file mode 100644 index 0000000000..2dc4086f64 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pagelayout_editor_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_16.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_16.png new file mode 100644 index 0000000000..182a280c98 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_24.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_24.png index e9caba32f6..ae0ef82431 100644 Binary files a/resources/bitmaps_png/png/icon_pcbcalculator_24_24.png and b/resources/bitmaps_png/png/icon_pcbcalculator_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_32.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_32.png new file mode 100644 index 0000000000..f5f161a3ff Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_48.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_48.png new file mode 100644 index 0000000000..365a6cab20 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_64.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_64.png new file mode 100644 index 0000000000..f7700db3c2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_16.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_16.png new file mode 100644 index 0000000000..182a280c98 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_24.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_24.png index e9caba32f6..ae0ef82431 100644 Binary files a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_24.png and b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_32.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_32.png new file mode 100644 index 0000000000..f5f161a3ff Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_48.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_48.png new file mode 100644 index 0000000000..365a6cab20 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_64.png b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_64.png new file mode 100644 index 0000000000..f7700db3c2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbcalculator_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_16.png b/resources/bitmaps_png/png/icon_pcbnew_24_16.png new file mode 100644 index 0000000000..04ab99bb04 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_24.png b/resources/bitmaps_png/png/icon_pcbnew_24_24.png index a0142449d7..ba7b085a07 100644 Binary files a/resources/bitmaps_png/png/icon_pcbnew_24_24.png and b/resources/bitmaps_png/png/icon_pcbnew_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_32.png b/resources/bitmaps_png/png/icon_pcbnew_24_32.png new file mode 100644 index 0000000000..b2f6c2d483 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_48.png b/resources/bitmaps_png/png/icon_pcbnew_24_48.png new file mode 100644 index 0000000000..30fc637dfd Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_64.png b/resources/bitmaps_png/png/icon_pcbnew_24_64.png new file mode 100644 index 0000000000..044d40e3e2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_dark_16.png b/resources/bitmaps_png/png/icon_pcbnew_24_dark_16.png new file mode 100644 index 0000000000..04ab99bb04 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_dark_24.png b/resources/bitmaps_png/png/icon_pcbnew_24_dark_24.png index a0142449d7..ba7b085a07 100644 Binary files a/resources/bitmaps_png/png/icon_pcbnew_24_dark_24.png and b/resources/bitmaps_png/png/icon_pcbnew_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_dark_32.png b/resources/bitmaps_png/png/icon_pcbnew_24_dark_32.png new file mode 100644 index 0000000000..b2f6c2d483 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_dark_48.png b/resources/bitmaps_png/png/icon_pcbnew_24_dark_48.png new file mode 100644 index 0000000000..30fc637dfd Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcbnew_24_dark_64.png b/resources/bitmaps_png/png/icon_pcbnew_24_dark_64.png new file mode 100644 index 0000000000..044d40e3e2 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcbnew_24_dark_64.png differ