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

Add a few more actions to the hotkeys list and add hotkeys to tooltips. 

Fixes: lp:1792159
* https://bugs.launchpad.net/kicad/+bug/1792159
This commit is contained in:
Jeff Young 2019-07-07 20:53:55 +01:00
parent 986392d88e
commit b029e4e44a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/tool/actions.cpp
View File

@ -226,7 +226,7 @@ TOOL_ACTION ACTIONS::zoomRedraw( "common.Control.zoomRedraw",
WXK_F3,
#endif
LEGACY_HK_NAME( "Zoom Redraw" ),
_( "Refresh" ), "",
_( "Refresh" ), _( "Refresh" ),
zoom_redraw_xpm );
TOOL_ACTION ACTIONS::zoomFitScreen( "common.Control.zoomFitScreen",
@ -237,7 +237,7 @@ TOOL_ACTION ACTIONS::zoomFitScreen( "common.Control.zoomFitScreen",
WXK_HOME,
#endif
LEGACY_HK_NAME( "Zoom Auto" ),
_( "Zoom to Fit" ), "",
_( "Zoom to Fit" ), _( "Zoom to Fit" ),
zoom_fit_in_page_xpm );
TOOL_ACTION ACTIONS::zoomIn( "common.Control.zoomIn",
@ -248,7 +248,7 @@ TOOL_ACTION ACTIONS::zoomIn( "common.Control.zoomIn",
WXK_F1,
#endif
LEGACY_HK_NAME( "Zoom In" ),
_( "Zoom In at Cursor" ), "",
_( "Zoom In at Cursor" ), _( "Zoom In at Cursor" ),
zoom_in_xpm );
TOOL_ACTION ACTIONS::zoomOut( "common.Control.zoomOut",
@ -259,31 +259,31 @@ TOOL_ACTION ACTIONS::zoomOut( "common.Control.zoomOut",
WXK_F2,
#endif
LEGACY_HK_NAME( "Zoom Out" ),
_( "Zoom Out at Cursor" ), "",
_( "Zoom Out at Cursor" ), _( "Zoom Out at Cursor" ),
zoom_out_xpm );
TOOL_ACTION ACTIONS::zoomInCenter( "common.Control.zoomInCenter",
AS_GLOBAL,
0, "",
_( "Zoom In" ), "",
_( "Zoom In" ), _( "Zoom In" ),
zoom_in_xpm );
TOOL_ACTION ACTIONS::zoomOutCenter( "common.Control.zoomOutCenter",
AS_GLOBAL,
0, "",
_( "Zoom Out" ), "",
_( "Zoom Out" ), _( "Zoom Out" ),
zoom_out_xpm );
TOOL_ACTION ACTIONS::zoomCenter( "common.Control.zoomCenter",
AS_GLOBAL,
WXK_F4, LEGACY_HK_NAME( "Zoom Center" ),
_( "Center" ), "",
_( "Center" ), _( "Center" ),
zoom_center_on_screen_xpm );
TOOL_ACTION ACTIONS::zoomTool( "common.Control.zoomTool",
AS_GLOBAL,
MD_CTRL + WXK_F5, LEGACY_HK_NAME( "Zoom to Selection" ),
_( "Zoom to Selection" ), "",
_( "Zoom to Selection" ), _( "Zoom to Selection" ),
zoom_area_xpm, AF_ACTIVATE );
TOOL_ACTION ACTIONS::zoomPreset( "common.Control.zoomPreset",

7
common/tool/tool_action.cpp
View File

@ -82,7 +82,12 @@ wxString TOOL_ACTION::GetMenuItem() const
wxString TOOL_ACTION::GetDescription() const
{
return wxGetTranslation( m_tooltip );
wxString tooltip = wxGetTranslation( m_tooltip );
if( GetHotKey() )
tooltip += wxString::Format( wxT( " (%s)" ), KeyNameFromKeyCode( GetHotKey() ) );
return tooltip;
}