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

Re-enable import non-Kicad project, but make it clear current will be lost. 

(And there's no sense in asking if they want to save changes first,
as those will be lost too.)
This commit is contained in:
Jeff Young 2023-10-24 23:17:40 +01:00
parent fca1ad5285
commit 46aecefb04
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/files-io.cpp
View File

@ -623,12 +623,10 @@ void SCH_EDIT_FRAME::OnAppendProject( wxCommandEvent& event )
void SCH_EDIT_FRAME::OnImportProject( wxCommandEvent& aEvent )
{
if( !AskToSaveChanges() )
return;
if( Schematic().RootScreen() && !Schematic().RootScreen()->Items().empty() )
{
wxString msg = _( "This operation replaces the contents of the current project.\n\n"
wxString msg = _( "This operation replaces the contents of the current schematic, "
"which will be permanently lost.\n\n"
"Do you want to proceed?" );
if( !IsOK( this, msg ) )

12
eeschema/menubar.cpp
View File

@ -106,14 +106,10 @@ void SCH_EDIT_FRAME::doReCreateMenuBar()
submenuImport->SetTitle( _( "Import" ) );
submenuImport->SetIcon( BITMAPS::import );
if( Kiface().IsSingle() )
{
submenuImport->Add( _( "Non-KiCad Schematic..." ),
_( "Replace current schematic sheet with one imported from another "
"application" ),
ID_IMPORT_NON_KICAD_SCH,
BITMAPS::import_document );
}
submenuImport->Add( _( "Non-KiCad Schematic..." ),
_( "Replace current schematic sheet with one imported from another application" ),
ID_IMPORT_NON_KICAD_SCH,
BITMAPS::import_document );
submenuImport->Add( EE_ACTIONS::importFPAssignments, ACTION_MENU::NORMAL,
_( "Footprint Assignments..." ) );