From 19aba615c26d26d269dab5b35365f8050825a731 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 15 Jun 2019 17:40:14 +0100 Subject: [PATCH] Remove selection condition from conditional menu separators. We don't allow duplicate separators anyway so all they really do is complicate the code. --- common/eda_draw_frame.cpp | 3 ++- common/tool/conditional_menu.cpp | 4 ++-- eeschema/tools/ee_selection_tool.cpp | 12 ++++++------ eeschema/tools/ee_tool_base.h | 2 +- eeschema/tools/lib_control.cpp | 8 ++++---- eeschema/tools/lib_edit_tool.cpp | 8 ++++---- eeschema/tools/lib_pin_tool.cpp | 2 +- eeschema/tools/sch_edit_tool.cpp | 6 +++--- eeschema/tools/sch_wire_bus_tool.cpp | 6 +++--- gerbview/tools/gerbview_selection_tool.cpp | 2 +- include/tool/conditional_menu.h | 7 ++----- pagelayout_editor/tools/pl_drawing_tools.cpp | 2 +- pagelayout_editor/tools/pl_edit_tool.cpp | 2 +- pagelayout_editor/tools/pl_picker_tool.cpp | 2 +- pagelayout_editor/tools/pl_selection_tool.cpp | 4 ++-- pcbnew/tools/drawing_tool.cpp | 4 ++-- pcbnew/tools/edit_tool.cpp | 8 ++++---- pcbnew/tools/footprint_editor_tools.cpp | 8 ++++---- pcbnew/tools/pad_tool.cpp | 2 +- pcbnew/tools/pcb_editor_control.cpp | 6 +++--- pcbnew/tools/pcb_tool_base.cpp | 2 +- pcbnew/tools/selection_tool.cpp | 2 +- 22 files changed, 50 insertions(+), 52 deletions(-) diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp index 63f1e6c699..ff25315bef 100644 --- a/common/eda_draw_frame.cpp +++ b/common/eda_draw_frame.cpp @@ -338,12 +338,13 @@ void EDA_DRAW_FRAME::AddStandardSubMenus( TOOL_MENU& aToolMenu ) COMMON_TOOLS* commonTools = m_toolManager->GetTool(); CONDITIONAL_MENU& aMenu = aToolMenu.GetMenu(); + aMenu.AddSeparator( 1000 ); aMenu.AddItem( ACTIONS::zoomCenter, SELECTION_CONDITIONS::ShowAlways, 1000 ); aMenu.AddItem( ACTIONS::zoomIn, SELECTION_CONDITIONS::ShowAlways, 1000 ); aMenu.AddItem( ACTIONS::zoomOut, SELECTION_CONDITIONS::ShowAlways, 1000 ); aMenu.AddItem( ACTIONS::zoomFitScreen, SELECTION_CONDITIONS::ShowAlways, 1000 ); - aMenu.AddSeparator(SELECTION_CONDITIONS::ShowAlways, 1000 ); + aMenu.AddSeparator( 1000 ); auto zoomMenu = std::make_shared( this ); zoomMenu->SetTool( commonTools ); diff --git a/common/tool/conditional_menu.cpp b/common/tool/conditional_menu.cpp index f0b0a54f31..c3a8b5f097 100644 --- a/common/tool/conditional_menu.cpp +++ b/common/tool/conditional_menu.cpp @@ -92,9 +92,9 @@ void CONDITIONAL_MENU::AddMenu( ACTION_MENU* aMenu, const SELECTION_CONDITION& a } -void CONDITIONAL_MENU::AddSeparator( const SELECTION_CONDITION& aCondition, int aOrder ) +void CONDITIONAL_MENU::AddSeparator( int aOrder ) { - addEntry( ENTRY( aCondition, aOrder ) ); + addEntry( ENTRY( SELECTION_CONDITIONS::ShowAlways, aOrder ) ); } diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp index 5e05efdbfd..ce2927f971 100644 --- a/eeschema/tools/ee_selection_tool.cpp +++ b/eeschema/tools/ee_selection_tool.cpp @@ -213,17 +213,17 @@ bool EE_SELECTION_TOOL::Init() menu.AddItem( EE_ACTIONS::explicitCrossProbe, sheetSelection && EE_CONDITIONS::Idle, 1 ); menu.AddItem( EE_ACTIONS::leaveSheet, belowRootSheetCondition, 1 ); - menu.AddSeparator( EE_CONDITIONS::Empty, 100 ); + menu.AddSeparator( 100 ); menu.AddItem( EE_ACTIONS::drawWire, schEditCondition && EE_CONDITIONS::Empty, 100 ); menu.AddItem( EE_ACTIONS::drawBus, schEditCondition && EE_CONDITIONS::Empty, 100 ); - menu.AddSeparator( SCH_WIRE_BUS_TOOL::IsDrawingWire, 100 ); + menu.AddSeparator( 100 ); menu.AddItem( EE_ACTIONS::finishWire, SCH_WIRE_BUS_TOOL::IsDrawingWire, 100 ); - menu.AddSeparator( SCH_WIRE_BUS_TOOL::IsDrawingBus, 100 ); + menu.AddSeparator( 100 ); menu.AddItem( EE_ACTIONS::finishBus, SCH_WIRE_BUS_TOOL::IsDrawingBus, 100 ); - menu.AddSeparator( EE_CONDITIONS::NotEmpty, 200 ); + menu.AddSeparator( 200 ); menu.AddItem( EE_ACTIONS::selectConnection, wireOrBusSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::placeJunction, wireOrBusSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::placeLabel, wireOrBusSelection && EE_CONDITIONS::Idle, 250 ); @@ -234,11 +234,11 @@ bool EE_SELECTION_TOOL::Init() menu.AddItem( EE_ACTIONS::placeSheetPin, sheetSelection && EE_CONDITIONS::Idle, 250 ); menu.AddItem( EE_ACTIONS::importSheetPin, sheetSelection && EE_CONDITIONS::Idle, 250 ); - menu.AddSeparator( havePartCondition && EE_CONDITIONS::Empty, 400 ); + menu.AddSeparator( 400 ); menu.AddItem( EE_ACTIONS::symbolProperties, havePartCondition && EE_CONDITIONS::Empty, 400 ); menu.AddItem( EE_ACTIONS::pinTable, havePartCondition && EE_CONDITIONS::Empty, 400 ); - menu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1000 ); + menu.AddSeparator( 1000 ); m_frame->AddStandardSubMenus( m_menu ); return true; diff --git a/eeschema/tools/ee_tool_base.h b/eeschema/tools/ee_tool_base.h index e5aa7d00d5..18257ae154 100644 --- a/eeschema/tools/ee_tool_base.h +++ b/eeschema/tools/ee_tool_base.h @@ -77,7 +77,7 @@ public: // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways, 1 ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1 ); + ctxMenu.AddSeparator( 1 ); // Finally, add the standard zoom/grid items m_frame->AddStandardSubMenus( m_menu ); diff --git a/eeschema/tools/lib_control.cpp b/eeschema/tools/lib_control.cpp index c986d07b15..613f2b7969 100644 --- a/eeschema/tools/lib_control.cpp +++ b/eeschema/tools/lib_control.cpp @@ -114,23 +114,23 @@ bool LIB_CONTROL::Init() ctxMenu.AddItem( ACTIONS::saveAs, libSelectedCondition ); ctxMenu.AddItem( ACTIONS::revert, libSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( EE_ACTIONS::newSymbol, SELECTION_CONDITIONS::ShowAlways ); ctxMenu.AddItem( EE_ACTIONS::editSymbol, symbolSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( ACTIONS::save, symbolSelectedCondition ); ctxMenu.AddItem( ACTIONS::saveCopyAs, symbolSelectedCondition ); ctxMenu.AddItem( EE_ACTIONS::duplicateSymbol, symbolSelectedCondition ); ctxMenu.AddItem( EE_ACTIONS::deleteSymbol, symbolSelectedCondition ); ctxMenu.AddItem( ACTIONS::revert, symbolSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( EE_ACTIONS::cutSymbol, symbolSelectedCondition ); ctxMenu.AddItem( EE_ACTIONS::copySymbol, symbolSelectedCondition ); ctxMenu.AddItem( EE_ACTIONS::pasteSymbol, SELECTION_CONDITIONS::ShowAlways ); - ctxMenu.AddSeparator( symbolSelectedCondition ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( EE_ACTIONS::importSymbol, SELECTION_CONDITIONS::ShowAlways ); ctxMenu.AddItem( EE_ACTIONS::exportSymbol, symbolSelectedCondition ); } diff --git a/eeschema/tools/lib_edit_tool.cpp b/eeschema/tools/lib_edit_tool.cpp index 99a4859b10..14e01a861e 100644 --- a/eeschema/tools/lib_edit_tool.cpp +++ b/eeschema/tools/lib_edit_tool.cpp @@ -63,7 +63,7 @@ bool LIB_EDIT_TOOL::Init() { CONDITIONAL_MENU& moveMenu = moveTool->GetToolMenu().GetMenu(); - moveMenu.AddSeparator( SELECTION_CONDITIONS::NotEmpty ); + moveMenu.AddSeparator( 200 ); moveMenu.AddItem( EE_ACTIONS::rotateCCW, EE_CONDITIONS::NotEmpty, 200 ); moveMenu.AddItem( EE_ACTIONS::rotateCW, EE_CONDITIONS::NotEmpty, 200 ); moveMenu.AddItem( EE_ACTIONS::mirrorX, EE_CONDITIONS::NotEmpty, 200 ); @@ -72,7 +72,7 @@ bool LIB_EDIT_TOOL::Init() moveMenu.AddItem( EE_ACTIONS::properties, EE_CONDITIONS::Count( 1 ), 200 ); - moveMenu.AddSeparator( EE_CONDITIONS::IdleSelection, 300 ); + moveMenu.AddSeparator( 300 ); moveMenu.AddItem( ACTIONS::cut, EE_CONDITIONS::IdleSelection, 300 ); moveMenu.AddItem( ACTIONS::copy, EE_CONDITIONS::IdleSelection, 300 ); moveMenu.AddItem( ACTIONS::duplicate, EE_CONDITIONS::NotEmpty, 300 ); @@ -82,7 +82,7 @@ bool LIB_EDIT_TOOL::Init() // CONDITIONAL_MENU& drawMenu = drawingTools->GetToolMenu().GetMenu(); - drawMenu.AddSeparator( EE_CONDITIONS::NotEmpty, 200 ); + drawMenu.AddSeparator( 200 ); drawMenu.AddItem( EE_ACTIONS::rotateCCW, EE_CONDITIONS::IdleSelection, 200 ); drawMenu.AddItem( EE_ACTIONS::rotateCW, EE_CONDITIONS::IdleSelection, 200 ); drawMenu.AddItem( EE_ACTIONS::mirrorX, EE_CONDITIONS::IdleSelection, 200 ); @@ -102,7 +102,7 @@ bool LIB_EDIT_TOOL::Init() selToolMenu.AddItem( EE_ACTIONS::properties, EE_CONDITIONS::Count( 1 ), 200 ); - selToolMenu.AddSeparator( EE_CONDITIONS::Idle, 300 ); + selToolMenu.AddSeparator( 300 ); selToolMenu.AddItem( ACTIONS::cut, EE_CONDITIONS::IdleSelection, 300 ); selToolMenu.AddItem( ACTIONS::copy, EE_CONDITIONS::IdleSelection, 300 ); selToolMenu.AddItem( ACTIONS::paste, EE_CONDITIONS::Idle, 300 ); diff --git a/eeschema/tools/lib_pin_tool.cpp b/eeschema/tools/lib_pin_tool.cpp index 0212790dde..3844914505 100644 --- a/eeschema/tools/lib_pin_tool.cpp +++ b/eeschema/tools/lib_pin_tool.cpp @@ -103,7 +103,7 @@ bool LIB_PIN_TOOL::Init() CONDITIONAL_MENU& selToolMenu = m_selectionTool->GetToolMenu().GetMenu(); - selToolMenu.AddSeparator( singlePinCondition, 400 ); + selToolMenu.AddSeparator( 400 ); selToolMenu.AddItem( EE_ACTIONS::pushPinLength, singlePinCondition, 400 ); selToolMenu.AddItem( EE_ACTIONS::pushPinNameSize, singlePinCondition, 400 ); selToolMenu.AddItem( EE_ACTIONS::pushPinNumSize, singlePinCondition, 400 ); diff --git a/eeschema/tools/sch_edit_tool.cpp b/eeschema/tools/sch_edit_tool.cpp index 22369c9dc1..a3ffd82644 100644 --- a/eeschema/tools/sch_edit_tool.cpp +++ b/eeschema/tools/sch_edit_tool.cpp @@ -358,7 +358,7 @@ bool SCH_EDIT_TOOL::Init() { CONDITIONAL_MENU& moveMenu = moveTool->GetToolMenu().GetMenu(); - moveMenu.AddSeparator( SELECTION_CONDITIONS::NotEmpty ); + moveMenu.AddSeparator(); moveMenu.AddItem( EE_ACTIONS::rotateCCW, orientCondition ); moveMenu.AddItem( EE_ACTIONS::rotateCW, orientCondition ); moveMenu.AddItem( EE_ACTIONS::mirrorX, orientCondition ); @@ -376,7 +376,7 @@ bool SCH_EDIT_TOOL::Init() m_menu.AddSubMenu( symUnitMenu ); moveMenu.AddMenu( symUnitMenu.get(), E_C::SingleMultiUnitSymbol, 1 ); - moveMenu.AddSeparator( E_C::IdleSelection ); + moveMenu.AddSeparator(); moveMenu.AddItem( ACTIONS::cut, E_C::IdleSelection ); moveMenu.AddItem( ACTIONS::copy, E_C::IdleSelection ); moveMenu.AddItem( ACTIONS::duplicate, duplicateCondition ); @@ -447,7 +447,7 @@ bool SCH_EDIT_TOOL::Init() selToolMenu.AddItem( EE_ACTIONS::toText, toTextlCondition, 200 ); selToolMenu.AddItem( EE_ACTIONS::cleanupSheetPins, singleSheetCondition, 250 ); - selToolMenu.AddSeparator( E_C::Idle, 300 ); + selToolMenu.AddSeparator( 300 ); selToolMenu.AddItem( ACTIONS::cut, E_C::IdleSelection, 300 ); selToolMenu.AddItem( ACTIONS::copy, E_C::IdleSelection, 300 ); selToolMenu.AddItem( ACTIONS::paste, E_C::Idle, 300 ); diff --git a/eeschema/tools/sch_wire_bus_tool.cpp b/eeschema/tools/sch_wire_bus_tool.cpp index 733c834b79..a33fbdac2d 100644 --- a/eeschema/tools/sch_wire_bus_tool.cpp +++ b/eeschema/tools/sch_wire_bus_tool.cpp @@ -221,7 +221,7 @@ bool SCH_WIRE_BUS_TOOL::Init() // ctxMenu.AddItem( EE_ACTIONS::leaveSheet, belowRootSheetCondition, 2 ); - ctxMenu.AddSeparator( E_C::ShowAlways, 10 ); + ctxMenu.AddSeparator( 10 ); ctxMenu.AddItem( EE_ACTIONS::drawWire, wireOrBusTool && E_C::Idle, 10 ); ctxMenu.AddItem( EE_ACTIONS::drawBus, wireOrBusTool && E_C::Idle, 10 ); ctxMenu.AddItem( EE_ACTIONS::drawLines, lineTool && E_C::Idle, 10 ); @@ -234,7 +234,7 @@ bool SCH_WIRE_BUS_TOOL::Init() m_menu.AddSubMenu( busUnfoldMenu ); ctxMenu.AddMenu( busUnfoldMenu.get(), EE_CONDITIONS::Idle, 10 ); - ctxMenu.AddSeparator( wireOrBusTool && EE_CONDITIONS::Idle, 100 ); + ctxMenu.AddSeparator( 100 ); ctxMenu.AddItem( EE_ACTIONS::placeJunction, wireOrBusTool && E_C::Idle, 100 ); ctxMenu.AddItem( EE_ACTIONS::placeLabel, wireOrBusTool && E_C::Idle, 100 ); ctxMenu.AddItem( EE_ACTIONS::placeGlobalLabel, wireOrBusTool && E_C::Idle, 100 ); @@ -242,7 +242,7 @@ bool SCH_WIRE_BUS_TOOL::Init() ctxMenu.AddItem( EE_ACTIONS::breakWire, wireOrBusTool && E_C::Idle, 100 ); ctxMenu.AddItem( EE_ACTIONS::breakBus, wireOrBusTool && E_C::Idle, 100 ); - ctxMenu.AddSeparator( wireOrBusTool && EE_CONDITIONS::Idle, 200 ); + ctxMenu.AddSeparator( 200 ); ctxMenu.AddItem( EE_ACTIONS::selectNode, wireOrBusTool && E_C::Idle, 200 ); ctxMenu.AddItem( EE_ACTIONS::selectConnection, wireOrBusTool && E_C::Idle, 200 ); diff --git a/gerbview/tools/gerbview_selection_tool.cpp b/gerbview/tools/gerbview_selection_tool.cpp index 0a9d5ef106..6361faab30 100644 --- a/gerbview/tools/gerbview_selection_tool.cpp +++ b/gerbview/tools/gerbview_selection_tool.cpp @@ -164,7 +164,7 @@ bool GERBVIEW_SELECTION_TOOL::Init() auto& menu = m_menu.GetMenu(); menu.AddMenu( selectMenu.get() ); - menu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1000 ); + menu.AddSeparator( 1000 ); getEditFrame()->AddStandardSubMenus( m_menu ); diff --git a/include/tool/conditional_menu.h b/include/tool/conditional_menu.h index b9a86cb340..e994d2a2c1 100644 --- a/include/tool/conditional_menu.h +++ b/include/tool/conditional_menu.h @@ -96,12 +96,9 @@ public: * Function AddSeparator() * * Adds a separator to the menu. - * @param aCondition is a condition that has to be fulfilled to enable the submenu entry. - * @param aOrder determines location of the added menu, higher numbers are put on the bottom. - * You may use ANY_ORDER here if you think it does not matter. + * @param aOrder determines location of the separator, higher numbers are put on the bottom. */ - void AddSeparator( const SELECTION_CONDITION& aCondition = SELECTION_CONDITIONS::ShowAlways, - int aOrder = ANY_ORDER ); + void AddSeparator( int aOrder = ANY_ORDER ); /** * Function Evaluate() diff --git a/pagelayout_editor/tools/pl_drawing_tools.cpp b/pagelayout_editor/tools/pl_drawing_tools.cpp index d1eab244bf..ad9326aa5f 100644 --- a/pagelayout_editor/tools/pl_drawing_tools.cpp +++ b/pagelayout_editor/tools/pl_drawing_tools.cpp @@ -97,7 +97,7 @@ bool PL_DRAWING_TOOLS::Init() // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways, 1 ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1 ); + ctxMenu.AddSeparator( 1 ); // Finally, add the standard zoom/grid items m_frame->AddStandardSubMenus( m_menu ); diff --git a/pagelayout_editor/tools/pl_edit_tool.cpp b/pagelayout_editor/tools/pl_edit_tool.cpp index 8838f628e1..6a14a9d0b9 100644 --- a/pagelayout_editor/tools/pl_edit_tool.cpp +++ b/pagelayout_editor/tools/pl_edit_tool.cpp @@ -76,7 +76,7 @@ bool PL_EDIT_TOOL::Init() // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways, 1 ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::NotEmpty ); + ctxMenu.AddSeparator( 200 ); ctxMenu.AddItem( PL_ACTIONS::doDelete, SELECTION_CONDITIONS::NotEmpty, 200 ); // Finally, add the standard zoom/grid items diff --git a/pagelayout_editor/tools/pl_picker_tool.cpp b/pagelayout_editor/tools/pl_picker_tool.cpp index e1fab86b83..9c31fc4f01 100644 --- a/pagelayout_editor/tools/pl_picker_tool.cpp +++ b/pagelayout_editor/tools/pl_picker_tool.cpp @@ -50,7 +50,7 @@ bool PL_PICKER_TOOL::Init() // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways, 1 ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1 ); + ctxMenu.AddSeparator( 1 ); // Finally, add the standard zoom/grid items m_frame->AddStandardSubMenus( m_menu ); diff --git a/pagelayout_editor/tools/pl_selection_tool.cpp b/pagelayout_editor/tools/pl_selection_tool.cpp index 4507c00ba0..afca057af4 100644 --- a/pagelayout_editor/tools/pl_selection_tool.cpp +++ b/pagelayout_editor/tools/pl_selection_tool.cpp @@ -94,14 +94,14 @@ bool PL_SELECTION_TOOL::Init() auto& menu = m_menu.GetMenu(); - menu.AddSeparator( PL_CONDITIONS::Idle, 200 ); + menu.AddSeparator( 200 ); menu.AddItem( PL_ACTIONS::addLine, PL_CONDITIONS::Idle, 250 ); menu.AddItem( PL_ACTIONS::addRectangle, PL_CONDITIONS::Idle, 250 ); menu.AddItem( PL_ACTIONS::addText, PL_CONDITIONS::Idle, 250 ); menu.AddItem( PL_ACTIONS::addImage, PL_CONDITIONS::Idle, 250 ); menu.AddItem( PL_ACTIONS::appendImportedWorksheet, PL_CONDITIONS::Idle, 250 ); - menu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1000 ); + menu.AddSeparator( 1000 ); m_frame->AddStandardSubMenus( m_menu ); return true; diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp index 9a52c57114..3ff7c0e8f0 100644 --- a/pcbnew/tools/drawing_tool.cpp +++ b/pcbnew/tools/drawing_tool.cpp @@ -212,13 +212,13 @@ bool DRAWING_TOOL::Init() // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, activeToolFunctor, 1 ); - ctxMenu.AddSeparator( activeToolFunctor, 1 ); + ctxMenu.AddSeparator( 1 ); // tool-specific actions ctxMenu.AddItem( closeZoneOutline, zoneActiveFunctor, 200 ); ctxMenu.AddItem( deleteLastPoint, canUndoPoint, 200 ); - ctxMenu.AddSeparator( canUndoPoint, 500 ); + ctxMenu.AddSeparator( 500 ); // Type-specific sub-menus will be added for us by other tools // For example, zone fill/unfill is provided by the PCB control tool diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index 800705a47f..5f80b6d609 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -250,7 +250,7 @@ bool EDIT_TOOL::Init() menu.AddItem( PCB_ACTIONS::createArray, SELECTION_CONDITIONS::NotEmpty ); - menu.AddSeparator( SELECTION_CONDITIONS::NotEmpty ); + menu.AddSeparator(); menu.AddItem( ACTIONS::cut, SELECTION_CONDITIONS::NotEmpty ); menu.AddItem( ACTIONS::copy, SELECTION_CONDITIONS::NotEmpty ); // Selection tool handles the context menu for some other tools, such as the Picker. @@ -258,13 +258,13 @@ bool EDIT_TOOL::Init() menu.AddItem( ACTIONS::paste, noActiveToolCondition ); // Mirror only available in modedit - menu.AddSeparator( editingModuleCondition && SELECTION_CONDITIONS::NotEmpty ); + menu.AddSeparator(); menu.AddItem( PCB_ACTIONS::mirror, editingModuleCondition && SELECTION_CONDITIONS::NotEmpty ); menu.AddItem( PCB_ACTIONS::createPadFromShapes, editingModuleCondition && SELECTION_CONDITIONS::NotEmpty ); menu.AddItem( PCB_ACTIONS::explodePadToShapes, editingModuleCondition && SELECTION_CONDITIONS::NotEmpty ); // Footprint actions - menu.AddSeparator( singleModuleCondition ); + menu.AddSeparator(); menu.AddItem( PCB_ACTIONS::editFootprintInFpEditor, singleModuleCondition ); menu.AddItem( PCB_ACTIONS::updateFootprint, singleModuleCondition ); menu.AddItem( PCB_ACTIONS::changeFootprint, singleModuleCondition ); @@ -279,7 +279,7 @@ bool EDIT_TOOL::Init() // "Cancel" goes at the top of the context menu when a tool is active ctxMenu.AddItem( ACTIONS::cancelInteractive, activeToolCondition, 1 ); - ctxMenu.AddSeparator( activeToolCondition, 1 ); + ctxMenu.AddSeparator( 1 ); if( frame ) frame->AddStandardSubMenus( m_menu ); diff --git a/pcbnew/tools/footprint_editor_tools.cpp b/pcbnew/tools/footprint_editor_tools.cpp index 56f4fb5a86..4d19bfbfa9 100644 --- a/pcbnew/tools/footprint_editor_tools.cpp +++ b/pcbnew/tools/footprint_editor_tools.cpp @@ -183,25 +183,25 @@ bool MODULE_EDITOR_TOOLS::Init() ctxMenu.AddItem( ACTIONS::saveAs, libSelectedCondition ); ctxMenu.AddItem( ACTIONS::revert, libSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( PCB_ACTIONS::newFootprint, SELECTION_CONDITIONS::ShowAlways ); #ifdef KICAD_SCRIPTING ctxMenu.AddItem( PCB_ACTIONS::createFootprint, SELECTION_CONDITIONS::ShowAlways ); #endif ctxMenu.AddItem( PCB_ACTIONS::editFootprint, fpSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( ACTIONS::save, fpSelectedCondition ); ctxMenu.AddItem( ACTIONS::saveCopyAs, fpSelectedCondition ); ctxMenu.AddItem( PCB_ACTIONS::deleteFootprint, fpSelectedCondition ); ctxMenu.AddItem( ACTIONS::revert, fpSelectedCondition ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( PCB_ACTIONS::cutFootprint, fpSelectedCondition ); ctxMenu.AddItem( PCB_ACTIONS::copyFootprint, fpSelectedCondition ); ctxMenu.AddItem( PCB_ACTIONS::pasteFootprint, SELECTION_CONDITIONS::ShowAlways ); - ctxMenu.AddSeparator( fpSelectedCondition ); + ctxMenu.AddSeparator(); ctxMenu.AddItem( PCB_ACTIONS::importFootprint, SELECTION_CONDITIONS::ShowAlways ); ctxMenu.AddItem( PCB_ACTIONS::exportFootprint, fpSelectedCondition ); diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp index e58048ce8c..6fbc21a3ca 100644 --- a/pcbnew/tools/pad_tool.cpp +++ b/pcbnew/tools/pad_tool.cpp @@ -199,7 +199,7 @@ bool PAD_TOOL::Init() // we need a separator only when the selection is empty auto separatorCond = canShowMenuCond && SELECTION_CONDITIONS::Count( 0 ); - menu.AddSeparator( separatorCond, 1000 ); + menu.AddSeparator( 1000 ); } return true; diff --git a/pcbnew/tools/pcb_editor_control.cpp b/pcbnew/tools/pcb_editor_control.cpp index f79b4a136c..452c9db85a 100644 --- a/pcbnew/tools/pcb_editor_control.cpp +++ b/pcbnew/tools/pcb_editor_control.cpp @@ -383,11 +383,11 @@ bool PCB_EDITOR_CONTROL::Init() // "Cancel" goes at the top of the context menu when a tool is active ctxMenu.AddItem( ACTIONS::cancelInteractive, activeToolCondition, 1 ); - ctxMenu.AddSeparator( activeToolCondition, 1 ); + ctxMenu.AddSeparator( 1 ); // "Get and Place Footprint" should be available for Place Footprint tool ctxMenu.AddItem( PCB_ACTIONS::findMove, placeModuleCondition, 1000 ); - ctxMenu.AddSeparator( placeModuleCondition, 1000 ); + ctxMenu.AddSeparator( 1000 ); // Finally, add the standard zoom & grid items getEditFrame()->AddStandardSubMenus( m_menu ); @@ -409,7 +409,7 @@ bool PCB_EDITOR_CONTROL::Init() // Add "Get and Place Footprint" when Selection tool is in an inactive state menu.AddItem( PCB_ACTIONS::findMove, inactiveStateCondition ); - menu.AddSeparator( inactiveStateCondition ); + menu.AddSeparator(); toolMenu.AddSubMenu( zoneMenu ); toolMenu.AddSubMenu( lockMenu ); diff --git a/pcbnew/tools/pcb_tool_base.cpp b/pcbnew/tools/pcb_tool_base.cpp index 191750875d..8b668999cd 100644 --- a/pcbnew/tools/pcb_tool_base.cpp +++ b/pcbnew/tools/pcb_tool_base.cpp @@ -216,7 +216,7 @@ bool PCB_TOOL_BASE::Init() // cancel current tool goes in main context menu at the top if present ctxMenu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways, 1 ); - ctxMenu.AddSeparator( SELECTION_CONDITIONS::ShowAlways, 1 ); + ctxMenu.AddSeparator( 1 ); // Finally, add the standard zoom/grid items getEditFrame()->AddStandardSubMenus( m_menu ); diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp index 49d55b771d..8a48452ae5 100644 --- a/pcbnew/tools/selection_tool.cpp +++ b/pcbnew/tools/selection_tool.cpp @@ -223,7 +223,7 @@ bool SELECTION_TOOL::Init() auto& menu = m_menu.GetMenu(); menu.AddMenu( selectMenu.get(), SELECTION_CONDITIONS::NotEmpty ); - menu.AddSeparator( SELECTION_CONDITIONS::NotEmpty, 1000 ); + menu.AddSeparator( 1000 ); if( frame ) frame->AddStandardSubMenus( m_menu );