From 126d40f9d3745cf5cc29251b02135ddf3b987b66 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 13 Dec 2020 18:09:53 +0000 Subject: [PATCH] "Sheet label" too confusing w/ sheet names and fields. Use "sheet pin". --- common/layer_id.cpp | 2 +- eeschema/sch_screen.cpp | 2 +- eeschema/tools/ee_actions.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/layer_id.cpp b/common/layer_id.cpp index ace32e9fb5..dfc9907f97 100644 --- a/common/layer_id.cpp +++ b/common/layer_id.cpp @@ -124,7 +124,7 @@ wxString LayerName( int aLayer ) case LAYER_SHEETNAME: return _( "Sheet names" ); case LAYER_SHEETFIELDS: return _( "Sheet fields" ); case LAYER_SHEETFILENAME: return _( "Sheet file names" ); - case LAYER_SHEETLABEL: return _( "Sheet labels" ); + case LAYER_SHEETLABEL: return _( "Sheet pins" ); case LAYER_NOCONNECT: return _( "No-connect symbols" ); case LAYER_ERC_WARN: return _( "ERC warnings" ); case LAYER_ERC_ERR: return _( "ERC errors" ); diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index 2e7860ab39..2b46c88ef6 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -292,7 +292,7 @@ void SCH_SCREEN::DeleteItem( SCH_ITEM* aItem ) // This structure is attached to a sheet, get the parent sheet object. SCH_SHEET_PIN* sheetPin = (SCH_SHEET_PIN*) aItem; SCH_SHEET* sheet = sheetPin->GetParent(); - wxCHECK_RET( sheet, wxT( "Sheet label parent not properly set, bad programmer!" ) ); + wxCHECK_RET( sheet, wxT( "Sheet pin parent not properly set, bad programmer!" ) ); sheet->RemovePin( sheetPin ); return; } diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index 085c381e17..2db5de0ac6 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -298,7 +298,7 @@ TOOL_ACTION EE_ACTIONS::placeLabel( "eeschema.InteractiveDrawing.placeLabel", TOOL_ACTION EE_ACTIONS::placeHierLabel( "eeschema.InteractiveDrawing.placeHierarchicalLabel", AS_GLOBAL, 'H', LEGACY_HK_NAME( "Add Hierarchical Label" ), - _( "Add Hierarchical Label" ), _( "Add a hierarchical sheet label" ), + _( "Add Hierarchical Label" ), _( "Add a hierarchical label" ), add_hierarchical_label_xpm, AF_ACTIVATE, (void*) SCH_HIER_LABEL_T ); TOOL_ACTION EE_ACTIONS::drawSheet( "eeschema.InteractiveDrawing.drawSheet",