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

Move microwave tools from toolbar to Place menu 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8233
This commit is contained in:
david-beinder 2021-05-11 18:06:15 +02:00 committed by Jon Evans
parent 75f49ba1b6
commit 1642f0d784
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/menubar_pcb_editor.cpp
View File

@ -298,6 +298,18 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
placeMenu->Add( PCB_ACTIONS::drawVia );
placeMenu->Add( PCB_ACTIONS::drawZone );
placeMenu->Add( PCB_ACTIONS::drawRuleArea );
ACTION_MENU* muwaveSubmenu = new ACTION_MENU( false, selTool );
muwaveSubmenu->SetTitle( _( "Add Microwave Shape" ) );
muwaveSubmenu->SetIcon( BITMAPS::mw_add_line );
muwaveSubmenu->Add( PCB_ACTIONS::microwaveCreateLine );
muwaveSubmenu->Add( PCB_ACTIONS::microwaveCreateGap );
muwaveSubmenu->Add( PCB_ACTIONS::microwaveCreateStub );
muwaveSubmenu->Add( PCB_ACTIONS::microwaveCreateStubArc );
muwaveSubmenu->Add( PCB_ACTIONS::microwaveCreateFunctionShape );
placeMenu->Add( muwaveSubmenu );
placeMenu->AppendSeparator();
placeMenu->Add( PCB_ACTIONS::placeText );
placeMenu->Add( PCB_ACTIONS::drawLine );
placeMenu->Add( PCB_ACTIONS::drawArc );

12
pcbnew/toolbars_pcb_editor.cpp
View File

@ -396,7 +396,6 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
static ACTION_GROUP* originGroup = nullptr;
static ACTION_GROUP* routingGroup = nullptr;
static ACTION_GROUP* tuneGroup = nullptr;
static ACTION_GROUP* microwaveGroup = nullptr;
if( !dimensionGroup )
{
@ -429,16 +428,6 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
&PCB_ACTIONS::routerTuneDiffPairSkew } );
}
if( !microwaveGroup )
{
microwaveGroup = new ACTION_GROUP( "group.pcbMicrowave",
{ &PCB_ACTIONS::microwaveCreateLine,
&PCB_ACTIONS::microwaveCreateGap,
&PCB_ACTIONS::microwaveCreateStub,
&PCB_ACTIONS::microwaveCreateStubArc,
&PCB_ACTIONS::microwaveCreateFunctionShape } );
}
m_drawToolBar->Add( ACTIONS::selectionTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::highlightNetTool, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::localRatsnestTool, ACTION_TOOLBAR::TOGGLE );
@ -448,7 +437,6 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
m_drawToolBar->AddGroup( routingGroup, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->AddGroup( tuneGroup, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::drawVia, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->AddGroup( microwaveGroup, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::drawZone, ACTION_TOOLBAR::TOGGLE );
m_drawToolBar->Add( PCB_ACTIONS::drawRuleArea, ACTION_TOOLBAR::TOGGLE );