haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed remaining occurences of 'part' to 'symbol' in the symbol editor

This commit is contained in:
Maciej Suminski 2018-01-18 11:23:59 +01:00
parent d87a7ae58e
commit 8721f7ed70
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/class_libentry.cpp
View File

@ -207,7 +207,7 @@ LIB_PART::LIB_PART( LIB_PART& aPart, PART_LIB* aLibrary ) :
LIB_PART::~LIB_PART() LIB_PART::~LIB_PART()
{ {
wxLogTrace( traceSchLibMem, 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__ ) ), GetChars( wxString::FromAscii( __WXFUNCTION__ ) ),
(long long unsigned) m_aliases.size() ); (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 ) void LIB_PART::SetAliases( const wxArrayString& aAliasList )
{ {
wxCHECK_RET( !m_library, 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" ) ); wxCHECK_RET( !aAliasList.IsEmpty(), wxT( "Alias list cannot be empty" ) );
if( aAliasList == GetAliasNames() ) if( aAliasList == GetAliasNames() )
@ -1291,7 +1291,7 @@ LIB_ALIAS* LIB_PART::RemoveAlias( LIB_ALIAS* aAlias )
bool rename = aAlias->IsRoot(); bool rename = aAlias->IsRoot();
wxLogTrace( traceSchLibMem, 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( wxString::FromAscii( __WXFUNCTION__ ) ),
GetChars( GetName() ), GetChars( GetName() ),
GetChars( aAlias->GetName() ), GetChars( aAlias->GetName() ),
@ -1351,7 +1351,7 @@ LIB_ALIAS* LIB_PART::GetAlias( size_t aIndex )
void LIB_PART::AddAlias( const wxString& aName ) void LIB_PART::AddAlias( const wxString& aName )
{ {
wxCHECK_RET( !HasAlias( 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." ) ); aName + wxT( ">. Bad programmer." ) );
m_aliases.push_back( new LIB_ALIAS( aName, this ) ); m_aliases.push_back( new LIB_ALIAS( aName, this ) );

4
eeschema/class_library.cpp
View File

@ -649,7 +649,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {
wxString msg; 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() ) ); GetChars( filename ), GetChars( ioe.What() ) );
wxLogError( msg ); wxLogError( msg );
@ -673,7 +673,7 @@ void PART_LIBS::LoadAllLibraries( PROJECT* aProject, bool aShowProgress )
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {
wxString msg = wxString::Format( _( wxString msg = wxString::Format( _(
"Part library \"%s\" failed to load.\nError: %s" ), "Symbol library \"%s\" failed to load.\nError: %s" ),
GetChars( cache_name ), GetChars( cache_name ),
GetChars( ioe.What() ) GetChars( ioe.What() )
); );

2
eeschema/cmp_tree_model_adapter_base.cpp
View File

@ -191,7 +191,7 @@ void CMP_TREE_MODEL_ADAPTER_BASE::AttachTo( wxDataViewCtrl* aDataViewCtrl )
aDataViewCtrl->AssociateModel( this ); aDataViewCtrl->AssociateModel( this );
aDataViewCtrl->ClearColumns(); aDataViewCtrl->ClearColumns();
wxString part_head = _( "Part" ); wxString part_head = _( "Symbol" );
wxString desc_head = _( "Desc" ); wxString desc_head = _( "Desc" );
m_col_part = aDataViewCtrl->AppendTextColumn( part_head, 0, wxDATAVIEW_CELL_INERT, m_col_part = aDataViewCtrl->AppendTextColumn( part_head, 0, wxDATAVIEW_CELL_INERT,

2
eeschema/component_references_lister.cpp
View File

@ -530,7 +530,7 @@ int SCH_REFERENCE_LIST::CheckAnnotation( wxArrayString* aMessageList )
else else
tmp = wxT( "?" ); 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( componentFlatList[ii].GetRef() ),
GetChars( tmp ), GetChars( tmp ),
componentFlatList[ii].m_Unit, componentFlatList[ii].m_Unit,

2
eeschema/hotkeys.cpp
View File

@ -219,7 +219,7 @@ static EDA_HOTKEY HkMoveLibItem( _HKI( "Move Library Item" ), HK_LIBEDIT_MOVE_GR
// Load/save files // 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 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 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 ); static EDA_HOTKEY HkLoadSchematic( _HKI( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );

4
eeschema/libedit.cpp
View File

@ -482,7 +482,7 @@ void LIB_EDIT_FRAME::loadPart( const wxString& aAlias, const wxString& aLibrary,
if( !alias ) 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 ) ); GetChars( aAlias ), GetChars( aLibrary ) );
DisplayError( this, msg ); DisplayError( this, msg );
return; return;
@ -669,7 +669,7 @@ void LIB_EDIT_FRAME::DisplayCmpDoc()
if( part->IsPower() ) if( part->IsPower() )
msg = _( "Power Symbol" ); msg = _( "Power Symbol" );
else else
msg = _( "Part" ); msg = _( "Symbol" );
AppendMsgPanel( _( "Type" ), msg, MAGENTA, 8 ); AppendMsgPanel( _( "Type" ), msg, MAGENTA, 8 );
AppendMsgPanel( _( "Description" ), alias->GetDescription(), CYAN, 8 ); AppendMsgPanel( _( "Description" ), alias->GetDescription(), CYAN, 8 );

2
eeschema/libeditframe.cpp
View File

@ -524,7 +524,7 @@ void LIB_EDIT_FRAME::OnUpdatePartModified( wxUpdateUIEvent& aEvent )
if( aEvent.GetId() == ID_LIBEDIT_SAVE_PART ) if( aEvent.GetId() == ID_LIBEDIT_SAVE_PART )
{ {
bool readOnly = libName.IsEmpty() || m_libMgr->IsLibraryReadOnly( libName ); 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 ); g_Libedit_Hokeys_Descr, HK_SAVE_PART );
aEvent.SetText( text ); aEvent.SetText( text );

4
eeschema/pinedit.cpp
View File

@ -747,7 +747,7 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event )
if( part->GetUnitCount() > 1 ) 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 ) if( m_showDeMorgan )
@ -787,7 +787,7 @@ void LIB_EDIT_FRAME::OnCheckComponent( wxCommandEvent& event )
if( part->GetUnitCount() > 1 ) 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 ) if( m_showDeMorgan )

24
eeschema/widgets/cmp_tree_pane.cpp
View File

@ -57,35 +57,35 @@ CMP_TREE_PANE::CMP_TREE_PANE( LIB_EDIT_FRAME* aParent, LIB_MANAGER* aLibMgr )
KiBitmap( save_library_xpm ) ); KiBitmap( save_library_xpm ) );
AddMenuItem( menuLibrary.get(), ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save Library As..." ), AddMenuItem( menuLibrary.get(), ID_LIBEDIT_SAVE_LIBRARY_AS, _( "Save Library As..." ),
KiBitmap( save_library_xpm ) ); 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 ) ); KiBitmap( undo_xpm ) );
menuLibrary->AppendSeparator(); 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 ) ); 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 ) ); 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 ) ); KiBitmap( paste_xpm ) );
std::unique_ptr<wxMenu> menuPart = std::make_unique<wxMenu>(); std::unique_ptr<wxMenu> menuPart = std::make_unique<wxMenu>();
AddMenuItem( menuPart.get(), ID_LIBEDIT_EDIT_PART, _( "Edit Part" ), AddMenuItem( menuPart.get(), ID_LIBEDIT_EDIT_PART, _( "&Edit Symbol" ),
KiBitmap( edit_xpm ) ); KiBitmap( edit_xpm ) );
AddMenuItem( menuPart.get(), ID_LIBEDIT_REMOVE_PART, _( "Remove Part" ), AddMenuItem( menuPart.get(), ID_LIBEDIT_REMOVE_PART, _( "Remove Symbol" ),
KiBitmap( delete_xpm ) ); 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 ) ); 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 ) ); 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 ) ); KiBitmap( undo_xpm ) );
menuPart->AppendSeparator(); menuPart->AppendSeparator();
AddMenuItem( menuPart.get(), ID_LIBEDIT_CUT_PART, _( "Cut Part" ), AddMenuItem( menuPart.get(), ID_LIBEDIT_CUT_PART, _( "Cut Symbol" ),
KiBitmap( cut_xpm ) ); KiBitmap( cut_xpm ) );
AddMenuItem( menuPart.get(), ID_LIBEDIT_COPY_PART, _( "Copy Part" ), AddMenuItem( menuPart.get(), ID_LIBEDIT_COPY_PART, _( "Copy Symbol" ),
KiBitmap( copy_xpm ) ); KiBitmap( copy_xpm ) );
AddMenuItem( menuPart.get(), ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Part" ), AddMenuItem( menuPart.get(), ID_LIBEDIT_DUPLICATE_PART, _( "Duplicate Symbol" ),
KiBitmap( duplicate_xpm ) ); KiBitmap( duplicate_xpm ) );
menuPart->AppendSeparator(); menuPart->AppendSeparator();