From a69a4be8537876a443fac8fb75472bb477c69be5 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Fri, 1 Jan 2021 13:13:33 -0800 Subject: [PATCH] Fix build error with icon names --- bitmaps_png/include/bitmaps_png/bitmaps_list.h | 1 - eeschema/tools/ee_actions.cpp | 2 +- kicad/project_tree.cpp | 14 +++++++------- kicad/tools/kicad_manager_actions.cpp | 8 ++++---- pcbnew/tools/pcb_actions.cpp | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index d1c91af79e..48fdb66af2 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -87,7 +87,6 @@ EXTERN_BITMAP( axis3d_left_xpm ) EXTERN_BITMAP( axis3d_right_xpm ) EXTERN_BITMAP( axis3d_top_xpm ) EXTERN_BITMAP( axis3d_xpm ) -EXTERN_BITMAP( bitmap2component_xpm ) EXTERN_BITMAP( bom_xpm ) EXTERN_BITMAP( break_bus_xpm ) EXTERN_BITMAP( break_line_xpm ) diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index c36a684467..6eb67d2793 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -605,7 +605,7 @@ TOOL_ACTION EE_ACTIONS::drawSheetOnClipboard( "eeschema.EditorControl.drawSheetO TOOL_ACTION EE_ACTIONS::showPcbNew( "eeschema.EditorControl.showPcbNew", AS_GLOBAL, 0, "", _( "Switch to PCB Editor" ), _( "Open PCB in board editor" ), - pcbnew_xpm ); + icon_pcbnew_24_xpm ); TOOL_ACTION EE_ACTIONS::exportNetlist( "eeschema.EditorControl.exportNetlist", AS_GLOBAL, 0, "", diff --git a/kicad/project_tree.cpp b/kicad/project_tree.cpp index e6ea5df2eb..72ac32e412 100644 --- a/kicad/project_tree.cpp +++ b/kicad/project_tree.cpp @@ -44,7 +44,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) : // icons size is not know (depending on they are built) // so get it: wxSize iconsize; - wxBitmap dummy = KiBitmap( eeschema_xpm ); + wxBitmap dummy = KiBitmap( icon_eeschema_24_xpm ); iconsize.x = dummy.GetWidth(); iconsize.y = dummy.GetHeight(); @@ -54,11 +54,11 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) : m_imageList->Add( KiBitmap( project_xpm ) ); // TREE_LEGACY_PROJECT m_imageList->Add( KiBitmap( project_kicad_xpm ) ); // TREE_JSON_PROJECT - m_imageList->Add( KiBitmap( eeschema_xpm ) ); // TREE_LEGACY_SCHEMATIC - m_imageList->Add( KiBitmap( eeschema_xpm ) ); // TREE_SEXPR_SCHEMATIC - m_imageList->Add( KiBitmap( pcbnew_xpm ) ); // TREE_LEGACY_PCB - m_imageList->Add( KiBitmap( pcbnew_xpm ) ); // TREE_SEXPR_PCB - m_imageList->Add( KiBitmap( icon_gerbview_24_xpm ) ); // TREE_GERBER + m_imageList->Add( KiBitmap( icon_eeschema_24_xpm ) ); // TREE_LEGACY_SCHEMATIC + m_imageList->Add( KiBitmap( icon_eeschema_24_xpm ) ); // TREE_SEXPR_SCHEMATIC + m_imageList->Add( KiBitmap( icon_pcbnew_24_xpm ) ); // TREE_LEGACY_PCB + m_imageList->Add( KiBitmap( icon_pcbnew_24_xpm ) ); // TREE_SEXPR_PCB + m_imageList->Add( KiBitmap( icon_gerbview_24_xpm ) ); // TREE_GERBER m_imageList->Add( KiBitmap( gerber_job_file_xpm ) ); // TREE_GERBER_JOB_FILE (.gbrjob) m_imageList->Add( KiBitmap( file_html_xpm ) ); // TREE_HTML m_imageList->Add( KiBitmap( file_pdf_xpm ) ); // TREE_PDF @@ -66,7 +66,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) : m_imageList->Add( KiBitmap( netlist_xpm ) ); // TREE_NET m_imageList->Add( KiBitmap( unknown_xpm ) ); // TREE_UNKNOWN m_imageList->Add( KiBitmap( directory_xpm ) ); // TREE_DIRECTORY - m_imageList->Add( KiBitmap( icon_cvpcb_24_xpm ) ); // TREE_CMP_LINK + m_imageList->Add( KiBitmap( icon_cvpcb_24_xpm ) ); // TREE_CMP_LINK m_imageList->Add( KiBitmap( tools_xpm ) ); // TREE_REPORT m_imageList->Add( KiBitmap( file_pos_xpm ) ); // TREE_POS m_imageList->Add( KiBitmap( file_drl_xpm ) ); // TREE_DRILL diff --git a/kicad/tools/kicad_manager_actions.cpp b/kicad/tools/kicad_manager_actions.cpp index 50d7f83c1c..462f65fa61 100644 --- a/kicad/tools/kicad_manager_actions.cpp +++ b/kicad/tools/kicad_manager_actions.cpp @@ -63,7 +63,7 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::editSchematic( "kicad.Control.editSchematic", AS_GLOBAL, MD_CTRL + 'E', LEGACY_HK_NAME( "Run Eeschema" ), _( "Edit Schematic" ), _( "Edit Schematic" ), - eeschema_xpm, AF_NONE, (void*) FRAME_SCH ); + icon_eeschema_24_xpm, AF_NONE, (void*) FRAME_SCH ); TOOL_ACTION KICAD_MANAGER_ACTIONS::editSymbols( "kicad.Control.editSymbols", AS_GLOBAL, @@ -75,7 +75,7 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::editPCB( "kicad.Control.editPCB", AS_GLOBAL, MD_CTRL + 'P', LEGACY_HK_NAME( "Run Pcbnew" ), _( "Edit PCB" ), _( "Edit PCB" ), - pcbnew_xpm, AF_NONE, (void*) FRAME_PCB_EDITOR ); + icon_pcbnew_24_xpm, AF_NONE, (void*) FRAME_PCB_EDITOR ); TOOL_ACTION KICAD_MANAGER_ACTIONS::editFootprints( "kicad.Control.editFootprints", AS_GLOBAL, @@ -93,12 +93,12 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::convertImage( "kicad.Control.convertImage", AS_GLOBAL, MD_CTRL + 'B', LEGACY_HK_NAME( "Run Bitmap2Component" ), _( "Convert Image" ), _( "Convert bitmap images to schematic or PCB components" ), - bitmap2component_xpm ); + icon_bitmap2component_24_xpm ); TOOL_ACTION KICAD_MANAGER_ACTIONS::showCalculator( "kicad.Control.showCalculator", AS_GLOBAL, 0, LEGACY_HK_NAME( "Run PcbCalculator" ), _( "Calculator Tools" ), _( "Run component calculations, track width calculations, etc." ), - calculator_xpm ); + icon_pcbcalculator_24_xpm ); TOOL_ACTION KICAD_MANAGER_ACTIONS::editWorksheet( "kicad.Control.editWorksheet", AS_GLOBAL, diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index d04243a4bc..b8bdb49dc4 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -719,7 +719,7 @@ TOOL_ACTION PCB_ACTIONS::showNet( "pcbnew.EditorControl.showNet", AS_GLOBAL, 0, TOOL_ACTION PCB_ACTIONS::showEeschema( "pcbnew.EditorControl.showEeschema", AS_GLOBAL, 0, "", _( "Switch to Schematic Editor" ), _( "Open schematic in Eeschema" ), - eeschema_xpm ); + icon_eeschema_24_xpm ); // PCB_CONTROL @@ -1034,7 +1034,7 @@ TOOL_ACTION PCB_ACTIONS::layerChanged( "pcbnew.Control.layerChanged", TOOL_ACTION PCB_ACTIONS::boardStatistics( "pcbnew.InspectionTool.ShowStatisticsDialog", AS_GLOBAL, 0, "", _( "Show Board Statistics" ), _( "Shows board statistics" ), - pcbnew_xpm ); + icon_pcbnew_24_xpm ); TOOL_ACTION PCB_ACTIONS::inspectClearance( "pcbnew.InspectionTool.InspectClearance", AS_GLOBAL, 0, "",