From 30748006f7fab340c8f0a0b5edbca68e098d9a2d Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 1 Jun 2025 14:03:11 +0100 Subject: [PATCH] Standardize on American English spelling of "canceled". --- common/io/cadstar/cadstar_archive_parser.cpp | 5 ++--- eeschema/dialogs/dialog_erc.cpp | 2 +- eeschema/files-io.cpp | 5 +++++ eeschema/sch_io/altium/sch_io_altium.cpp | 2 +- eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp | 4 ++-- eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp | 2 +- eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp | 2 +- eeschema/symbol_editor/symbol_edit_frame.cpp | 2 +- eeschema/tools/backannotate.cpp | 2 +- pcbnew/dialogs/dialog_drc.cpp | 2 +- pcbnew/microwave/microwave_footprint.cpp | 4 ++-- pcbnew/pcb_io/altium/altium_pcb.cpp | 2 +- pcbnew/pcb_io/eagle/pcb_io_eagle.cpp | 4 ++-- pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp | 2 +- pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp | 2 +- pcbnew/pcb_io/fabmaster/import_fabmaster.cpp | 2 +- pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp | 2 +- pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp | 4 ++-- pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp | 2 +- pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp | 2 +- pcbnew/router/router_tool.cpp | 2 +- pcbnew/tools/footprint_editor_control.cpp | 2 +- 22 files changed, 31 insertions(+), 27 deletions(-) diff --git a/common/io/cadstar/cadstar_archive_parser.cpp b/common/io/cadstar/cadstar_archive_parser.cpp index c2dc39a170..4d9c936d59 100644 --- a/common/io/cadstar/cadstar_archive_parser.cpp +++ b/common/io/cadstar/cadstar_archive_parser.cpp @@ -2492,8 +2492,7 @@ XNODE* CADSTAR_ARCHIVE_PARSER::LoadArchiveFile( const wxString& aFileName, { delete rootNode; - // @spellingerror - THROW_IO_ERROR( _( "File import cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } aProgressReporter->SetCurrentProgress( currentProgress() ); @@ -2817,7 +2816,7 @@ void CADSTAR_ARCHIVE_PARSER::checkPoint() m_progressReporter->AdvanceProgress(); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "File import cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } } diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index b741b3b46d..d763e80483 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -453,7 +453,7 @@ void DIALOG_ERC::OnRunERCClick( wxCommandEvent& event ) if( m_cancelled ) // @spellingerror - m_messages->Report( _( "-------- ERC cancelled by user.

" ), RPT_SEVERITY_INFO ); + m_messages->Report( _( "-------- ERC canceled by user.

" ), RPT_SEVERITY_INFO ); else m_messages->Report( _( "Done.

" ), RPT_SEVERITY_INFO ); diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index bab4ee0905..88ba909368 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -1382,6 +1382,11 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType, GetScreen()->SetFileName( newfilename.GetFullPath() ); GetScreen()->SetContentModified(); + progressReporter.Report( _( "Cleaning up schematic..." ) ); + + if( !progressReporter.KeepRefreshing() ) + THROW_IO_ERROR( _( "File import canceled by user." ) ); + RecalculateConnections( nullptr, GLOBAL_CLEANUP ); // Only perform the dangling end test on root sheet. diff --git a/eeschema/sch_io/altium/sch_io_altium.cpp b/eeschema/sch_io/altium/sch_io_altium.cpp index be6dcaf064..47ed524a9d 100644 --- a/eeschema/sch_io/altium/sch_io_altium.cpp +++ b/eeschema/sch_io/altium/sch_io_altium.cpp @@ -836,7 +836,7 @@ void SCH_IO_ALTIUM::ParseAltiumSch( const wxString& aFileName ) m_progressReporter->Report( wxString::Format( _( "Importing %s" ), relative.GetFullPath() ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } if( isBinaryFile( aFileName ) ) diff --git a/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp b/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp index 5a7d4d5c0e..b66a730fd3 100644 --- a/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp +++ b/eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp @@ -115,7 +115,7 @@ void SCH_IO_KICAD_LEGACY::checkpoint() / std::max( 1U, m_lineCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); m_lastProgressLine = curLine; } @@ -287,7 +287,7 @@ void SCH_IO_KICAD_LEGACY::loadFile( const wxString& aFileName, SCH_SCREEN* aScre m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); m_lineReader = &reader; m_lineCount = 0; diff --git a/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp b/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp index cebd70c6f8..35fb86f5a2 100644 --- a/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp +++ b/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp @@ -303,7 +303,7 @@ void SCH_IO_KICAD_SEXPR::loadFile( const wxString& aFileName, SCH_SHEET* aSheet m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); while( reader.ReadLine() ) lineCount++; diff --git a/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp b/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp index a8dffe0264..b04d6e4ef7 100644 --- a/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp +++ b/eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr_parser.cpp @@ -106,7 +106,7 @@ void SCH_IO_KICAD_SEXPR_PARSER::checkpoint() / std::max( 1U, m_lineCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); m_lastProgressLine = curLine; } diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp index 5968079dc9..7c5edfdc85 100644 --- a/eeschema/symbol_editor/symbol_edit_frame.cpp +++ b/eeschema/symbol_editor/symbol_edit_frame.cpp @@ -279,7 +279,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : Raise(); if( loadingCancelled ) - ShowInfoBarWarning( _( "Symbol library loading was cancelled by user." ) ); + ShowInfoBarWarning( _( "Symbol library loading canceled by user." ) ); } diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp index af7b64d828..16fcb20926 100644 --- a/eeschema/tools/backannotate.cpp +++ b/eeschema/tools/backannotate.cpp @@ -353,7 +353,7 @@ void BACK_ANNOTATE::checkForUnusedSymbols() if( m_matchByReference && !m_frame->ReadyToNetlist( _( "Re-linking footprints requires a fully " "annotated schematic." ) ) ) { - m_reporter.ReportTail( _( "Footprint re-linking cancelled by user." ), RPT_SEVERITY_ERROR ); + m_reporter.ReportTail( _( "Footprint re-linking canceled by user." ), RPT_SEVERITY_ERROR ); } } diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp index f34ff33f2e..92a4f8fa76 100644 --- a/pcbnew/dialogs/dialog_drc.cpp +++ b/pcbnew/dialogs/dialog_drc.cpp @@ -357,7 +357,7 @@ void DIALOG_DRC::OnRunDRCClick( wxCommandEvent& aEvent ) } if( m_cancelled ) - m_messages->Report( _( "-------- DRC cancelled by user.

" ) ); + m_messages->Report( _( "-------- DRC canceled by user.

" ) ); else m_messages->Report( _( "Done.

" ) ); diff --git a/pcbnew/microwave/microwave_footprint.cpp b/pcbnew/microwave/microwave_footprint.cpp index c7d4200988..f2517254d2 100644 --- a/pcbnew/microwave/microwave_footprint.cpp +++ b/pcbnew/microwave/microwave_footprint.cpp @@ -82,7 +82,7 @@ FOOTPRINT* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprint // TODO: why is this QuasiModal? if( dlg.ShowQuasiModal() != wxID_OK ) - return nullptr; // cancelled by user + return nullptr; // canceled by user value = dlg.GetValue(); gap_size = editFrame->ValueFromString( value ); @@ -97,7 +97,7 @@ FOOTPRINT* MICROWAVE_TOOL::createFootprint( MICROWAVE_FOOTPRINT_SHAPE aFootprint // TODO: why is this QuasiModal? if( angledlg.ShowQuasiModal() != wxID_OK ) - return nullptr; // cancelled by user + return nullptr; // canceled by user msg = angledlg.GetValue(); diff --git a/pcbnew/pcb_io/altium/altium_pcb.cpp b/pcbnew/pcb_io/altium/altium_pcb.cpp index 24f59cb169..2681eb1ab4 100644 --- a/pcbnew/pcb_io/altium/altium_pcb.cpp +++ b/pcbnew/pcb_io/altium/altium_pcb.cpp @@ -330,7 +330,7 @@ void ALTIUM_PCB::checkpoint() / std::max( 1U, m_totalCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); m_lastProgressCount = m_doneCount; } diff --git a/pcbnew/pcb_io/eagle/pcb_io_eagle.cpp b/pcbnew/pcb_io/eagle/pcb_io_eagle.cpp index a3c2f118a9..8f471a0fdb 100644 --- a/pcbnew/pcb_io/eagle/pcb_io_eagle.cpp +++ b/pcbnew/pcb_io/eagle/pcb_io_eagle.cpp @@ -306,7 +306,7 @@ void PCB_IO_EAGLE::checkpoint() / std::max( 1U, m_totalCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); m_lastProgressCount = m_doneCount; } @@ -348,7 +348,7 @@ BOARD* PCB_IO_EAGLE::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe, m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } wxFileName fn = aFileName; diff --git a/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp b/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp index 7e2b9e9806..381d721609 100644 --- a/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp +++ b/pcbnew/pcb_io/easyeda/pcb_io_easyeda_plugin.cpp @@ -153,7 +153,7 @@ BOARD* PCB_IO_EASYEDA::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe, m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } PCB_IO_EASYEDA_PARSER parser( nullptr ); diff --git a/pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp b/pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp index 482173bd34..fea5cef311 100644 --- a/pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp +++ b/pcbnew/pcb_io/easyedapro/pcb_io_easyedapro.cpp @@ -116,7 +116,7 @@ BOARD* PCB_IO_EASYEDAPRO::LoadBoard( const wxString& aFileName, BOARD* aAppendTo m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } PCB_IO_EASYEDAPRO_PARSER parser( nullptr, nullptr ); diff --git a/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp b/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp index 3a72194558..b6269eaabe 100644 --- a/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp +++ b/pcbnew/pcb_io/fabmaster/import_fabmaster.cpp @@ -79,7 +79,7 @@ void FABMASTER::checkpoint() / std::max( 1U, m_totalCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); m_lastProgressCount = m_doneCount; } diff --git a/pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp b/pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp index 0caef0c219..fd88ef6abe 100644 --- a/pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp +++ b/pcbnew/pcb_io/fabmaster/pcb_io_fabmaster.cpp @@ -59,7 +59,7 @@ BOARD* PCB_IO_FABMASTER::LoadBoard( const wxString& aFileName, BOARD* aAppendToM m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "File import canceled by user." ) ); } if( !m_fabmaster.Read( aFileName.ToStdString() ) ) diff --git a/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp b/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp index 4966cb98c0..c988f01081 100644 --- a/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp +++ b/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp @@ -217,7 +217,7 @@ void PCB_IO_KICAD_LEGACY::checkpoint() / std::max( 1U, m_lineCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); m_lastProgressLine = curLine; } @@ -503,7 +503,7 @@ BOARD* PCB_IO_KICAD_LEGACY::LoadBoard( const wxString& aFileName, BOARD* aAppend m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); while( reader.ReadLine() ) m_lineCount++; diff --git a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp index b4aee1b780..3021fa7357 100644 --- a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp +++ b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp @@ -2814,7 +2814,7 @@ BOARD* PCB_IO_KICAD_SEXPR::LoadBoard( const wxString& aFileName, BOARD* aAppendT m_progressReporter->Report( wxString::Format( _( "Loading %s..." ), aFileName ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); while( reader.ReadLine() ) lineCount++; diff --git a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp index 8f1bcc1b31..60d4ccb395 100644 --- a/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp +++ b/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp @@ -152,7 +152,7 @@ void PCB_IO_KICAD_SEXPR_PARSER::checkpoint() / std::max( 1U, m_lineCount ) ); if( !m_progressReporter->KeepRefreshing() ) - THROW_IO_ERROR( _( "Open cancelled by user." ) ); + THROW_IO_ERROR( _( "Open canceled by user." ) ); m_lastProgressTime = curTime; } diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp index 1adf2bd4a1..46e7be0a05 100644 --- a/pcbnew/router/router_tool.cpp +++ b/pcbnew/router/router_tool.cpp @@ -1048,7 +1048,7 @@ int ROUTER_TOOL::handleLayerSwitch( const TOOL_EVENT& aEvent, bool aForceVia ) // Reset the cursor to the end of the track controls()->SetCursorPosition( m_endSnapPoint ); - if( targetLayer == UNDEFINED_LAYER ) // cancelled by user + if( targetLayer == UNDEFINED_LAYER ) // canceled by user return 0; // One cannot place a blind/buried via on only one layer: diff --git a/pcbnew/tools/footprint_editor_control.cpp b/pcbnew/tools/footprint_editor_control.cpp index 9cff9ee22e..781c67030a 100644 --- a/pcbnew/tools/footprint_editor_control.cpp +++ b/pcbnew/tools/footprint_editor_control.cpp @@ -478,7 +478,7 @@ int FOOTPRINT_EDITOR_CONTROL::RenameFootprint( const TOOL_EVENT& aEvent ) return true; } ) ) { - return 0; // cancelled by user + return 0; // canceled by user } if( newName == oldName )