From b8108d294fa6d57581a9c7e536c67cf01b2659d3 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 1 Feb 2020 13:29:46 +0100 Subject: [PATCH] Fix a few I18n messages, and minor wxWidgets alerts. --- eeschema/dialogs/dialog_annotate_base.cpp | 107 ++--- eeschema/dialogs/dialog_annotate_base.fbp | 379 ++---------------- eeschema/dialogs/dialog_annotate_base.h | 20 +- ...ialog_edit_component_in_schematic_base.cpp | 24 +- ...ialog_edit_component_in_schematic_base.fbp | 10 +- .../dialog_edit_component_in_schematic_base.h | 2 +- eeschema/tools/backannotate.cpp | 21 +- 7 files changed, 118 insertions(+), 445 deletions(-) diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp index 221d066767..b4c72089d5 100644 --- a/eeschema/dialogs/dialog_annotate_base.cpp +++ b/eeschema/dialogs/dialog_annotate_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,135 +14,138 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bmainSizer; bmainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bupperSizer; bupperSizer = new wxBoxSizer( wxVERTICAL ); - + m_userMessage = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_userMessage->Wrap( 1 ); m_userMessage->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); m_userMessage->Hide(); - + bupperSizer->Add( m_userMessage, 0, wxALL|wxEXPAND, 5 ); - + wxFlexGridSizer* fgSizer1; fgSizer1 = new wxFlexGridSizer( 2, 2, 0, 0 ); fgSizer1->AddGrowableCol( 0 ); fgSizer1->AddGrowableCol( 1 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + wxString m_rbScopeChoices[] = { _("Use the entire schematic"), _("Use the current page only") }; int m_rbScopeNChoices = sizeof( m_rbScopeChoices ) / sizeof( wxString ); m_rbScope = new wxRadioBox( this, wxID_ANY, _("Scope:"), wxDefaultPosition, wxDefaultSize, m_rbScopeNChoices, m_rbScopeChoices, 1, wxRA_SPECIFY_COLS ); m_rbScope->SetSelection( 0 ); fgSizer1->Add( m_rbScope, 0, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Order:") ), wxVERTICAL ); - + wxBoxSizer* bSizerXpos; bSizerXpos = new wxBoxSizer( wxHORIZONTAL ); - + m_rbSortBy_X_Position = new wxRadioButton( sbSizer1->GetStaticBox(), ID_SORT_BY_X_POSITION, _("Sort components by &X position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); bSizerXpos->Add( m_rbSortBy_X_Position, 0, wxBOTTOM|wxTOP, 3 ); - - + + bSizerXpos->Add( 0, 0, 1, 0, 5 ); - + annotate_down_right_bitmap = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - - + + sbSizer1->Add( bSizerXpos, 0, wxEXPAND, 5 ); - + wxBoxSizer* bSizerYpos; bSizerYpos = new wxBoxSizer( wxHORIZONTAL ); - + m_rbSortBy_Y_Position = new wxRadioButton( sbSizer1->GetStaticBox(), ID_SORT_BY_Y_POSITION, _("Sort components by &Y position"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxBOTTOM|wxTOP, 3 ); - - + + bSizerYpos->Add( 0, 0, 1, 0, 5 ); - + annotate_right_down_bitmap = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - - + + sbSizer1->Add( bSizerYpos, 0, wxEXPAND, 5 ); - - + + fgSizer1->Add( sbSizer1, 0, wxALL|wxEXPAND, 5 ); - + wxString m_rbOptionsChoices[] = { _("Keep existing annotations"), _("Reset existing annotations"), _("Reset, but keep order of multi-unit parts") }; int m_rbOptionsNChoices = sizeof( m_rbOptionsChoices ) / sizeof( wxString ); m_rbOptions = new wxRadioBox( this, wxID_ANY, _("Options:"), wxDefaultPosition, wxDefaultSize, m_rbOptionsNChoices, m_rbOptionsChoices, 1, wxRA_SPECIFY_COLS ); m_rbOptions->SetSelection( 0 ); fgSizer1->Add( m_rbOptions, 0, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer2; sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Numbering:") ), wxVERTICAL ); - + wxGridBagSizer* gbSizer1; gbSizer1 = new wxGridBagSizer( 0, 0 ); gbSizer1->SetFlexibleDirection( wxBOTH ); gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_rbFirstFree = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_FIRST_FREE, _("Use first free number after:"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); gbSizer1->Add( m_rbFirstFree, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxTOP, 2 ); - + m_textNumberAfter = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 ); gbSizer1->Add( m_textNumberAfter, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxLEFT, 2 ); - + m_rbSheetX100 = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_SHEET_X_100, _("First free after sheet number X 100"), wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_rbSheetX100, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxTOP, 4 ); - + m_rbSheetX1000 = new wxRadioButton( sbSizer2->GetStaticBox(), wxID_SHEET_X_1000, _("First free after sheet number X 1000"), wxDefaultPosition, wxDefaultSize, 0 ); gbSizer1->Add( m_rbSheetX1000, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxTOP, 2 ); - - + + sbSizer2->Add( gbSizer1, 1, wxEXPAND, 5 ); - - + + fgSizer1->Add( sbSizer2, 1, wxALL|wxEXPAND, 5 ); - - + + bupperSizer->Add( fgSizer1, 0, wxBOTTOM|wxEXPAND, 5 ); - + m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessageWindow->SetMinSize( wxSize( -1,120 ) ); - + bupperSizer->Add( m_MessageWindow, 5, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - - + + bmainSizer->Add( bupperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); - + wxBoxSizer* m_buttonsSizer; m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); - + m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonsSizer->Add( m_btnClear, 0, wxEXPAND|wxALL, 10 ); - + + + m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - - m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); - - + + m_buttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); + + bmainSizer->Add( m_buttonsSizer, 0, wxEXPAND|wxLEFT, 5 ); - - + + this->SetSizer( bmainSizer ); this->Layout(); bmainSizer->Fit( this ); - + // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ANNOTATE_BASE::OnClose ) ); m_btnClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this ); @@ -157,5 +160,5 @@ DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE() m_btnClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCloseClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this ); - + } diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp index 0780a1988e..205bc62eb5 100644 --- a/eeschema/dialogs/dialog_annotate_base.fbp +++ b/eeschema/dialogs/dialog_annotate_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ dialog_annotate_base 1000 none + + 1 dialog_annotate_base @@ -24,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -52,42 +55,7 @@ - - - - - - - - - OnClose - - - - - - - - - - - - - - - - - - - - - - - - - - bmainSizer @@ -135,6 +103,7 @@ 1 wxID_ANY + 0 0 @@ -160,29 +129,6 @@ 1 - - - - - - - - - - - - - - - - - - - - - - - @@ -265,30 +211,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -303,7 +225,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -375,30 +296,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -467,29 +364,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -565,30 +439,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -657,29 +507,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -750,30 +577,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -788,7 +591,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -869,30 +671,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -960,33 +738,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1054,30 +805,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1145,30 +872,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1232,29 +935,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -1283,25 +963,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 ID_CLEAR_ANNOTATION_CMP Clear Annotation + + 0 0 @@ -1316,6 +1002,8 @@ protected 1 + + Resizable 1 @@ -1331,35 +1019,22 @@ OnClearAnnotationCmpClick - - - - - - - - - - - - - - - - - - - - - - - + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 5 wxALL|wxEXPAND - 1 + 0 0 1 @@ -1372,14 +1047,8 @@ m_sdbSizer1 protected - OnCloseClick - - - OnApplyClick - - diff --git a/eeschema/dialogs/dialog_annotate_base.h b/eeschema/dialogs/dialog_annotate_base.h index 7ea011d4af..72238eda1d 100644 --- a/eeschema/dialogs/dialog_annotate_base.h +++ b/eeschema/dialogs/dialog_annotate_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_ANNOTATE_BASE_H__ -#define __DIALOG_ANNOTATE_BASE_H__ +#pragma once #include #include @@ -49,7 +48,7 @@ class WX_HTML_REPORT_PANEL; class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM { private: - + protected: wxStaticText* m_userMessage; wxRadioBox* m_rbScope; @@ -67,19 +66,18 @@ class DIALOG_ANNOTATE_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnClearAnnotationCmpClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCloseClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnApplyClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_ANNOTATE_BASE(); - + }; -#endif //__DIALOG_ANNOTATE_BASE_H__ diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index cc91be3ba6..5e9b02f596 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -93,7 +93,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bButtonSize->Add( m_bpMoveDown, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 10 ); + bButtonSize->Add( 0, 0, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 ); m_bpDelete = new wxBitmapButton( sbFields->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_bpDelete->SetToolTip( _("Delete field") ); @@ -102,12 +102,12 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bButtonSize->Add( m_bpDelete, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bButtonSize->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bButtonSize->Add( 0, 0, 1, wxEXPAND, 5 ); m_updateFieldValues = new wxButton( sbFields->GetStaticBox(), wxID_ANY, _("Update Fields from Library..."), wxDefaultPosition, wxDefaultSize, 0 ); m_updateFieldValues->SetToolTip( _("Sets fields to the original library values") ); - bButtonSize->Add( m_updateFieldValues, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bButtonSize->Add( m_updateFieldValues, 0, wxEXPAND, 5 ); sbFields->Add( bButtonSize, 0, wxALL|wxEXPAND, 5 ); @@ -195,8 +195,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - wxBoxSizer* bSizer101; - bSizer101 = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bSizerBottom; + bSizerBottom = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* bSizer11; bSizer11 = new wxBoxSizer( wxHORIZONTAL ); @@ -212,16 +212,16 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE bSizer11->Add( m_textCtrlTimeStamp, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - bSizer101->Add( bSizer11, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + bSizerBottom->Add( bSizer11, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); - bSizer101->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizerBottom->Add( 0, 0, 1, wxEXPAND, 5 ); m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice Model..."), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer101->Add( m_spiceFieldsButton, 0, wxEXPAND|wxALL, 5 ); + bSizerBottom->Add( m_spiceFieldsButton, 0, wxEXPAND|wxALL, 5 ); - bSizer101->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 15 ); + bSizerBottom->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 15 ); m_stdDialogButtonSizer = new wxStdDialogButtonSizer(); m_stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); @@ -230,10 +230,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE m_stdDialogButtonSizer->AddButton( m_stdDialogButtonSizerCancel ); m_stdDialogButtonSizer->Realize(); - bSizer101->Add( m_stdDialogButtonSizer, 0, wxEXPAND, 5 ); + bSizerBottom->Add( m_stdDialogButtonSizer, 0, wxEXPAND, 5 ); - mainSizer->Add( bSizer101, 0, wxEXPAND, 5 ); + mainSizer->Add( bSizerBottom, 0, wxEXPAND, 5 ); this->SetSizer( mainSizer ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index 04f8a6481b..f9156811e4 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -14,6 +14,7 @@ dialog_edit_component_in_schematic_base 1000 none + 1 dialog_edit_component_in_schematic_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -391,7 +393,7 @@ 10 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT + wxEXPAND|wxLEFT|wxRIGHT 0 0 @@ -474,7 +476,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 1 0 @@ -484,7 +486,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND + wxEXPAND 0 1 @@ -1206,7 +1208,7 @@ 0 - bSizer101 + bSizerBottom wxHORIZONTAL none diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h index 4eafc8905b..2a1efb141d 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 6 2019) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp index 1a0604fedd..7757cfea34 100644 --- a/eeschema/tools/backannotate.cpp +++ b/eeschema/tools/backannotate.cpp @@ -109,7 +109,8 @@ bool BACK_ANNOTATE::FetchNetlistFromPCB( std::string& aNetlist ) { DisplayErrorMessage( m_frame, _( "Cannot fetch PCB netlist because eeschema is opened in " - "stand-alone mode, you must launch the KiCad project manager " + "stand-alone mode.\n" + "You must launch the KiCad project manager " "and create a project." ) ); return false; } @@ -149,7 +150,7 @@ int BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload ) if( path == "" ) { - msg.Printf( _( "Footprint %s has no symbol associated." ), ref ); + msg.Printf( _( "Footprint \"%s\" has no symbol associated." ), ref ); m_settings.reporter.ReportHead( msg, REPORTER::RPT_WARNING ); continue; } @@ -167,7 +168,7 @@ int BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload ) if( nearestItem != m_pcbModules.end() && nearestItem->first == path ) { // Module with this path already exists - generate error - msg.Printf( _( "Pcb footprints %s and %s linked to same symbol" ), + msg.Printf( _( "Pcb footprints \"%s\" and \"%s\" linked to same symbol" ), nearestItem->second->ref, ref ); m_settings.reporter.ReportHead( msg, REPORTER::RPT_ERROR ); ++errors; @@ -222,7 +223,7 @@ int BACK_ANNOTATE::getChangeList() { // Haven't found linked symbol in multiunits or common refs. Generate error wxString msg; - msg.Printf( _( "Cannot find symbol for %s footprint" ), pcbData->ref ); + msg.Printf( _( "Cannot find symbol for \"%s\" footprint" ), pcbData->ref ); ++errors; m_settings.reporter.ReportTail( msg, REPORTER::RPT_ERROR ); } @@ -248,7 +249,7 @@ int BACK_ANNOTATE::checkForUnusedSymbols() { ++errors; wxString msg; - msg.Printf( _( "Cannot find footprint for %s symbol" ), m_refs[i++].GetFullRef() ); + msg.Printf( _( "Cannot find footprint for \"%s\" symbol" ), m_refs[i++].GetFullRef() ); m_settings.reporter.ReportTail( msg, REPORTER::RPT_ERROR ); } @@ -307,7 +308,7 @@ int BACK_ANNOTATE::checkSharedSchematicErrors() // Refs share same component but have different values or footprints ++errors; wxString msg; - msg.Printf( _( "%s and %s use the same schematic symbol. " + msg.Printf( _( "\"%s\" and \"%s\" use the same schematic symbol.\n" "They cannot have different footprints or values." ), ( it + 1 )->second->ref, it->second->ref ); m_settings.reporter.ReportTail( msg, REPORTER::RPT_ERROR ); @@ -325,8 +326,8 @@ int BACK_ANNOTATE::checkSharedSchematicErrors() if( !checkReuseViolation( tmp, *it->second ) ) { wxString msg; - msg.Printf( _( "Unable to change %s footprint or value because associated" - "symbol is reused in the another project" ), + msg.Printf( _( "Unable to change \"%s\" footprint or value because associated" + " symbol is reused in the another project" ), it->second->ref ); m_settings.reporter.ReportTail( msg, REPORTER::RPT_ERROR ); ++errors; @@ -356,7 +357,7 @@ void BACK_ANNOTATE::applyChangelist() if( m_settings.processReferences && ref.GetRef() != module.ref ) { ++m_changesCount; - msg.Printf( _( "Change %s reference to %s." ), ref.GetFullRef(), module.ref ); + msg.Printf( _( "Change \"%s\" reference to \"%s\"." ), ref.GetFullRef(), module.ref ); if( !m_settings.dryRun ) ref.GetComp()->SetRef( &ref.GetSheetPath(), module.ref ); m_settings.reporter.ReportHead( msg, REPORTER::RPT_ACTION ); @@ -376,7 +377,7 @@ void BACK_ANNOTATE::applyChangelist() if( m_settings.processValues && oldValue != module.value ) { ++m_changesCount; - msg.Printf( _( "Change %s value from %s to %s." ), ref.GetFullRef(), + msg.Printf( _( "Change \"%s\" value from \"%s\" to \"\"%s\"." ), ref.GetFullRef(), getTextFromField( ref, VALUE ), module.value ); if( !m_settings.dryRun ) item.first.GetComp()->GetField( VALUE )->SetText( module.value );