From d4c8e1b5e9a4157eaad2ca0f63a92633166e4d1b Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Tue, 19 Dec 2017 12:11:52 +0100 Subject: [PATCH] Fixed ignored hot keys for save part/library commands in Symbol Editor Previously wxUpdateUIEvent::SetText() stripped hotkey from menu entries. Fixes: lp:1737819 * https://bugs.launchpad.net/kicad/+bug/1737819 --- eeschema/libeditframe.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp index d40db851e5..dc2d7ea9c4 100644 --- a/eeschema/libeditframe.cpp +++ b/eeschema/libeditframe.cpp @@ -527,8 +527,10 @@ void LIB_EDIT_FRAME::OnUpdatePartModified( wxUpdateUIEvent& aEvent ) if( aEvent.GetId() == ID_LIBEDIT_SAVE_PART ) { bool readOnly = libName.IsEmpty() || m_libMgr->IsLibraryReadOnly( libName ); + wxString text = AddHotkeyName( readOnly ? _( "&Save Part [Read Only]" ) : _( "&Save Part" ), + g_Libedit_Hokeys_Descr, HK_SAVE_PART ); - aEvent.SetText( readOnly ? _( "Save [Read Only]" ) : _( "Save" ) ); + aEvent.SetText( text ); aEvent.Enable( !readOnly && !partName.IsEmpty() && m_libMgr->IsPartModified( partName, libName ) ); } @@ -576,9 +578,12 @@ void LIB_EDIT_FRAME::OnUpdateRedo( wxUpdateUIEvent& event ) void LIB_EDIT_FRAME::OnUpdateSaveLib( wxUpdateUIEvent& event ) { wxString lib = getTargetLib(); - bool readOnly = m_libMgr->IsLibraryReadOnly( lib ); + bool readOnly = lib.IsEmpty() || m_libMgr->IsLibraryReadOnly( lib ); - event.SetText( readOnly ? _( "Save library [Read Only]" ) : _( "Save library" ) ); + wxString text = AddHotkeyName( readOnly ? _( "&Save Library [Read Only]" ) + : _( "&Save Library" ) , g_Libedit_Hokeys_Descr, HK_SAVE_PART ); + + event.SetText( text ); event.Enable( !readOnly && m_libMgr->IsLibraryModified( lib ) ); }