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

EAGLE import tKeepout/bKeepout to F_CrtYd/B_CrtYd 

Also move Pcbnew import menu to correct sub menu.

Fixes https://gitlab.com/kicad/code/kicad/issues/2347
This commit is contained in:
Michael Kavanagh 2020-04-23 01:07:28 +01:00 committed by Seth Hillbrand
parent b1e1e22a5e
commit b67f18b394
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/eagle_plugin.cpp
View File

@ -2303,8 +2303,8 @@ PCB_LAYER_ID EAGLE_PLUGIN::kicad_layer( int aEagleLayer ) const
// these will also appear in the ratsnest, so there's no need for a warning // these will also appear in the ratsnest, so there's no need for a warning
case EAGLE_LAYER::UNROUTED: kiLayer = Dwgs_User; break; case EAGLE_LAYER::UNROUTED: kiLayer = Dwgs_User; break;
case EAGLE_LAYER::TKEEPOUT: case EAGLE_LAYER::TKEEPOUT: kiLayer = F_CrtYd; break;
case EAGLE_LAYER::BKEEPOUT: case EAGLE_LAYER::BKEEPOUT: kiLayer = B_CrtYd; break;
case EAGLE_LAYER::TTEST: case EAGLE_LAYER::TTEST:
case EAGLE_LAYER::BTEST: case EAGLE_LAYER::BTEST:
case EAGLE_LAYER::HOLES: case EAGLE_LAYER::HOLES:

11
pcbnew/menubar_pcb_editor.cpp
View File

@ -84,10 +84,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
fileMenu->AddMenu( openRecentMenu, FILE_HISTORY::FileHistoryNotEmpty( fileHistory ) ); fileMenu->AddMenu( openRecentMenu, FILE_HISTORY::FileHistoryNotEmpty( fileHistory ) );
fileMenu->AddItem( PCB_ACTIONS::appendBoard, SELECTION_CONDITIONS::ShowAlways ); fileMenu->AddItem( PCB_ACTIONS::appendBoard, SELECTION_CONDITIONS::ShowAlways );
fileMenu->AddItem( ID_IMPORT_NON_KICAD_BOARD,
_( "Import Non-KiCad Board File..." ),
_( "Import board file from other applications" ),
import_brd_file_xpm, SELECTION_CONDITIONS::ShowAlways );
fileMenu->AddSeparator(); fileMenu->AddSeparator();
} }
@ -125,6 +121,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
submenuImport->Add( _( "Graphics..." ), _( "Import 2D drawing file" ), submenuImport->Add( _( "Graphics..." ), _( "Import 2D drawing file" ),
ID_GEN_IMPORT_GRAPHICS_FILE, import_vector_xpm ); ID_GEN_IMPORT_GRAPHICS_FILE, import_vector_xpm );
if( Kiface().IsSingle() )
{
submenuImport->Add( _( "Non-KiCad Board File..." ),
_( "Import board file from other applications" ),
ID_IMPORT_NON_KICAD_BOARD, import_brd_file_xpm );
}
fileMenu->AddSeparator(); fileMenu->AddSeparator();
fileMenu->AddMenu( submenuImport, SELECTION_CONDITIONS::ShowAlways ); fileMenu->AddMenu( submenuImport, SELECTION_CONDITIONS::ShowAlways );