haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add bitmap bundle support to BITMAP_SCALE 

Change a bunch of buttons and toolbars to use it

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14119
This commit is contained in:
Jon Evans 2023-10-21 14:56:19 -04:00
parent 71fb1afe4c
commit eb5b3db063
1038 changed files with 1382 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
3d-viewer/dialogs/panel_preview_3d_model.cpp
View File

@ -79,16 +79,16 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
m_previewLabel->SetFont( KIUI::GetStatusFont( this ) );
// Set the bitmap of 3D view buttons:
m_bpvTop->SetBitmap( KiBitmap( BITMAPS::axis3d_top ) );
m_bpvFront->SetBitmap( KiBitmap( BITMAPS::axis3d_front ) );
m_bpvBack->SetBitmap( KiBitmap( BITMAPS::axis3d_back ) );
m_bpvLeft->SetBitmap( KiBitmap( BITMAPS::axis3d_left ) );
m_bpvRight->SetBitmap( KiBitmap( BITMAPS::axis3d_right ) );
m_bpvBottom->SetBitmap( KiBitmap( BITMAPS::axis3d_bottom ) );
m_bpvISO->SetBitmap( KiBitmap( BITMAPS::ortho ) );
m_bpvBodyStyle->SetBitmap( KiBitmap( BITMAPS::axis3d ) );
m_bpUpdate->SetBitmap( KiBitmap( BITMAPS::reload ) );
m_bpSettings->SetBitmap( KiBitmap( BITMAPS::options_3drender ) );
m_bpvTop->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_top ) );
m_bpvFront->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_front ) );
m_bpvBack->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_back ) );
m_bpvLeft->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_left ) );
m_bpvRight->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_right ) );
m_bpvBottom->SetBitmap( KiBitmapBundle( BITMAPS::axis3d_bottom ) );
m_bpvISO->SetBitmap( KiBitmapBundle( BITMAPS::ortho ) );
m_bpvBodyStyle->SetBitmap( KiBitmapBundle( BITMAPS::axis3d ) );
m_bpUpdate->SetBitmap( KiBitmapBundle( BITMAPS::reload ) );
m_bpSettings->SetBitmap( KiBitmapBundle( BITMAPS::options_3drender ) );
// Set the min and max values of spin buttons (mandatory on Linux)
// They are not used, so they are set to min and max 32 bits int values

14
common/bitmap.cpp
View File

@ -107,8 +107,22 @@ wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag )
}
wxBitmapBundle KiBitmapBundle( BITMAPS aBitmap )
{
return GetBitmapStore()->GetBitmapBundle( aBitmap );
}
wxBitmapBundle KiDisabledBitmapBundle( BITMAPS aBitmap )
{
return GetBitmapStore()->GetDisabledBitmapBundle( aBitmap );
}
int KiIconScale( wxWindow* aWindow )
{
// For historical reasons, "4" here means unity (no scaling)
#if defined( __WXMSW__)
// Basically don't try and scale within kicad and let wx do its thing
// with wx introducing bitmap bundles, it will auto scale automatically with dpi

945
common/bitmap_info.cpp
View File

@ -186,6 +186,166 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_dark_16.png" ), 16, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_dark_16.png" ), 16, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_dark_16.png" ), 16, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::e_24].emplace_back( BITMAPS::e_24, wxT( "e_24_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::e_48].emplace_back( BITMAPS::e_48, wxT( "e_48_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::e_96].emplace_back( BITMAPS::e_96, wxT( "e_96_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::e_192].emplace_back( BITMAPS::e_192, wxT( "e_192_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_add].emplace_back( BITMAPS::git_add, wxT( "git_add_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_changed_ahead].emplace_back( BITMAPS::git_changed_ahead, wxT( "git_changed_ahead_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_conflict].emplace_back( BITMAPS::git_conflict, wxT( "git_conflict_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_delete].emplace_back( BITMAPS::git_delete, wxT( "git_delete_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_good_check].emplace_back( BITMAPS::git_good_check, wxT( "git_good_check_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_modified].emplace_back( BITMAPS::git_modified, wxT( "git_modified_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_out_of_date].emplace_back( BITMAPS::git_out_of_date, wxT( "git_out_of_date_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_bitmap2component_16].emplace_back( BITMAPS::icon_bitmap2component_16, wxT( "icon_bitmap2component_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_eeschema_16].emplace_back( BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_gerbview_16].emplace_back( BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_kicad_16].emplace_back( BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_kicad_nightly_16].emplace_back( BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_libedit_16].emplace_back( BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_modedit_16].emplace_back( BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_16].emplace_back( BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_pcbcalculator_16].emplace_back( BITMAPS::icon_pcbcalculator_16, wxT( "icon_pcbcalculator_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::icon_pcbnew_16].emplace_back( BITMAPS::icon_pcbnew_16, wxT( "icon_pcbnew_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::label_align_left].emplace_back( BITMAPS::label_align_left, wxT( "label_align_left_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::label_align_right].emplace_back( BITMAPS::label_align_right, wxT( "label_align_right_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::label_align_top].emplace_back( BITMAPS::label_align_top, wxT( "label_align_top_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::label_align_bottom].emplace_back( BITMAPS::label_align_bottom, wxT( "label_align_bottom_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::list_nets_16].emplace_back( BITMAPS::list_nets_16, wxT( "list_nets_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::notifications].emplace_back( BITMAPS::notifications, wxT( "notifications_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_generic_16].emplace_back( BITMAPS::options_generic_16, wxT( "options_generic_16_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinorient_right].emplace_back( BITMAPS::pinorient_right, wxT( "pinorient_right_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinorient_left].emplace_back( BITMAPS::pinorient_left, wxT( "pinorient_left_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinorient_up].emplace_back( BITMAPS::pinorient_up, wxT( "pinorient_up_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinorient_down].emplace_back( BITMAPS::pinorient_down, wxT( "pinorient_down_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_normal].emplace_back( BITMAPS::pinshape_normal, wxT( "pinshape_normal_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_invert].emplace_back( BITMAPS::pinshape_invert, wxT( "pinshape_invert_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_normal].emplace_back( BITMAPS::pinshape_clock_normal, wxT( "pinshape_clock_normal_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_invert].emplace_back( BITMAPS::pinshape_clock_invert, wxT( "pinshape_clock_invert_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_active_low_input].emplace_back( BITMAPS::pinshape_active_low_input, wxT( "pinshape_active_low_input_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_active_low].emplace_back( BITMAPS::pinshape_clock_active_low, wxT( "pinshape_clock_active_low_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_active_low_output].emplace_back( BITMAPS::pinshape_active_low_output, wxT( "pinshape_active_low_output_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_fall].emplace_back( BITMAPS::pinshape_clock_fall, wxT( "pinshape_clock_fall_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pinshape_nonlogic].emplace_back( BITMAPS::pinshape_nonlogic, wxT( "pinshape_nonlogic_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_input].emplace_back( BITMAPS::pintype_input, wxT( "pintype_input_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_output].emplace_back( BITMAPS::pintype_output, wxT( "pintype_output_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_bidi].emplace_back( BITMAPS::pintype_bidi, wxT( "pintype_bidi_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_3states].emplace_back( BITMAPS::pintype_3states, wxT( "pintype_3states_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_passive].emplace_back( BITMAPS::pintype_passive, wxT( "pintype_passive_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_notspecif].emplace_back( BITMAPS::pintype_notspecif, wxT( "pintype_notspecif_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_powerinput].emplace_back( BITMAPS::pintype_powerinput, wxT( "pintype_powerinput_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_poweroutput].emplace_back( BITMAPS::pintype_poweroutput, wxT( "pintype_poweroutput_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_opencoll].emplace_back( BITMAPS::pintype_opencoll, wxT( "pintype_opencoll_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_openemit].emplace_back( BITMAPS::pintype_openemit, wxT( "pintype_openemit_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_nic].emplace_back( BITMAPS::pintype_nic, wxT( "pintype_nic_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pintype_noconnect].emplace_back( BITMAPS::pintype_noconnect, wxT( "pintype_noconnect_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_down].emplace_back( BITMAPS::small_down, wxT( "small_down_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_edit].emplace_back( BITMAPS::small_edit, wxT( "small_edit_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_folder].emplace_back( BITMAPS::small_folder, wxT( "small_folder_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_horizontal].emplace_back( BITMAPS::text_horizontal, wxT( "text_horizontal_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_vertical].emplace_back( BITMAPS::text_vertical, wxT( "text_vertical_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_left].emplace_back( BITMAPS::text_align_left, wxT( "text_align_left_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_center].emplace_back( BITMAPS::text_align_center, wxT( "text_align_center_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_right].emplace_back( BITMAPS::text_align_right, wxT( "text_align_right_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_bottom].emplace_back( BITMAPS::text_align_bottom, wxT( "text_align_bottom_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_middle].emplace_back( BITMAPS::text_align_middle, wxT( "text_align_middle_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_align_top].emplace_back( BITMAPS::text_align_top, wxT( "text_align_top_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_valign_top].emplace_back( BITMAPS::text_valign_top, wxT( "text_valign_top_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_valign_center].emplace_back( BITMAPS::text_valign_center, wxT( "text_valign_center_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_valign_bottom].emplace_back( BITMAPS::text_valign_bottom, wxT( "text_valign_bottom_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_bold].emplace_back( BITMAPS::text_bold, wxT( "text_bold_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_italic].emplace_back( BITMAPS::text_italic, wxT( "text_italic_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_mirrored].emplace_back( BITMAPS::text_mirrored, wxT( "text_mirrored_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::tree_nosel].emplace_back( BITMAPS::tree_nosel, wxT( "tree_nosel_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::tree_sel].emplace_back( BITMAPS::tree_sel, wxT( "tree_sel_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_32.png" ), 32, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::git_add].emplace_back( BITMAPS::git_add, wxT( "git_add_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_changed_ahead].emplace_back( BITMAPS::git_changed_ahead, wxT( "git_changed_ahead_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_conflict].emplace_back( BITMAPS::git_conflict, wxT( "git_conflict_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_delete].emplace_back( BITMAPS::git_delete, wxT( "git_delete_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_good_check].emplace_back( BITMAPS::git_good_check, wxT( "git_good_check_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_modified].emplace_back( BITMAPS::git_modified, wxT( "git_modified_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::git_out_of_date].emplace_back( BITMAPS::git_out_of_date, wxT( "git_out_of_date_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_bitmap2component_16].emplace_back( BITMAPS::icon_bitmap2component_16, wxT( "icon_bitmap2component_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_eeschema_16].emplace_back( BITMAPS::icon_eeschema_16, wxT( "icon_eeschema_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_gerbview_16].emplace_back( BITMAPS::icon_gerbview_16, wxT( "icon_gerbview_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_kicad_16].emplace_back( BITMAPS::icon_kicad_16, wxT( "icon_kicad_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_kicad_nightly_16].emplace_back( BITMAPS::icon_kicad_nightly_16, wxT( "icon_kicad_nightly_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_libedit_16].emplace_back( BITMAPS::icon_libedit_16, wxT( "icon_libedit_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_modedit_16].emplace_back( BITMAPS::icon_modedit_16, wxT( "icon_modedit_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_pagelayout_editor_16].emplace_back( BITMAPS::icon_pagelayout_editor_16, wxT( "icon_pagelayout_editor_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_pcbcalculator_16].emplace_back( BITMAPS::icon_pcbcalculator_16, wxT( "icon_pcbcalculator_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::icon_pcbnew_16].emplace_back( BITMAPS::icon_pcbnew_16, wxT( "icon_pcbnew_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::label_align_left].emplace_back( BITMAPS::label_align_left, wxT( "label_align_left_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::label_align_right].emplace_back( BITMAPS::label_align_right, wxT( "label_align_right_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::label_align_top].emplace_back( BITMAPS::label_align_top, wxT( "label_align_top_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::label_align_bottom].emplace_back( BITMAPS::label_align_bottom, wxT( "label_align_bottom_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::list_nets_16].emplace_back( BITMAPS::list_nets_16, wxT( "list_nets_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::notifications].emplace_back( BITMAPS::notifications, wxT( "notifications_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_generic_16].emplace_back( BITMAPS::options_generic_16, wxT( "options_generic_16_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinorient_right].emplace_back( BITMAPS::pinorient_right, wxT( "pinorient_right_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinorient_left].emplace_back( BITMAPS::pinorient_left, wxT( "pinorient_left_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinorient_up].emplace_back( BITMAPS::pinorient_up, wxT( "pinorient_up_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinorient_down].emplace_back( BITMAPS::pinorient_down, wxT( "pinorient_down_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_normal].emplace_back( BITMAPS::pinshape_normal, wxT( "pinshape_normal_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_invert].emplace_back( BITMAPS::pinshape_invert, wxT( "pinshape_invert_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_normal].emplace_back( BITMAPS::pinshape_clock_normal, wxT( "pinshape_clock_normal_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_invert].emplace_back( BITMAPS::pinshape_clock_invert, wxT( "pinshape_clock_invert_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_active_low_input].emplace_back( BITMAPS::pinshape_active_low_input, wxT( "pinshape_active_low_input_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_active_low].emplace_back( BITMAPS::pinshape_clock_active_low, wxT( "pinshape_clock_active_low_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_active_low_output].emplace_back( BITMAPS::pinshape_active_low_output, wxT( "pinshape_active_low_output_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_clock_fall].emplace_back( BITMAPS::pinshape_clock_fall, wxT( "pinshape_clock_fall_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pinshape_nonlogic].emplace_back( BITMAPS::pinshape_nonlogic, wxT( "pinshape_nonlogic_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_input].emplace_back( BITMAPS::pintype_input, wxT( "pintype_input_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_output].emplace_back( BITMAPS::pintype_output, wxT( "pintype_output_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_bidi].emplace_back( BITMAPS::pintype_bidi, wxT( "pintype_bidi_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_3states].emplace_back( BITMAPS::pintype_3states, wxT( "pintype_3states_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_passive].emplace_back( BITMAPS::pintype_passive, wxT( "pintype_passive_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_notspecif].emplace_back( BITMAPS::pintype_notspecif, wxT( "pintype_notspecif_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_powerinput].emplace_back( BITMAPS::pintype_powerinput, wxT( "pintype_powerinput_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_poweroutput].emplace_back( BITMAPS::pintype_poweroutput, wxT( "pintype_poweroutput_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_opencoll].emplace_back( BITMAPS::pintype_opencoll, wxT( "pintype_opencoll_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_openemit].emplace_back( BITMAPS::pintype_openemit, wxT( "pintype_openemit_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_nic].emplace_back( BITMAPS::pintype_nic, wxT( "pintype_nic_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pintype_noconnect].emplace_back( BITMAPS::pintype_noconnect, wxT( "pintype_noconnect_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_down].emplace_back( BITMAPS::small_down, wxT( "small_down_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_edit].emplace_back( BITMAPS::small_edit, wxT( "small_edit_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_folder].emplace_back( BITMAPS::small_folder, wxT( "small_folder_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_horizontal].emplace_back( BITMAPS::text_horizontal, wxT( "text_horizontal_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_vertical].emplace_back( BITMAPS::text_vertical, wxT( "text_vertical_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_left].emplace_back( BITMAPS::text_align_left, wxT( "text_align_left_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_center].emplace_back( BITMAPS::text_align_center, wxT( "text_align_center_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_right].emplace_back( BITMAPS::text_align_right, wxT( "text_align_right_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_bottom].emplace_back( BITMAPS::text_align_bottom, wxT( "text_align_bottom_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_middle].emplace_back( BITMAPS::text_align_middle, wxT( "text_align_middle_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_align_top].emplace_back( BITMAPS::text_align_top, wxT( "text_align_top_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_valign_top].emplace_back( BITMAPS::text_valign_top, wxT( "text_valign_top_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_valign_center].emplace_back( BITMAPS::text_valign_center, wxT( "text_valign_center_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_valign_bottom].emplace_back( BITMAPS::text_valign_bottom, wxT( "text_valign_bottom_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_bold].emplace_back( BITMAPS::text_bold, wxT( "text_bold_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_italic].emplace_back( BITMAPS::text_italic, wxT( "text_italic_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_mirrored].emplace_back( BITMAPS::text_mirrored, wxT( "text_mirrored_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::tree_nosel].emplace_back( BITMAPS::tree_nosel, wxT( "tree_nosel_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::tree_sel].emplace_back( BITMAPS::tree_sel, wxT( "tree_sel_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::visibility].emplace_back( BITMAPS::visibility, wxT( "visibility_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::visibility_off].emplace_back( BITMAPS::visibility_off, wxT( "visibility_off_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::www].emplace_back( BITMAPS::www, wxT( "www_dark_32.png" ), 32, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::about].emplace_back( BITMAPS::about, wxT( "about_24.png" ), 24, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_aligned_dimension].emplace_back( BITMAPS::add_aligned_dimension, wxT( "add_aligned_dimension_24.png" ), 24, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_24.png" ), 24, wxT( "light" ) );
@ -971,6 +1131,791 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
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_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_24.png" ), 24, 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" ) );
aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_board].emplace_back( BITMAPS::add_board, wxT( "add_board_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_bus2bus].emplace_back( BITMAPS::add_bus2bus, wxT( "add_bus2bus_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_bus].emplace_back( BITMAPS::add_bus, wxT( "add_bus_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_center_dimension].emplace_back( BITMAPS::add_center_dimension, wxT( "add_center_dimension_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_class_flag].emplace_back( BITMAPS::add_class_flag, wxT( "add_class_flag_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_circle].emplace_back( BITMAPS::add_circle, wxT( "add_circle_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_component].emplace_back( BITMAPS::add_component, wxT( "add_component_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_corner].emplace_back( BITMAPS::add_corner, wxT( "add_corner_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_dashed_line].emplace_back( BITMAPS::add_dashed_line, wxT( "add_dashed_line_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_document].emplace_back( BITMAPS::add_document, wxT( "add_document_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_glabel].emplace_back( BITMAPS::add_glabel, wxT( "add_glabel_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_graphical_segments].emplace_back( BITMAPS::add_graphical_segments, wxT( "add_graphical_segments_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_graphical_polygon].emplace_back( BITMAPS::add_graphical_polygon, wxT( "add_graphical_polygon_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_hierarchical_label].emplace_back( BITMAPS::add_hierarchical_label, wxT( "add_hierarchical_label_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_hierar_pin].emplace_back( BITMAPS::add_hierar_pin, wxT( "add_hierar_pin_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_hierarchical_subsheet].emplace_back( BITMAPS::add_hierarchical_subsheet, wxT( "add_hierarchical_subsheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_junction].emplace_back( BITMAPS::add_junction, wxT( "add_junction_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_keepout_area].emplace_back( BITMAPS::add_keepout_area, wxT( "add_keepout_area_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_label].emplace_back( BITMAPS::add_label, wxT( "add_label_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_leader].emplace_back( BITMAPS::add_leader, wxT( "add_leader_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_library].emplace_back( BITMAPS::add_library, wxT( "add_library_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_line2bus].emplace_back( BITMAPS::add_line2bus, wxT( "add_line2bus_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_line_label].emplace_back( BITMAPS::add_line_label, wxT( "add_line_label_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_line].emplace_back( BITMAPS::add_line, wxT( "add_line_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_orthogonal_dimension].emplace_back( BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_pcb_target].emplace_back( BITMAPS::add_pcb_target, wxT( "add_pcb_target_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_power].emplace_back( BITMAPS::add_power, wxT( "add_power_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_radial_dimension].emplace_back( BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_rectangle].emplace_back( BITMAPS::add_rectangle, wxT( "add_rectangle_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_symbol_to_schematic].emplace_back( BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_textbox].emplace_back( BITMAPS::add_textbox, wxT( "add_textbox_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_tracks].emplace_back( BITMAPS::add_tracks, wxT( "add_tracks_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_top].emplace_back( BITMAPS::align_items_top, wxT( "align_items_top_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_bottom].emplace_back( BITMAPS::align_items_bottom, wxT( "align_items_bottom_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::apply_pad_settings].emplace_back( BITMAPS::apply_pad_settings, wxT( "apply_pad_settings_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::array].emplace_back( BITMAPS::array, wxT( "array_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::auto_associate].emplace_back( BITMAPS::auto_associate, wxT( "auto_associate_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::auto_track_width].emplace_back( BITMAPS::auto_track_width, wxT( "auto_track_width_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::autoplace_fields].emplace_back( BITMAPS::autoplace_fields, wxT( "autoplace_fields_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_back].emplace_back( BITMAPS::axis3d_back, wxT( "axis3d_back_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_bottom].emplace_back( BITMAPS::axis3d_bottom, wxT( "axis3d_bottom_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_front].emplace_back( BITMAPS::axis3d_front, wxT( "axis3d_front_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_left].emplace_back( BITMAPS::axis3d_left, wxT( "axis3d_left_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_right].emplace_back( BITMAPS::axis3d_right, wxT( "axis3d_right_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d_top].emplace_back( BITMAPS::axis3d_top, wxT( "axis3d_top_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::axis3d].emplace_back( BITMAPS::axis3d, wxT( "axis3d_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::break_line].emplace_back( BITMAPS::break_line, wxT( "break_line_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::delete_cursor].emplace_back( BITMAPS::delete_cursor, wxT( "delete_cursor_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::delete_gerber].emplace_back( BITMAPS::delete_gerber, wxT( "delete_gerber_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::delete_sheet].emplace_back( BITMAPS::delete_sheet, wxT( "delete_sheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::duplicate].emplace_back( BITMAPS::duplicate, wxT( "duplicate_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edit_comp_footprint].emplace_back( BITMAPS::edit_comp_footprint, wxT( "edit_comp_footprint_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edit_comp_ref].emplace_back( BITMAPS::edit_comp_ref, wxT( "edit_comp_ref_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edit_comp_value].emplace_back( BITMAPS::edit_comp_value, wxT( "edit_comp_value_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::editor].emplace_back( BITMAPS::editor, wxT( "editor_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edit_cmp_symb_links].emplace_back( BITMAPS::edit_cmp_symb_links, wxT( "edit_cmp_symb_links_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edit].emplace_back( BITMAPS::edit, wxT( "edit_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::edge_to_copper_clearance].emplace_back( BITMAPS::edge_to_copper_clearance, wxT( "edge_to_copper_clearance_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::enter_sheet].emplace_back( BITMAPS::enter_sheet, wxT( "enter_sheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ercerr].emplace_back( BITMAPS::ercerr, wxT( "ercerr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::erc_green].emplace_back( BITMAPS::erc_green, wxT( "erc_green_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ercwarn].emplace_back( BITMAPS::ercwarn, wxT( "ercwarn_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::erc].emplace_back( BITMAPS::erc, wxT( "erc_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::exit].emplace_back( BITMAPS::exit, wxT( "exit_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::exchange].emplace_back( BITMAPS::exchange, wxT( "exchange_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export3d].emplace_back( BITMAPS::export3d, wxT( "export3d_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_cmp].emplace_back( BITMAPS::export_cmp, wxT( "export_cmp_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_dsn].emplace_back( BITMAPS::export_dsn, wxT( "export_dsn_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_idf].emplace_back( BITMAPS::export_idf, wxT( "export_idf_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_file].emplace_back( BITMAPS::export_file, wxT( "export_file_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_footprint_names].emplace_back( BITMAPS::export_footprint_names, wxT( "export_footprint_names_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_module].emplace_back( BITMAPS::export_module, wxT( "export_module_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_part].emplace_back( BITMAPS::export_part, wxT( "export_part_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_png].emplace_back( BITMAPS::export_png, wxT( "export_png_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_step].emplace_back( BITMAPS::export_step, wxT( "export_step_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_svg].emplace_back( BITMAPS::export_svg, wxT( "export_svg_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::export_to_pcbnew].emplace_back( BITMAPS::export_to_pcbnew, wxT( "export_to_pcbnew_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::fabrication].emplace_back( BITMAPS::fabrication, wxT( "fabrication_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_bom].emplace_back( BITMAPS::file_bom, wxT( "file_bom_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_drl].emplace_back( BITMAPS::file_drl, wxT( "file_drl_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_dsn].emplace_back( BITMAPS::file_dsn, wxT( "file_dsn_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_gbr].emplace_back( BITMAPS::file_gbr, wxT( "file_gbr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_gerber_job].emplace_back( BITMAPS::file_gerber_job, wxT( "file_gerber_job_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_html].emplace_back( BITMAPS::file_html, wxT( "file_html_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_idf].emplace_back( BITMAPS::file_idf, wxT( "file_idf_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_pdf].emplace_back( BITMAPS::file_pdf, wxT( "file_pdf_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::flag].emplace_back( BITMAPS::flag, wxT( "flag_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::flip_board].emplace_back( BITMAPS::flip_board, wxT( "flip_board_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::gbr_select_mode1].emplace_back( BITMAPS::gbr_select_mode1, wxT( "gbr_select_mode1_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::gbr_select_mode2].emplace_back( BITMAPS::gbr_select_mode2, wxT( "gbr_select_mode2_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::gerbview_show_negative_objects].emplace_back( BITMAPS::gerbview_show_negative_objects, wxT( "gerbview_show_negative_objects_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::general_deletions].emplace_back( BITMAPS::general_deletions, wxT( "general_deletions_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::general_ratsnest].emplace_back( BITMAPS::general_ratsnest, wxT( "general_ratsnest_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::grid_select].emplace_back( BITMAPS::grid_select, wxT( "grid_select_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::grid_select_axis].emplace_back( BITMAPS::grid_select_axis, wxT( "grid_select_axis_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::grid_override].emplace_back( BITMAPS::grid_override, wxT( "grid_override_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::grid].emplace_back( BITMAPS::grid, wxT( "grid_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::group].emplace_back( BITMAPS::group, wxT( "group_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::group_enter].emplace_back( BITMAPS::group_enter, wxT( "group_enter_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::group_leave].emplace_back( BITMAPS::group_leave, wxT( "group_leave_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::group_remove].emplace_back( BITMAPS::group_remove, wxT( "group_remove_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::group_ungroup].emplace_back( BITMAPS::group_ungroup, wxT( "group_ungroup_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::heal_shapes].emplace_back( BITMAPS::heal_shapes, wxT( "heal_shapes_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::help].emplace_back( BITMAPS::help, wxT( "help_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::help_online].emplace_back( BITMAPS::help_online, wxT( "help_online_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::hidden_pin].emplace_back( BITMAPS::hidden_pin, wxT( "hidden_pin_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::hide_ratsnest].emplace_back( BITMAPS::hide_ratsnest, wxT( "hide_ratsnest_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::hierarchy_nav].emplace_back( BITMAPS::hierarchy_nav, wxT( "hierarchy_nav_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::hotkeys].emplace_back( BITMAPS::hotkeys, wxT( "hotkeys_48.png" ), 48, wxT( "light" ) );
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_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_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_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" ) );
aBitmapInfoCache[BITMAPS::import_brd_file].emplace_back( BITMAPS::import_brd_file, wxT( "import_brd_file_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_document].emplace_back( BITMAPS::import_document, wxT( "import_document_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_footprint_names].emplace_back( BITMAPS::import_footprint_names, wxT( "import_footprint_names_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_hierarchical_label].emplace_back( BITMAPS::import_hierarchical_label, wxT( "import_hierarchical_label_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_module].emplace_back( BITMAPS::import_module, wxT( "import_module_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_part].emplace_back( BITMAPS::import_part, wxT( "import_part_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_project].emplace_back( BITMAPS::import_project, wxT( "import_project_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import_vector].emplace_back( BITMAPS::import_vector, wxT( "import_vector_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::import].emplace_back( BITMAPS::import, wxT( "import_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::info].emplace_back( BITMAPS::info, wxT( "info_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::insert_module_board].emplace_back( BITMAPS::insert_module_board, wxT( "insert_module_board_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::intersect_polygons].emplace_back( BITMAPS::intersect_polygons, wxT( "intersect_polygons_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::language].emplace_back( BITMAPS::language, wxT( "language_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::layers_manager].emplace_back( BITMAPS::layers_manager, wxT( "layers_manager_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::leave_sheet].emplace_back( BITMAPS::leave_sheet, wxT( "leave_sheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::left].emplace_back( BITMAPS::left, wxT( "left_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::libedit].emplace_back( BITMAPS::libedit, wxT( "libedit_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::lib_next].emplace_back( BITMAPS::lib_next, wxT( "lib_next_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::lib_previous].emplace_back( BITMAPS::lib_previous, wxT( "lib_previous_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::library_browser].emplace_back( BITMAPS::library_browser, wxT( "library_browser_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::library_archive].emplace_back( BITMAPS::library_archive, wxT( "library_archive_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::library_archive_as].emplace_back( BITMAPS::library_archive_as, wxT( "library_archive_as_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::library].emplace_back( BITMAPS::library, wxT( "library_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::library_table].emplace_back( BITMAPS::library_table, wxT( "library_table_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::lines_any].emplace_back( BITMAPS::lines_any, wxT( "lines_any_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::lines90].emplace_back( BITMAPS::lines90, wxT( "lines90_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::list_nets].emplace_back( BITMAPS::list_nets, wxT( "list_nets_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::load_drill].emplace_back( BITMAPS::load_drill, wxT( "load_drill_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::load_gerber].emplace_back( BITMAPS::load_gerber, wxT( "load_gerber_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::load_module_board].emplace_back( BITMAPS::load_module_board, wxT( "load_module_board_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::lock_unlock].emplace_back( BITMAPS::lock_unlock, wxT( "lock_unlock_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::locked].emplace_back( BITMAPS::locked, wxT( "locked_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::marker_exclude].emplace_back( BITMAPS::marker_exclude, wxT( "marker_exclude_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::marker_next].emplace_back( BITMAPS::marker_next, wxT( "marker_next_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::marker_previous].emplace_back( BITMAPS::marker_previous, wxT( "marker_previous_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::measurement].emplace_back( BITMAPS::measurement, wxT( "measurement_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::merge_polygons].emplace_back( BITMAPS::merge_polygons, wxT( "merge_polygons_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mirror_h].emplace_back( BITMAPS::mirror_h, wxT( "mirror_h_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mirror_v].emplace_back( BITMAPS::mirror_v, wxT( "mirror_v_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mode_module].emplace_back( BITMAPS::mode_module, wxT( "mode_module_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_editor].emplace_back( BITMAPS::module_editor, wxT( "module_editor_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_wizard].emplace_back( BITMAPS::module_wizard, wxT( "module_wizard_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_filtered_list].emplace_back( BITMAPS::module_filtered_list, wxT( "module_filtered_list_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_options].emplace_back( BITMAPS::module_options, wxT( "module_options_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_pin_filtered_list].emplace_back( BITMAPS::module_pin_filtered_list, wxT( "module_pin_filtered_list_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module_library_list].emplace_back( BITMAPS::module_library_list, wxT( "module_library_list_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::module].emplace_back( BITMAPS::module, wxT( "module_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::morgan1].emplace_back( BITMAPS::morgan1, wxT( "morgan1_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::morgan2].emplace_back( BITMAPS::morgan2, wxT( "morgan2_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::move_exactly].emplace_back( BITMAPS::move_exactly, wxT( "move_exactly_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::move].emplace_back( BITMAPS::move, wxT( "move_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::move_relative].emplace_back( BITMAPS::move_relative, wxT( "move_relative_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mw_add_gap].emplace_back( BITMAPS::mw_add_gap, wxT( "mw_add_gap_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mw_add_line].emplace_back( BITMAPS::mw_add_line, wxT( "mw_add_line_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mw_add_shape].emplace_back( BITMAPS::mw_add_shape, wxT( "mw_add_shape_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mw_add_stub_arc].emplace_back( BITMAPS::mw_add_stub_arc, wxT( "mw_add_stub_arc_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::mw_add_stub].emplace_back( BITMAPS::mw_add_stub, wxT( "mw_add_stub_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::net_highlight].emplace_back( BITMAPS::net_highlight, wxT( "net_highlight_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::net_highlight_schematic].emplace_back( BITMAPS::net_highlight_schematic, wxT( "net_highlight_schematic_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::netlist].emplace_back( BITMAPS::netlist, wxT( "netlist_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_component].emplace_back( BITMAPS::new_component, wxT( "new_component_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_footprint].emplace_back( BITMAPS::new_footprint, wxT( "new_footprint_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_generic].emplace_back( BITMAPS::new_generic, wxT( "new_generic_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_library].emplace_back( BITMAPS::new_library, wxT( "new_library_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_project].emplace_back( BITMAPS::new_project, wxT( "new_project_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::new_project_from_template].emplace_back( BITMAPS::new_project_from_template, wxT( "new_project_from_template_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::noconn].emplace_back( BITMAPS::noconn, wxT( "noconn_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::normal].emplace_back( BITMAPS::normal, wxT( "normal_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::open_project].emplace_back( BITMAPS::open_project, wxT( "open_project_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::open_project_demo].emplace_back( BITMAPS::open_project_demo, wxT( "open_project_demo_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_3drender].emplace_back( BITMAPS::options_3drender, wxT( "options_3drender_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_board].emplace_back( BITMAPS::options_board, wxT( "options_board_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_generic].emplace_back( BITMAPS::options_generic, wxT( "options_generic_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_pad].emplace_back( BITMAPS::options_pad, wxT( "options_pad_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::options_schematic].emplace_back( BITMAPS::options_schematic, wxT( "options_schematic_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::opt_show_polygon].emplace_back( BITMAPS::opt_show_polygon, wxT( "opt_show_polygon_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ortho].emplace_back( BITMAPS::ortho, wxT( "ortho_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pack_footprints].emplace_back( BITMAPS::pack_footprints, wxT( "pack_footprints_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pad_sketch].emplace_back( BITMAPS::pad_sketch, wxT( "pad_sketch_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pad].emplace_back( BITMAPS::pad, wxT( "pad_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pad_enumerate].emplace_back( BITMAPS::pad_enumerate, wxT( "pad_enumerate_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pad_number].emplace_back( BITMAPS::pad_number, wxT( "pad_number_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pads_mask_layers].emplace_back( BITMAPS::pads_mask_layers, wxT( "pads_mask_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pads_remove].emplace_back( BITMAPS::pads_remove, wxT( "pads_remove_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::path].emplace_back( BITMAPS::path, wxT( "path_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pagelayout_normal_view_mode].emplace_back( BITMAPS::pagelayout_normal_view_mode, wxT( "pagelayout_normal_view_mode_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pagelayout_special_view_mode].emplace_back( BITMAPS::pagelayout_special_view_mode, wxT( "pagelayout_special_view_mode_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::part_properties].emplace_back( BITMAPS::part_properties, wxT( "part_properties_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::paste].emplace_back( BITMAPS::paste, wxT( "paste_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::paste_special].emplace_back( BITMAPS::paste_special, wxT( "paste_special_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pcb_target].emplace_back( BITMAPS::pcb_target, wxT( "pcb_target_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pin2pin].emplace_back( BITMAPS::pin2pin, wxT( "pin2pin_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pin_size_to].emplace_back( BITMAPS::pin_size_to, wxT( "pin_size_to_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pin_show_etype].emplace_back( BITMAPS::pin_show_etype, wxT( "pin_show_etype_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pin_table].emplace_back( BITMAPS::pin_table, wxT( "pin_table_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::pin].emplace_back( BITMAPS::pin, wxT( "pin_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::plot].emplace_back( BITMAPS::plot, wxT( "plot_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::polar_coord].emplace_back( BITMAPS::polar_coord, wxT( "polar_coord_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_bom].emplace_back( BITMAPS::post_bom, wxT( "post_bom_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_compo].emplace_back( BITMAPS::post_compo, wxT( "post_compo_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_d356].emplace_back( BITMAPS::post_d356, wxT( "post_d356_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_drill].emplace_back( BITMAPS::post_drill, wxT( "post_drill_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_gencad].emplace_back( BITMAPS::post_gencad, wxT( "post_gencad_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_gerber].emplace_back( BITMAPS::post_gerber, wxT( "post_gerber_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::post_rpt].emplace_back( BITMAPS::post_rpt, wxT( "post_rpt_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::preference].emplace_back( BITMAPS::preference, wxT( "preference_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::print_button].emplace_back( BITMAPS::print_button, wxT( "print_button_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::project].emplace_back( BITMAPS::project, wxT( "project_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::project_close].emplace_back( BITMAPS::project_close, wxT( "project_close_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::project_kicad].emplace_back( BITMAPS::project_kicad, wxT( "project_kicad_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair].emplace_back( BITMAPS::ps_diff_pair, wxT( "ps_diff_pair_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_gap].emplace_back( BITMAPS::ps_diff_pair_gap, wxT( "ps_diff_pair_gap_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_length].emplace_back( BITMAPS::ps_diff_pair_tune_length, wxT( "ps_diff_pair_tune_length_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_phase].emplace_back( BITMAPS::ps_diff_pair_tune_phase, wxT( "ps_diff_pair_tune_phase_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::ps_tune_length].emplace_back( BITMAPS::ps_tune_length, wxT( "ps_tune_length_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::push_pad_settings].emplace_back( BITMAPS::push_pad_settings, wxT( "push_pad_settings_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::puzzle_piece].emplace_back( BITMAPS::puzzle_piece, wxT( "puzzle_piece_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::py_script].emplace_back( BITMAPS::py_script, wxT( "py_script_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::recent].emplace_back( BITMAPS::recent, wxT( "recent_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::redo].emplace_back( BITMAPS::redo, wxT( "redo_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::refresh].emplace_back( BITMAPS::refresh, wxT( "refresh_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::reload].emplace_back( BITMAPS::reload, wxT( "reload_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::render_mode].emplace_back( BITMAPS::render_mode, wxT( "render_mode_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rescue].emplace_back( BITMAPS::rescue, wxT( "rescue_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::right].emplace_back( BITMAPS::right, wxT( "right_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner].emplace_back( BITMAPS::router_len_tuner, wxT( "router_len_tuner_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_setup].emplace_back( BITMAPS::router_len_tuner_setup, wxT( "router_len_tuner_setup_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_decr].emplace_back( BITMAPS::router_len_tuner_amplitude_decr, wxT( "router_len_tuner_amplitude_decr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_incr].emplace_back( BITMAPS::router_len_tuner_amplitude_incr, wxT( "router_len_tuner_amplitude_incr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_dist_decr].emplace_back( BITMAPS::router_len_tuner_dist_decr, wxT( "router_len_tuner_dist_decr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_dist_incr].emplace_back( BITMAPS::router_len_tuner_dist_incr, wxT( "router_len_tuner_dist_incr_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw].emplace_back( BITMAPS::rotate_ccw, wxT( "rotate_ccw_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_cw].emplace_back( BITMAPS::rotate_cw, wxT( "rotate_cw_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_x].emplace_back( BITMAPS::rotate_ccw_x, wxT( "rotate_ccw_x_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_x].emplace_back( BITMAPS::rotate_cw_x, wxT( "rotate_cw_x_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_y].emplace_back( BITMAPS::rotate_ccw_y, wxT( "rotate_ccw_y_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_y].emplace_back( BITMAPS::rotate_cw_y, wxT( "rotate_cw_y_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_z].emplace_back( BITMAPS::rotate_ccw_z, wxT( "rotate_ccw_z_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_z].emplace_back( BITMAPS::rotate_cw_z, wxT( "rotate_cw_z_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::save_as].emplace_back( BITMAPS::save_as, wxT( "save_as_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::save].emplace_back( BITMAPS::save, wxT( "save_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::select_layer_pair].emplace_back( BITMAPS::select_layer_pair, wxT( "select_layer_pair_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::select_w_layer].emplace_back( BITMAPS::select_w_layer, wxT( "select_w_layer_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::select_same_sheet].emplace_back( BITMAPS::select_same_sheet, wxT( "select_same_sheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::shape_3d].emplace_back( BITMAPS::shape_3d, wxT( "shape_3d_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::shape_3d_back].emplace_back( BITMAPS::shape_3d_back, wxT( "shape_3d_back_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sheetset].emplace_back( BITMAPS::sheetset, wxT( "sheetset_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::simulator].emplace_back( BITMAPS::simulator, wxT( "simulator_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_add_plot].emplace_back( BITMAPS::sim_add_plot, wxT( "sim_add_plot_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_command].emplace_back( BITMAPS::sim_command, wxT( "sim_command_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_run].emplace_back( BITMAPS::sim_run, wxT( "sim_run_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_stop].emplace_back( BITMAPS::sim_stop, wxT( "sim_stop_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_tune].emplace_back( BITMAPS::sim_tune, wxT( "sim_tune_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_probe].emplace_back( BITMAPS::sim_probe, wxT( "sim_probe_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::sim_add_signal].emplace_back( BITMAPS::sim_add_signal, wxT( "sim_add_signal_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::slice_line].emplace_back( BITMAPS::slice_line, wxT( "slice_line_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::search_tree].emplace_back( BITMAPS::search_tree, wxT( "search_tree_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::set_origin].emplace_back( BITMAPS::set_origin, wxT( "set_origin_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_dcodenumber].emplace_back( BITMAPS::show_dcodenumber, wxT( "show_dcodenumber_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_dnp].emplace_back( BITMAPS::show_dnp, wxT( "show_dnp_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_footprint].emplace_back( BITMAPS::show_footprint, wxT( "show_footprint_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_mod_edge].emplace_back( BITMAPS::show_mod_edge, wxT( "show_mod_edge_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_ratsnest].emplace_back( BITMAPS::show_ratsnest, wxT( "show_ratsnest_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::showtrack].emplace_back( BITMAPS::showtrack, wxT( "showtrack_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_not_in_posfile].emplace_back( BITMAPS::show_not_in_posfile, wxT( "show_not_in_posfile_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_other].emplace_back( BITMAPS::show_other, wxT( "show_other_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_tht].emplace_back( BITMAPS::show_tht, wxT( "show_tht_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_smt].emplace_back( BITMAPS::show_smt, wxT( "show_smt_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_zone].emplace_back( BITMAPS::show_zone, wxT( "show_zone_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_zone_disable].emplace_back( BITMAPS::show_zone_disable, wxT( "show_zone_disable_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_zone_outline_only].emplace_back( BITMAPS::show_zone_outline_only, wxT( "show_zone_outline_only_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_zone_triangulation].emplace_back( BITMAPS::show_zone_triangulation, wxT( "show_zone_triangulation_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_all_layers].emplace_back( BITMAPS::show_all_layers, wxT( "show_all_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_no_layers].emplace_back( BITMAPS::show_no_layers, wxT( "show_no_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_no_copper_layers].emplace_back( BITMAPS::show_no_copper_layers, wxT( "show_no_copper_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_all_copper_layers].emplace_back( BITMAPS::show_all_copper_layers, wxT( "show_all_copper_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_all_front_layers].emplace_back( BITMAPS::show_all_front_layers, wxT( "show_all_front_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_all_back_layers].emplace_back( BITMAPS::show_all_back_layers, wxT( "show_all_back_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_front_assembly_layers].emplace_back( BITMAPS::show_front_assembly_layers, wxT( "show_front_assembly_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::subtract_polygons].emplace_back( BITMAPS::subtract_polygons, wxT( "subtract_polygons_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::text_sketch].emplace_back( BITMAPS::text_sketch, wxT( "text_sketch_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::thermal_spokes].emplace_back( BITMAPS::thermal_spokes, wxT( "thermal_spokes_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::three_d].emplace_back( BITMAPS::three_d, wxT( "three_d_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::tool_ratsnest].emplace_back( BITMAPS::tool_ratsnest, wxT( "tool_ratsnest_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::tools].emplace_back( BITMAPS::tools, wxT( "tools_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::trash].emplace_back( BITMAPS::trash, wxT( "trash_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::undo].emplace_back( BITMAPS::undo, wxT( "undo_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unit_inch].emplace_back( BITMAPS::unit_inch, wxT( "unit_inch_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unit_mil].emplace_back( BITMAPS::unit_mil, wxT( "unit_mil_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unit_mm].emplace_back( BITMAPS::unit_mm, wxT( "unit_mm_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unknown].emplace_back( BITMAPS::unknown, wxT( "unknown_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unlocked].emplace_back( BITMAPS::unlocked, wxT( "unlocked_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::unzip].emplace_back( BITMAPS::unzip, wxT( "unzip_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::up].emplace_back( BITMAPS::up, wxT( "up_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::update_pcb_from_sch].emplace_back( BITMAPS::update_pcb_from_sch, wxT( "update_pcb_from_sch_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::update_sch_from_pcb].emplace_back( BITMAPS::update_sch_from_pcb, wxT( "update_sch_from_pcb_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via].emplace_back( BITMAPS::via, wxT( "via_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_annulus].emplace_back( BITMAPS::via_annulus, wxT( "via_annulus_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_buried].emplace_back( BITMAPS::via_buried, wxT( "via_buried_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_microvia].emplace_back( BITMAPS::via_microvia, wxT( "via_microvia_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_sketch].emplace_back( BITMAPS::via_sketch, wxT( "via_sketch_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_diameter].emplace_back( BITMAPS::via_diameter, wxT( "via_diameter_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::via_hole_diameter].emplace_back( BITMAPS::via_hole_diameter, wxT( "via_hole_diameter_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::width_conn].emplace_back( BITMAPS::width_conn, wxT( "width_conn_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::width_track_via].emplace_back( BITMAPS::width_track_via, wxT( "width_track_via_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::width_track].emplace_back( BITMAPS::width_track, wxT( "width_track_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zip].emplace_back( BITMAPS::zip, wxT( "zip_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zone_duplicate].emplace_back( BITMAPS::zone_duplicate, wxT( "zone_duplicate_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zone_fillet].emplace_back( BITMAPS::zone_fillet, wxT( "zone_fillet_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zone_unfill].emplace_back( BITMAPS::zone_unfill, wxT( "zone_unfill_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zoom_area].emplace_back( BITMAPS::zoom_area, wxT( "zoom_area_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zoom_auto_fit_in_page].emplace_back( BITMAPS::zoom_auto_fit_in_page, wxT( "zoom_auto_fit_in_page_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zoom_fit_in_page].emplace_back( BITMAPS::zoom_fit_in_page, wxT( "zoom_fit_in_page_48.png" ), 48, wxT( "light" ) );
aBitmapInfoCache[BITMAPS::zoom_fit_to_objects].emplace_back( BITMAPS::zoom_fit_to_objects, wxT( "zoom_fit_to_objects_48.png" ), 48, wxT( "light" ) );
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_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" ) );
aBitmapInfoCache[BITMAPS::add_arc].emplace_back( BITMAPS::add_arc, wxT( "add_arc_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_board].emplace_back( BITMAPS::add_board, wxT( "add_board_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_bus2bus].emplace_back( BITMAPS::add_bus2bus, wxT( "add_bus2bus_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_bus].emplace_back( BITMAPS::add_bus, wxT( "add_bus_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_center_dimension].emplace_back( BITMAPS::add_center_dimension, wxT( "add_center_dimension_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_class_flag].emplace_back( BITMAPS::add_class_flag, wxT( "add_class_flag_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_circle].emplace_back( BITMAPS::add_circle, wxT( "add_circle_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_component].emplace_back( BITMAPS::add_component, wxT( "add_component_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_corner].emplace_back( BITMAPS::add_corner, wxT( "add_corner_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_dashed_line].emplace_back( BITMAPS::add_dashed_line, wxT( "add_dashed_line_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_document].emplace_back( BITMAPS::add_document, wxT( "add_document_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_glabel].emplace_back( BITMAPS::add_glabel, wxT( "add_glabel_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_graphical_segments].emplace_back( BITMAPS::add_graphical_segments, wxT( "add_graphical_segments_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_graphical_polygon].emplace_back( BITMAPS::add_graphical_polygon, wxT( "add_graphical_polygon_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_hierarchical_label].emplace_back( BITMAPS::add_hierarchical_label, wxT( "add_hierarchical_label_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_hierar_pin].emplace_back( BITMAPS::add_hierar_pin, wxT( "add_hierar_pin_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_hierarchical_subsheet].emplace_back( BITMAPS::add_hierarchical_subsheet, wxT( "add_hierarchical_subsheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_junction].emplace_back( BITMAPS::add_junction, wxT( "add_junction_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_keepout_area].emplace_back( BITMAPS::add_keepout_area, wxT( "add_keepout_area_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_label].emplace_back( BITMAPS::add_label, wxT( "add_label_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_leader].emplace_back( BITMAPS::add_leader, wxT( "add_leader_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_library].emplace_back( BITMAPS::add_library, wxT( "add_library_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_line2bus].emplace_back( BITMAPS::add_line2bus, wxT( "add_line2bus_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_line_label].emplace_back( BITMAPS::add_line_label, wxT( "add_line_label_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_line].emplace_back( BITMAPS::add_line, wxT( "add_line_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_orthogonal_dimension].emplace_back( BITMAPS::add_orthogonal_dimension, wxT( "add_orthogonal_dimension_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_pcb_target].emplace_back( BITMAPS::add_pcb_target, wxT( "add_pcb_target_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_power].emplace_back( BITMAPS::add_power, wxT( "add_power_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_radial_dimension].emplace_back( BITMAPS::add_radial_dimension, wxT( "add_radial_dimension_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_rectangle].emplace_back( BITMAPS::add_rectangle, wxT( "add_rectangle_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_symbol_to_schematic].emplace_back( BITMAPS::add_symbol_to_schematic, wxT( "add_symbol_to_schematic_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_tracks].emplace_back( BITMAPS::add_tracks, wxT( "add_tracks_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_via].emplace_back( BITMAPS::add_via, wxT( "add_via_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_zone_cutout].emplace_back( BITMAPS::add_zone_cutout, wxT( "add_zone_cutout_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::add_zone].emplace_back( BITMAPS::add_zone, wxT( "add_zone_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items].emplace_back( BITMAPS::align_items, wxT( "align_items_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_left].emplace_back( BITMAPS::align_items_left, wxT( "align_items_left_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_right].emplace_back( BITMAPS::align_items_right, wxT( "align_items_right_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_top].emplace_back( BITMAPS::align_items_top, wxT( "align_items_top_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_bottom].emplace_back( BITMAPS::align_items_bottom, wxT( "align_items_bottom_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_center].emplace_back( BITMAPS::align_items_center, wxT( "align_items_center_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::align_items_middle].emplace_back( BITMAPS::align_items_middle, wxT( "align_items_middle_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::anchor].emplace_back( BITMAPS::anchor, wxT( "anchor_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::annotate_down_right].emplace_back( BITMAPS::annotate_down_right, wxT( "annotate_down_right_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::annotate_right_down].emplace_back( BITMAPS::annotate_right_down, wxT( "annotate_right_down_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::annotate].emplace_back( BITMAPS::annotate, wxT( "annotate_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::apply_pad_settings].emplace_back( BITMAPS::apply_pad_settings, wxT( "apply_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::array].emplace_back( BITMAPS::array, wxT( "array_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::auto_associate].emplace_back( BITMAPS::auto_associate, wxT( "auto_associate_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::auto_track_width].emplace_back( BITMAPS::auto_track_width, wxT( "auto_track_width_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::autoplace_fields].emplace_back( BITMAPS::autoplace_fields, wxT( "autoplace_fields_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_back].emplace_back( BITMAPS::axis3d_back, wxT( "axis3d_back_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_bottom].emplace_back( BITMAPS::axis3d_bottom, wxT( "axis3d_bottom_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_front].emplace_back( BITMAPS::axis3d_front, wxT( "axis3d_front_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_left].emplace_back( BITMAPS::axis3d_left, wxT( "axis3d_left_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_right].emplace_back( BITMAPS::axis3d_right, wxT( "axis3d_right_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d_top].emplace_back( BITMAPS::axis3d_top, wxT( "axis3d_top_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::axis3d].emplace_back( BITMAPS::axis3d, wxT( "axis3d_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::break_line].emplace_back( BITMAPS::break_line, wxT( "break_line_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::bug].emplace_back( BITMAPS::bug, wxT( "bug_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::bus_definition_tool].emplace_back( BITMAPS::bus_definition_tool, wxT( "bus_definition_tool_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::cancel].emplace_back( BITMAPS::cancel, wxT( "cancel_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::chamfer].emplace_back( BITMAPS::chamfer, wxT( "chamfer_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::change_entry_orient].emplace_back( BITMAPS::change_entry_orient, wxT( "change_entry_orient_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::contrast_mode].emplace_back( BITMAPS::contrast_mode, wxT( "contrast_mode_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::curved_ratsnest].emplace_back( BITMAPS::curved_ratsnest, wxT( "curved_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::checked_ok].emplace_back( BITMAPS::checked_ok, wxT( "checked_ok_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::color_materials].emplace_back( BITMAPS::color_materials, wxT( "color_materials_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::component_select_unit].emplace_back( BITMAPS::component_select_unit, wxT( "component_select_unit_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::config].emplace_back( BITMAPS::config, wxT( "config_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::convert].emplace_back( BITMAPS::convert, wxT( "convert_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::copy].emplace_back( BITMAPS::copy, wxT( "copy_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::copy_pad_settings].emplace_back( BITMAPS::copy_pad_settings, wxT( "copy_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::cursor_shape].emplace_back( BITMAPS::cursor_shape, wxT( "cursor_shape_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::cursor].emplace_back( BITMAPS::cursor, wxT( "cursor_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::custom_pad_to_primitives].emplace_back( BITMAPS::custom_pad_to_primitives, wxT( "custom_pad_to_primitives_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::cut].emplace_back( BITMAPS::cut, wxT( "cut_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::datasheet].emplace_back( BITMAPS::datasheet, wxT( "datasheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::delete_association].emplace_back( BITMAPS::delete_association, wxT( "delete_association_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::delete_cursor].emplace_back( BITMAPS::delete_cursor, wxT( "delete_cursor_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::delete_gerber].emplace_back( BITMAPS::delete_gerber, wxT( "delete_gerber_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::delete_sheet].emplace_back( BITMAPS::delete_sheet, wxT( "delete_sheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::directory].emplace_back( BITMAPS::directory, wxT( "directory_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::directory_browser].emplace_back( BITMAPS::directory_browser, wxT( "directory_browser_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::directory_open].emplace_back( BITMAPS::directory_open, wxT( "directory_open_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::distribute_horizontal].emplace_back( BITMAPS::distribute_horizontal, wxT( "distribute_horizontal_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::distribute_vertical].emplace_back( BITMAPS::distribute_vertical, wxT( "distribute_vertical_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::down].emplace_back( BITMAPS::down, wxT( "down_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::drag].emplace_back( BITMAPS::drag, wxT( "drag_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::drag_segment_withslope].emplace_back( BITMAPS::drag_segment_withslope, wxT( "drag_segment_withslope_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::drc].emplace_back( BITMAPS::drc, wxT( "drc_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::duplicate].emplace_back( BITMAPS::duplicate, wxT( "duplicate_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edit_comp_footprint].emplace_back( BITMAPS::edit_comp_footprint, wxT( "edit_comp_footprint_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edit_comp_ref].emplace_back( BITMAPS::edit_comp_ref, wxT( "edit_comp_ref_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edit_comp_value].emplace_back( BITMAPS::edit_comp_value, wxT( "edit_comp_value_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::editor].emplace_back( BITMAPS::editor, wxT( "editor_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edit_cmp_symb_links].emplace_back( BITMAPS::edit_cmp_symb_links, wxT( "edit_cmp_symb_links_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edit].emplace_back( BITMAPS::edit, wxT( "edit_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::edge_to_copper_clearance].emplace_back( BITMAPS::edge_to_copper_clearance, wxT( "edge_to_copper_clearance_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::enter_sheet].emplace_back( BITMAPS::enter_sheet, wxT( "enter_sheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ercerr].emplace_back( BITMAPS::ercerr, wxT( "ercerr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::erc_green].emplace_back( BITMAPS::erc_green, wxT( "erc_green_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ercwarn].emplace_back( BITMAPS::ercwarn, wxT( "ercwarn_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::erc].emplace_back( BITMAPS::erc, wxT( "erc_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::exit].emplace_back( BITMAPS::exit, wxT( "exit_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::exchange].emplace_back( BITMAPS::exchange, wxT( "exchange_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export3d].emplace_back( BITMAPS::export3d, wxT( "export3d_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_cmp].emplace_back( BITMAPS::export_cmp, wxT( "export_cmp_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_dsn].emplace_back( BITMAPS::export_dsn, wxT( "export_dsn_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_idf].emplace_back( BITMAPS::export_idf, wxT( "export_idf_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_file].emplace_back( BITMAPS::export_file, wxT( "export_file_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_footprint_names].emplace_back( BITMAPS::export_footprint_names, wxT( "export_footprint_names_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_module].emplace_back( BITMAPS::export_module, wxT( "export_module_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_part].emplace_back( BITMAPS::export_part, wxT( "export_part_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_png].emplace_back( BITMAPS::export_png, wxT( "export_png_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_step].emplace_back( BITMAPS::export_step, wxT( "export_step_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_svg].emplace_back( BITMAPS::export_svg, wxT( "export_svg_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::export_to_pcbnew].emplace_back( BITMAPS::export_to_pcbnew, wxT( "export_to_pcbnew_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::fabrication].emplace_back( BITMAPS::fabrication, wxT( "fabrication_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_bom].emplace_back( BITMAPS::file_bom, wxT( "file_bom_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_drl].emplace_back( BITMAPS::file_drl, wxT( "file_drl_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_dsn].emplace_back( BITMAPS::file_dsn, wxT( "file_dsn_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_gbr].emplace_back( BITMAPS::file_gbr, wxT( "file_gbr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_gerber_job].emplace_back( BITMAPS::file_gerber_job, wxT( "file_gerber_job_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_html].emplace_back( BITMAPS::file_html, wxT( "file_html_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_idf].emplace_back( BITMAPS::file_idf, wxT( "file_idf_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_pdf].emplace_back( BITMAPS::file_pdf, wxT( "file_pdf_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_pos].emplace_back( BITMAPS::file_pos, wxT( "file_pos_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::file_svg].emplace_back( BITMAPS::file_svg, wxT( "file_svg_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::fill_zone].emplace_back( BITMAPS::fill_zone, wxT( "fill_zone_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::fillet].emplace_back( BITMAPS::fillet, wxT( "fillet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::filter].emplace_back( BITMAPS::filter, wxT( "filter_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::find].emplace_back( BITMAPS::find, wxT( "find_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::find_replace].emplace_back( BITMAPS::find_replace, wxT( "find_replace_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::flag].emplace_back( BITMAPS::flag, wxT( "flag_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::flip_board].emplace_back( BITMAPS::flip_board, wxT( "flip_board_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::gbr_select_mode1].emplace_back( BITMAPS::gbr_select_mode1, wxT( "gbr_select_mode1_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::gbr_select_mode2].emplace_back( BITMAPS::gbr_select_mode2, wxT( "gbr_select_mode2_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::gerbview_show_negative_objects].emplace_back( BITMAPS::gerbview_show_negative_objects, wxT( "gerbview_show_negative_objects_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::general_deletions].emplace_back( BITMAPS::general_deletions, wxT( "general_deletions_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::general_ratsnest].emplace_back( BITMAPS::general_ratsnest, wxT( "general_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::grid_select].emplace_back( BITMAPS::grid_select, wxT( "grid_select_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::grid_select_axis].emplace_back( BITMAPS::grid_select_axis, wxT( "grid_select_axis_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::grid_override].emplace_back( BITMAPS::grid_override, wxT( "grid_override_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::grid].emplace_back( BITMAPS::grid, wxT( "grid_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::group].emplace_back( BITMAPS::group, wxT( "group_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::group_enter].emplace_back( BITMAPS::group_enter, wxT( "group_enter_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::group_leave].emplace_back( BITMAPS::group_leave, wxT( "group_leave_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::group_remove].emplace_back( BITMAPS::group_remove, wxT( "group_remove_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::group_ungroup].emplace_back( BITMAPS::group_ungroup, wxT( "group_ungroup_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::heal_shapes].emplace_back( BITMAPS::heal_shapes, wxT( "heal_shapes_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::help].emplace_back( BITMAPS::help, wxT( "help_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::help_online].emplace_back( BITMAPS::help_online, wxT( "help_online_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::hidden_pin].emplace_back( BITMAPS::hidden_pin, wxT( "hidden_pin_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::hide_ratsnest].emplace_back( BITMAPS::hide_ratsnest, wxT( "hide_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::hierarchy_nav].emplace_back( BITMAPS::hierarchy_nav, wxT( "hierarchy_nav_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::hotkeys].emplace_back( BITMAPS::hotkeys, wxT( "hotkeys_dark_48.png" ), 48, wxT( "dark" ) );
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_cvpcb_24].emplace_back( BITMAPS::icon_cvpcb_24, wxT( "icon_cvpcb_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_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" ) );
aBitmapInfoCache[BITMAPS::import_brd_file].emplace_back( BITMAPS::import_brd_file, wxT( "import_brd_file_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_document].emplace_back( BITMAPS::import_document, wxT( "import_document_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_footprint_names].emplace_back( BITMAPS::import_footprint_names, wxT( "import_footprint_names_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_hierarchical_label].emplace_back( BITMAPS::import_hierarchical_label, wxT( "import_hierarchical_label_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_module].emplace_back( BITMAPS::import_module, wxT( "import_module_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_part].emplace_back( BITMAPS::import_part, wxT( "import_part_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_project].emplace_back( BITMAPS::import_project, wxT( "import_project_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import_vector].emplace_back( BITMAPS::import_vector, wxT( "import_vector_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::import].emplace_back( BITMAPS::import, wxT( "import_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::info].emplace_back( BITMAPS::info, wxT( "info_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::insert_module_board].emplace_back( BITMAPS::insert_module_board, wxT( "insert_module_board_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::intersect_polygons].emplace_back( BITMAPS::intersect_polygons, wxT( "intersect_polygons_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::language].emplace_back( BITMAPS::language, wxT( "language_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::layers_manager].emplace_back( BITMAPS::layers_manager, wxT( "layers_manager_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::leave_sheet].emplace_back( BITMAPS::leave_sheet, wxT( "leave_sheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::left].emplace_back( BITMAPS::left, wxT( "left_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::libedit].emplace_back( BITMAPS::libedit, wxT( "libedit_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::lib_next].emplace_back( BITMAPS::lib_next, wxT( "lib_next_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::lib_previous].emplace_back( BITMAPS::lib_previous, wxT( "lib_previous_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::library_browser].emplace_back( BITMAPS::library_browser, wxT( "library_browser_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::library_archive].emplace_back( BITMAPS::library_archive, wxT( "library_archive_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::library_archive_as].emplace_back( BITMAPS::library_archive_as, wxT( "library_archive_as_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::library].emplace_back( BITMAPS::library, wxT( "library_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::library_table].emplace_back( BITMAPS::library_table, wxT( "library_table_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::lines_any].emplace_back( BITMAPS::lines_any, wxT( "lines_any_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::lines90].emplace_back( BITMAPS::lines90, wxT( "lines90_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::list_nets].emplace_back( BITMAPS::list_nets, wxT( "list_nets_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::load_drill].emplace_back( BITMAPS::load_drill, wxT( "load_drill_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::load_gerber].emplace_back( BITMAPS::load_gerber, wxT( "load_gerber_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::load_module_board].emplace_back( BITMAPS::load_module_board, wxT( "load_module_board_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::lock_unlock].emplace_back( BITMAPS::lock_unlock, wxT( "lock_unlock_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::locked].emplace_back( BITMAPS::locked, wxT( "locked_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::marker_exclude].emplace_back( BITMAPS::marker_exclude, wxT( "marker_exclude_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::marker_next].emplace_back( BITMAPS::marker_next, wxT( "marker_next_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::marker_previous].emplace_back( BITMAPS::marker_previous, wxT( "marker_previous_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::measurement].emplace_back( BITMAPS::measurement, wxT( "measurement_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::merge_polygons].emplace_back( BITMAPS::merge_polygons, wxT( "merge_polygons_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mirror_h].emplace_back( BITMAPS::mirror_h, wxT( "mirror_h_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mirror_v].emplace_back( BITMAPS::mirror_v, wxT( "mirror_v_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mode_module].emplace_back( BITMAPS::mode_module, wxT( "mode_module_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_editor].emplace_back( BITMAPS::module_editor, wxT( "module_editor_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_wizard].emplace_back( BITMAPS::module_wizard, wxT( "module_wizard_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_filtered_list].emplace_back( BITMAPS::module_filtered_list, wxT( "module_filtered_list_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_options].emplace_back( BITMAPS::module_options, wxT( "module_options_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_pin_filtered_list].emplace_back( BITMAPS::module_pin_filtered_list, wxT( "module_pin_filtered_list_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module_library_list].emplace_back( BITMAPS::module_library_list, wxT( "module_library_list_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::module].emplace_back( BITMAPS::module, wxT( "module_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::morgan1].emplace_back( BITMAPS::morgan1, wxT( "morgan1_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::morgan2].emplace_back( BITMAPS::morgan2, wxT( "morgan2_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::move_exactly].emplace_back( BITMAPS::move_exactly, wxT( "move_exactly_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::move].emplace_back( BITMAPS::move, wxT( "move_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::move_relative].emplace_back( BITMAPS::move_relative, wxT( "move_relative_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mw_add_gap].emplace_back( BITMAPS::mw_add_gap, wxT( "mw_add_gap_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mw_add_line].emplace_back( BITMAPS::mw_add_line, wxT( "mw_add_line_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mw_add_shape].emplace_back( BITMAPS::mw_add_shape, wxT( "mw_add_shape_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mw_add_stub_arc].emplace_back( BITMAPS::mw_add_stub_arc, wxT( "mw_add_stub_arc_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::mw_add_stub].emplace_back( BITMAPS::mw_add_stub, wxT( "mw_add_stub_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::net_highlight].emplace_back( BITMAPS::net_highlight, wxT( "net_highlight_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::net_highlight_schematic].emplace_back( BITMAPS::net_highlight_schematic, wxT( "net_highlight_schematic_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::netlist].emplace_back( BITMAPS::netlist, wxT( "netlist_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_component].emplace_back( BITMAPS::new_component, wxT( "new_component_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_footprint].emplace_back( BITMAPS::new_footprint, wxT( "new_footprint_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_generic].emplace_back( BITMAPS::new_generic, wxT( "new_generic_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_library].emplace_back( BITMAPS::new_library, wxT( "new_library_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_project].emplace_back( BITMAPS::new_project, wxT( "new_project_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::new_project_from_template].emplace_back( BITMAPS::new_project_from_template, wxT( "new_project_from_template_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::noconn].emplace_back( BITMAPS::noconn, wxT( "noconn_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::normal].emplace_back( BITMAPS::normal, wxT( "normal_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::open_project].emplace_back( BITMAPS::open_project, wxT( "open_project_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::open_project_demo].emplace_back( BITMAPS::open_project_demo, wxT( "open_project_demo_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_3drender].emplace_back( BITMAPS::options_3drender, wxT( "options_3drender_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_board].emplace_back( BITMAPS::options_board, wxT( "options_board_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_generic].emplace_back( BITMAPS::options_generic, wxT( "options_generic_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_pad].emplace_back( BITMAPS::options_pad, wxT( "options_pad_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::options_schematic].emplace_back( BITMAPS::options_schematic, wxT( "options_schematic_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::opt_show_polygon].emplace_back( BITMAPS::opt_show_polygon, wxT( "opt_show_polygon_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ortho].emplace_back( BITMAPS::ortho, wxT( "ortho_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pack_footprints].emplace_back( BITMAPS::pack_footprints, wxT( "pack_footprints_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pad_sketch].emplace_back( BITMAPS::pad_sketch, wxT( "pad_sketch_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pad].emplace_back( BITMAPS::pad, wxT( "pad_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pad_enumerate].emplace_back( BITMAPS::pad_enumerate, wxT( "pad_enumerate_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pad_number].emplace_back( BITMAPS::pad_number, wxT( "pad_number_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pads_mask_layers].emplace_back( BITMAPS::pads_mask_layers, wxT( "pads_mask_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pads_remove].emplace_back( BITMAPS::pads_remove, wxT( "pads_remove_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::path].emplace_back( BITMAPS::path, wxT( "path_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pagelayout_normal_view_mode].emplace_back( BITMAPS::pagelayout_normal_view_mode, wxT( "pagelayout_normal_view_mode_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pagelayout_special_view_mode].emplace_back( BITMAPS::pagelayout_special_view_mode, wxT( "pagelayout_special_view_mode_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::part_properties].emplace_back( BITMAPS::part_properties, wxT( "part_properties_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::paste].emplace_back( BITMAPS::paste, wxT( "paste_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::paste_special].emplace_back( BITMAPS::paste_special, wxT( "paste_special_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pcb_target].emplace_back( BITMAPS::pcb_target, wxT( "pcb_target_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pin2pin].emplace_back( BITMAPS::pin2pin, wxT( "pin2pin_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pin_size_to].emplace_back( BITMAPS::pin_size_to, wxT( "pin_size_to_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pin_show_etype].emplace_back( BITMAPS::pin_show_etype, wxT( "pin_show_etype_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pin_table].emplace_back( BITMAPS::pin_table, wxT( "pin_table_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::pin].emplace_back( BITMAPS::pin, wxT( "pin_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::plot].emplace_back( BITMAPS::plot, wxT( "plot_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::polar_coord].emplace_back( BITMAPS::polar_coord, wxT( "polar_coord_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_bom].emplace_back( BITMAPS::post_bom, wxT( "post_bom_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_compo].emplace_back( BITMAPS::post_compo, wxT( "post_compo_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_d356].emplace_back( BITMAPS::post_d356, wxT( "post_d356_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_drill].emplace_back( BITMAPS::post_drill, wxT( "post_drill_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_gencad].emplace_back( BITMAPS::post_gencad, wxT( "post_gencad_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_gerber].emplace_back( BITMAPS::post_gerber, wxT( "post_gerber_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::post_rpt].emplace_back( BITMAPS::post_rpt, wxT( "post_rpt_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::preference].emplace_back( BITMAPS::preference, wxT( "preference_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::print_button].emplace_back( BITMAPS::print_button, wxT( "print_button_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::project].emplace_back( BITMAPS::project, wxT( "project_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::project_close].emplace_back( BITMAPS::project_close, wxT( "project_close_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::project_kicad].emplace_back( BITMAPS::project_kicad, wxT( "project_kicad_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair].emplace_back( BITMAPS::ps_diff_pair, wxT( "ps_diff_pair_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_gap].emplace_back( BITMAPS::ps_diff_pair_gap, wxT( "ps_diff_pair_gap_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_length].emplace_back( BITMAPS::ps_diff_pair_tune_length, wxT( "ps_diff_pair_tune_length_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ps_diff_pair_tune_phase].emplace_back( BITMAPS::ps_diff_pair_tune_phase, wxT( "ps_diff_pair_tune_phase_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::ps_tune_length].emplace_back( BITMAPS::ps_tune_length, wxT( "ps_tune_length_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::push_pad_settings].emplace_back( BITMAPS::push_pad_settings, wxT( "push_pad_settings_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::puzzle_piece].emplace_back( BITMAPS::puzzle_piece, wxT( "puzzle_piece_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::py_script].emplace_back( BITMAPS::py_script, wxT( "py_script_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::recent].emplace_back( BITMAPS::recent, wxT( "recent_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::redo].emplace_back( BITMAPS::redo, wxT( "redo_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::refresh].emplace_back( BITMAPS::refresh, wxT( "refresh_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::reload].emplace_back( BITMAPS::reload, wxT( "reload_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::render_mode].emplace_back( BITMAPS::render_mode, wxT( "render_mode_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rescue].emplace_back( BITMAPS::rescue, wxT( "rescue_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::right].emplace_back( BITMAPS::right, wxT( "right_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner].emplace_back( BITMAPS::router_len_tuner, wxT( "router_len_tuner_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_setup].emplace_back( BITMAPS::router_len_tuner_setup, wxT( "router_len_tuner_setup_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_decr].emplace_back( BITMAPS::router_len_tuner_amplitude_decr, wxT( "router_len_tuner_amplitude_decr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_amplitude_incr].emplace_back( BITMAPS::router_len_tuner_amplitude_incr, wxT( "router_len_tuner_amplitude_incr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_dist_decr].emplace_back( BITMAPS::router_len_tuner_dist_decr, wxT( "router_len_tuner_dist_decr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::router_len_tuner_dist_incr].emplace_back( BITMAPS::router_len_tuner_dist_incr, wxT( "router_len_tuner_dist_incr_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw].emplace_back( BITMAPS::rotate_ccw, wxT( "rotate_ccw_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_cw].emplace_back( BITMAPS::rotate_cw, wxT( "rotate_cw_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_x].emplace_back( BITMAPS::rotate_ccw_x, wxT( "rotate_ccw_x_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_x].emplace_back( BITMAPS::rotate_cw_x, wxT( "rotate_cw_x_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_y].emplace_back( BITMAPS::rotate_ccw_y, wxT( "rotate_ccw_y_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_y].emplace_back( BITMAPS::rotate_cw_y, wxT( "rotate_cw_y_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_ccw_z].emplace_back( BITMAPS::rotate_ccw_z, wxT( "rotate_ccw_z_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::rotate_cw_z].emplace_back( BITMAPS::rotate_cw_z, wxT( "rotate_cw_z_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::save_as].emplace_back( BITMAPS::save_as, wxT( "save_as_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::save].emplace_back( BITMAPS::save, wxT( "save_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::select_layer_pair].emplace_back( BITMAPS::select_layer_pair, wxT( "select_layer_pair_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::select_w_layer].emplace_back( BITMAPS::select_w_layer, wxT( "select_w_layer_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::select_same_sheet].emplace_back( BITMAPS::select_same_sheet, wxT( "select_same_sheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::shape_3d].emplace_back( BITMAPS::shape_3d, wxT( "shape_3d_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::shape_3d_back].emplace_back( BITMAPS::shape_3d_back, wxT( "shape_3d_back_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sheetset].emplace_back( BITMAPS::sheetset, wxT( "sheetset_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::simulator].emplace_back( BITMAPS::simulator, wxT( "simulator_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sim_run].emplace_back( BITMAPS::sim_run, wxT( "sim_run_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sim_stop].emplace_back( BITMAPS::sim_stop, wxT( "sim_stop_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sim_tune].emplace_back( BITMAPS::sim_tune, wxT( "sim_tune_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sim_probe].emplace_back( BITMAPS::sim_probe, wxT( "sim_probe_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::sim_add_signal].emplace_back( BITMAPS::sim_add_signal, wxT( "sim_add_signal_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::slice_line].emplace_back( BITMAPS::slice_line, wxT( "slice_line_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::search_tree].emplace_back( BITMAPS::search_tree, wxT( "search_tree_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::set_origin].emplace_back( BITMAPS::set_origin, wxT( "set_origin_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_dcodenumber].emplace_back( BITMAPS::show_dcodenumber, wxT( "show_dcodenumber_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_dnp].emplace_back( BITMAPS::show_dnp, wxT( "show_dnp_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_footprint].emplace_back( BITMAPS::show_footprint, wxT( "show_footprint_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_mod_edge].emplace_back( BITMAPS::show_mod_edge, wxT( "show_mod_edge_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_ratsnest].emplace_back( BITMAPS::show_ratsnest, wxT( "show_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::showtrack].emplace_back( BITMAPS::showtrack, wxT( "showtrack_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_not_in_posfile].emplace_back( BITMAPS::show_not_in_posfile, wxT( "show_not_in_posfile_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_other].emplace_back( BITMAPS::show_other, wxT( "show_other_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_tht].emplace_back( BITMAPS::show_tht, wxT( "show_tht_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_smt].emplace_back( BITMAPS::show_smt, wxT( "show_smt_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_zone].emplace_back( BITMAPS::show_zone, wxT( "show_zone_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_zone_disable].emplace_back( BITMAPS::show_zone_disable, wxT( "show_zone_disable_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_zone_outline_only].emplace_back( BITMAPS::show_zone_outline_only, wxT( "show_zone_outline_only_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_zone_triangulation].emplace_back( BITMAPS::show_zone_triangulation, wxT( "show_zone_triangulation_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_all_layers].emplace_back( BITMAPS::show_all_layers, wxT( "show_all_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_no_layers].emplace_back( BITMAPS::show_no_layers, wxT( "show_no_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_no_copper_layers].emplace_back( BITMAPS::show_no_copper_layers, wxT( "show_no_copper_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_all_copper_layers].emplace_back( BITMAPS::show_all_copper_layers, wxT( "show_all_copper_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_all_front_layers].emplace_back( BITMAPS::show_all_front_layers, wxT( "show_all_front_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_all_back_layers].emplace_back( BITMAPS::show_all_back_layers, wxT( "show_all_back_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_front_assembly_layers].emplace_back( BITMAPS::show_front_assembly_layers, wxT( "show_front_assembly_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::show_back_assembly_layers].emplace_back( BITMAPS::show_back_assembly_layers, wxT( "show_back_assembly_layers_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::special_tools].emplace_back( BITMAPS::special_tools, wxT( "special_tools_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::spreadsheet].emplace_back( BITMAPS::spreadsheet, wxT( "spreadsheet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::subtract_polygons].emplace_back( BITMAPS::subtract_polygons, wxT( "subtract_polygons_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::swap].emplace_back( BITMAPS::swap, wxT( "swap_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::swap_layer].emplace_back( BITMAPS::swap_layer, wxT( "swap_layer_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::switch_corner_rounding_shape].emplace_back( BITMAPS::switch_corner_rounding_shape, wxT( "switch_corner_rounding_shape_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text].emplace_back( BITMAPS::text, wxT( "text_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::text_sketch].emplace_back( BITMAPS::text_sketch, wxT( "text_sketch_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::thermal_spokes].emplace_back( BITMAPS::thermal_spokes, wxT( "thermal_spokes_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::three_d].emplace_back( BITMAPS::three_d, wxT( "three_d_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::tool_ratsnest].emplace_back( BITMAPS::tool_ratsnest, wxT( "tool_ratsnest_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::tools].emplace_back( BITMAPS::tools, wxT( "tools_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::trash].emplace_back( BITMAPS::trash, wxT( "trash_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::undo].emplace_back( BITMAPS::undo, wxT( "undo_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unit_inch].emplace_back( BITMAPS::unit_inch, wxT( "unit_inch_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unit_mil].emplace_back( BITMAPS::unit_mil, wxT( "unit_mil_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unit_mm].emplace_back( BITMAPS::unit_mm, wxT( "unit_mm_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unknown].emplace_back( BITMAPS::unknown, wxT( "unknown_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unlocked].emplace_back( BITMAPS::unlocked, wxT( "unlocked_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::unzip].emplace_back( BITMAPS::unzip, wxT( "unzip_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::up].emplace_back( BITMAPS::up, wxT( "up_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::update_pcb_from_sch].emplace_back( BITMAPS::update_pcb_from_sch, wxT( "update_pcb_from_sch_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::update_sch_from_pcb].emplace_back( BITMAPS::update_sch_from_pcb, wxT( "update_sch_from_pcb_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via].emplace_back( BITMAPS::via, wxT( "via_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_annulus].emplace_back( BITMAPS::via_annulus, wxT( "via_annulus_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_buried].emplace_back( BITMAPS::via_buried, wxT( "via_buried_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_microvia].emplace_back( BITMAPS::via_microvia, wxT( "via_microvia_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_sketch].emplace_back( BITMAPS::via_sketch, wxT( "via_sketch_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_diameter].emplace_back( BITMAPS::via_diameter, wxT( "via_diameter_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::via_hole_diameter].emplace_back( BITMAPS::via_hole_diameter, wxT( "via_hole_diameter_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::width_conn].emplace_back( BITMAPS::width_conn, wxT( "width_conn_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::width_track_via].emplace_back( BITMAPS::width_track_via, wxT( "width_track_via_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::width_track].emplace_back( BITMAPS::width_track, wxT( "width_track_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zip].emplace_back( BITMAPS::zip, wxT( "zip_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zone_duplicate].emplace_back( BITMAPS::zone_duplicate, wxT( "zone_duplicate_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zone_fillet].emplace_back( BITMAPS::zone_fillet, wxT( "zone_fillet_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zone_unfill].emplace_back( BITMAPS::zone_unfill, wxT( "zone_unfill_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zoom_area].emplace_back( BITMAPS::zoom_area, wxT( "zoom_area_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zoom_auto_fit_in_page].emplace_back( BITMAPS::zoom_auto_fit_in_page, wxT( "zoom_auto_fit_in_page_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zoom_fit_in_page].emplace_back( BITMAPS::zoom_fit_in_page, wxT( "zoom_fit_in_page_dark_48.png" ), 48, wxT( "dark" ) );
aBitmapInfoCache[BITMAPS::zoom_fit_to_objects].emplace_back( BITMAPS::zoom_fit_to_objects, wxT( "zoom_fit_to_objects_dark_48.png" ), 48, wxT( "dark" ) );
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_selection].emplace_back( BITMAPS::zoom_selection, wxT( "zoom_selection_dark_48.png" ), 48, 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" ) );
aBitmapInfoCache[BITMAPS::icon_gerbview_32].emplace_back( BITMAPS::icon_gerbview_32, wxT( "icon_gerbview_32_32.png" ), 32, wxT( "light" ) );

40
common/bitmap_store.cpp
View File

@ -121,6 +121,39 @@ wxBitmap BITMAP_STORE::GetBitmap( BITMAPS aBitmapId, int aHeight )
}
wxBitmapBundle BITMAP_STORE::GetBitmapBundle( BITMAPS aBitmapId )
{
wxVector<wxBitmap> bmps;
for( const BITMAP_INFO& info : m_bitmapInfoCache[aBitmapId] )
{
if( info.theme != m_theme )
continue;
bmps.push_back( wxBitmap( getImage( info.id, info.height ) ) );
}
return wxBitmapBundle::FromBitmaps( bmps );
}
wxBitmapBundle BITMAP_STORE::GetDisabledBitmapBundle( BITMAPS aBitmapId )
{
wxVector<wxBitmap> bmps;
for( const BITMAP_INFO& info : m_bitmapInfoCache[aBitmapId] )
{
if( info.theme != m_theme )
continue;
bmps.push_back( wxBitmap( getImage( info.id, info.height ) )
.ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 ) );
}
return wxBitmapBundle::FromBitmaps( bmps );
}
wxBitmap BITMAP_STORE::GetBitmapScaled( BITMAPS aBitmapId, int aScaleFactor, int aHeight )
{
wxImage image = getImage( aBitmapId, aHeight );
@ -152,7 +185,8 @@ wxImage BITMAP_STORE::getImage( BITMAPS aBitmapId, int aHeight )
if( count < 0 )
{
wxLogTrace( traceBitmaps, "Bitmap for %d, %d, %s has an info tag with file %s,"
wxLogTrace( traceBitmaps,
"Bitmap for %d, %d, %s has an info tag with file %s,"
"but that file could not be found in the archive!",
aBitmapId, aHeight, m_theme );
data = s_imageNotFound;
@ -228,8 +262,8 @@ wxString BITMAP_STORE::computeBitmapName( BITMAPS aBitmapId, int aHeight )
if( fn.IsEmpty() )
{
wxLogTrace( traceBitmaps, "No bitmap found matching ID %d, height %d, theme %s",
aBitmapId, aHeight, m_theme );
wxLogTrace( traceBitmaps, "No bitmap found matching ID %d, height %d, theme %s", aBitmapId,
aHeight, m_theme );
return m_bitmapInfoCache.at( aBitmapId ).begin()->filename;
}

2
common/dialog_about/dialog_about.cpp
View File

@ -443,7 +443,7 @@ wxStaticBitmap* DIALOG_ABOUT::createStaticBitmap( wxScrolledWindow* aParent, wxB
if( aIcon )
bitmap->SetBitmap( *aIcon );
else
bitmap->SetBitmap( KiBitmap( BITMAPS::right ) );
bitmap->SetBitmap( KiBitmapBundle( BITMAPS::right ) );
return bitmap;
}

4
common/dialogs/dialog_configure_paths.cpp
View File

@ -64,8 +64,8 @@ DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent ) :
m_helpBox( nullptr ),
m_heightBeforeHelp( 400 )
{
m_btnAddEnvVar->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_btnDeleteEnvVar->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_btnAddEnvVar->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_btnDeleteEnvVar->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_EnvVars->ClearRows();
m_EnvVars->AppendCols( 1 ); // for the isExternal flags

2
common/dialogs/dialog_locked_items_query.cpp
View File

@ -28,7 +28,7 @@
DIALOG_LOCKED_ITEMS_QUERY::DIALOG_LOCKED_ITEMS_QUERY( wxWindow* aParent, int aLockedItemCount ) :
DIALOG_LOCKED_ITEMS_QUERY_BASE( aParent )
{
m_icon->SetBitmap( KiBitmap( BITMAPS::locked ) );
m_icon->SetBitmap( KiBitmapBundle( BITMAPS::locked ) );
m_messageLine1->SetLabel( wxString::Format( m_messageLine1->GetLabel(), aLockedItemCount ) );

2
common/dialogs/dialog_migrate_settings.cpp
View File

@ -31,7 +31,7 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
{
m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) );
m_btnCustomPath->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_btnCustomPath->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
// Disabled for now. See https://gitlab.com/kicad/code/kicad/-/issues/9826
m_cbCopyLibraryTables->Hide();

2
common/dialogs/dialog_page_settings.cpp
View File

@ -86,7 +86,7 @@ DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* aParent, double aI
m_customSizeY( aParent, m_userSizeYLabel, m_userSizeYCtrl, m_userSizeYUnits )
{
m_projectPath = Prj().GetProjectPath();
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_maxPageSizeMils = aMaxUserSizeMils;
m_tb = m_parent->GetTitleBlock();

4
common/dialogs/dialog_plugin_options.cpp
View File

@ -76,8 +76,8 @@ DIALOG_PLUGIN_OPTIONS::DIALOG_PLUGIN_OPTIONS( wxWindow* aParent,
m_html->SetPage( m_initial_help );
// Configure button logos
m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
// initial focus on the grid please.
SetInitialFocus( m_grid );

4
common/dialogs/eda_reorderable_list_dialog.cpp
View File

@ -35,8 +35,8 @@ EDA_REORDERABLE_LIST_DIALOG::EDA_REORDERABLE_LIST_DIALOG( wxWindow* aParent, con
m_selectedAvailable( 0 ),
m_selectedEnabled( 0 )
{
m_btnUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_btnDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_btnUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_btnDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
// DIALOG_SHIM needs a unique hash_key because classname is not sufficient
// because so many dialogs share this same class, with different numbers of

6
common/dialogs/git/panel_git_repos.cpp
View File

@ -36,9 +36,9 @@
PANEL_GIT_REPOS::PANEL_GIT_REPOS( wxWindow* aParent ) : PANEL_GIT_REPOS_BASE( aParent)
{
m_btnAddRepo->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_btnEditRepo->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_btnDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_btnAddRepo->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_btnEditRepo->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
m_btnDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
}

4
common/dialogs/panel_common_settings.cpp
View File

@ -59,8 +59,8 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( wxWindow* aParent )
m_antialiasingFallbackLabel->Show( false );
#endif
m_textEditorBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_pdfViewerBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_textEditorBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_pdfViewerBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
/*
* Automatic dark mode detection works fine on Mac, so no need for the explicit options.

8
common/dialogs/panel_grid_settings.cpp
View File

@ -75,10 +75,10 @@ PANEL_GRID_SETTINGS::PANEL_GRID_SETTINGS( wxWindow* aParent, UNITS_PROVIDER* aUn
m_grid1HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk1 ) ) );
m_grid2HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk2 ) ) );
m_addGridButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_removeGridButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_moveUpButton->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_moveDownButton->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_addGridButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_removeGridButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_moveUpButton->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_moveDownButton->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
Layout();
}

2
common/dialogs/panel_mouse_settings.cpp
View File

@ -47,7 +47,7 @@ PANEL_MOUSE_SETTINGS::PANEL_MOUSE_SETTINGS( wxWindow* aParent ) :
m_lblAlt->SetLabel( _( "Option" ) );
#endif
m_scrollWarning->SetBitmap( KiBitmap( BITMAPS::small_warning ) );
m_scrollWarning->SetBitmap( KiBitmapBundle( BITMAPS::small_warning ) );
m_scrollWarning->Hide();
m_checkAutoZoomSpeed->Bind( wxEVT_COMMAND_CHECKBOX_CLICKED,

8
common/dialogs/panel_setup_netclasses.cpp
View File

@ -198,11 +198,11 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( wxWindow* aParentWindow, EDA_DRA
COMMON_SETTINGS* cfg = Pgm().GetCommonSettings();
m_splitter->SetSashPosition( cfg->m_NetclassPanel.sash_pos );
m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_removeButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_removeButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_addAssignmentButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_removeAssignmentButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addAssignmentButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_removeAssignmentButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
// wxFormBuilder doesn't include this event...
m_netclassGrid->Connect( wxEVT_GRID_CELL_CHANGING,

4
common/dialogs/panel_text_variables.cpp
View File

@ -46,8 +46,8 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject
m_errorRow( -1 ), m_errorCol( -1 ),
m_gridWidthsDirty( true )
{
m_btnAddTextVar->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_btnDeleteTextVar->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_btnAddTextVar->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_btnDeleteTextVar->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_TextVars->ClearRows();

43
common/tool/action_toolbar.cpp
View File

@ -48,12 +48,6 @@
#include <wx/settings.h>
wxBitmap MakeDisabledBitmap( const wxBitmap& aSource )
{
return aSource.ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 );
}
ACTION_GROUP::ACTION_GROUP( const std::string& aName,
const std::vector<const TOOL_ACTION*>& aActions )
{
@ -120,15 +114,16 @@ ACTION_TOOLBAR_PALETTE::ACTION_TOOLBAR_PALETTE( wxWindow* aParent, bool aVertica
void ACTION_TOOLBAR_PALETTE::AddAction( const TOOL_ACTION& aAction )
{
wxBitmap normalBmp = KiScaledBitmap( aAction.GetIcon(), this );
wxBitmap disabledBmp = MakeDisabledBitmap( normalBmp );
// TODO(JE)
wxBitmapBundle normalBmp = KiBitmapBundle( aAction.GetIcon() );
int padding = ( m_buttonSize.GetWidth() - normalBmp.GetWidth() ) / 2;
int bmpWidth = normalBmp.GetPreferredBitmapSizeFor( this ).GetWidth();
int padding = ( m_buttonSize.GetWidth() - bmpWidth ) / 2;
BITMAP_BUTTON* button = new BITMAP_BUTTON( m_panel, aAction.GetUIId() );
button->SetBitmap( normalBmp );
button->SetDisabledBitmap( disabledBmp );
button->SetDisabledBitmap( KiDisabledBitmapBundle( aAction.GetIcon() ) );
button->SetPadding( padding );
button->SetToolTip( aAction.GetTooltip() );
button->AcceptDragInAsClick();
@ -227,9 +222,9 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
wxASSERT_MSG( !( aIsCancellable && !aIsToggleEntry ), wxS( "aIsCancellable requires aIsToggleEntry" ) );
int toolId = aAction.GetUIId();
wxBitmap bmp = KiScaledBitmap( aAction.GetIcon(), GetParent() );
AddTool( toolId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
KiDisabledBitmapBundle( aAction.GetIcon() ),
aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
aAction.GetTooltip(), wxEmptyString, nullptr );
@ -242,9 +237,9 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
void ACTION_TOOLBAR::AddButton( const TOOL_ACTION& aAction )
{
int toolId = aAction.GetUIId();
wxBitmap bmp = KiScaledBitmap( aAction.GetIcon(), GetParent() );
AddTool( toolId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
AddTool( toolId, wxEmptyString, KiBitmapBundle( aAction.GetIcon() ),
KiDisabledBitmapBundle( aAction.GetIcon() ),
wxITEM_NORMAL, aAction.GetTooltip(), wxEmptyString, nullptr );
m_toolKinds[ toolId ] = false;
@ -282,7 +277,6 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
{
int groupId = aGroup->GetUIId();
const TOOL_ACTION* defaultAction = aGroup->GetDefaultAction();
wxBitmap bmp = KiScaledBitmap( defaultAction->GetIcon(), GetParent() );
wxASSERT( GetParent() );
wxASSERT( defaultAction );
@ -292,7 +286,8 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
m_actionGroups[ groupId ] = aGroup;
// Add the main toolbar item representing the group
AddTool( groupId, wxEmptyString, bmp, MakeDisabledBitmap( bmp ),
AddTool( groupId, wxEmptyString, KiBitmapBundle( defaultAction->GetIcon() ),
KiDisabledBitmapBundle( defaultAction->GetIcon() ),
aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL,
wxEmptyString, wxEmptyString, nullptr );
@ -328,9 +323,8 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
// Update the item information
item->SetShortHelp( aAction.GetTooltip() );
item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
item->SetDisabledBitmap(
MakeDisabledBitmap( item->GetBitmapBundle().GetBitmapFor( GetParent() ) ) );
item->SetBitmap( KiBitmapBundle( aAction.GetIcon() ) );
item->SetDisabledBitmap( KiDisabledBitmapBundle( aAction.GetIcon() ) );
// Register a new handler with the new UI conditions
if( m_toolManager )
@ -408,7 +402,10 @@ void ACTION_TOOLBAR::SetToolBitmap( const TOOL_ACTION& aAction, const wxBitmap&
wxAuiToolBarItem* tb_item = wxAuiToolBar::FindTool( toolId );
if( tb_item )
tb_item->SetDisabledBitmap( MakeDisabledBitmap( aBitmap ) );
{
tb_item->SetDisabledBitmap(
aBitmap.ConvertToDisabled( KIPLATFORM::UI::IsDarkTheme() ? 70 : 255 ) );
}
}
@ -836,10 +833,8 @@ void ACTION_TOOLBAR::RefreshBitmaps()
{
wxAuiToolBarItem* tool = FindTool( pair.first );
wxBitmap bmp = KiScaledBitmap( pair.second->GetIcon(), GetParent() );
tool->SetBitmap( bmp );
tool->SetDisabledBitmap( MakeDisabledBitmap( bmp ) );
tool->SetBitmap( KiBitmapBundle( pair.second->GetIcon() ) );
tool->SetDisabledBitmap( KiDisabledBitmapBundle( pair.second->GetIcon() ) );
}
Refresh();

2
common/widgets/kistatusbar.cpp
View File

@ -93,7 +93,7 @@ KISTATUSBAR::KISTATUSBAR( int aNumberFields, wxWindow* parent, wxWindowID id ) :
wxDefaultSize, wxBU_EXACTFIT );
m_notificationsButton->SetPadding( 0 );
m_notificationsButton->SetBitmap( KiBitmap( BITMAPS::notifications ) );
m_notificationsButton->SetBitmap( KiBitmapBundle( BITMAPS::notifications ) );
m_notificationsButton->SetShowBadge( true );
m_notificationsButton->SetBitmapCentered( true );

2
common/widgets/lib_tree.cpp
View File

@ -85,7 +85,7 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
m_sort_ctrl = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition,
wxDefaultSize, wxBU_AUTODRAW|0 );
m_sort_ctrl->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
m_sort_ctrl->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
m_sort_ctrl->Bind( wxEVT_LEFT_DOWN,
[&]( wxMouseEvent& aEvent )
{

10
cvpcb/dialogs/dialog_config_equfiles.cpp
View File

@ -44,11 +44,11 @@ DIALOG_CONFIG_EQUFILES::DIALOG_CONFIG_EQUFILES( wxWindow* aParent ) :
{
SetTitle( wxString::Format( _( "Project file: '%s'" ), Prj().GetProjectFullName() ) );
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_bpEdit->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_bpEdit->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
PROJECT_FILE& project = Prj().GetProjectFile();

4
eeschema/dialogs/dialog_annotate.cpp
View File

@ -190,8 +190,8 @@ void DIALOG_ANNOTATE::InitValues()
m_textNumberAfter->SetValue( wxString::Format( wxT( "%d" ), annotateStartNum ) );
annotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_down_right ) );
annotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_right_down ) );
annotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_down_right ) );
annotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_right_down ) );
m_MessageWindow->SetVisibleSeverities( cfg->m_AnnotatePanel.messages_filter );

6
eeschema/dialogs/dialog_bom.cpp
View File

@ -122,9 +122,9 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) :
m_initialized( false ),
m_helpWindow( nullptr )
{
m_buttonAddGenerator->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_buttonDelGenerator->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_buttonEdit->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_buttonAddGenerator->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_buttonDelGenerator->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_buttonEdit->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
installGeneratorsList();

4
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -85,8 +85,8 @@ DIALOG_CHANGE_SYMBOLS::DIALOG_CHANGE_SYMBOLS( SCH_EDIT_FRAME* aParent, SCH_SYMBO
m_matchSizer->FindItem( m_matchBySelection )->Show( false );
}
m_matchIdBrowserButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
m_newIdBrowserButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
m_matchIdBrowserButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
m_newIdBrowserButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
if( m_mode == MODE::CHANGE )
{

22
eeschema/dialogs/dialog_field_properties.cpp
View File

@ -91,34 +91,34 @@ DIALOG_FIELD_PROPERTIES::DIALOG_FIELD_PROPERTIES( SCH_BASE_FRAME* aParent, const
m_separator1->SetIsSeparator();
m_horizontal->SetIsRadioButton();
m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
m_vertical->SetIsRadioButton();
m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
m_separator2->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator3->SetIsSeparator();
m_hAlignLeft->SetIsRadioButton();
m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_hAlignCenter->SetIsRadioButton();
m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_hAlignRight->SetIsRadioButton();
m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator4->SetIsSeparator();
m_vAlignTop->SetIsRadioButton();
m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_vAlignCenter->SetIsRadioButton();
m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_vAlignBottom->SetIsRadioButton();
m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_separator5->SetIsSeparator();
@ -183,7 +183,7 @@ void DIALOG_FIELD_PROPERTIES::init()
}
// Show the footprint selection dialog if this is the footprint field.
m_TextValueSelectButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
m_TextValueSelectButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
m_TextValueSelectButton->Show( m_fieldId == FOOTPRINT_FIELD );
if( m_fieldId == FOOTPRINT_FIELD )

36
eeschema/dialogs/dialog_label_properties.cpp
View File

@ -123,17 +123,17 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
}
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_separator1->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator2->SetIsSeparator();
@ -155,10 +155,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
m_diamond->Hide();
m_rectangle->Hide();
m_spin0->SetBitmap( KiBitmap( BITMAPS::label_align_left ) );
m_spin1->SetBitmap( KiBitmap( BITMAPS::label_align_right ) );
m_spin2->SetBitmap( KiBitmap( BITMAPS::label_align_bottom ) );
m_spin3->SetBitmap( KiBitmap( BITMAPS::label_align_top ) );
m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::label_align_left ) );
m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::label_align_right ) );
m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::label_align_bottom ) );
m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::label_align_top ) );
}
else if( m_currentLabel->Type() == SCH_DIRECTIVE_LABEL_T )
{
@ -174,10 +174,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
m_bold->Hide();
m_italic->Hide();
m_separator2->Hide();
m_spin0->SetBitmap( KiBitmap( BITMAPS::pinorient_down ) );
m_spin1->SetBitmap( KiBitmap( BITMAPS::pinorient_up ) );
m_spin2->SetBitmap( KiBitmap( BITMAPS::pinorient_right ) );
m_spin3->SetBitmap( KiBitmap( BITMAPS::pinorient_left ) );
m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_down ) );
m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_up ) );
m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_right ) );
m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::pinorient_left ) );
m_separator3->Hide();
m_formattingGB->Detach( m_fontCtrl );
@ -188,10 +188,10 @@ DIALOG_LABEL_PROPERTIES::DIALOG_LABEL_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_L
{
m_shapeSizer->Show( false );
m_spin0->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_spin1->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_spin2->SetBitmap( KiBitmap( BITMAPS::text_align_bottom ) );
m_spin3->SetBitmap( KiBitmap( BITMAPS::text_align_top ) );
m_spin0->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_spin1->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_spin2->SetBitmap( KiBitmapBundle( BITMAPS::text_align_bottom ) );
m_spin3->SetBitmap( KiBitmapBundle( BITMAPS::text_align_top ) );
}
if( !m_currentLabel->AutoRotateOnPlacementSupported() )

6
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -804,9 +804,9 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent,
m_grid->SetColAttr( COL_POSY, attr );
*/
m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_refreshButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_refreshButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
m_divider1->SetIsSeparator();
m_divider2->SetIsSeparator();

14
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -82,13 +82,13 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
m_SymbolNameCtrl->SetValidator( FIELD_VALIDATOR( VALUE_FIELD ) );
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_addFilterButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteFilterButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_editFilterButton->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_addFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_editFilterButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
SetupStandardButtons();

20
eeschema/dialogs/dialog_lib_text_properties.cpp
View File

@ -55,34 +55,34 @@ DIALOG_LIB_TEXT_PROPERTIES::DIALOG_LIB_TEXT_PROPERTIES( SYMBOL_EDIT_FRAME* aPare
m_separator1->SetIsSeparator();
m_horizontal->SetIsRadioButton();
m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
m_vertical->SetIsRadioButton();
m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
m_separator2->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator3->SetIsSeparator();
m_hAlignLeft->SetIsRadioButton();
m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_hAlignCenter->SetIsRadioButton();
m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_hAlignRight->SetIsRadioButton();
m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator4->SetIsSeparator();
m_vAlignTop->SetIsRadioButton();
m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_vAlignCenter->SetIsRadioButton();
m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_vAlignBottom->SetIsRadioButton();
m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_separator5->SetIsSeparator();

20
eeschema/dialogs/dialog_lib_textbox_properties.cpp
View File

@ -87,33 +87,33 @@ DIALOG_LIB_TEXTBOX_PROPERTIES::DIALOG_LIB_TEXTBOX_PROPERTIES( SYMBOL_EDIT_FRAME*
m_separator1->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator2->SetIsSeparator();
m_hAlignLeft->SetIsRadioButton();
m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_hAlignCenter->SetIsRadioButton();
m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_hAlignRight->SetIsRadioButton();
m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator3->SetIsSeparator();
m_vAlignTop->SetIsRadioButton();
m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_vAlignCenter->SetIsRadioButton();
m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_vAlignBottom->SetIsRadioButton();
m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_separator4->SetIsSeparator();
m_horizontal->SetIsRadioButton();
m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
m_vertical->SetIsRadioButton();
m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
m_separator5->SetIsSeparator();

4
eeschema/dialogs/dialog_pin_properties.cpp
View File

@ -217,8 +217,8 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
attr->SetEditor( new GRID_CELL_ICON_TEXT_POPUP( PinShapeIcons(), PinShapeNames() ) );
m_alternatesGrid->SetColAttr( COL_SHAPE, attr );
m_addAlternate->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteAlternate->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addAlternate->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteAlternate->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_addAlternate->GetParent()->Layout();
SetupStandardButtons();

2
eeschema/dialogs/dialog_plot_schematic.cpp
View File

@ -67,7 +67,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent )
{
m_configChanged = false;
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_MessagesBox->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );

2
eeschema/dialogs/dialog_sch_import_settings.cpp
View File

@ -39,7 +39,7 @@ DIALOG_SCH_IMPORT_SETTINGS::DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_E
DIALOG_SCH_IMPORT_SETTINGS_BASE( aParent ),
m_frame( aFrame )
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
SetupStandardButtons( { { wxID_OK, _( "Import Settings" ) } } );
}

4
eeschema/dialogs/dialog_sheet_pin_properties.cpp
View File

@ -51,9 +51,9 @@ DIALOG_SHEET_PIN_PROPERTIES::DIALOG_SHEET_PIN_PROPERTIES( SCH_EDIT_FRAME* parent
m_separator1->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator2->SetIsSeparator();

8
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -88,10 +88,10 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
SetupStandardButtons();
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
// Set font sizes
m_hierarchicalPathLabel->SetFont( KIUI::GetInfoFont( this ) );

2
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -73,7 +73,7 @@ DIALOG_SIM_MODEL<T_symbol, T_field>::DIALOG_SIM_MODEL( wxWindow* aParent, T_symb
m_lastParamGridWidth( 0 ),
m_inKillFocus( false )
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
for( LIB_PIN* pin : aSymbol.GetAllLibPins() )
{

12
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -172,13 +172,13 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent )
m_separator1->SetIsSeparator();
m_separator2->SetIsSeparator();
m_bRefresh->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
m_bRefreshPreview->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_bRefresh->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
m_bRefreshPreview->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_addFieldButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_removeFieldButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_renameFieldButton->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_addFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_removeFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_renameFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
m_removeFieldButton->Enable( false );
m_renameFieldButton->Enable( false );

8
eeschema/dialogs/dialog_symbol_properties.cpp
View File

@ -376,10 +376,10 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
SetupStandardButtons();
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
// wxFormBuilder doesn't include this event...
m_fieldsGrid->Bind( wxEVT_GRID_CELL_CHANGING, &DIALOG_SYMBOL_PROPERTIES::OnGridCellChanging,

20
eeschema/dialogs/dialog_text_properties.cpp
View File

@ -130,33 +130,33 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_ITE
m_separator1->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator2->SetIsSeparator();
m_hAlignLeft->SetIsRadioButton();
m_hAlignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_hAlignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_hAlignCenter->SetIsRadioButton();
m_hAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_hAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_hAlignRight->SetIsRadioButton();
m_hAlignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_hAlignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator3->SetIsSeparator();
m_vAlignTop->SetIsRadioButton();
m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_vAlignCenter->SetIsRadioButton();
m_vAlignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_vAlignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_vAlignBottom->SetIsRadioButton();
m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_separator4->SetIsSeparator();
m_horizontal->SetIsRadioButton();
m_horizontal->SetBitmap( KiBitmap( BITMAPS::text_horizontal ) );
m_horizontal->SetBitmap( KiBitmapBundle( BITMAPS::text_horizontal ) );
m_vertical->SetIsRadioButton();
m_vertical->SetBitmap( KiBitmap( BITMAPS::text_vertical ) );
m_vertical->SetBitmap( KiBitmapBundle( BITMAPS::text_vertical ) );
m_separator5->SetIsSeparator();

4
eeschema/dialogs/dialog_user_defined_signals.cpp
View File

@ -47,8 +47,8 @@ DIALOG_USER_DEFINED_SIGNALS::DIALOG_USER_DEFINED_SIGNALS( SIMULATOR_FRAME* aPare
for( const auto& [ id, signal ] : *m_signals )
addGridRow( signal, id );
m_addButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
SetupStandardButtons();
Layout();

4
eeschema/dialogs/panel_bom_presets.cpp
View File

@ -33,8 +33,8 @@
PANEL_BOM_PRESETS::PANEL_BOM_PRESETS( wxWindow* aWindow, SCHEMATIC_SETTINGS& aSettings ) :
PANEL_BOM_PRESETS_BASE( aWindow ), m_settings( aSettings )
{
m_btnDeleteBomPreset->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_btnDeleteBomFmtPreset->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_btnDeleteBomPreset->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_btnDeleteBomFmtPreset->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
}

4
eeschema/dialogs/panel_eeschema_annotation_options.cpp
View File

@ -37,8 +37,8 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS::PANEL_EESCHEMA_ANNOTATION_OPTIONS(
PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( aWindow ),
m_schSettingsProvider( schSettingsProvider )
{
annotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_down_right ) );
annotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::annotate_right_down ) );
annotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_down_right ) );
annotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::annotate_right_down ) );
}

8
eeschema/dialogs/panel_setup_buses.cpp
View File

@ -37,10 +37,10 @@ PANEL_SETUP_BUSES::PANEL_SETUP_BUSES( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame
{
m_membersLabelTemplate = m_membersLabel->GetLabel();
m_addAlias->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteAlias->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addMember->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_removeMember->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addAlias->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteAlias->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_addMember->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_removeMember->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_source->SetFont( KIUI::GetInfoFont( aWindow ) );

4
eeschema/dialogs/panel_setup_pinmap.cpp
View File

@ -240,9 +240,9 @@ void PANEL_SETUP_PINMAP::setDRCMatrixButtonState( wxWindow *aButton, PIN_ERROR a
if( !!bitmap_butt )
{
if( wxBitmapButton* wx_btn = dynamic_cast<wxBitmapButton*>( aButton ) )
wx_btn->SetBitmap( KiBitmap( bitmap_butt ) );
wx_btn->SetBitmap( KiBitmapBundle( bitmap_butt ) );
else if( BITMAP_BUTTON* ki_btn = dynamic_cast<BITMAP_BUTTON*>( aButton ) )
ki_btn->SetBitmap( KiBitmap( bitmap_butt ) );
ki_btn->SetBitmap( KiBitmapBundle( bitmap_butt ) );
aButton->SetToolTip( tooltip );
}

10
eeschema/dialogs/panel_sym_lib_table.cpp
View File

@ -374,11 +374,11 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, P
m_parent->SetInitialFocus( m_cur_grid );
// Configure button logos
m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_move_up_button->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_move_down_button->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_browse_button->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_move_up_button->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_move_down_button->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_browse_button->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
}

4
eeschema/dialogs/panel_template_fieldnames.cpp
View File

@ -54,8 +54,8 @@ PANEL_TEMPLATE_FIELDNAMES::PANEL_TEMPLATE_FIELDNAMES( wxWindow* aWindow,
m_templateMgr->AddTemplateFieldNames( cfg->m_Drawing.field_names );
}
m_addFieldButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_deleteFieldButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_deleteFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_checkboxColWidth = m_grid->GetColSize( 1 );

2
eeschema/import_gfx/dialog_import_gfx_sch.cpp
View File

@ -70,7 +70,7 @@ DIALOG_IMPORT_GFX_SCH::DIALOG_IMPORT_GFX_SCH( SCH_BASE_FRAME* aParent ) :
m_yOrigin( aParent, m_yLabel, m_yCtrl, m_yUnits ),
m_defaultLineWidth( aParent, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits )
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
auto initWidgetsFromSettings = [&]( const auto& aCfg )
{

10
eeschema/widgets/tuner_slider.cpp
View File

@ -56,16 +56,16 @@ TUNER_SLIDER::TUNER_SLIDER( SIMULATOR_FRAME_UI* aFrame, wxWindow* aParent,
throw KI_PARAM_ERROR( wxString::Format( _( "%s not found" ), m_ref ) );
m_name->SetLabel( wxString::Format( _( "Tune %s" ), m_ref ) );
m_closeBtn->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_closeBtn->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_e24->SetBitmap( KiBitmap( BITMAPS::e_24 ) );
m_e24->SetBitmap( KiBitmapBundle( BITMAPS::e_24 ) );
m_e24->SetIsCheckButton();
m_separator->SetIsSeparator();
m_e48->SetBitmap( KiBitmap( BITMAPS::e_48 ) );
m_e48->SetBitmap( KiBitmapBundle( BITMAPS::e_48 ) );
m_e48->SetIsCheckButton();
m_e96->SetBitmap( KiBitmap( BITMAPS::e_96 ) );
m_e96->SetBitmap( KiBitmapBundle( BITMAPS::e_96 ) );
m_e96->SetIsCheckButton();
m_e192->SetBitmap( KiBitmap( BITMAPS::e_192 ) );
m_e192->SetBitmap( KiBitmapBundle( BITMAPS::e_192 ) );
m_e192->SetIsCheckButton();
const SIM_MODEL::PARAM* tunerParam = item->model->GetTunerParam();

15
include/bitmap_store.h
View File

@ -23,6 +23,8 @@
#include <memory>
#include <unordered_map>
#include <wx/bmpbndl.h>
#include <bitmaps/bitmap_info.h>
class ASSET_ARCHIVE;
@ -54,6 +56,19 @@ public:
*/
wxBitmap GetBitmap( BITMAPS aBitmapId, int aHeight = -1 );
/**
* Constructs and returns a bitmap bundle containing all available sizes of the given ID
* @param aBitmapId is from the BITMAPS enum in bitmaps_list.h
*/
wxBitmapBundle GetBitmapBundle( BITMAPS aBitmapId );
/**
* Constructs and returns a bitmap bundle for the given icon ID, with the bitmaps
* converted to disabled state according to the current UI theme.
* @param aBitmapId is from the BITMAPS enum in bitmaps_list.h
*/
wxBitmapBundle GetDisabledBitmapBundle( BITMAPS aBitmapId );
/**
* Retrieves a bitmap from the given bitmap id, scaled to a given factor.
*

5
include/bitmaps/bitmap_types.h
View File

@ -30,6 +30,7 @@
// test if it works under stable release
// #include <wx/bitmap.h> // only to define wxBitmap
class wxBitmap; // only to define wxBitmap
class wxBitmapBundle;
class wxWindow;
class wxString;
class BITMAP_STORE;
@ -53,6 +54,10 @@ BITMAP_STORE* GetBitmapStore();
*/
wxBitmap KiBitmap( BITMAPS aBitmap, int aHeightTag = -1 );
wxBitmapBundle KiBitmapBundle( BITMAPS aBitmap );
wxBitmapBundle KiDisabledBitmapBundle( BITMAPS aBitmap );
/**
* Wipes out the scaled bitmap cache so that the icon theme can be changed.
* TODO: move scaling system into BITMAP_STORE so this global doesn't need to exist

4
kicad/dialogs/dialog_template_selector.cpp
View File

@ -143,8 +143,8 @@ void DIALOG_TEMPLATE_SELECTOR::OnPageChange( wxNotebookEvent& event )
DIALOG_TEMPLATE_SELECTOR::DIALOG_TEMPLATE_SELECTOR( wxWindow* aParent ) :
DIALOG_TEMPLATE_SELECTOR_BASE( aParent )
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_reloadButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_reloadButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
m_htmlWin->SetPage( _( "<h1>Template Selector</h1>" ) );
m_notebook->Connect( wxEVT_SIZE,

8
kicad/pcm/dialogs/dialog_manage_repositories.cpp
View File

@ -35,10 +35,10 @@ DIALOG_MANAGE_REPOSITORIES::DIALOG_MANAGE_REPOSITORIES(
DIALOG_MANAGE_REPOSITORIES_BASE( parent ),
m_pcm( pcm )
{
m_buttonAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_buttonRemove->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_buttonMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_buttonMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_buttonAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_buttonRemove->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_buttonMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_buttonMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
// For aesthetic reasons, we must set the size of m_buttonAdd to match the other bitmaps
// manually (for instance m_buttonRemove)

2
kicad/pcm/dialogs/dialog_pcm.cpp
View File

@ -66,7 +66,7 @@ DIALOG_PCM::DIALOG_PCM( wxWindow* parent, std::shared_ptr<PLUGIN_CONTENT_MANAGER
m_gridPendingActions->PushEventHandler( new GRID_TRICKS( m_gridPendingActions ) );
m_discardActionButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_discardActionButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_panelPending->Layout();
m_actionCallback = [this]( const PACKAGE_VIEW_DATA& aData, PCM_PACKAGE_ACTION aAction,

16
pagelayout_editor/dialogs/properties_frame.cpp
View File

@ -96,27 +96,27 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) :
m_staticTextSizeInfo->SetFont( KIUI::GetInfoFont( this ).Italic() );
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator2->SetIsSeparator();
m_alignLeft->SetIsRadioButton();
m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_alignCenter->SetIsRadioButton();
m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_alignRight->SetIsRadioButton();
m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator3->SetIsSeparator();
m_vAlignTop->SetIsRadioButton();
m_vAlignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_vAlignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_vAlignMiddle->SetIsRadioButton();
m_vAlignMiddle->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_vAlignMiddle->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_vAlignBottom->SetIsRadioButton();
m_vAlignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_separator4->SetIsSeparator();

24
pcb_calculator/calculator_panels/panel_color_code.cpp
View File

@ -42,12 +42,12 @@ PANEL_COLOR_CODE::~PANEL_COLOR_CODE()
void PANEL_COLOR_CODE::ThemeChanged()
{
// Update the bitmaps
m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
m_Band1bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_tolerance ) );
Refresh();
}
@ -87,12 +87,12 @@ void PANEL_COLOR_CODE::ToleranceSelection( int aSelection )
GetSizer()->Layout();
// All this shouldn't be necessary but if you want the bitmaps to show up on OSX it is.
m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
m_Band1bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::color_code_tolerance ) );
Refresh();
}

4
pcb_calculator/calculator_panels/panel_electrical_spacing_iec60664.cpp
View File

@ -54,7 +54,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664::PANEL_ELECTRICAL_SPACING_IEC60664( wxWindow*
ConvertMarkdown2Html( wxGetTranslation( iec60664help ), msg );
m_panelHelp->SetPage( msg );
m_creepageclearanceBitmap->SetBitmap( KiBitmap( BITMAPS::creepage_clearance ) );
m_creepageclearanceBitmap->SetBitmap( KiBitmapBundle( BITMAPS::creepage_clearance ) );
Layout();
}
@ -67,7 +67,7 @@ PANEL_ELECTRICAL_SPACING_IEC60664::~PANEL_ELECTRICAL_SPACING_IEC60664()
void PANEL_ELECTRICAL_SPACING_IEC60664::ThemeChanged()
{
m_creepageclearanceBitmap->SetBitmap( KiBitmap( BITMAPS::creepage_clearance ) );
m_creepageclearanceBitmap->SetBitmap( KiBitmapBundle( BITMAPS::creepage_clearance ) );
}

8
pcb_calculator/calculator_panels/panel_regulator.cpp
View File

@ -43,8 +43,8 @@ PANEL_REGULATOR::PANEL_REGULATOR( wxWindow* parent, wxWindowID id, const wxPoint
m_r1Units->SetLabel( wxT( "kΩ" ) );
m_r2Units->SetLabel( wxT( "kΩ" ) );
m_bitmapRegul3pins->SetBitmap( KiBitmap( BITMAPS::regul_3pins ) );
m_bitmapRegul4pins->SetBitmap( KiBitmap( BITMAPS::regul ) );
m_bitmapRegul3pins->SetBitmap( KiBitmapBundle( BITMAPS::regul_3pins ) );
m_bitmapRegul4pins->SetBitmap( KiBitmapBundle( BITMAPS::regul ) );
m_choiceRegulatorSelector->Append( m_RegulatorList.GetRegList() );
SelectLastSelectedRegulator();
@ -61,8 +61,8 @@ PANEL_REGULATOR::~PANEL_REGULATOR()
void PANEL_REGULATOR::ThemeChanged()
{
// Update the bitmaps
m_bitmapRegul3pins->SetBitmap( KiBitmap( BITMAPS::regul_3pins ) );
m_bitmapRegul4pins->SetBitmap( KiBitmap( BITMAPS::regul ) );
m_bitmapRegul3pins->SetBitmap( KiBitmapBundle( BITMAPS::regul_3pins ) );
m_bitmapRegul4pins->SetBitmap( KiBitmapBundle( BITMAPS::regul ) );
}

10
pcb_calculator/calculator_panels/panel_rf_attenuators.cpp
View File

@ -38,7 +38,7 @@ PANEL_RF_ATTENUATORS::PANEL_RF_ATTENUATORS( wxWindow* parent, wxWindowID id, con
PANEL_RF_ATTENUATORS_BASE( parent, id, pos, size, style, name )
{
m_CurrAttenuator = nullptr;
m_bpButtonCalcAtt->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpButtonCalcAtt->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
// Populate attenuator list ordered like in dialog menu list
m_AttenuatorList.push_back( new ATTENUATOR_PI() );
@ -71,8 +71,8 @@ PANEL_RF_ATTENUATORS::~PANEL_RF_ATTENUATORS()
void PANEL_RF_ATTENUATORS::ThemeChanged()
{
// Update the bitmaps
m_bpButtonCalcAtt->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
m_bpButtonCalcAtt->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
// Update the font
m_staticTextAttMsg->SetFont( KIUI::GetInfoFont( this ).Italic() );
@ -88,7 +88,7 @@ void PANEL_RF_ATTENUATORS::ThemeChanged()
void PANEL_RF_ATTENUATORS::UpdateUI()
{
m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
m_attenuatorBitmap->GetParent()->Layout();
m_attenuatorBitmap->GetParent()->Refresh();
@ -169,7 +169,7 @@ void PANEL_RF_ATTENUATORS::TransfPanelDataToAttenuator()
void PANEL_RF_ATTENUATORS::TransfAttenuatorDataToPanel()
{
m_attenuatorBitmap->SetBitmap( KiBitmap( m_CurrAttenuator->m_SchBitmapName ) );
m_attenuatorBitmap->SetBitmap( KiBitmapBundle( m_CurrAttenuator->m_SchBitmapName ) );
wxString msg;

10
pcb_calculator/calculator_panels/panel_transline.cpp
View File

@ -32,8 +32,8 @@ PANEL_TRANSLINE::PANEL_TRANSLINE( wxWindow* parent, wxWindowID id, const wxPoint
m_currTransLine( nullptr ),
m_currTransLineType( DEFAULT_TYPE )
{
m_bpButtonAnalyze->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpButtonSynthetize->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpButtonAnalyze->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_bpButtonSynthetize->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
// Populate transline list ordered like in dialog menu list
@ -66,9 +66,9 @@ PANEL_TRANSLINE::~PANEL_TRANSLINE()
void PANEL_TRANSLINE::ThemeChanged()
{
// Update the bitmaps
m_bpButtonAnalyze->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpButtonSynthetize->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_translineBitmap->SetBitmap( KiBitmap( m_transline_list[m_currTransLineType]->m_BitmapName ) );
m_bpButtonAnalyze->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_bpButtonSynthetize->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_translineBitmap->SetBitmap( KiBitmapBundle( m_transline_list[m_currTransLineType]->m_BitmapName ) );
}

4
pcb_calculator/calculator_panels/panel_via_size.cpp
View File

@ -66,7 +66,7 @@ PANEL_VIA_SIZE::PANEL_VIA_SIZE( wxWindow* parent, wxWindowID id,
m_viaThermalResUnits->SetLabel( wxT( "°C/W" ) );
m_viaReactanceUnits->SetLabel( wxT( "Ω" ) );
m_viaBitmap->SetBitmap( KiBitmap( BITMAPS::viacalc ) );
m_viaBitmap->SetBitmap( KiBitmapBundle( BITMAPS::viacalc ) );
// Needed on wxWidgets 3.0 to ensure sizers are correctly set
GetSizer()->SetSizeHints( this );
@ -80,7 +80,7 @@ PANEL_VIA_SIZE::~PANEL_VIA_SIZE()
void PANEL_VIA_SIZE::ThemeChanged()
{
m_viaBitmap->SetBitmap( KiBitmap( BITMAPS::viacalc ) );
m_viaBitmap->SetBitmap( KiBitmapBundle( BITMAPS::viacalc ) );
}

4
pcb_calculator/transline_dlg_funct.cpp
View File

@ -103,11 +103,11 @@ void PANEL_TRANSLINE::TranslineTypeSelection( enum TRANSLINE_TYPE_ID aType )
m_currTransLineType = DEFAULT_TYPE;
}
m_translineBitmap->SetBitmap( KiBitmap( m_transline_list[m_currTransLineType]->m_BitmapName ) );
m_translineBitmap->SetBitmap( KiBitmapBundle( m_transline_list[m_currTransLineType]->m_BitmapName ) );
// This helper bitmap is shown for coupled microstrip only:
m_bmCMicrostripZoddZeven->Show( aType == C_MICROSTRIP_TYPE );
m_bmCMicrostripZoddZeven->SetBitmap( KiBitmap( BITMAPS::microstrip_zodd_zeven ) );
m_bmCMicrostripZoddZeven->SetBitmap( KiBitmapBundle( BITMAPS::microstrip_zodd_zeven ) );
TRANSLINE_IDENT* tr_ident = m_transline_list[m_currTransLineType];
m_currTransLine = tr_ident->m_TLine;

16
pcbnew/dialogs/dialog_board_reannotate.cpp
View File

@ -107,14 +107,14 @@ DIALOG_BOARD_REANNOTATE::DIALOG_BOARD_REANNOTATE( PCB_EDIT_FRAME* aParentFrame )
InitValues();
// Init bitmaps associated to some wxRadioButton
reannotate_down_right_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_right_down ) );
reannotate_right_down_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_left_down ) );
reannotate_down_left_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_right_up ) );
reannotate_left_down_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_left_up ) );
reannotate_up_right_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_down_left ) );
reannotate_right_up_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_up_left ) );
reannotate_up_left_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_down_right ) );
reannotate_left_up_bitmap->SetBitmap( KiBitmap( BITMAPS::reannotate_up_right ) );
reannotate_down_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_right_down ) );
reannotate_right_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_left_down ) );
reannotate_down_left_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_right_up ) );
reannotate_left_down_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_left_up ) );
reannotate_up_right_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_down_left ) );
reannotate_right_up_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_up_left ) );
reannotate_up_left_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_down_right ) );
reannotate_left_up_bitmap->SetBitmap( KiBitmapBundle( BITMAPS::reannotate_up_right ) );
m_FrontRefDesStart->SetValidator( wxTextValidator( wxFILTER_DIGITS ) );
m_BackRefDesStart->SetValidator( wxTextValidator( wxFILTER_DIGITS ) );

12
pcbnew/dialogs/dialog_dimension_properties.cpp
View File

@ -94,23 +94,23 @@ DIALOG_DIMENSION_PROPERTIES::DIALOG_DIMENSION_PROPERTIES( PCB_BASE_EDIT_FRAME* a
m_separator0->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator1->SetIsSeparator();
m_alignLeft->SetIsRadioButton();
m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_alignCenter->SetIsRadioButton();
m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_alignRight->SetIsRadioButton();
m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator2->SetIsSeparator();
m_mirrored->SetIsCheckButton();
m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
m_separator3->SetIsSeparator();

4
pcbnew/dialogs/dialog_exchange_footprints.cpp
View File

@ -95,7 +95,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
else
{
m_upperSizer->FindItem( m_matchAll )->Show( false );
m_newIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
m_newIDBrowseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
}
if( m_currentFootprint )
@ -113,7 +113,7 @@ DIALOG_EXCHANGE_FOOTPRINTS::DIALOG_EXCHANGE_FOOTPRINTS( PCB_EDIT_FRAME* aParent,
if( m_currentFootprint )
m_specifiedID->ChangeValue( From_UTF8( m_currentFootprint->GetFPID().Format().c_str() ) );
m_specifiedIDBrowseButton->SetBitmap( KiBitmap( BITMAPS::small_library ) );
m_specifiedIDBrowseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_library ) );
m_upperSizer->SetEmptyCellSize( wxSize( 0, 0 ) );
// The upper sizer has its content modified: re-layout it:

2
pcbnew/dialogs/dialog_export_svg.cpp
View File

@ -79,7 +79,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) :
m_printMirror( false ),
m_oneFileOnly( false )
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_messagesPanel->SetFileName( Prj().GetProjectPath() + wxT( "report.txt" ) );

4
pcbnew/dialogs/dialog_footprint_properties.cpp
View File

@ -139,8 +139,8 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen
m_solderPasteRatio.SetNegativeZero();
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_tcLibraryID->SetBackgroundColour( KIPLATFORM::UI::GetDialogBGColour() );

12
pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
View File

@ -212,12 +212,12 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR(
m_solderPasteRatio.SetNegativeZero();
// Configure button logos
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAddLayer->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDeleteLayer->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAddPadGroup->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpRemovePadGroup->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpAddLayer->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDeleteLayer->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_bpAddPadGroup->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpRemovePadGroup->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
SetupStandardButtons();

2
pcbnew/dialogs/dialog_gen_footprint_position.cpp
View File

@ -170,7 +170,7 @@ private:
void DIALOG_GEN_FOOTPRINT_POSITION::initDialog()
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
PROJECT_FILE& projectFile = m_parent->Prj().GetProjectFile();
PCBNEW_SETTINGS* cfg = m_parent->GetPcbNewSettings();

2
pcbnew/dialogs/dialog_gendrill.cpp
View File

@ -125,7 +125,7 @@ void DIALOG_GENDRILL::initDialog()
void DIALOG_GENDRILL::InitDisplayParams()
{
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_rbExcellon->SetValue( m_drillFileType == 0 );
m_rbGerberX2->SetValue( m_drillFileType == 1 );

2
pcbnew/dialogs/dialog_global_edit_teardrops.cpp
View File

@ -154,7 +154,7 @@ DIALOG_GLOBAL_EDIT_TEARDROPS::DIALOG_GLOBAL_EDIT_TEARDROPS( PCB_EDIT_FRAME* aPar
m_parent = aParent;
m_brd = m_parent->GetBoard();
m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
m_teardropHDPercent.SetUnits( EDA_UNITS::PERCENT );
m_teardropLenPercent.SetUnits( EDA_UNITS::PERCENT );

4
pcbnew/dialogs/dialog_group_properties.cpp
View File

@ -40,8 +40,8 @@ DIALOG_GROUP_PROPERTIES::DIALOG_GROUP_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
m_toolMgr( aParent->GetToolManager() ),
m_group( aGroup )
{
m_bpAddMember->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpRemoveMember->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAddMember->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpRemoveMember->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_nameCtrl->SetValue( m_group->GetName() );

2
pcbnew/dialogs/dialog_import_netlist.cpp
View File

@ -64,7 +64,7 @@ DIALOG_IMPORT_NETLIST::DIALOG_IMPORT_NETLIST( PCB_EDIT_FRAME* aParent,
m_runDragCommand( false )
{
m_NetlistFilenameCtrl->SetValue( m_netlistPath );
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
auto cfg = m_parent->GetPcbNewSettings();

2
pcbnew/dialogs/dialog_import_settings.cpp
View File

@ -41,7 +41,7 @@ DIALOG_IMPORT_SETTINGS::DIALOG_IMPORT_SETTINGS( wxWindow* aParent, PCB_EDIT_FRAM
{
wxSize sizeNeeded;
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
// Make sure "Select All" button is big enough to hold "Deselect All"
m_selectAllButton->SetLabel( _( "Deselect All" ) ); // Change the text temporarily

6
pcbnew/dialogs/dialog_net_inspector.cpp
View File

@ -1095,9 +1095,9 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent ) :
adjustListColumns();
m_addNet->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_renameNet->SetBitmap( KiBitmap( BITMAPS::small_edit ) );
m_deleteNet->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_addNet->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_renameNet->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
m_deleteNet->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
SetupStandardButtons();
// Now SetupStandardButtons is called, change the label of Cancel button

24
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -189,9 +189,9 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad
m_cbShowPadOutline->SetValue( m_sketchPreview );
m_FlippedWarningIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
m_nonCopperWarningIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
m_legacyTeardropsIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
m_FlippedWarningIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
m_nonCopperWarningIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
m_legacyTeardropsIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
m_masterPad = m_parent->GetDesignSettings().m_Pad_Master.get();
m_previewPad = new PAD( (FOOTPRINT*) nullptr );
@ -1165,13 +1165,13 @@ bool DIALOG_PAD_PROPERTIES::Show( bool aShow )
// It *should* work to set the stackup bitmap in the constructor, but it doesn't.
// wxWidgets needs to have these set when the panel is visible for some reason.
// https://gitlab.com/kicad/code/kicad/-/issues/5534
m_stackupImage0->SetBitmap( KiBitmap( BITMAPS::pads_reset_unused ) );
m_stackupImage1->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused_keep_bottom ) );
m_stackupImage2->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
m_stackupImage4->SetBitmap( KiBitmap( BITMAPS::pads_npth_top_bottom ) );
m_stackupImage5->SetBitmap( KiBitmap( BITMAPS::pads_npth_top ) );
m_stackupImage6->SetBitmap( KiBitmap( BITMAPS::pads_npth_bottom ) );
m_stackupImage7->SetBitmap( KiBitmap( BITMAPS::pads_npth ) );
m_stackupImage0->SetBitmap( KiBitmapBundle( BITMAPS::pads_reset_unused ) );
m_stackupImage1->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused_keep_bottom ) );
m_stackupImage2->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
m_stackupImage4->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_top_bottom ) );
m_stackupImage5->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_top ) );
m_stackupImage6->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth_bottom ) );
m_stackupImage7->SetBitmap( KiBitmapBundle( BITMAPS::pads_npth ) );
Layout();
}
@ -1655,13 +1655,13 @@ void DIALOG_PAD_PROPERTIES::updatePadSizeControls()
{
m_sizeXLabel->SetLabel( _( "Diameter:" ) );
m_sizeY.Show( false );
m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
}
else
{
m_sizeXLabel->SetLabel( _( "Pad size X:" ) );
m_sizeY.Show( true );
m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_rect_sizes ) );
m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_rect_sizes ) );
}
m_sizeXLabel->GetParent()->Layout();

6
pcbnew/dialogs/dialog_plot.cpp
View File

@ -157,14 +157,14 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
m_bpMoveUp = new STD_BITMAP_BUTTON( sbSizer->GetStaticBox(), wxID_ANY, wxNullBitmap,
wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0 );
m_bpMoveUp->SetToolTip( _( "Move current selection up" ) );
m_bpMoveUp->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_bpMoveUp->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
bButtonSizer->Add( m_bpMoveUp, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 );
m_bpMoveDown = new STD_BITMAP_BUTTON( sbSizer->GetStaticBox(), wxID_ANY, wxNullBitmap,
wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW | 0 );
m_bpMoveDown->SetToolTip( _( "Move current selection down" ) );
m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_bpMoveDown->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
bButtonSizer->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5 );
@ -209,7 +209,7 @@ void DIALOG_PLOT::init_Dialog()
m_zoneFillCheck->SetValue( cfg->m_Plot.check_zones_before_plotting );
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
// m_PSWidthAdjust is stored in mm in user config
m_PSWidthAdjust = KiROUND( cfg->m_Plot.ps_fine_width_adjust * pcbIUScale.IU_PER_MM );

18
pcbnew/dialogs/dialog_text_properties.cpp
View File

@ -180,32 +180,32 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PC
}
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator1->SetIsSeparator();
m_alignLeft->SetIsRadioButton();
m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_alignCenter->SetIsRadioButton();
m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_alignRight->SetIsRadioButton();
m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator2->SetIsSeparator();
m_valignBottom->SetIsRadioButton();
m_valignBottom->SetBitmap( KiBitmap( BITMAPS::text_valign_bottom ) );
m_valignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
m_valignCenter->SetIsRadioButton();
m_valignCenter->SetBitmap( KiBitmap( BITMAPS::text_valign_center ) );
m_valignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_center ) );
m_valignTop->SetIsRadioButton();
m_valignTop->SetBitmap( KiBitmap( BITMAPS::text_valign_top ) );
m_valignTop->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_top ) );
m_separator3->SetIsSeparator();
m_mirrored->SetIsCheckButton();
m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
SetTitle( title );
m_hash_key = title;

12
pcbnew/dialogs/dialog_textbox_properties.cpp
View File

@ -87,23 +87,23 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare
m_separator0->SetIsSeparator();
m_bold->SetIsCheckButton();
m_bold->SetBitmap( KiBitmap( BITMAPS::text_bold ) );
m_bold->SetBitmap( KiBitmapBundle( BITMAPS::text_bold ) );
m_italic->SetIsCheckButton();
m_italic->SetBitmap( KiBitmap( BITMAPS::text_italic ) );
m_italic->SetBitmap( KiBitmapBundle( BITMAPS::text_italic ) );
m_separator1->SetIsSeparator();
m_alignLeft->SetIsRadioButton();
m_alignLeft->SetBitmap( KiBitmap( BITMAPS::text_align_left ) );
m_alignLeft->SetBitmap( KiBitmapBundle( BITMAPS::text_align_left ) );
m_alignCenter->SetIsRadioButton();
m_alignCenter->SetBitmap( KiBitmap( BITMAPS::text_align_center ) );
m_alignCenter->SetBitmap( KiBitmapBundle( BITMAPS::text_align_center ) );
m_alignRight->SetIsRadioButton();
m_alignRight->SetBitmap( KiBitmap( BITMAPS::text_align_right ) );
m_alignRight->SetBitmap( KiBitmapBundle( BITMAPS::text_align_right ) );
m_separator2->SetIsSeparator();
m_mirrored->SetIsCheckButton();
m_mirrored->SetBitmap( KiBitmap( BITMAPS::text_mirrored ) );
m_mirrored->SetBitmap( KiBitmapBundle( BITMAPS::text_mirrored ) );
m_separator3->SetIsSeparator();

4
pcbnew/dialogs/dialog_track_via_properties.cpp
View File

@ -63,10 +63,10 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
wxASSERT( !m_items.Empty() );
m_legacyTeardropsIcon->SetBitmap( KiBitmap( BITMAPS::dialog_warning ) );
m_legacyTeardropsIcon->SetBitmap( KiBitmapBundle( BITMAPS::dialog_warning ) );
m_legacyTeardropsWarning->Show( m_frame->GetBoard()->LegacyTeardrops() );
m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
m_teardropHDPercent.SetUnits( EDA_UNITS::PERCENT );
m_teardropLenPercent.SetUnits( EDA_UNITS::PERCENT );

6
pcbnew/dialogs/dialog_tuning_pattern_properties.cpp
View File

@ -44,16 +44,16 @@ DIALOG_TUNING_PATTERN_PROPERTIES::DIALOG_TUNING_PATTERN_PROPERTIES( PCB_BASE_EDI
switch( m_mode )
{
case PNS::PNS_MODE_TUNE_SINGLE:
m_legend->SetBitmap( KiBitmap( BITMAPS::tune_single_track_length_legend ) );
m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_single_track_length_legend ) );
break;
case PNS::PNS_MODE_TUNE_DIFF_PAIR:
m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_length_legend ) );
m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_length_legend ) );
m_r.Enable( false );
break;
case PNS::PNS_MODE_TUNE_DIFF_PAIR_SKEW:
m_legend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_skew_legend ) );
m_legend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_skew_legend ) );
m_targetLengthLabel->SetLabel( _( "Target skew: ") );
break;

6
pcbnew/dialogs/dialog_unused_pad_layers.cpp
View File

@ -41,7 +41,7 @@ DIALOG_UNUSED_PAD_LAYERS::DIALOG_UNUSED_PAD_LAYERS( PCB_BASE_FRAME* aParent,
m_items( aItems ),
m_commit( aCommit )
{
m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
// Set keep Through Hole pads on external layers ON by default.
// Because such a pad does not allow soldering/unsoldering, disable this option
@ -62,9 +62,9 @@ DIALOG_UNUSED_PAD_LAYERS::DIALOG_UNUSED_PAD_LAYERS( PCB_BASE_FRAME* aParent,
void DIALOG_UNUSED_PAD_LAYERS::updateImage()
{
if( m_cbPreservePads->IsChecked() )
m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused_keep_bottom ) );
m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused_keep_bottom ) );
else
m_image->SetBitmap( KiBitmap( BITMAPS::pads_remove_unused ) );
m_image->SetBitmap( KiBitmapBundle( BITMAPS::pads_remove_unused ) );
}

4
pcbnew/dialogs/panel_fp_editor_defaults.cpp
View File

@ -304,8 +304,8 @@ bool PANEL_FP_EDITOR_DEFAULTS::Show( bool aShow )
// These *should* work in the constructor, and indeed they do if this panel is the
// first displayed. However, on OSX 3.0.5 (at least), if another panel is displayed
// first then the icons will be blank unless they're set here.
m_bpAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_bpAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_bpDelete->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
}
if( aShow && m_firstShow )

10
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -388,11 +388,11 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, PRO
m_parent->SetInitialFocus( m_cur_grid );
// Configure button logos
m_append_button->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_move_up_button->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_move_down_button->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_append_button->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_move_up_button->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_move_down_button->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
// For aesthetic reasons, we must set the size of m_browseButton to match the other bitmaps
// manually (for instance m_append_button)

6
pcbnew/dialogs/panel_fp_properties_3d_model.cpp
View File

@ -105,9 +105,9 @@ PANEL_FP_PROPERTIES_3D_MODEL::PANEL_FP_PROPERTIES_3D_MODEL(
m_LowerSizer3D->Add( m_previewPane, 1, wxEXPAND, 5 );
// Configure button logos
m_button3DShapeAdd->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_button3DShapeBrowse->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_button3DShapeRemove->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_button3DShapeAdd->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_button3DShapeBrowse->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_button3DShapeRemove->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
}

10
pcbnew/dialogs/panel_pcbnew_action_plugins.cpp
View File

@ -42,11 +42,11 @@ PANEL_PCBNEW_ACTION_PLUGINS::PANEL_PCBNEW_ACTION_PLUGINS( wxWindow* aParent ) :
m_genericIcon = KiBitmap( BITMAPS::puzzle_piece );
m_grid->PushEventHandler( new GRID_TRICKS( m_grid ) );
m_moveUpButton->SetBitmap( KiBitmap( BITMAPS::small_up ) );
m_moveDownButton->SetBitmap( KiBitmap( BITMAPS::small_down ) );
m_openDirectoryButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_reloadButton->SetBitmap( KiBitmap( BITMAPS::small_refresh ) );
m_showErrorsButton->SetBitmap( KiBitmap( BITMAPS::small_warning ) );
m_moveUpButton->SetBitmap( KiBitmapBundle( BITMAPS::small_up ) );
m_moveDownButton->SetBitmap( KiBitmapBundle( BITMAPS::small_down ) );
m_openDirectoryButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
m_reloadButton->SetBitmap( KiBitmapBundle( BITMAPS::small_refresh ) );
m_showErrorsButton->SetBitmap( KiBitmapBundle( BITMAPS::small_warning ) );
}

26
pcbnew/dialogs/panel_setup_constraints.cpp
View File

@ -53,19 +53,19 @@ PANEL_SETUP_CONSTRAINTS::PANEL_SETUP_CONSTRAINTS( wxWindow* aParentWindow, PCB_E
m_Frame = aFrame;
m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings();
m_filletBitmap->SetBitmap( KiBitmap( BITMAPS::zone_fillet ) );
m_spokeBitmap->SetBitmap( KiBitmap( BITMAPS::thermal_spokes ) );
m_bitmapClearance->SetBitmap( KiBitmap( BITMAPS::ps_diff_pair_gap ) );
m_bitmapMinTrackWidth->SetBitmap( KiBitmap( BITMAPS::width_track ) );
m_bitmapMinConn->SetBitmap( KiBitmap( BITMAPS::width_conn ) );
m_bitmapMinViaAnnulus->SetBitmap( KiBitmap( BITMAPS::via_annulus ) );
m_bitmapMinViaDiameter->SetBitmap( KiBitmap( BITMAPS::via_diameter ) );
m_bitmapMinViaDrill->SetBitmap( KiBitmap( BITMAPS::via_hole_diameter ) );
m_bitmapMinuViaDiameter->SetBitmap( KiBitmap( BITMAPS::via_diameter ) );
m_bitmapMinuViaDrill->SetBitmap( KiBitmap( BITMAPS::via_hole_diameter ) );
m_bitmapHoleClearance->SetBitmap( KiBitmap( BITMAPS::hole_to_copper_clearance ) );
m_bitmapMinHoleClearance->SetBitmap( KiBitmap( BITMAPS::hole_to_hole_clearance ) );
m_bitmapEdgeClearance->SetBitmap( KiBitmap( BITMAPS::edge_to_copper_clearance ) );
m_filletBitmap->SetBitmap( KiBitmapBundle( BITMAPS::zone_fillet ) );
m_spokeBitmap->SetBitmap( KiBitmapBundle( BITMAPS::thermal_spokes ) );
m_bitmapClearance->SetBitmap( KiBitmapBundle( BITMAPS::ps_diff_pair_gap ) );
m_bitmapMinTrackWidth->SetBitmap( KiBitmapBundle( BITMAPS::width_track ) );
m_bitmapMinConn->SetBitmap( KiBitmapBundle( BITMAPS::width_conn ) );
m_bitmapMinViaAnnulus->SetBitmap( KiBitmapBundle( BITMAPS::via_annulus ) );
m_bitmapMinViaDiameter->SetBitmap( KiBitmapBundle( BITMAPS::via_diameter ) );
m_bitmapMinViaDrill->SetBitmap( KiBitmapBundle( BITMAPS::via_hole_diameter ) );
m_bitmapMinuViaDiameter->SetBitmap( KiBitmapBundle( BITMAPS::via_diameter ) );
m_bitmapMinuViaDrill->SetBitmap( KiBitmapBundle( BITMAPS::via_hole_diameter ) );
m_bitmapHoleClearance->SetBitmap( KiBitmapBundle( BITMAPS::hole_to_copper_clearance ) );
m_bitmapMinHoleClearance->SetBitmap( KiBitmapBundle( BITMAPS::hole_to_hole_clearance ) );
m_bitmapEdgeClearance->SetBitmap( KiBitmapBundle( BITMAPS::edge_to_copper_clearance ) );
m_stCircleToPolyWarning->SetFont( KIUI::GetInfoFont( this ) );

2
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -64,7 +64,7 @@ PANEL_SETUP_RULES::PANEL_SETUP_RULES( wxWindow* aParentWindow, PCB_EDIT_FRAME* a
m_shapeRegex.Compile( "^Shape\\s*[!=]=\\s*$", wxRE_ADVANCED );
m_zoneConnStyleRegex.Compile( "^Zone_Connection_Style\\s*[!=]=\\s*$", wxRE_ADVANCED );
m_compileButton->SetBitmap( KiBitmap( BITMAPS::drc ) );
m_compileButton->SetBitmap( KiBitmapBundle( BITMAPS::drc ) );
m_textEditor->SetZoom( Pgm().GetCommonSettings()->m_Appearance.text_editor_zoom );

6
pcbnew/dialogs/panel_setup_teardrops.cpp
View File

@ -38,9 +38,9 @@ PANEL_SETUP_TEARDROPS::PANEL_SETUP_TEARDROPS( wxWindow* aParentWindow, PCB_EDIT_
m_teardropMaxLenTrack( aFrame, m_stMaxLen2, m_tcTdMaxLen2, m_stMaxLenUnits2 ),
m_teardropMaxHeightTrack( aFrame, m_stTdMaxSize2, m_tcMaxHeight2, m_stMaxHeightUnits2 )
{
m_bitmapTeardrop->SetBitmap( KiBitmap( BITMAPS::teardrop_sizes ) );
m_bitmapTeardrop1->SetBitmap( KiBitmap( BITMAPS::teardrop_rect_sizes ) );
m_bitmapTeardrop2->SetBitmap( KiBitmap( BITMAPS::teardrop_track_sizes ) );
m_bitmapTeardrop->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_sizes ) );
m_bitmapTeardrop1->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_rect_sizes ) );
m_bitmapTeardrop2->SetBitmap( KiBitmapBundle( BITMAPS::teardrop_track_sizes ) );
wxFont infoFont = KIUI::GetInfoFont( this ).Italic();
m_minTrackWidthHint->SetFont( infoFont );

18
pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
View File

@ -59,15 +59,15 @@ PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( wxWindow* aParentWindo
m_Pcb = m_Frame->GetBoard();
m_BrdSettings = &m_Pcb->GetDesignSettings();
m_trackWidthsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_trackWidthsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
m_trackWidthsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_viaSizesAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_viaSizesSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
m_viaSizesRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_diffPairsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
m_diffPairsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
m_diffPairsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
m_trackWidthsAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_trackWidthsSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
m_trackWidthsRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_viaSizesAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_viaSizesSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
m_viaSizesRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
m_diffPairsAddButton->SetBitmap( KiBitmapBundle( BITMAPS::small_plus ) );
m_diffPairsSortButton->SetBitmap( KiBitmapBundle( BITMAPS::small_sort_desc ) );
m_diffPairsRemoveButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
// Membership combobox editors require a bit more room, so increase the row size of
// all our grids for consistency

6
pcbnew/dialogs/panel_setup_tuning_patterns.cpp
View File

@ -44,9 +44,9 @@ PANEL_SETUP_TUNING_PATTERNS::PANEL_SETUP_TUNING_PATTERNS( wxWindow* aParent, EDA
m_dpSettings( aDiffPairSettings ),
m_skewSettings( aSkewSettings )
{
m_singleTrackLegend->SetBitmap( KiBitmap( BITMAPS::tune_single_track_length_legend ) );
m_diffPairLegend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_length_legend ) );
m_skewLegend->SetBitmap( KiBitmap( BITMAPS::tune_diff_pair_skew_legend ) );
m_singleTrackLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_single_track_length_legend ) );
m_diffPairLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_length_legend ) );
m_skewLegend->SetBitmap( KiBitmapBundle( BITMAPS::tune_diff_pair_skew_legend ) );
m_track_r.SetUnits( EDA_UNITS::PERCENT );
m_dp_r.SetUnits( EDA_UNITS::PERCENT );

2
pcbnew/import_gfx/dialog_import_graphics.cpp
View File

@ -101,7 +101,7 @@ DIALOG_IMPORT_GRAPHICS::DIALOG_IMPORT_GRAPHICS( PCB_BASE_FRAME* aParent ) :
m_dxfUnitsChoice->SetSelection( cfg->m_ImportGraphics.dxf_units );
m_browseButton->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
m_browseButton->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
wxCommandEvent dummy;
onFilename( dummy );

4
pcbnew/widgets/appearance_controls.cpp
View File

@ -451,10 +451,10 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
createControls();
m_btnNetInspector->SetBitmap( KiBitmap( BITMAPS::list_nets_16 ) );
m_btnNetInspector->SetBitmap( KiBitmapBundle( BITMAPS::list_nets_16 ) );
m_btnNetInspector->SetPadding( 2 );
m_btnConfigureNetClasses->SetBitmap( KiBitmap( BITMAPS::options_generic_16 ) );
m_btnConfigureNetClasses->SetBitmap( KiBitmapBundle( BITMAPS::options_generic_16 ) );
m_btnConfigureNetClasses->SetPadding( 2 );
m_txtNetFilter->SetHint( _( "Filter nets" ) );

2
resources/bitmaps_png/CMakeLists.txt
View File

@ -898,8 +898,10 @@ if( MAINTAIN_PNGS )
# these 3 cmake commands for each desired bitmap size set, repeat as needed:
bitmap_dir( 16 16 "${BMAPS_SMALL}" )
bitmap_dir( 32 32 "${BMAPS_SMALL}" ) # 2x HiDPI
bitmap_dir( 24 24 "${BMAPS_MID}" )
bitmap_dir( 48 48 "${BMAPS_MID}" ) # 2x HiDPI
bitmap_dir( 32 32 "${BMAPS_32}" )

BIN
resources/bitmaps_png/png/about_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 919 B

BIN
resources/bitmaps_png/png/about_dark_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
resources/bitmaps_png/png/add_aligned_dimension_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 846 B

BIN
resources/bitmaps_png/png/add_aligned_dimension_dark_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 876 B

BIN
resources/bitmaps_png/png/add_arc_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 483 B

BIN
resources/bitmaps_png/png/add_arc_dark_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 630 B

BIN
resources/bitmaps_png/png/add_board_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

Some files were not shown because too many files have changed in this diff Show More