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

Context menu: use same message for Zoom and Grid in Legacy mode and GAL mode. 

a minor cosmetic other fix in Eeschema, edit submenu.
This commit is contained in:
jean-pierre charras 2018-04-01 21:09:52 +02:00
parent e750417fa0
commit 0171547154
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/zoom.cpp
View File

@ -284,7 +284,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
wxMenu* zoom_choice = new wxMenu; wxMenu* zoom_choice = new wxMenu;
AddMenuItem( MasterMenu, zoom_choice, AddMenuItem( MasterMenu, zoom_choice,
ID_POPUP_ZOOM_SELECT, _( "Zoom Select" ), ID_POPUP_ZOOM_SELECT, _( "Zoom" ),
KiBitmap( zoom_selection_xpm ) ); KiBitmap( zoom_selection_xpm ) );
zoom = screen->GetZoom(); zoom = screen->GetZoom();
@ -308,7 +308,7 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
{ {
wxMenu* gridMenu = new wxMenu; wxMenu* gridMenu = new wxMenu;
AddMenuItem( MasterMenu, gridMenu, ID_POPUP_GRID_SELECT, AddMenuItem( MasterMenu, gridMenu, ID_POPUP_GRID_SELECT,
_( "Grid Select" ), KiBitmap( grid_select_xpm ) ); _( "Grid" ), KiBitmap( grid_select_xpm ) );
wxArrayString gridsList; wxArrayString gridsList;
int icurr = screen->BuildGridsChoiceList( gridsList, g_UserUnit != INCHES ); int icurr = screen->BuildGridsChoiceList( gridsList, g_UserUnit != INCHES );

5
eeschema/menubar.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2016 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
@ -515,12 +515,11 @@ void prepareEditMenu( wxMenu* aParentMenu )
KiBitmap( paste_xpm ) ); KiBitmap( paste_xpm ) );
// Delete // Delete
aParentMenu->AppendSeparator();
AddMenuItem( aParentMenu, ID_MENU_DELETE_ITEM_BUTT, AddMenuItem( aParentMenu, ID_MENU_DELETE_ITEM_BUTT,
_( "&Delete" ), HELP_DELETE_ITEMS, _( "&Delete" ), HELP_DELETE_ITEMS,
KiBitmap( delete_xpm ) ); KiBitmap( delete_xpm ) );
aParentMenu->AppendSeparator();
// Find // Find
aParentMenu->AppendSeparator(); aParentMenu->AppendSeparator();
text = AddHotkeyName( _( "&Find..." ), g_Schematic_Hokeys_Descr, HK_FIND_ITEM ); text = AddHotkeyName( _( "&Find..." ), g_Schematic_Hokeys_Descr, HK_FIND_ITEM );