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

Fix a UI policy issue. Very minor cosmetic change: give same look to Zoom and Grid selection in 2 menus.

This commit is contained in:
jean-pierre charras 2017-01-20 11:35:24 +01:00
parent 92632a7a13
commit 2de913797a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/zoom.cpp
View File

@ -257,7 +257,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 Select" ),
KiBitmap( zoom_selection_xpm ) ); KiBitmap( zoom_selection_xpm ) );
zoom = screen->GetZoom(); zoom = screen->GetZoom();
@ -281,7 +281,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 Select" ), KiBitmap( grid_select_xpm ) );
wxArrayString gridsList; wxArrayString gridsList;
int icurr = screen->BuildGridsChoiceList( gridsList, g_UserUnit != INCHES ); int icurr = screen->BuildGridsChoiceList( gridsList, g_UserUnit != INCHES );

4
pcbnew/router/router_tool.cpp
View File

@ -237,8 +237,8 @@ public:
Add( PNS::TOOL_BASE::ACT_RouterOptions ); Add( PNS::TOOL_BASE::ACT_RouterOptions );
AppendSeparator(); AppendSeparator();
Add( &m_zoomMenu, _( "Zoom select" ), false ); Add( &m_zoomMenu, _( "Zoom Select" ), false );
Add( &m_gridMenu, _( "Grid select" ), false ); Add( &m_gridMenu, _( "Grid Select" ), false );
} }
private: private:

5
pcbnew/tools/tool_menu.cpp
View File

@ -96,9 +96,10 @@ void TOOL_MENU::AddStandardSubMenus( EDA_DRAW_FRAME& aFrame )
m_menu.AddItem( COMMON_ACTIONS::zoomOut, S_C::ShowAlways, 1000 ); m_menu.AddItem( COMMON_ACTIONS::zoomOut, S_C::ShowAlways, 1000 );
m_menu.AddItem( COMMON_ACTIONS::zoomFitScreen, S_C::ShowAlways, 1000 ); m_menu.AddItem( COMMON_ACTIONS::zoomFitScreen, S_C::ShowAlways, 1000 );
m_menu.AddSeparator(SELECTION_CONDITIONS::ShowAlways, 1000);
m_menu.AddMenu( createOwnSubMenu<ZOOM_MENU>( &aFrame ).get(), m_menu.AddMenu( createOwnSubMenu<ZOOM_MENU>( &aFrame ).get(),
_( "Zoom" ), false, S_C::ShowAlways, 1000 ); _( "Zoom Select" ), false, S_C::ShowAlways, 1000 );
m_menu.AddMenu( createOwnSubMenu<GRID_MENU>( &aFrame ).get(), m_menu.AddMenu( createOwnSubMenu<GRID_MENU>( &aFrame ).get(),
_( "Grid" ), false, S_C::ShowAlways, 1000 ); _( "Grid Select" ), false, S_C::ShowAlways, 1000 );
} }