From b67f18b3946a3014dc6852b7005791e99b1800d0 Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Thu, 23 Apr 2020 01:07:28 +0100 Subject: [PATCH] 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 --- pcbnew/eagle_plugin.cpp | 4 ++-- pcbnew/menubar_pcb_editor.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pcbnew/eagle_plugin.cpp b/pcbnew/eagle_plugin.cpp index 6b904f76f3..b46b99aeea 100644 --- a/pcbnew/eagle_plugin.cpp +++ b/pcbnew/eagle_plugin.cpp @@ -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 case EAGLE_LAYER::UNROUTED: kiLayer = Dwgs_User; break; - case EAGLE_LAYER::TKEEPOUT: - case EAGLE_LAYER::BKEEPOUT: + case EAGLE_LAYER::TKEEPOUT: kiLayer = F_CrtYd; break; + case EAGLE_LAYER::BKEEPOUT: kiLayer = B_CrtYd; break; case EAGLE_LAYER::TTEST: case EAGLE_LAYER::BTEST: case EAGLE_LAYER::HOLES: diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index f14c54fe85..27e7e82133 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -84,10 +84,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() fileMenu->AddMenu( openRecentMenu, FILE_HISTORY::FileHistoryNotEmpty( fileHistory ) ); 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(); } @@ -124,6 +120,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() submenuImport->Add( PCB_ACTIONS::importSpecctraSession ); submenuImport->Add( _( "Graphics..." ), _( "Import 2D drawing file" ), 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->AddMenu( submenuImport, SELECTION_CONDITIONS::ShowAlways );