Commit 24a317ce authored by Maciej Suminski's avatar Maciej Suminski
Browse files

The Selection Tool is always active. Removed entries for toolbar menu and hotkeys for the tool.

parent 7d788109

common/tool/tool_dispatcher.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -280,11 +280,6 @@ void TOOL_DISPATCHER::DispatchWxCommand( const wxCommandEvent& aEvent ) 
        toolName = "pcbnew.InteractiveRouter";

        toolName = "pcbnew.InteractiveRouter";

        activateTool = true;

        activateTool = true;

        break;

        break;



    case ID_SELECTION_TOOL:

        toolName = "pcbnew.InteractiveSelection";

        activateTool = true;

        break;

    }

    }





    // do nothing if the legacy view is active

    // do nothing if the legacy view is active

common/tool/tool_manager.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ struct TOOL_MANAGER::TOOL_STATE 








TOOL_MANAGER::TOOL_MANAGER() :

TOOL_MANAGER::TOOL_MANAGER() :

    m_model( NULL ), m_view( NULL )

    m_model( NULL ), m_view( NULL ), m_viewControls( NULL ), m_editFrame( NULL )

{

{

    m_actionMgr = new ACTION_MANAGER( this );

    m_actionMgr = new ACTION_MANAGER( this );

}

}
@@ -476,6 +476,7 @@ bool TOOL_MANAGER::ProcessEvent( TOOL_EVENT& aEvent ) 
    if( m_view->IsDirty() )

    if( m_view->IsDirty() )

    {

    {

        PCB_EDIT_FRAME* f = static_cast<PCB_EDIT_FRAME*>( GetEditFrame() );

        PCB_EDIT_FRAME* f = static_cast<PCB_EDIT_FRAME*>( GetEditFrame() );

        if( f->IsGalCanvasActive() )

            f->GetGalCanvas()->Refresh();    // fixme: ugly hack, provide a method in TOOL_DISPATCHER.

            f->GetGalCanvas()->Refresh();    // fixme: ugly hack, provide a method in TOOL_DISPATCHER.

    }

    }

pcbnew/menubar_pcbframe.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -310,11 +310,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() 




    editMenu->AppendSeparator();

    editMenu->AppendSeparator();





    AddMenuItem( editMenu, ID_SELECTION_TOOL,

                 _( "Select Tool" ),

                 _( "Interactive selection and drag&drop tool." ),

                 KiBitmap( tools_xpm ) );



    AddMenuItem( editMenu, ID_PNS_ROUTER_TOOL,

    AddMenuItem( editMenu, ID_PNS_ROUTER_TOOL,

                 _( "Interactive router" ),

                 _( "Interactive router" ),

                 _( "Interactive router drag&drop tool." ),

                 _( "Interactive router drag&drop tool." ),

pcbnew/pcbframe.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -121,8 +121,6 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME ) 
    // menu Config

    // menu Config





    /* Tom's hacks start */

    /* Tom's hacks start */

    EVT_MENU ( ID_SELECTION_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    EVT_TOOL ( ID_SELECTION_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    EVT_MENU ( ID_PNS_ROUTER_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    EVT_MENU ( ID_PNS_ROUTER_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    EVT_TOOL ( ID_PNS_ROUTER_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    EVT_TOOL ( ID_PNS_ROUTER_TOOL, PCB_EDIT_FRAME::onGenericCommand )

    /* Tom's hacks end */

    /* Tom's hacks end */

pcbnew/pcbnew_id.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -370,7 +370,6 @@ enum pcbnew_ids 
    ID_FOOTPRINT_WIZARD_SELECT_WIZARD,

    ID_FOOTPRINT_WIZARD_SELECT_WIZARD,

    ID_FOOTPRINT_WIZARD_EXPORT_TO_BOARD,

    ID_FOOTPRINT_WIZARD_EXPORT_TO_BOARD,





    ID_SELECTION_TOOL,

    ID_PNS_ROUTER_TOOL

    ID_PNS_ROUTER_TOOL

};

};