From 5c21f938031587e98dc3d1500e4b5246ff880ba1 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 26 Jun 2021 12:33:37 +0100 Subject: [PATCH] Consistency in progress and error messages. --- .../3d_render_raytracing/create_scene.cpp | 2 +- .../3d_rendering/legacy/create_scene.cpp | 7 ++-- common/kiway.cpp | 6 ++-- common/project.cpp | 4 +-- eeschema/dialogs/dialog_choose_symbol.cpp | 3 +- .../dialogs/dialog_edit_symbols_libid.cpp | 2 +- .../dialog_global_sym_lib_table_config.cpp | 4 +-- eeschema/eeschema_config.cpp | 4 +-- eeschema/files-io.cpp | 2 +- eeschema/generate_alias_info.cpp | 3 +- eeschema/sch_base_frame.cpp | 2 +- .../sch_plugins/kicad/sch_sexpr_plugin.cpp | 8 ++--- .../sch_plugins/legacy/sch_legacy_plugin.cpp | 16 ++++----- eeschema/sheet.cpp | 4 +-- eeschema/symbol_editor/symbol_edit_frame.cpp | 4 +-- eeschema/symbol_editor/symbol_editor.cpp | 2 +- .../symbol_editor/symbol_library_manager.cpp | 4 +-- eeschema/symbol_library.cpp | 2 +- eeschema/symbol_tree_model_adapter.cpp | 2 +- eeschema/widgets/symbol_preview_widget.cpp | 2 +- gerbview/files.cpp | 15 +++++--- pagelayout_editor/pl_editor_frame.cpp | 2 +- .../dialog_global_fp_lib_table_config.cpp | 6 ++-- pcbnew/footprint_info_impl.cpp | 4 +-- pcbnew/generate_footprint_info.cpp | 2 +- pcbnew/pcb_base_frame.cpp | 2 +- pcbnew/pcbnew_config.cpp | 2 +- pcbnew/plugins/altium/altium_pcb.cpp | 36 +++++++++---------- qa/pns/pns_log_viewer.cpp | 5 +-- qa/qa_utils/pcb_test_frame.cpp | 5 +-- 30 files changed, 79 insertions(+), 83 deletions(-) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp index 92fb0ee9ac..779312eaf6 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp @@ -878,7 +878,7 @@ void RENDER_3D_RAYTRACE::Reload( REPORTER* aStatusReporter, REPORTER* aWarningRe #endif if( aStatusReporter ) - aStatusReporter->Report( _( "Loading 3D models" ) ); + aStatusReporter->Report( _( "Loading 3D models..." ) ); loadModels( m_objectContainer, aOnlyLoadCopperAndShapes ); diff --git a/3d-viewer/3d_rendering/legacy/create_scene.cpp b/3d-viewer/3d_rendering/legacy/create_scene.cpp index bd5daa7abe..275236e3a3 100644 --- a/3d-viewer/3d_rendering/legacy/create_scene.cpp +++ b/3d-viewer/3d_rendering/legacy/create_scene.cpp @@ -641,7 +641,7 @@ void RENDER_3D_LEGACY::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo // Load 3D models if( aStatusReporter ) - aStatusReporter->Report( _( "Loading 3D models" ) ); + aStatusReporter->Report( _( "Loading 3D models..." ) ); load3dModels( aStatusReporter ); @@ -881,9 +881,8 @@ void RENDER_3D_LEGACY::load3dModels( REPORTER* aStatusReporter ) // Display the short filename of the 3D model loaded: // (the full name is usually too long to be displayed) wxFileName fn( model.m_Filename ); - wxString msg; - msg.Printf( _( "Loading %s" ), fn.GetFullName() ); - aStatusReporter->Report( msg ); + aStatusReporter->Report( wxString::Format( _( "Loading %s..." ), + fn.GetFullName() ) ); } // Check if the model is not present in our cache map diff --git a/common/kiway.cpp b/common/kiway.cpp index fe3b8678f8..d4f98af5d2 100644 --- a/common/kiway.cpp +++ b/common/kiway.cpp @@ -410,15 +410,15 @@ KIWAY_PLAYER* KIWAY::Player( FRAME_T aFrameType, bool doCreate, wxTopLevelWindow } catch( const IO_ERROR& ioe ) { - DisplayErrorMessage( nullptr, _( "Error loading editor" ), ioe.What() ); + DisplayErrorMessage( nullptr, _( "Error loading editor." ), ioe.What() ); } catch( const std::exception& e) { - DisplayErrorMessage( nullptr, _( "Error loading editor" ), e.what() ); + DisplayErrorMessage( nullptr, _( "Error loading editor." ), e.what() ); } catch( ... ) { - DisplayErrorMessage( nullptr, _( "Error loading editor" ) ); + DisplayErrorMessage( nullptr, _( "Error loading editor." ) ); } } diff --git a/common/project.cpp b/common/project.cpp index 02d3ab70c3..f3643a8dee 100644 --- a/common/project.cpp +++ b/common/project.cpp @@ -309,12 +309,12 @@ FP_LIB_TABLE* PROJECT::PcbFootprintLibs( KIWAY& aKiway ) } catch( const IO_ERROR& ioe ) { - DisplayErrorMessage( NULL, _( "Error loading project footprint library table" ), + DisplayErrorMessage( NULL, _( "Error loading project footprint library table." ), ioe.What() ); } catch( ... ) { - DisplayErrorMessage( NULL, _( "Error loading project footprint library table" ) ); + DisplayErrorMessage( NULL, _( "Error loading project footprint library table." ) ); } } diff --git a/eeschema/dialogs/dialog_choose_symbol.cpp b/eeschema/dialogs/dialog_choose_symbol.cpp index 368dfde325..876da6ecf7 100644 --- a/eeschema/dialogs/dialog_choose_symbol.cpp +++ b/eeschema/dialogs/dialog_choose_symbol.cpp @@ -463,8 +463,7 @@ void DIALOG_CHOOSE_SYMBOL::PopulateFootprintSelector( LIB_ID const& aLibId ) } catch( const IO_ERROR& ioe ) { - wxLogError( wxString::Format( _( "Error occurred loading symbol %s from library %s." - "\n\n%s" ), + wxLogError( wxString::Format( _( "Error loading symbol %s from library %s.\n\n%s" ), aLibId.GetLibItemName().wx_str(), aLibId.GetLibNickname().wx_str(), ioe.What() ) ); diff --git a/eeschema/dialogs/dialog_edit_symbols_libid.cpp b/eeschema/dialogs/dialog_edit_symbols_libid.cpp index 12e0b561ac..099e09ae7f 100644 --- a/eeschema/dialogs/dialog_edit_symbols_libid.cpp +++ b/eeschema/dialogs/dialog_edit_symbols_libid.cpp @@ -724,7 +724,7 @@ bool DIALOG_EDIT_SYMBOLS_LIBID::TransferDataFromWindow() { wxString msg; - msg.Printf( _( "Error occurred loading symbol %s from library %s.\n\n%s" ), + msg.Printf( _( "Error loading symbol %s from library %s.\n\n%s" ), id.GetLibItemName().wx_str(), id.GetLibNickname().wx_str(), ioe.What() ); diff --git a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp b/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp index b0d1e6ea0c..77920399ec 100644 --- a/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp +++ b/eeschema/dialogs/dialog_global_sym_lib_table_config.cpp @@ -129,8 +129,8 @@ bool DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG::TransferDataFromWindow() } catch( const IO_ERROR& ioe ) { - DisplayError( this, wxString::Format( _( "Error occurred loading global symbol library " - "table.\n\n%s" ), + DisplayError( this, wxString::Format( _( "Error loading global symbol library table." + "\n\n%s" ), ioe.What() ) ); return false; } diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 23d5558e7e..19976a5e76 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -97,7 +97,7 @@ bool SCH_EDIT_FRAME::LoadProjectSettings() if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( filename ) ) { - ShowInfoBarError( _( "Error loading drawing sheet" ), true ); + ShowInfoBarError( _( "Error loading drawing sheet." ), true ); } return true; @@ -268,7 +268,7 @@ SYMBOL_LIB_TABLE* PROJECT::SchSymbolLibTable() catch( const IO_ERROR& ioe ) { wxString msg; - msg.Printf( _( "An error occurred loading the symbol library table '%s'." ), + msg.Printf( _( "Error loading the symbol library table '%s'." ), fn.GetFullPath() ); DisplayErrorMessage( NULL, msg, ioe.What() ); } diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index e31e932854..9fc3018c0a 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -427,7 +427,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector& aFileSet, in } catch( const std::bad_alloc& ) { - msg.Printf( _( "Memory exhausted loading schematic file '%s'." ), fullFileName ); + msg.Printf( _( "Memory exhausted loading schematic '%s'." ), fullFileName ); DisplayErrorMessage( this, msg ); failedLoad = true; diff --git a/eeschema/generate_alias_info.cpp b/eeschema/generate_alias_info.cpp index f3dc1dffd3..a33919b818 100644 --- a/eeschema/generate_alias_info.cpp +++ b/eeschema/generate_alias_info.cpp @@ -78,8 +78,7 @@ public: } catch( const IO_ERROR& ioe ) { - wxLogError( wxString::Format( _( "Error occurred loading symbol %s from library %s." - "\n\n%s" ), + wxLogError( wxString::Format( _( "Error loading symbol %s from library %s.\n\n%s" ), m_lib_id.GetLibItemName().wx_str(), m_lib_id.GetLibNickname().wx_str(), ioe.What() ) ); diff --git a/eeschema/sch_base_frame.cpp b/eeschema/sch_base_frame.cpp index 8be853041e..13cda4f2fb 100644 --- a/eeschema/sch_base_frame.cpp +++ b/eeschema/sch_base_frame.cpp @@ -67,7 +67,7 @@ LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIB_TABLE* aLibTable, { if( aShowErrorMsg ) { - wxString msg = wxString::Format( _( "Error loading symbol '%s' from library '%s'." ), + wxString msg = wxString::Format( _( "Error loading symbol %s from library '%s'." ), aLibId.GetLibItemName().wx_str(), aLibId.GetLibNickname().wx_str() ); DisplayErrorMessage( aParent, msg, ioe.What() ); diff --git a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp index 1d81059677..9fc0b8f796 100644 --- a/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp +++ b/eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp @@ -484,10 +484,10 @@ void SCH_SEXPR_PLUGIN::loadHierarchy( SCH_SHEET* aSheet ) // Save the current path so that it gets restored when descending and ascending the // sheet hierarchy which allows for sheet schematic files to be nested in folders // relative to the last path a schematic was loaded from. - wxLogTrace( traceSchLegacyPlugin, "Saving path \"%s\"", m_currentPath.top() ); + wxLogTrace( traceSchLegacyPlugin, "Saving path '%s'", m_currentPath.top() ); m_currentPath.push( fileName.GetPath() ); - wxLogTrace( traceSchLegacyPlugin, "Current path \"%s\"", m_currentPath.top() ); - wxLogTrace( traceSchLegacyPlugin, "Loading \"%s\"", fileName.GetFullPath() ); + wxLogTrace( traceSchLegacyPlugin, "Current path '%s'", m_currentPath.top() ); + wxLogTrace( traceSchLegacyPlugin, "Loading '%s'", fileName.GetFullPath() ); m_rootSheet->SearchHierarchy( fileName.GetFullPath(), &screen ); @@ -1530,7 +1530,7 @@ void SCH_SEXPR_PLUGIN_CACHE::Load() wxCHECK2( wxLocale::GetInfo( wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER ) == ".", LOCALE_IO toggle ); - wxLogTrace( traceSchLegacyPlugin, "Loading sexpr symbol library file \"%s\"", + wxLogTrace( traceSchLegacyPlugin, "Loading sexpr symbol library file '%s'", m_libFileName.GetFullPath() ); FILE_LINE_READER reader( m_libFileName.GetFullPath() ); diff --git a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp index e4e3a293ef..3e9a009c12 100644 --- a/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp +++ b/eeschema/sch_plugins/legacy/sch_legacy_plugin.cpp @@ -718,10 +718,10 @@ void SCH_LEGACY_PLUGIN::loadHierarchy( SCH_SHEET* aSheet ) // Save the current path so that it gets restored when descending and ascending the // sheet hierarchy which allows for sheet schematic files to be nested in folders // relative to the last path a schematic was loaded from. - wxLogTrace( traceSchLegacyPlugin, "Saving path \"%s\"", m_currentPath.top() ); + wxLogTrace( traceSchLegacyPlugin, "Saving path '%s'", m_currentPath.top() ); m_currentPath.push( fileName.GetPath() ); - wxLogTrace( traceSchLegacyPlugin, "Current path \"%s\"", m_currentPath.top() ); - wxLogTrace( traceSchLegacyPlugin, "Loading \"%s\"", fileName.GetFullPath() ); + wxLogTrace( traceSchLegacyPlugin, "Current path '%s'", m_currentPath.top() ); + wxLogTrace( traceSchLegacyPlugin, "Loading '%s'", fileName.GetFullPath() ); m_rootSheet->SearchHierarchy( fileName.GetFullPath(), &screen ); @@ -2613,15 +2613,15 @@ void SCH_LEGACY_PLUGIN_CACHE::Load() wxCHECK_RET( m_libFileName.IsAbsolute(), wxString::Format( "Cannot use relative file paths in legacy plugin to " - "open library \"%s\".", m_libFileName.GetFullPath() ) ); + "open library '%s'.", m_libFileName.GetFullPath() ) ); - wxLogTrace( traceSchLegacyPlugin, "Loading legacy symbol file \"%s\"", + wxLogTrace( traceSchLegacyPlugin, "Loading legacy symbol file '%s'", m_libFileName.GetFullPath() ); FILE_LINE_READER reader( m_libFileName.GetFullPath() ); if( !reader.ReadLine() ) - THROW_IO_ERROR( _( "unexpected end of file" ) ); + THROW_IO_ERROR( _( "Unexpected end of file." ) ); const char* line = reader.Line(); @@ -3248,7 +3248,7 @@ void SCH_LEGACY_PLUGIN_CACHE::loadDrawEntries( std::unique_ptr& aSym line = aReader.ReadLine(); } - SCH_PARSE_ERROR( "file ended prematurely loading symbol draw element", aReader, line ); + SCH_PARSE_ERROR( "File ended prematurely loading symbol draw element.", aReader, line ); } @@ -3764,7 +3764,7 @@ void SCH_LEGACY_PLUGIN_CACHE::loadFootprintFilters( std::unique_ptr& line = aReader.ReadLine(); } - SCH_PARSE_ERROR( "file ended prematurely while loading footprint filters", aReader, line ); + SCH_PARSE_ERROR( "File ended prematurely while loading footprint filters.", aReader, line ); } diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp index 318f21695e..c1656cbd69 100644 --- a/eeschema/sheet.cpp +++ b/eeschema/sheet.cpp @@ -159,7 +159,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier } catch( const IO_ERROR& ioe ) { - msg.Printf( _( "Error occurred loading schematic file '%s'." ), fullFilename ); + msg.Printf( _( "Error loading schematic '%s'." ), fullFilename ); DisplayErrorMessage( this, msg, ioe.What() ); msg.Printf( _( "Failed to load '%s'." ), fullFilename ); @@ -281,7 +281,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHier } catch( const IO_ERROR& ioe ) { - msg.Printf( _( "An error occurred loading the symbol library table '%s'." ), + msg.Printf( _( "Error loading the symbol library table '%s'." ), symLibTableFn.GetFullPath() ); DisplayErrorMessage( nullptr, msg, ioe.What() ); return false; diff --git a/eeschema/symbol_editor/symbol_edit_frame.cpp b/eeschema/symbol_editor/symbol_edit_frame.cpp index 475cfb369d..7f1a51e71c 100644 --- a/eeschema/symbol_editor/symbol_edit_frame.cpp +++ b/eeschema/symbol_editor/symbol_edit_frame.cpp @@ -910,8 +910,8 @@ void SYMBOL_EDIT_FRAME::SyncLibraries( bool aShowProgress, const wxString& aForc m_libMgr->Sync( aForceRefresh, [&]( int progress, int max, const wxString& libName ) { - progressDlg.Update( progress, - wxString::Format( _( "Loading library '%s'" ), libName ) ); + progressDlg.Update( progress, wxString::Format( _( "Loading library '%s'..." ), + libName ) ); } ); } else diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp index d58728bf81..0391d03577 100644 --- a/eeschema/symbol_editor/symbol_editor.cpp +++ b/eeschema/symbol_editor/symbol_editor.cpp @@ -285,7 +285,7 @@ bool SYMBOL_EDIT_FRAME::LoadSymbolFromCurrentLib( const wxString& aAliasName, in { wxString msg; - msg.Printf( _( "Error occurred loading symbol %s from library '%s'." ), + msg.Printf( _( "Error loading symbol %s from library '%s'." ), aAliasName, GetCurLib() ); DisplayErrorMessage( this, msg, ioe.What() ); diff --git a/eeschema/symbol_editor/symbol_library_manager.cpp b/eeschema/symbol_editor/symbol_library_manager.cpp index fffd91cd4e..030a175349 100644 --- a/eeschema/symbol_editor/symbol_library_manager.cpp +++ b/eeschema/symbol_editor/symbol_library_manager.cpp @@ -102,7 +102,7 @@ void SYMBOL_LIBRARY_MANAGER::Preload( PROGRESS_REPORTER& aReporter ) { HTML_MESSAGE_BOX dlg( &m_frame, _( "Load Error" ) ); - dlg.MessageSet( _( "Errors were encountered loading symbols:" ) ); + dlg.MessageSet( _( "Errors loading symbols:" ) ); wxString msg = loader.GetErrors(); msg.Replace( "\n", "
" ); @@ -429,7 +429,7 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER::GetBufferedSymbol( const wxString& aAlias, } catch( const IO_ERROR& e ) { - wxLogMessage( _( "Error loading symbol \"%s\" from library \"%s\". (%s)" ), + wxLogMessage( _( "Error loading symbol %s from library '%s'. (%s)" ), aAlias, aLibrary, e.What() ); bufferedSymbol = nullptr; } diff --git a/eeschema/symbol_library.cpp b/eeschema/symbol_library.cpp index 02a408d672..4826a23935 100644 --- a/eeschema/symbol_library.cpp +++ b/eeschema/symbol_library.cpp @@ -514,7 +514,7 @@ void SYMBOL_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress ) { if( aShowProgress ) { - lib_dialog.Update( i, _( "Loading " + lib_names[i] ) ); + lib_dialog.Update( i, wxString::Format( _( "Loading %s..." ), lib_names[i] ) ); } // lib_names[] does not store the file extension. Set it. diff --git a/eeschema/symbol_tree_model_adapter.cpp b/eeschema/symbol_tree_model_adapter.cpp index 04b07de21a..73ab2e3db6 100644 --- a/eeschema/symbol_tree_model_adapter.cpp +++ b/eeschema/symbol_tree_model_adapter.cpp @@ -102,7 +102,7 @@ void SYMBOL_TREE_MODEL_ADAPTER::AddLibraries( const std::vector& aNick { HTML_MESSAGE_BOX dlg( aParent, _( "Load Error" ) ); - dlg.MessageSet( _( "Errors were encountered loading symbols:" ) ); + dlg.MessageSet( _( "Errors loading symbols:" ) ); wxString msg = loader.GetErrors(); msg.Replace( "\n", "
" ); diff --git a/eeschema/widgets/symbol_preview_widget.cpp b/eeschema/widgets/symbol_preview_widget.cpp index ccf9903564..a8597de4fb 100644 --- a/eeschema/widgets/symbol_preview_widget.cpp +++ b/eeschema/widgets/symbol_preview_widget.cpp @@ -178,7 +178,7 @@ void SYMBOL_PREVIEW_WIDGET::DisplaySymbol( const LIB_ID& aSymbolID, int aUnit, i } catch( const IO_ERROR& ioe ) { - wxLogError( wxString::Format( _( "Error loading symbol %s from library %s.\n\n%s" ), + wxLogError( wxString::Format( _( "Error loading symbol %s from library '%s'.\n\n%s" ), aSymbolID.GetLibItemName().wx_str(), aSymbolID.GetLibNickname().wx_str(), ioe.What() ) ); diff --git a/gerbview/files.cpp b/gerbview/files.cpp index 94c71ce888..4c53f75aa9 100644 --- a/gerbview/files.cpp +++ b/gerbview/files.cpp @@ -239,15 +239,20 @@ bool GERBVIEW_FRAME::LoadListOfGerberAndDrillFiles( const wxString& aPath, if( !progress && ( aFilenameList.GetCount() > 1 ) ) { progress = std::make_unique( this, - _( "Loading Gerber files..." ), 1, false ); + _( "Loading Gerber files..." ), 1, + false ); progress->SetMaxProgress( aFilenameList.GetCount() - 1 ); - progress->Report( wxString::Format( _("Loading %u/%zu %s" ), ii+1, - aFilenameList.GetCount(), m_lastFileName ) ); + progress->Report( wxString::Format( _("Loading %u/%zu %s..." ), + ii+1, + aFilenameList.GetCount(), + m_lastFileName ) ); } else if( progress ) { - progress->Report( wxString::Format( _("Loading %u/%zu %s" ), ii+1, - aFilenameList.GetCount(), m_lastFileName ) ); + progress->Report( wxString::Format( _("Loading %u/%zu %s..." ), + ii+1, + aFilenameList.GetCount(), + m_lastFileName ) ); progress->KeepRefreshing(); } diff --git a/pagelayout_editor/pl_editor_frame.cpp b/pagelayout_editor/pl_editor_frame.cpp index 8a7069321d..9389fab908 100644 --- a/pagelayout_editor/pl_editor_frame.cpp +++ b/pagelayout_editor/pl_editor_frame.cpp @@ -332,7 +332,7 @@ bool PL_EDITOR_FRAME::OpenProjectFiles( const std::vector& aFileSet, i if( !LoadDrawingSheetFile( fn ) ) { - wxMessageBox( wxString::Format( _( "Error when loading file \"%s\"" ), fn ) ); + wxMessageBox( wxString::Format( _( "Error loading drawing sheet '%s'." ), fn ) ); return false; } else diff --git a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp b/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp index d60646a41a..6c76a018f9 100644 --- a/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp +++ b/pcbnew/dialogs/dialog_global_fp_lib_table_config.cpp @@ -131,9 +131,9 @@ bool DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG::TransferDataFromWindow() } catch( const IO_ERROR& ioe ) { - DisplayError( this, - wxString::Format( _( "Error occurred loading global footprint library table:" - "\n\n%s" ), ioe.What() ) ); + DisplayError( this, wxString::Format( _( "Error loading global footprint library table." + "\n\n%s" ), + ioe.What() ) ); return false; } diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp index 61ee5bfb75..e0b824c54d 100644 --- a/pcbnew/footprint_info_impl.cpp +++ b/pcbnew/footprint_info_impl.cpp @@ -127,7 +127,7 @@ bool FOOTPRINT_LIST_IMPL::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxStri if( m_progress_reporter ) { m_progress_reporter->SetMaxProgress( m_queue_in.size() ); - m_progress_reporter->Report( _( "Fetching Footprint Libraries" ) ); + m_progress_reporter->Report( _( "Fetching footprint libraries..." ) ); } m_cancelled = false; @@ -156,7 +156,7 @@ bool FOOTPRINT_LIST_IMPL::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxStri { m_progress_reporter->SetMaxProgress( m_queue_out.size() ); m_progress_reporter->AdvancePhase(); - m_progress_reporter->Report( _( "Loading Footprints" ) ); + m_progress_reporter->Report( _( "Loading footprints..." ) ); } loader.Join(); diff --git a/pcbnew/generate_footprint_info.cpp b/pcbnew/generate_footprint_info.cpp index 50adf1c181..97830d71f1 100644 --- a/pcbnew/generate_footprint_info.cpp +++ b/pcbnew/generate_footprint_info.cpp @@ -78,7 +78,7 @@ public: } catch( const IO_ERROR& ioe ) { - wxLogError( wxString::Format( _( "Error loading footprint %s from library %s.\n\n%s" ), + wxLogError( wxString::Format( _( "Error loading footprint %s from library '%s'.\n\n%s" ), m_lib_id.GetLibItemName().wx_str(), m_lib_id.GetLibNickname().wx_str(), ioe.What() ) ); diff --git a/pcbnew/pcb_base_frame.cpp b/pcbnew/pcb_base_frame.cpp index fa646ff0bc..57af982f21 100644 --- a/pcbnew/pcb_base_frame.cpp +++ b/pcbnew/pcb_base_frame.cpp @@ -148,7 +148,7 @@ FP_LIB_TABLE* PROJECT::PcbFootprintLibs() } catch( const IO_ERROR& ioe ) { - DisplayErrorMessage( nullptr, _( "Error loading project footprint libraries" ), + DisplayErrorMessage( nullptr, _( "Error loading project footprint libraries." ), ioe.What() ); } } diff --git a/pcbnew/pcbnew_config.cpp b/pcbnew/pcbnew_config.cpp index fbed5d995c..6fc2700602 100644 --- a/pcbnew/pcbnew_config.cpp +++ b/pcbnew/pcbnew_config.cpp @@ -80,7 +80,7 @@ bool PCB_EDIT_FRAME::LoadProjectSettings() if( !DS_DATA_MODEL::GetTheInstance().LoadDrawingSheet( filename ) ) { - ShowInfoBarError( _( "Error loading drawing sheet" ), true ); + ShowInfoBarError( _( "Error loading drawing sheet." ), true ); } // Load render settings that aren't stored in PCB_DISPLAY_OPTIONS diff --git a/pcbnew/plugins/altium/altium_pcb.cpp b/pcbnew/plugins/altium/altium_pcb.cpp index 31d7ddf84a..2a918fc4f1 100644 --- a/pcbnew/plugins/altium/altium_pcb.cpp +++ b/pcbnew/plugins/altium/altium_pcb.cpp @@ -625,7 +625,7 @@ void ALTIUM_PCB::ParseBoard6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Board Data" ); + m_progressReporter->Report( "Loading board data..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -834,7 +834,7 @@ void ALTIUM_PCB::ParseClasses6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Net Classes" ); + m_progressReporter->Report( "Loading netclasses..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -874,7 +874,7 @@ void ALTIUM_PCB::ParseComponents6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Components" ); + m_progressReporter->Report( "Loading components..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -921,7 +921,7 @@ void ALTIUM_PCB::ParseComponentsBodies6Data( const CFB::CompoundFileReader& aRea const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Components 3D Models" ); + m_progressReporter->Report( "Loading component 3D models..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1204,7 +1204,7 @@ void ALTIUM_PCB::ParseDimensions6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Dimension Drawings" ); + m_progressReporter->Report( "Loading dimension drawings..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1245,7 +1245,7 @@ void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry, const wxString aRootDir ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: 3D Models" ); + m_progressReporter->Report( "Loading 3D models..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1332,7 +1332,7 @@ void ALTIUM_PCB::ParseNets6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Nets" ); + m_progressReporter->Report( "Loading nets..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1355,7 +1355,7 @@ void ALTIUM_PCB::ParsePolygons6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Polygons" ); + m_progressReporter->Report( "Loading polygons..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1488,7 +1488,7 @@ void ALTIUM_PCB::ParseRules6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Rules" ); + m_progressReporter->Report( "Loading rules..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1520,7 +1520,7 @@ void ALTIUM_PCB::ParseBoardRegionsData( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Board Regions" ); + m_progressReporter->Report( "Loading board regions..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1542,7 +1542,7 @@ void ALTIUM_PCB::ParseShapeBasedRegions6Data( const CFB::CompoundFileReader& aRe const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Zones" ); + m_progressReporter->Report( "Loading zones..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1656,7 +1656,7 @@ void ALTIUM_PCB::ParseRegions6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Zone Fills" ); + m_progressReporter->Report( "Loading zone fills..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1744,7 +1744,7 @@ void ALTIUM_PCB::ParseArcs6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Arcs" ); + m_progressReporter->Report( "Loading arcs..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -1883,7 +1883,7 @@ void ALTIUM_PCB::ParsePads6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Pads" ); + m_progressReporter->Report( "Loading pads..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -2296,7 +2296,7 @@ void ALTIUM_PCB::ParseVias6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Vias" ); + m_progressReporter->Report( "Loading vias..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -2356,7 +2356,7 @@ void ALTIUM_PCB::ParseTracks6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Tracks" ); + m_progressReporter->Report( "Loading tracks..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -2462,7 +2462,7 @@ void ALTIUM_PCB::ParseTexts6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Text" ); + m_progressReporter->Report( "Loading text..." ); ALTIUM_PARSER reader( aReader, aEntry ); @@ -2648,7 +2648,7 @@ void ALTIUM_PCB::ParseFills6Data( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ) { if( m_progressReporter ) - m_progressReporter->Report( "Parse: Rectangles" ); + m_progressReporter->Report( "Loading rectangles..." ); ALTIUM_PARSER reader( aReader, aEntry ); diff --git a/qa/pns/pns_log_viewer.cpp b/qa/pns/pns_log_viewer.cpp index 0f1f25fb09..74f3595d78 100644 --- a/qa/pns/pns_log_viewer.cpp +++ b/qa/pns/pns_log_viewer.cpp @@ -399,10 +399,7 @@ static BOARD* loadBoard( const std::string& filename ) } catch( const IO_ERROR& ioe ) { - wxString msg = wxString::Format( _( "Error loading board.\n%s" ), - ioe.Problem() ); - - printf( "Board Loading Error: '%s'\n", (const char*) msg.mb_str() ); + printf( "Board Loading Error: '%s'\n", ioe.Problem() ); return nullptr; } diff --git a/qa/qa_utils/pcb_test_frame.cpp b/qa/qa_utils/pcb_test_frame.cpp index bce258d568..7d1e7786c6 100644 --- a/qa/qa_utils/pcb_test_frame.cpp +++ b/qa/qa_utils/pcb_test_frame.cpp @@ -100,10 +100,7 @@ BOARD* PCB_TEST_FRAME_BASE::LoadAndDisplayBoard( const std::string& filename ) } catch( const IO_ERROR& ioe ) { - wxString msg = wxString::Format( _( "Error loading board.\n%s" ), - ioe.Problem() ); - - printf( "%s\n", (const char*) msg.mb_str() ); + printf( "Board Loading Error: '%s'\n", ioe.Problem() ); return nullptr; }