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

If there is no project name, default workbook name shall be "noname.wbk"

This commit is contained in:
Mikolaj Wielgus 2021-06-30 21:27:52 +02:00 committed by Jon Evans
parent 28531a982d
commit 86c7db46b9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/sim/sim_plot_frame.cpp
View File

@ -1125,7 +1125,12 @@ void SIM_PLOT_FRAME::menuSaveWorkbookAs( wxCommandEvent& event )
wxString defaultFilename = m_simulator->Settings()->GetWorkbookFilename(); wxString defaultFilename = m_simulator->Settings()->GetWorkbookFilename();
if( defaultFilename.IsEmpty() ) if( defaultFilename.IsEmpty() )
defaultFilename = Prj().GetProjectName() + wxT( ".wbk" ); {
if( Prj().GetProjectName().IsEmpty() )
defaultFilename = wxT( "noname.wbk" );
else
defaultFilename = Prj().GetProjectName() + wxT( ".wbk" );
}
wxFileDialog saveAsDlg( this, _( "Save Simulation Workbook As" ), m_savedWorkbooksPath, wxFileDialog saveAsDlg( this, _( "Save Simulation Workbook As" ), m_savedWorkbooksPath,
defaultFilename, WorkbookFileWildcard(), defaultFilename, WorkbookFileWildcard(),
@ -1530,14 +1535,19 @@ bool SIM_PLOT_FRAME::canCloseWindow( wxCloseEvent& aEvent )
wxFileName filename = m_simulator->Settings()->GetWorkbookFilename(); wxFileName filename = m_simulator->Settings()->GetWorkbookFilename();
if( filename.GetName().IsEmpty() ) if( filename.GetName().IsEmpty() )
filename.SetFullName( Prj().GetProjectName() + wxT( ".wbk" ) ); {
if( Prj().GetProjectName().IsEmpty() )
filename.SetFullName( wxT( "noname.wbk" ) );
else
filename.SetFullName( Prj().GetProjectName() + wxT( ".wbk" ) );
}
wxString msg = _( "Save changes to '%s' before closing?" ); wxString msg = _( "Save changes to '%s' before closing?" );
return HandleUnsavedChanges( this, wxString::Format( msg, filename.GetFullName() ), return HandleUnsavedChanges( this, wxString::Format( msg, filename.GetFullName() ),
[&]()->bool [&]()->bool
{ {
return saveWorkbook( Prj().AbsolutePath ( filename.GetFullName() ) ); return saveWorkbook( Prj().AbsolutePath( filename.GetFullName() ) );
} ); } );
} }