Browse Source

Put Place & Inspect menus in standard order.

pull/15/head
Jeff Young 6 years ago
parent
commit
d094934cf4
  1. 3
      common/tool/action_menu.cpp
  2. 15
      pagelayout_editor/menubar.cpp

3
common/tool/action_menu.cpp

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

15
pagelayout_editor/menubar.cpp

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

Loading…
Cancel
Save