From 8721f7ed70d9c27e35ccb52fb4946282a573117e Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 18 Jan 2018 11:23:59 +0100 Subject: [PATCH] Changed remaining occurences of 'part' to 'symbol' in the symbol editor --- eeschema/class_libentry.cpp | 8 ++++---- eeschema/class_library.cpp | 4 ++-- eeschema/cmp_tree_model_adapter_base.cpp | 2 +- eeschema/component_references_lister.cpp | 2 +- eeschema/hotkeys.cpp | 2 +- eeschema/libedit.cpp | 4 ++-- eeschema/libeditframe.cpp | 2 +- eeschema/pinedit.cpp | 4 ++-- eeschema/widgets/cmp_tree_pane.cpp | 24 ++++++++++++------------ 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eeschema/class_libentry.cpp b/eeschema/class_libentry.cpp index 434af86282..e9677e6aa3 100644 --- a/eeschema/class_libentry.cpp +++ b/eeschema/class_libentry.cpp @@ -207,7 +207,7 @@ LIB_PART::LIB_PART( LIB_PART& aPart, PART_LIB* aLibrary ) : LIB_PART::~LIB_PART() { wxLogTrace( traceSchLibMem, - wxT( "%s: destroying part with alias list count of %llu" ), + wxT( "%s: destroying symbol with alias list count of %llu" ), GetChars( wxString::FromAscii( __WXFUNCTION__ ) ), (long long unsigned) m_aliases.size() ); @@ -1239,7 +1239,7 @@ bool LIB_PART::HasAlias( const wxString& aName ) const void LIB_PART::SetAliases( const wxArrayString& aAliasList ) { wxCHECK_RET( !m_library, - wxT( "Part aliases cannot be changed when they are owned by a library." ) ); + wxT( "Symbol aliases cannot be changed when they are owned by a library." ) ); wxCHECK_RET( !aAliasList.IsEmpty(), wxT( "Alias list cannot be empty" ) ); if( aAliasList == GetAliasNames() ) @@ -1291,7 +1291,7 @@ LIB_ALIAS* LIB_PART::RemoveAlias( LIB_ALIAS* aAlias ) bool rename = aAlias->IsRoot(); wxLogTrace( traceSchLibMem, - wxT( "%s: part:'%s', alias:'%s', alias count %llu, reference count %ld." ), + wxT( "%s: symbol:'%s', alias:'%s', alias count %llu, reference count %ld." ), GetChars( wxString::FromAscii( __WXFUNCTION__ ) ), GetChars( GetName() ), GetChars( aAlias->GetName() ), @@ -1351,7 +1351,7 @@ LIB_ALIAS* LIB_PART::GetAlias( size_t aIndex ) void LIB_PART::AddAlias( const wxString& aName ) { wxCHECK_RET( !HasAlias( aName ), - wxT( "Part <" ) + GetName() + wxT( "> already has an alias <" ) + + wxT( "Symbol <" ) + GetName() + wxT( "> already has an alias <" ) + aName + wxT( ">. Bad programmer." ) ); m_aliases.push_back( new LIB_ALIAS( aName, this ) ); diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp index c7d4ca57c4..ec97169670 100644 --- a/eeschema/class_library.cpp +++ b/eeschema/class_library.cpp @@ -649,7 +649,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress ) catch( const IO_ERROR& ioe ) { wxString msg; - msg.Printf( _( "Part library \"%s\" failed to load. Error:\n %s" ), + msg.Printf( _( "Symbol library \"%s\" failed to load. Error:\n %s" ), GetChars( filename ), GetChars( ioe.What() ) ); wxLogError( msg ); @@ -673,7 +673,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress ) catch( const IO_ERROR& ioe ) { wxString msg = wxString::Format( _( - "Part library \"%s\" failed to load.\nError: %s" ), + "Symbol library \"%s\" failed to load.\nError: %s" ), GetChars( cache_name ), GetChars( ioe.What() ) ); diff --git a/eeschema/cmp_tree_model_adapter_base.cpp b/eeschema/cmp_tree_model_adapter_base.cpp index 041d02ca0e..e4873fccab 100644 --- a/eeschema/cmp_tree_model_adapter_base.cpp +++ b/eeschema/cmp_tree_model_adapter_base.cpp @@ -191,7 +191,7 @@ void CMP_TREE_MODEL_ADAPTER_BASE::AttachTo( wxDataViewCtrl* aDataViewCtrl ) aDataViewCtrl->AssociateModel( this ); aDataViewCtrl->ClearColumns(); - wxString part_head = _( "Part" ); + wxString part_head = _( "Symbol" ); wxString desc_head = _( "Desc" ); m_col_part = aDataViewCtrl->AppendTextColumn( part_head, 0, wxDATAVIEW_CELL_INERT, diff --git a/eeschema/component_references_lister.cpp b/eeschema/component_references_lister.cpp index 3031b6f699..2e894668f5 100644 --- a/eeschema/component_references_lister.cpp +++ b/eeschema/component_references_lister.cpp @@ -530,7 +530,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( wxArrayString* aMessageList ) else tmp = wxT( "?" ); - msg.Printf( _( "Error item %s%s unit %d and no more than %d parts\n" ), + msg.Printf( _( "Error item %s%s unit %d and no more than %d symbols\n" ), GetChars( componentFlatList[ii].GetRef() ), GetChars( tmp ), componentFlatList[ii].m_Unit, diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 2bf4f812f2..7a60d70e23 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -219,7 +219,7 @@ static EDA_HOTKEY HkMoveLibItem( _HKI( "Move Library Item" ), HK_LIBEDIT_MOVE_GR // Load/save files static EDA_HOTKEY HkSaveLib( _HKI( "Save Library" ), HK_SAVE_LIB, 'S' + GR_KB_CTRL + GR_KB_ALT, ID_LIBEDIT_SAVE_LIBRARY ); -static EDA_HOTKEY HkSavePart( _HKI( "Save Part" ), HK_SAVE_PART, 'S' + GR_KB_CTRL, ID_LIBEDIT_SAVE_PART ); +static EDA_HOTKEY HkSavePart( _HKI( "Save Symbol" ), HK_SAVE_PART, 'S' + GR_KB_CTRL, ID_LIBEDIT_SAVE_PART ); static EDA_HOTKEY HkSaveSchematic( _HKI( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL ); static EDA_HOTKEY HkLoadSchematic( _HKI( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL ); diff --git a/eeschema/libedit.cpp b/eeschema/libedit.cpp index 807c4117b2..7593cea034 100644 --- a/eeschema/libedit.cpp +++ b/eeschema/libedit.cpp @@ -482,7 +482,7 @@ void LIB_EDIT_FRAME::loadPart( const wxString& aAlias, const wxString& aLibrary, if( !alias ) { - wxString msg = wxString::Format( _( "Part name \"%s\" not found in library \"%s\"" ), + wxString msg = wxString::Format( _( "Symbol name \"%s\" not found in library \"%s\"" ), GetChars( aAlias ), GetChars( aLibrary ) ); DisplayError( this, msg ); return; @@ -669,7 +669,7 @@ void LIB_EDIT_FRAME::DisplayCmpDoc() if( part->IsPower() ) msg = _( "Power Symbol" ); else - msg = _( "Part" ); + msg = _( "Symbol" ); AppendMsgPanel( _( "Type" ), msg, MAGENTA, 8 ); AppendMsgPanel( _( "Description" ), alias->GetDescription(), CYAN, 8 ); diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp index 66c7ed7c84..8f0df91cc8 100644 --- a/eeschema/libeditframe.cpp +++ b/eeschema/libeditframe.cpp @@ -524,7 +524,7 @@ void LIB_EDIT_FRAME::OnUpdatePartModified( wxUpdateUIEvent& aEvent ) if( aEvent.GetId() == ID_LIBEDIT_SAVE_PART ) { bool readOnly = libName.IsEmpty() || m_libMgr->IsLibraryReadOnly( libName ); - wxString text = AddHotkeyName( readOnly ? _( "&Save Part [Read Only]" ) : _( "&Save Part" ), + wxString text = AddHotkeyName( readOnly ? _( "&Save Symbol [Read Only]" ) : _( "&Save Symbol" ), g_Libedit_Hokeys_Descr, HK_SAVE_PART ); aEvent.SetText( text ); diff --git a/eeschema/pinedit.cpp b/eeschema/pinedit.cpp index 80af8fe73b..7848871502 100644 --- a/eeschema/pinedit.cpp +++ b/eeschema/pinedit.cpp @@ -747,7 +747,7 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event ) if( part->GetUnitCount() > 1 ) { - msg += wxString::Format( _( " in part %c" ), 'A' + curr_pin->GetUnit() - 1 ); + msg += wxString::Format( _( " in symbol %c" ), 'A' + curr_pin->GetUnit() - 1 ); } if( m_showDeMorgan ) @@ -787,7 +787,7 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event ) if( part->GetUnitCount() > 1 ) { - msg += wxString::Format( _( " in part %c" ), 'A' + pin->GetUnit() - 1 ); + msg += wxString::Format( _( " in symbol %c" ), 'A' + pin->GetUnit() - 1 ); } if( m_showDeMorgan ) diff --git a/eeschema/widgets/cmp_tree_pane.cpp b/eeschema/widgets/cmp_tree_pane.cpp index f6297f80e5..c2676760e6 100644 --- a/eeschema/widgets/cmp_tree_pane.cpp +++ b/eeschema/widgets/cmp_tree_pane.cpp @@ -57,35 +57,35 @@ CMP_TREE_PANE::CMP_TREE_PANE( LIB_EDIT_FRAME* aParent, LIB_MANAGER* aLibMgr ) KiBitmap( save_library_xpm ) ); AddMenuItem( menuLibrary.get(), ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save Library As..." ), KiBitmap( save_library_xpm ) ); - AddMenuItem( menuLibrary.get(), ID_LIBEDIT_REVERT_LIBRARY, _( "&Revert Library" ), + AddMenuItem( menuLibrary.get(), ID_LIBEDIT_REVERT_LIBRARY, _( "Revert Library" ), KiBitmap( undo_xpm ) ); menuLibrary->AppendSeparator(); - AddMenuItem( menuLibrary.get(), ID_LIBEDIT_NEW_PART, _( "New &Part..." ), + AddMenuItem( menuLibrary.get(), ID_LIBEDIT_NEW_PART, _( "New Sy&mbol..." ), KiBitmap( new_component_xpm ) ); - AddMenuItem( menuLibrary.get(), ID_LIBEDIT_IMPORT_PART, _( "Import Part..." ), + AddMenuItem( menuLibrary.get(), ID_LIBEDIT_IMPORT_PART, _( "&Import Symbol..." ), KiBitmap( import_part_xpm ) ); - AddMenuItem( menuLibrary.get(), ID_LIBEDIT_PASTE_PART, _( "Paste Part" ), + AddMenuItem( menuLibrary.get(), ID_LIBEDIT_PASTE_PART, _( "Paste Symbol" ), KiBitmap( paste_xpm ) ); std::unique_ptr menuPart = std::make_unique(); - AddMenuItem( menuPart.get(), ID_LIBEDIT_EDIT_PART, _( "Edit Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_EDIT_PART, _( "&Edit Symbol" ), KiBitmap( edit_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_REMOVE_PART, _( "Remove Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_REMOVE_PART, _( "Remove Symbol" ), KiBitmap( delete_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_EXPORT_PART, _( "Export Part..." ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_EXPORT_PART, _( "E&xport Symbol..." ), KiBitmap( export_part_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_SAVE_PART, _( "&Save Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_SAVE_PART, _( "&Save Symbol" ), KiBitmap( save_part_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_REVERT_PART, _( "&Revert Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_REVERT_PART, _( "Revert Symbol" ), KiBitmap( undo_xpm ) ); menuPart->AppendSeparator(); - AddMenuItem( menuPart.get(), ID_LIBEDIT_CUT_PART, _( "Cut Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_CUT_PART, _( "Cut Symbol" ), KiBitmap( cut_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_COPY_PART, _( "Copy Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_COPY_PART, _( "Copy Symbol" ), KiBitmap( copy_xpm ) ); - AddMenuItem( menuPart.get(), ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Part" ), + AddMenuItem( menuPart.get(), ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Symbol" ), KiBitmap( duplicate_xpm ) ); menuPart->AppendSeparator();