diff --git a/eeschema/eeschema_jobs_handler.cpp b/eeschema/eeschema_jobs_handler.cpp index e64079ee6b..074e2439b3 100644 --- a/eeschema/eeschema_jobs_handler.cpp +++ b/eeschema/eeschema_jobs_handler.cpp @@ -111,7 +111,9 @@ void EESCHEMA_JOBS_HANDLER::InitRenderSettings( KIGFX::SCH_RENDER_SETTINGS* aRen if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( resolvedSheetPath ) ) { - m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." ), path ), + m_reporter->Report( + wxString::Format( _( "Error loading drawing sheet '%s'." ) + wxS( "\n" ), + path ), RPT_SEVERITY_ERROR ); return false; } @@ -436,8 +438,8 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob ) if( !schPreset ) { - m_reporter->Report( - wxString::Format( _( "BOM preset '%s' not found" ), aBomJob->m_bomPresetName ), + m_reporter->Report( wxString::Format( _( "BOM preset '%s' not found" ) + wxS( "\n" ), + aBomJob->m_bomPresetName ), RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::ERR_UNKNOWN; @@ -531,8 +533,8 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob ) if( !f.Open( aBomJob->m_outputFile, wxFile::write ) ) { - m_reporter->Report( - wxString::Format( _( "Unable to open destination '%s'" ), aBomJob->m_outputFile ), + m_reporter->Report( wxString::Format( _( "Unable to open destination '%s'" ) + wxS( "\n" ), + aBomJob->m_outputFile ), RPT_SEVERITY_ERROR ); @@ -562,7 +564,8 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob ) if( !schFmtPreset ) { - m_reporter->Report( wxString::Format( _( "BOM format preset '%s' not found" ), + m_reporter->Report( + wxString::Format( _( "BOM format preset '%s' not found" ) + wxS( "\n" ), aBomJob->m_bomFmtPresetName ), RPT_SEVERITY_ERROR ); @@ -757,7 +760,8 @@ int EESCHEMA_JOBS_HANDLER::doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob, if( !plotter->OpenFile( fn.GetFullPath() ) ) { - m_reporter->Report( wxString::Format( _( "Unable to open destination '%s'" ), + m_reporter->Report( + wxString::Format( _( "Unable to open destination '%s'" ) + wxS( "\n" ), fn.GetFullPath() ), RPT_SEVERITY_ERROR ); @@ -825,7 +829,8 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob ) if( !symbol ) { - m_reporter->Report( _( "There is no symbol selected to save." ), RPT_SEVERITY_ERROR ); + m_reporter->Report( _( "There is no symbol selected to save." ) + wxS( "\n" ), + RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::ERR_ARGS; } } diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp index 56d473f438..765063849e 100644 --- a/pcbnew/pcbnew_jobs_handler.cpp +++ b/pcbnew/pcbnew_jobs_handler.cpp @@ -238,9 +238,9 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob ) if( aJob->IsCli() ) { if( EXPORT_SVG::Plot( brd, svgPlotOptions ) ) - m_reporter->Report( _( "Successfully created svg file" ), RPT_SEVERITY_INFO ); + m_reporter->Report( _( "Successfully created svg file" ) + wxS( "\n" ), RPT_SEVERITY_INFO ); else - m_reporter->Report( _( "Error creating svg file" ), RPT_SEVERITY_ERROR ); + m_reporter->Report( _( "Error creating svg file" ) + wxS( "\n" ), RPT_SEVERITY_ERROR ); } return CLI::EXIT_CODES::OK; @@ -890,7 +890,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob ) if( !svgJob->m_footprint.IsEmpty() && !singleFpPlotted ) { - m_reporter->Report( _( "The given footprint could not be found to export." ), + m_reporter->Report( _( "The given footprint could not be found to export." ) + wxS( "\n" ), RPT_SEVERITY_ERROR ); } @@ -947,7 +947,7 @@ int PCBNEW_JOBS_HANDLER::doFpExportSvg( JOB_FP_EXPORT_SVG* aSvgJob, const FOOTPR svgPlotOptions.m_plotFrame = false; if( !EXPORT_SVG::Plot( brd.get(), svgPlotOptions ) ) - m_reporter->Report( _( "Error creating svg file" ), RPT_SEVERITY_ERROR ); + m_reporter->Report( _( "Error creating svg file" ) + wxS( "\n" ), RPT_SEVERITY_ERROR ); return CLI::EXIT_CODES::OK; @@ -1198,7 +1198,8 @@ int PCBNEW_JOBS_HANDLER::JobExportIpc2581( JOB* aJob ) if( !wxRenameFile( tempFile, job->m_outputFile ) ) { m_reporter->Report( wxString::Format( _( "Error generating IPC2581 file '%s'.\n" - "Failed to rename temporary file '%s." ), + "Failed to rename temporary file '%s." ) + + wxS( "\n" ), job->m_outputFile, tempFile ), RPT_SEVERITY_ERROR ); } @@ -1238,7 +1239,7 @@ void PCBNEW_JOBS_HANDLER::loadOverrideDrawingSheet( BOARD* aBrd, const wxString& aBrd->GetProject()->GetProjectPath() ); if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( filename ) ) { - m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." ), path ), + m_reporter->Report( wxString::Format( _( "Error loading drawing sheet '%s'." )+ wxS( "\n" ), path ), RPT_SEVERITY_ERROR ); return false; }