Commit 958046dd authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Moved SELECTION_TOOL context menu to a separate class.

parent 9ef9b7b8

pcbnew/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ set( PCBNEW_CLASS_SRCS 
    tools/selection_tool.cpp

    tools/selection_area.cpp

    tools/selection_conditions.cpp

    tools/conditional_menu.cpp

    tools/bright_box.cpp

    tools/edit_points.cpp

    tools/edit_constraints.cpp

pcbnew/tools/edit_tool.cpp

+11 −11
Original line number Diff line number Diff line
@@ -79,17 +79,17 @@ bool EDIT_TOOL::Init() 
    }



    // Add context menu entries that are displayed when selection tool is active

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::editActivate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::rotate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::flip, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::remove, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::properties, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::moveExact, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::duplicate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::createArray, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::editActivate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::rotate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::flip, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::remove, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::properties, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::moveExact, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::duplicate, SELECTION_CONDITIONS::NotEmpty );

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::createArray, SELECTION_CONDITIONS::NotEmpty );



    // Footprint actions

    m_selectionTool->AddMenuItem( COMMON_ACTIONS::editFootprintInFpEditor,

    m_selectionTool->GetMenu().AddItem( COMMON_ACTIONS::editFootprintInFpEditor,

                                        SELECTION_CONDITIONS::OnlyType( PCB_MODULE_T ) &&

                                        SELECTION_CONDITIONS::Count( 1 ) );

pcbnew/tools/module_tools.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool MODULE_TOOLS::Init() 
        return false;

    }



    selectionTool->AddMenuItem( COMMON_ACTIONS::enumeratePads );

    selectionTool->GetMenu().AddItem( COMMON_ACTIONS::enumeratePads );



    return true;

}

pcbnew/tools/pcb_editor_control.cpp

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ bool PCB_EDITOR_CONTROL::Init() 


    if( selTool )

    {

        selTool->AddSubMenu( new ZONE_CONTEXT_MENU, _( "Zones" ),

        selTool->GetMenu().AddMenu( new ZONE_CONTEXT_MENU, _( "Zones" ),

                                    SELECTION_CONDITIONS::OnlyType( PCB_ZONE_AREA_T ) );

    }

pcbnew/tools/placement_tool.cpp

+1 −2
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ bool PLACEMENT_TOOL::Init() 
    menu->AppendSeparator();

    menu->Add( COMMON_ACTIONS::distributeHorizontally );

    menu->Add( COMMON_ACTIONS::distributeVertically );

    m_selectionTool->AddSubMenu( menu, _( "Align/distribute" ),

                                 SELECTION_CONDITIONS::MoreThan( 1 ) );

    m_selectionTool->GetMenu().AddMenu( menu, _( "Align/distribute" ), SELECTION_CONDITIONS::MoreThan( 1 ) );



    return true;

}