diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index 8decb74724..308eedc18f 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -370,12 +370,12 @@ TOOL_ACTION ACTIONS::refreshPreview( "common.Control.refreshPreview", TOOL_ACTION ACTIONS::pinLibrary( "common.Control.pinLibrary", AS_GLOBAL, 0, "", - _( "Pin" ), "Keep the library at the top of the list", + _( "Pin Library" ), "Keep the library at the top of the list", flag_xpm ); TOOL_ACTION ACTIONS::unpinLibrary( "common.Control.unpinLibrary", AS_GLOBAL, 0, "", - _( "Unpin" ), "No longer keep the library at the top of the list", + _( "Unpin Library" ), "No longer keep the library at the top of the list", flag_remove_xpm ); TOOL_ACTION ACTIONS::panUp( "common.Control.panUp", diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp index 5167442250..4344211501 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2010 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2016 - 2019 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2016 - 2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp index eb370dd638..d59da21643 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp @@ -1,7 +1,7 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -396,18 +396,18 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( LIB_EDIT_FRAME* parent, LI if( g_typeNames.empty()) { for( unsigned i = 0; i < ELECTRICAL_PINTYPES_TOTAL; ++i ) - g_typeIcons.push_back( GetBitmap( static_cast( i ) ) ); + g_typeIcons.push_back( ElectricalPinTypeGetBitmap( static_cast( i ) ) ); for( unsigned i = 0; i < ELECTRICAL_PINTYPES_TOTAL; ++i ) - g_typeNames.push_back( GetText( static_cast( i ) ) ); + g_typeNames.push_back( ElectricalPinTypeGetText( static_cast( i ) ) ); g_typeNames.push_back( INDETERMINATE_STATE ); for( unsigned i = 0; i < GRAPHIC_PINSHAPES_TOTAL; ++i ) - g_shapeIcons.push_back( GetBitmap( static_cast( i ) ) ); + g_shapeIcons.push_back( PinShapeGetBitmap( static_cast( i ) ) ); for( unsigned i = 0; i < GRAPHIC_PINSHAPES_TOTAL; ++i ) - g_shapeNames.push_back( GetText( static_cast( i ) ) ); + g_shapeNames.push_back( PinShapeGetText( static_cast( i ) ) ); g_shapeNames.push_back( INDETERMINATE_STATE ); diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp index 4f81b51844..85692afc0c 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -16,9 +16,9 @@ none 1 dialog_lib_edit_pin_table - + . - + 1 1 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 decl_pure_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_LIB_EDIT_PIN_TABLE_BASE - + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Pin Table - - - - - - - - - - - - - + + + + + + + + + + + + + OnClose - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI - + top_sizer wxVERTICAL none @@ -102,30 +102,30 @@ 1 1 1 - - - - + + + + 0 0 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 - wxALIGN_CENTRE + wxALIGN_CENTER 24 "Number" "Name" "Electrical Type" "Graphic Style" "Orientation" "Number Text Size" "Name Text Size" "Length" "X Position" "Y Position" - wxALIGN_CENTRE + wxALIGN_CENTER 10 66,84,140,140,100,110,110,84,84,84 - + 1 0 Dock @@ -137,103 +137,103 @@ 0 1 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 720,240 1 m_grid 1 - - + + protected 1 - + Resizable - wxALIGN_CENTRE + wxALIGN_CENTER 0 - - wxALIGN_CENTRE - + + wxALIGN_CENTER + 5 1 - + WX_GRID; widgets/wx_grid.h; forward_declare 0 - - - - - - - + + + + + + + OnCellEdited - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnSize - + @@ -241,7 +241,7 @@ wxEXPAND|wxLEFT 0 - + bSizer2 wxHORIZONTAL none @@ -254,88 +254,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Add Pin - + 0 - + 22,22 0 30,29 1 m_addButton 1 - - + + protected 1 - + Resizable - + 1 - - wxBU_AUTODRAW + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnAddRow - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -357,88 +357,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Delete Pin - + 0 - + -1,-1 0 30,29 1 m_deleteButton 1 - - + + protected 1 - + Resizable - + 1 - - wxBU_AUTODRAW + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnDeleteRow - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -450,76 +450,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline1 1 - - + + protected 1 - + Resizable 1 - + wxLI_VERTICAL ; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -531,83 +531,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Group by name - + 0 - - + + 0 - + 1 m_cbGroup 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + + OnRebuildRows - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -619,88 +619,88 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 - + wxID_ANY Refresh Grouping - + 0 - - + + 0 30,29 1 m_refreshButton 1 - - + + protected 1 - + Resizable - + 1 - - wxBU_AUTODRAW + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRebuildRows - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -712,76 +712,76 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_staticline2 1 - - + + protected 1 - + Resizable 1 - + wxLI_VERTICAL ; forward_declare 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -793,78 +793,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Pin numbers: - + 0 - - + + 0 - + 1 m_staticText1 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -876,78 +876,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY 0 - + 0 - - + + 0 - + 1 m_summary 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -963,17 +963,17 @@ 1 0 0 - + m_Buttons protected - + OnCancel - - - - - - + + + + + + diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp index 2e8902d4d7..55123e9896 100644 --- a/eeschema/lib_pin.cpp +++ b/eeschema/lib_pin.cpp @@ -1445,9 +1445,9 @@ void LIB_PIN::getMsgPanelInfoBase( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aLis aList.push_back( MSG_PANEL_ITEM( _( "Name" ), m_name, DARKCYAN ) ); aList.push_back( MSG_PANEL_ITEM( _( "Number" ), text, DARKCYAN ) ); - aList.push_back( MSG_PANEL_ITEM( _( "Type" ), GetText( m_type ), RED ) ); + aList.push_back( MSG_PANEL_ITEM( _( "Type" ), ElectricalPinTypeGetText( m_type ), RED ) ); - text = GetText( m_shape ); + text = PinShapeGetText( m_shape ); aList.push_back( MSG_PANEL_ITEM( _( "Style" ), text, BLUE ) ); text = IsVisible() ? _( "Yes" ) : _( "No" ); @@ -1676,7 +1676,7 @@ const BITMAP_DEF* LIB_PIN::GetOrientationSymbols() BITMAP_DEF LIB_PIN::GetMenuImage() const { - return GetBitmap( m_type ); + return ElectricalPinTypeGetBitmap( m_type ); } @@ -1685,7 +1685,7 @@ wxString LIB_PIN::GetSelectMenuText( EDA_UNITS aUnits ) const return wxString::Format( _( "Pin %s, %s, %s" ), m_number, GetElectricalTypeName(), - GetText( m_shape )); + PinShapeGetText( m_shape )); } diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h index 54677de7a2..b25e4ce0b8 100644 --- a/eeschema/lib_pin.h +++ b/eeschema/lib_pin.h @@ -259,7 +259,7 @@ public: */ wxString const GetElectricalTypeName() const { - return GetText( m_type ); + return ElectricalPinTypeGetText( m_type ); } /** diff --git a/eeschema/pin_shape.cpp b/eeschema/pin_shape.cpp index e583434a94..f1f54c2115 100644 --- a/eeschema/pin_shape.cpp +++ b/eeschema/pin_shape.cpp @@ -55,7 +55,7 @@ const std::map pinShapes = { // clang-format on -wxString GetText( GRAPHIC_PINSHAPE aShape ) +wxString PinShapeGetText( GRAPHIC_PINSHAPE aShape ) { auto findIt = pinShapes.find( aShape ); @@ -65,7 +65,7 @@ wxString GetText( GRAPHIC_PINSHAPE aShape ) } -BITMAP_DEF GetBitmap( GRAPHIC_PINSHAPE aShape ) +BITMAP_DEF PinShapeGetBitmap( GRAPHIC_PINSHAPE aShape ) { auto findIt = pinShapes.find( aShape ); diff --git a/eeschema/pin_shape.h b/eeschema/pin_shape.h index 5ecb3cc66b..216a526820 100644 --- a/eeschema/pin_shape.h +++ b/eeschema/pin_shape.h @@ -51,7 +51,7 @@ enum class GRAPHIC_PINSHAPE // UI -wxString GetText( GRAPHIC_PINSHAPE shape ); -BITMAP_DEF GetBitmap( GRAPHIC_PINSHAPE shape ); +wxString PinShapeGetText( GRAPHIC_PINSHAPE shape ); +BITMAP_DEF PinShapeGetBitmap( GRAPHIC_PINSHAPE shape ); #endif diff --git a/eeschema/pin_type.cpp b/eeschema/pin_type.cpp index 35a183792e..43a40c9195 100644 --- a/eeschema/pin_type.cpp +++ b/eeschema/pin_type.cpp @@ -47,7 +47,7 @@ const std::map pinTypes = { { ELECTRICAL_PINTYPE::PT_BIDI, { _( "Bidirectional" ), pintype_bidi_xpm } }, { ELECTRICAL_PINTYPE::PT_TRISTATE, { _( "Tri-state" ), pintype_3states_xpm } }, { ELECTRICAL_PINTYPE::PT_PASSIVE, { _( "Passive" ), pintype_passive_xpm } }, - { ELECTRICAL_PINTYPE::PT_UNSPECIFIED, { _( "Clock low" ), pintype_notspecif_xpm } }, + { ELECTRICAL_PINTYPE::PT_UNSPECIFIED, { _( "Unspecified" ), pintype_notspecif_xpm } }, { ELECTRICAL_PINTYPE::PT_POWER_IN, { _( "Power input" ), pintype_powerinput_xpm } }, { ELECTRICAL_PINTYPE::PT_POWER_OUT, { _( "Power output" ), pintype_poweroutput_xpm } }, { ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR,{ _( "Open collector" ), pintype_opencoll_xpm } }, @@ -56,7 +56,7 @@ const std::map pinTypes = { }; // clang-format on -wxString GetText( ELECTRICAL_PINTYPE aType ) +wxString ElectricalPinTypeGetText( ELECTRICAL_PINTYPE aType ) { auto findIt = pinTypes.find( aType ); @@ -66,7 +66,7 @@ wxString GetText( ELECTRICAL_PINTYPE aType ) } -BITMAP_DEF GetBitmap( ELECTRICAL_PINTYPE aType ) +BITMAP_DEF ElectricalPinTypeGetBitmap( ELECTRICAL_PINTYPE aType ) { auto findIt = pinTypes.find( aType ); diff --git a/eeschema/pin_type.h b/eeschema/pin_type.h index f2456e89f6..7f6213c3c5 100644 --- a/eeschema/pin_type.h +++ b/eeschema/pin_type.h @@ -54,7 +54,7 @@ enum class ELECTRICAL_PINTYPE #define ELECTRICAL_PINTYPES_TOTAL ( static_cast( ELECTRICAL_PINTYPE::PT_LAST_OPTION ) + 1 ) // UI -wxString GetText( ELECTRICAL_PINTYPE ); -BITMAP_DEF GetBitmap( ELECTRICAL_PINTYPE ); +wxString ElectricalPinTypeGetText( ELECTRICAL_PINTYPE ); +BITMAP_DEF ElectricalPinTypeGetBitmap( ELECTRICAL_PINTYPE ); #endif diff --git a/eeschema/widgets/pin_shape_combobox.cpp b/eeschema/widgets/pin_shape_combobox.cpp index 3bf29b4545..e90becbf7c 100644 --- a/eeschema/widgets/pin_shape_combobox.cpp +++ b/eeschema/widgets/pin_shape_combobox.cpp @@ -46,8 +46,8 @@ PinShapeComboBox::PinShapeComboBox( wxWindow* parent, { GRAPHIC_PINSHAPE shape = static_cast( ii ); - wxString text = GetText( shape ); - BITMAP_DEF bitmap = GetBitmap( shape ); + wxString text = PinShapeGetText( shape ); + BITMAP_DEF bitmap = PinShapeGetBitmap( shape ); if( bitmap == NULL ) Append( text ); diff --git a/eeschema/widgets/pin_type_combobox.cpp b/eeschema/widgets/pin_type_combobox.cpp index a5e44f0c38..d7775aefbd 100644 --- a/eeschema/widgets/pin_type_combobox.cpp +++ b/eeschema/widgets/pin_type_combobox.cpp @@ -46,8 +46,8 @@ PinTypeComboBox::PinTypeComboBox( wxWindow* parent, { ELECTRICAL_PINTYPE type = static_cast( ii ); - wxString text = GetText( type ); - BITMAP_DEF bitmap = GetBitmap( type ); + wxString text = ElectricalPinTypeGetText( type ); + BITMAP_DEF bitmap = ElectricalPinTypeGetBitmap( type ); if( bitmap == NULL ) Append( text );