From bd23d003d219cb513b01feb4d9763879c9248f53 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 2 Sep 2020 14:41:50 +0100 Subject: [PATCH] Bring Eeschema UI closer in line with Pcbnew for change terminology. Also clears up the text & tooltip of the Remap Symbols function to better explain why it's greyed out most of the time. --- eeschema/menubar.cpp | 2 +- eeschema/tools/ee_actions.cpp | 28 ++++++++++++++++++---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 206ba5052b..dd74186e1d 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -153,7 +153,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() editMenu->Add( ACTIONS::deleteTool ); editMenu->Add( EE_ACTIONS::editTextAndGraphics ); editMenu->Add( EE_ACTIONS::changeSymbols ); - editMenu->Add( EE_ACTIONS::updateSymbols ); //-- View menu ----------------------------------------------------------- @@ -237,6 +236,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() toolsMenu->AppendSeparator(); toolsMenu->Add( ACTIONS::showSymbolEditor ); + toolsMenu->Add( EE_ACTIONS::updateSymbols ); toolsMenu->Add( EE_ACTIONS::rescueSymbols ); toolsMenu->Add( EE_ACTIONS::remapSymbols ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index 9a8ee4cbd0..043e0a934c 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -401,20 +401,28 @@ TOOL_ACTION EE_ACTIONS::updateFieldsFromLibrary( "eeschema.InteractiveEdit.updat update_fields_xpm ); TOOL_ACTION EE_ACTIONS::changeSymbols( "eeschema.InteractiveEdit.changeSymbols", - AS_GLOBAL, 0, "", _( "Change Library Symbols..." ), - _( "Change library symbols in schematic" ), change_lib_symbols_in_schematic_xpm ); + AS_GLOBAL, 0, "", + _( "Change Symbols..." ), + _( "Assign different symbols from the library" ), + change_lib_symbols_in_schematic_xpm ); TOOL_ACTION EE_ACTIONS::updateSymbols( "eeschema.InteractiveEdit.updateSymbols", - AS_GLOBAL, 0, "", _( "Update Library Symbols..." ), - _( "Update library symbols in schematic" ), update_lib_symbols_in_schematic_xpm ); + AS_GLOBAL, 0, "", + _( "Update Symbols from Library..." ), + _( "Update symbols to include any changes from the library" ), + update_lib_symbols_in_schematic_xpm ); TOOL_ACTION EE_ACTIONS::changeSymbol( "eeschema.InteractiveEdit.changeSymbol", - AS_GLOBAL, 0, "", _( "Change Library Symbol..." ), - _( "Change library symbol for selected symbol" ), change_lib_symbols_in_schematic_xpm ); + AS_GLOBAL, 0, "", + _( "Change Symbol..." ), + _( "Assign a different symbol from the library" ), + change_lib_symbols_in_schematic_xpm ); TOOL_ACTION EE_ACTIONS::updateSymbol( "eeschema.InteractiveEdit.updateSymbol", - AS_GLOBAL, 0, "", _( "Update Library Symbol..." ), - _( "Update library symbol for selected symbol" ), update_lib_symbols_in_schematic_xpm ); + AS_GLOBAL, 0, "", + _( "Update Symbol..." ), + _( "Update symbol to include any changes from the library" ), + update_lib_symbols_in_schematic_xpm ); TOOL_ACTION EE_ACTIONS::assignNetclass( "eeschema.InteractiveEdit.assignNetclass", AS_GLOBAL, 0, "", @@ -564,8 +572,8 @@ TOOL_ACTION EE_ACTIONS::rescueSymbols( "eeschema.EditorControl.rescueSymbols", TOOL_ACTION EE_ACTIONS::remapSymbols( "eeschema.EditorControl.remapSymbols", AS_GLOBAL, 0, "", - _( "Remap Symbols..." ), - _( "Remap legacy library symbols to symbol library table" ), + _( "Remap Legacy Library Symbols..." ), + _( "Remap library symbol references in legacy schematics to the symbol library table" ), rescue_xpm ); TOOL_ACTION EE_ACTIONS::refreshSymbolFromLibrary( "eeschema.EditorControl.refreshSymbolFromLibrary",