AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-03-30 05:46:55 +00:00
Files Issues Releases Activity

Actionize more toolbar items

Browse Source
This commit is contained in:
Ian McInerney 2025-02-20 12:46:23 +00:00
parent fc6f3f2332
commit 384ca6bf98
9 changed files with 41 additions and 36 deletions

16
pcbnew/edit_track_width.cpp
View File

@ -98,22 +98,6 @@ void PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
switch( id )
{
case ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH:
{
if( GetDesignSettings().UseCustomTrackViaSize() )
{
GetDesignSettings().UseCustomTrackViaSize( false );
GetDesignSettings().m_UseConnectedTrackWidth = true;
}
else
{
GetDesignSettings().m_UseConnectedTrackWidth =
not GetDesignSettings().m_UseConnectedTrackWidth;
}
break;
}
case ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES:
GetDesignSettings().m_UseConnectedTrackWidth = false;
GetDesignSettings().SetTrackWidthIndex( 0 );

10
pcbnew/pcb_edit_frame.cpp
View File

@ -174,7 +174,6 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
EVT_MENU( ID_PCB_GEN_CMP_FILE, PCB_EDIT_FRAME::RecreateCmpFileFromBoard )
// Horizontal toolbar
EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event )
EVT_CHOICE( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event )
EVT_CHOICE( ID_AUX_TOOLBAR_PCB_VIA_SIZE, PCB_EDIT_FRAME::Tracks_and_Vias_Size_Event )
@ -185,7 +184,6 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
// User interface update event handlers.
EVT_UPDATE_UI( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, PCB_EDIT_FRAME::OnUpdateSelectTrackWidth )
EVT_UPDATE_UI( ID_AUX_TOOLBAR_PCB_VIA_SIZE, PCB_EDIT_FRAME::OnUpdateSelectViaSize )
EVT_UPDATE_UI( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, PCB_EDIT_FRAME::OnUpdateSelectAutoWidth )
EVT_UPDATE_UI_RANGE( ID_POPUP_PCB_SELECT_WIDTH1, ID_POPUP_PCB_SELECT_WIDTH8,
PCB_EDIT_FRAME::OnUpdateSelectTrackWidth )
EVT_UPDATE_UI_RANGE( ID_POPUP_PCB_SELECT_VIASIZE1, ID_POPUP_PCB_SELECT_VIASIZE8,
@ -972,6 +970,14 @@ void PCB_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( PCB_ACTIONS::routerShoveMode, CHECK( isShoveMode ) );
mgr->SetConditions( PCB_ACTIONS::routerWalkaroundMode, CHECK( isWalkaroundMode ) );
auto isAutoTrackWidth =
[this]( const SELECTION& )
{
return GetDesignSettings().m_UseConnectedTrackWidth;
};
mgr->SetConditions( PCB_ACTIONS::autoTrackWidth, CHECK( isAutoTrackWidth ) );
auto haveNetCond =
[] ( const SELECTION& aSel )
{

1
pcbnew/pcb_edit_frame.h
View File

@ -164,7 +164,6 @@ public:
void OnUpdateSelectViaSize( wxUpdateUIEvent& aEvent );
void OnUpdateSelectTrackWidth( wxUpdateUIEvent& aEvent );
void OnUpdateSelectAutoWidth( wxUpdateUIEvent& aEvent );
void RunEeschema();

1
pcbnew/pcbnew_id.h
View File

@ -21,7 +21,6 @@ enum pcbnew_ids
// Tracks and vias sizes general options
ID_AUX_TOOLBAR_PCB_VIA_SIZE,
ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
ID_POPUP_PCB_SELECT_WIDTH_START_RANGE,
ID_POPUP_PCB_SELECT_CUSTOM_WIDTH,
ID_POPUP_PCB_SELECT_AUTO_WIDTH,

18
pcbnew/toolbars_pcb_editor.cpp
View File

@ -346,15 +346,9 @@ std::optional<TOOLBAR_CONFIGURATION> PCB_EDIT_FRAME::DefaultTopAuxToolbarConfig(
TOOLBAR_CONFIGURATION config;
// clang-format off
config.AppendControl( "control.PCBTrackWidth" );
config.AppendControl( "control.PCBTrackWidth" )
.AppendAction( PCB_ACTIONS::autoTrackWidth );
/* TODO (ISM): Turn this into an action
m_tbTopAux->AddTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH, wxEmptyString,
KiBitmapBundle( BITMAPS::auto_track_width ),
_( "When routing from an existing track use its width instead "
"of the current width setting" ),
wxITEM_CHECK );
*/
config.AppendSeparator()
.AppendControl( "control.PCBViaDia" );
@ -736,11 +730,3 @@ void PCB_EDIT_FRAME::OnUpdateSelectViaSize( wxUpdateUIEvent& aEvent )
m_SelViaSizeBox->SetSelection( sel );
}
}
void PCB_EDIT_FRAME::OnUpdateSelectAutoWidth( wxUpdateUIEvent& aEvent )
{
BOARD_DESIGN_SETTINGS& bds = GetDesignSettings();
aEvent.Check( bds.m_UseConnectedTrackWidth );
}

19
pcbnew/tools/board_editor_control.cpp
View File

@ -1006,6 +1006,24 @@ int BOARD_EDITOR_CONTROL::ViaSizeDec( const TOOL_EVENT& aEvent )
}
int BOARD_EDITOR_CONTROL::AutoTrackWidth( const TOOL_EVENT& aEvent )
{
BOARD_DESIGN_SETTINGS& bds = getModel<BOARD>()->GetDesignSettings();
if( bds.UseCustomTrackViaSize() )
{
bds.UseCustomTrackViaSize( false );
bds.m_UseConnectedTrackWidth = true;
}
else
{
bds.m_UseConnectedTrackWidth = !bds.m_UseConnectedTrackWidth;
}
return 0;
}
int BOARD_EDITOR_CONTROL::PlaceFootprint( const TOOL_EVENT& aEvent )
{
if( m_inPlaceFootprint )
@ -1718,6 +1736,7 @@ void BOARD_EDITOR_CONTROL::setTransitions()
Go( &BOARD_EDITOR_CONTROL::TrackWidthDec, PCB_ACTIONS::trackWidthDec.MakeEvent() );
Go( &BOARD_EDITOR_CONTROL::ViaSizeInc, PCB_ACTIONS::viaSizeInc.MakeEvent() );
Go( &BOARD_EDITOR_CONTROL::ViaSizeDec, PCB_ACTIONS::viaSizeDec.MakeEvent() );
Go( &BOARD_EDITOR_CONTROL::AutoTrackWidth, PCB_ACTIONS::autoTrackWidth.MakeEvent() );
// Zone actions
Go( &BOARD_EDITOR_CONTROL::ZoneMerge, PCB_ACTIONS::zoneMerge.MakeEvent() );

1
pcbnew/tools/board_editor_control.h
View File

@ -88,6 +88,7 @@ public:
int TrackWidthDec( const TOOL_EVENT& aEvent );
int ViaSizeInc( const TOOL_EVENT& aEvent );
int ViaSizeDec( const TOOL_EVENT& aEvent );
int AutoTrackWidth( const TOOL_EVENT& aEvent );
// Zone actions
int ZoneMerge( const TOOL_EVENT& aEvent );

9
pcbnew/tools/pcb_actions.cpp
View File

@ -1129,6 +1129,15 @@ TOOL_ACTION PCB_ACTIONS::viaSizeDec( TOOL_ACTION_ARGS()
.FriendlyName( _( "Decrease Via Size" ) )
.Tooltip( _( "Change via size to previous pre-defined size" ) ) );
TOOL_ACTION PCB_ACTIONS::autoTrackWidth( TOOL_ACTION_ARGS()
.Name( "pcbnew.EditorControl.autoTrackWidth" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Automatically select track width" ) )
.Tooltip( _( "When routing from an existing track use its width instead "
"of the current width setting" ) )
.Icon( BITMAPS::auto_track_width )
.ToolbarState( TOOLBAR_STATE::TOGGLE ) );
TOOL_ACTION PCB_ACTIONS::trackViaSizeChanged( TOOL_ACTION_ARGS()
.Name( "pcbnew.EditorControl.trackViaSizeChanged" )
.Scope( AS_GLOBAL )

2
pcbnew/tools/pcb_actions.h
View File

@ -399,6 +399,8 @@ public:
static TOOL_ACTION viaSizeInc;
static TOOL_ACTION viaSizeDec;
static TOOL_ACTION autoTrackWidth;
static TOOL_ACTION trackViaSizeChanged; // notification
static TOOL_ACTION assignNetClass;