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

Handle '&'s in menu labels. 

Fixes: lp:1832904
* https://bugs.launchpad.net/kicad/+bug/1832904
This commit is contained in:
Jeff Young 2019-06-17 10:41:38 +01:00
parent e6d5110ccf
commit 5d7739a662
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tool/tool_action.cpp
View File

@ -74,7 +74,9 @@ wxString TOOL_ACTION::GetLabel() const
wxString TOOL_ACTION::GetMenuItem() const wxString TOOL_ACTION::GetMenuItem() const
{ {
return AddHotkeyName( wxGetTranslation( m_label ), m_hotKey, IS_HOTKEY ); wxString label = wxGetTranslation( m_label );
label.Replace( "&", "&&" );
return AddHotkeyName( label, m_hotKey, IS_HOTKEY );
} }

2
eeschema/tools/ee_actions.cpp
View File

@ -38,7 +38,7 @@
// //
TOOL_ACTION EE_ACTIONS::runERC( "eeschema.InspectionTool.runERC", TOOL_ACTION EE_ACTIONS::runERC( "eeschema.InspectionTool.runERC",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Electrical Rules &Checker" ), _( "Perform electrical rules check" ), _( "Electrical Rules Checker" ), _( "Perform electrical rules check" ),
erc_xpm ); erc_xpm );
TOOL_ACTION EE_ACTIONS::runSimulation( "eeschema.EditorControl.runSimulation", TOOL_ACTION EE_ACTIONS::runSimulation( "eeschema.EditorControl.runSimulation",

16
pcbnew/tools/pcb_actions.cpp
View File

@ -400,12 +400,12 @@ TOOL_ACTION PCB_ACTIONS::swapLayers( "pcbnew.GlobalEdit.swapLayers",
TOOL_ACTION PCB_ACTIONS::editTracksAndVias( "pcbnew.GlobalEdit.editTracksAndVias", TOOL_ACTION PCB_ACTIONS::editTracksAndVias( "pcbnew.GlobalEdit.editTracksAndVias",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Edit Track && Via Properties..." ), "", _( "Edit Track & Via Properties..." ), "",
width_track_via_xpm ); width_track_via_xpm );
TOOL_ACTION PCB_ACTIONS::editTextAndGraphics( "pcbnew.GlobalEdit.editTextAndGraphics", TOOL_ACTION PCB_ACTIONS::editTextAndGraphics( "pcbnew.GlobalEdit.editTextAndGraphics",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Edit Text && Graphic Properties..." ), "", _( "Edit Text & Graphic Properties..." ), "",
reset_text_xpm ); reset_text_xpm );
TOOL_ACTION PCB_ACTIONS::globalDeletions( "pcbnew.GlobalEdit.globalDeletions", TOOL_ACTION PCB_ACTIONS::globalDeletions( "pcbnew.GlobalEdit.globalDeletions",
@ -416,7 +416,7 @@ TOOL_ACTION PCB_ACTIONS::globalDeletions( "pcbnew.GlobalEdit.globalDeletions",
TOOL_ACTION PCB_ACTIONS::cleanupTracksAndVias( "pcbnew.GlobalEdit.cleanupTracksAndVias", TOOL_ACTION PCB_ACTIONS::cleanupTracksAndVias( "pcbnew.GlobalEdit.cleanupTracksAndVias",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Cleanup Tracks && Vias..." ), _( "Cleanup Tracks & Vias..." ),
_( "Clean stubs, vias, delete break points or unconnected tracks" ), _( "Clean stubs, vias, delete break points or unconnected tracks" ),
delete_xpm ); delete_xpm );
@ -497,23 +497,23 @@ TOOL_ACTION PCB_ACTIONS::exportSpecctraDSN( "pcbnew.EditorControl.exportSpecctra
TOOL_ACTION PCB_ACTIONS::generateGerbers( "pcbnew.EditorControl.generateGerbers", TOOL_ACTION PCB_ACTIONS::generateGerbers( "pcbnew.EditorControl.generateGerbers",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "&Gerbers (.gbr)..." ), _( "Generate Gerbers for fabrication" ), _( "Gerbers (.gbr)..." ), _( "Generate Gerbers for fabrication" ),
post_compo_xpm ); post_compo_xpm );
TOOL_ACTION PCB_ACTIONS::generateDrillFiles( "pcbnew.EditorControl.generateDrillFiles", TOOL_ACTION PCB_ACTIONS::generateDrillFiles( "pcbnew.EditorControl.generateDrillFiles",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "&Drill Files (.drl)..." ), _( "Generate Excellon drill file(s)" ), _( "Drill Files (.drl)..." ), _( "Generate Excellon drill file(s)" ),
post_drill_xpm ); post_drill_xpm );
TOOL_ACTION PCB_ACTIONS::generatePosFile( "pcbnew.EditorControl.generatePosFile", TOOL_ACTION PCB_ACTIONS::generatePosFile( "pcbnew.EditorControl.generatePosFile",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Footprint &Positions (.pos)..." ), _( "Footprint Positions (.pos)..." ),
_( "Generate footprint position file for pick and place" ), _( "Generate footprint position file for pick and place" ),
post_compo_xpm ); post_compo_xpm );
TOOL_ACTION PCB_ACTIONS::generateReportFile( "pcbnew.EditorControl.generateReportFile", TOOL_ACTION PCB_ACTIONS::generateReportFile( "pcbnew.EditorControl.generateReportFile",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "&Footprint Report (.rpt)..." ), _( "Footprint Report (.rpt)..." ),
_( "Create report of all footprints from current board" ), _( "Create report of all footprints from current board" ),
tools_xpm ); tools_xpm );
@ -524,7 +524,7 @@ TOOL_ACTION PCB_ACTIONS::generateD356File( "pcbnew.EditorControl.generateD356Fil
TOOL_ACTION PCB_ACTIONS::generateBOM( "pcbnew.EditorControl.generateBOM", TOOL_ACTION PCB_ACTIONS::generateBOM( "pcbnew.EditorControl.generateBOM",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "&BOM..." ), _( "Create bill of materials from current schematic" ), _( "BOM..." ), _( "Create bill of materials from current schematic" ),
bom_xpm ); bom_xpm );
// Track & via size control // Track & via size control