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

Put Place & Inspect menus in standard order.

This commit is contained in:
Jeff Young 2019-08-16 11:08:43 +01:00
parent 4fcfd266e0
commit d094934cf4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/tool/action_menu.cpp
View File

@ -172,8 +172,7 @@ wxMenuItem* ACTION_MENU::Add( const TOOL_ACTION& aAction, bool aIsCheckmarkEntry
m_toolActions[getMenuId( aAction )] = &aAction; m_toolActions[getMenuId( aAction )] = &aAction;
wxMenuItem* i = Append( item ); return Append( item );
return i;
} }

15
pagelayout_editor/menubar.cpp
View File

@ -138,12 +138,6 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
viewMenu->Resolve(); viewMenu->Resolve();
//-- Inspector menu -------------------------------------------------------
//
CONDITIONAL_MENU* inspectorMenu = new CONDITIONAL_MENU( false, selTool );
inspectorMenu->AddItem( PL_ACTIONS::showInspector, SELECTION_CONDITIONS::ShowAlways );
inspectorMenu->Resolve();
//-- Place menu ------------------------------------------------------- //-- Place menu -------------------------------------------------------
// //
CONDITIONAL_MENU* placeMenu = new CONDITIONAL_MENU( false, selTool ); CONDITIONAL_MENU* placeMenu = new CONDITIONAL_MENU( false, selTool );
@ -158,6 +152,13 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
placeMenu->Resolve(); placeMenu->Resolve();
//-- Inspector menu -------------------------------------------------------
//
CONDITIONAL_MENU* inspectorMenu = new CONDITIONAL_MENU( false, selTool );
inspectorMenu->AddItem( PL_ACTIONS::showInspector, SELECTION_CONDITIONS::ShowAlways );
inspectorMenu->Resolve();
//-- Preferences menu -------------------------------------------------- //-- Preferences menu --------------------------------------------------
// //
CONDITIONAL_MENU* preferencesMenu = new CONDITIONAL_MENU( false, selTool ); CONDITIONAL_MENU* preferencesMenu = new CONDITIONAL_MENU( false, selTool );
@ -177,8 +178,8 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
menuBar->Append( fileMenu, _( "&File" ) ); menuBar->Append( fileMenu, _( "&File" ) );
menuBar->Append( editMenu, _( "&Edit" ) ); menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( inspectorMenu, _( "&Inspect" ) );
menuBar->Append( placeMenu, _( "&Place" ) ); menuBar->Append( placeMenu, _( "&Place" ) );
menuBar->Append( inspectorMenu, _( "&Inspect" ) );
menuBar->Append( preferencesMenu, _( "P&references" ) ); menuBar->Append( preferencesMenu, _( "P&references" ) );
AddStandardHelpMenu( menuBar ); AddStandardHelpMenu( menuBar );