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

Excise the remaining occurrences of "Alias" for derived symbols. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12895
This commit is contained in:
Jeff Young 2022-11-16 17:09:59 +00:00
parent 6d71f27500
commit a61ac363c2
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/eda_item.cpp
View File

@ -373,7 +373,6 @@ static struct EDA_ITEM_DESC
.Map( SCH_SCREEN_T, _HKI( "SCH Screen" ) ) .Map( SCH_SCREEN_T, _HKI( "SCH Screen" ) )
.Map( LIB_SYMBOL_T, _HKI( "Symbol" ) ) .Map( LIB_SYMBOL_T, _HKI( "Symbol" ) )
.Map( LIB_ALIAS_T, _HKI( "Alias" ) )
.Map( LIB_SHAPE_T, _HKI( "Graphic" ) ) .Map( LIB_SHAPE_T, _HKI( "Graphic" ) )
.Map( LIB_TEXT_T, _HKI( "Text" ) ) .Map( LIB_TEXT_T, _HKI( "Text" ) )
.Map( LIB_TEXTBOX_T, _HKI( "Text Box" ) ) .Map( LIB_TEXTBOX_T, _HKI( "Text Box" ) )

4
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -271,7 +271,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::Validate()
if( parentName.IsEmpty() ) if( parentName.IsEmpty() )
{ {
m_delayedErrorMessage = _( "Aliased symbol must have a parent selected" ); m_delayedErrorMessage = _( "Derived symbol must have a parent selected" );
return false; return false;
} }

4
eeschema/generate_alias_info.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com> * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
* Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2017-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -34,7 +34,7 @@ static const wxString DescriptionFormat =
"__FIELDS__" "__FIELDS__"
"</table>"; "</table>";
static const wxString AliasOfFormat = "<br><i>" + _( "Alias of" ) + " %s (%s)</i>"; static const wxString AliasOfFormat = "<br><i>" + _( "Derived from" ) + " %s (%s)</i>";
static const wxString DescFormat = "<br>%s"; static const wxString DescFormat = "<br>%s";
static const wxString KeywordsFormat = "<br>" + _( "Keywords" ) + ": %s"; static const wxString KeywordsFormat = "<br>" + _( "Keywords" ) + ": %s";
static const wxString FieldFormat = static const wxString FieldFormat =

2
eeschema/sch_symbol.cpp
View File

@ -1684,7 +1684,7 @@ void SCH_SYMBOL::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_
if( parent ) if( parent )
msg = parent->GetName(); msg = parent->GetName();
aList.emplace_back( _( "Alias of" ), UnescapeString( msg ) ); aList.emplace_back( _( "Derived from" ), UnescapeString( msg ) );
} }
else if( !m_lib_id.GetLibNickname().empty() ) else if( !m_lib_id.GetLibNickname().empty() )
{ {

2
include/core/typeinfo.h
View File

@ -196,7 +196,6 @@ enum KICAD_T
* sort order is logical. * sort order is logical.
*/ */
LIB_SYMBOL_T, LIB_SYMBOL_T,
LIB_ALIAS_T,
LIB_SHAPE_T, LIB_SHAPE_T,
LIB_TEXT_T, LIB_TEXT_T,
LIB_TEXTBOX_T, LIB_TEXTBOX_T,
@ -408,7 +407,6 @@ constexpr bool IsEeschemaType( const KICAD_T aType )
case SCHEMATIC_T: case SCHEMATIC_T:
case LIB_SYMBOL_T: case LIB_SYMBOL_T:
case LIB_ALIAS_T:
case LIB_SHAPE_T: case LIB_SHAPE_T:
case LIB_TEXT_T: case LIB_TEXT_T:
case LIB_TEXTBOX_T: case LIB_TEXTBOX_T:

3
qa/unittests/eeschema/test_ee_item.cpp
View File

@ -112,8 +112,7 @@ public:
case SCHEMATIC_T: case SCHEMATIC_T:
case SCH_PIN_T: case SCH_PIN_T:
case LIB_SYMBOL_T: case LIB_SYMBOL_T: return nullptr;
case LIB_ALIAS_T: return nullptr;
default: default:
BOOST_FAIL( wxString::Format( BOOST_FAIL( wxString::Format(