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

Fix mismatch in tool name and activation action. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4110
This commit is contained in:
Jeff Young 2020-03-29 12:54:18 +01:00
parent c29c3d9cc1
commit d30fb79706
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cvpcb/display_footprints_frame.cpp
View File

@ -118,7 +118,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( KIWAY* aKiway, wxWindow* aPa
m_toolManager->InitTools(); m_toolManager->InitTools();
// Run the control tool, it is supposed to be always active // Run the control tool, it is supposed to be always active
m_toolManager->InvokeTool( "cvpcb.InteractiveSelection" ); m_toolManager->InvokeTool( "cvpcb.FootprintViewerInteractiveSelection" );
ReCreateHToolbar(); ReCreateHToolbar();
ReCreateVToolbar(); ReCreateVToolbar();

47
cvpcb/tools/cvpcb_actions.cpp
View File

@ -33,50 +33,53 @@
// Selection tool action for the footprint viewer window // Selection tool action for the footprint viewer window
TOOL_ACTION CVPCB_ACTIONS::selectionActivate( "cvpcb.InteractiveSelection", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::selectionActivate( "cvpcb.FootprintViewerInteractiveSelection",
0, "", AS_GLOBAL, 0, "",
"", "",
"", "",
NULL, AF_ACTIVATE ); // No description, it is not supposed to be shown anywhere NULL, AF_ACTIVATE ); // No description, it is not supposed to be shown anywhere
TOOL_ACTION CVPCB_ACTIONS::controlActivate( "cvpcb.Control", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::controlActivate( "cvpcb.Control",
0, "", AS_GLOBAL, 0, "",
"", "",
"", "",
NULL, AF_ACTIVATE ); // No description, it is not supposed to be shown anywhere NULL, AF_ACTIVATE ); // No description, it is not supposed to be shown anywhere
// Action to show the footprint viewer window // Action to show the footprint viewer window
TOOL_ACTION CVPCB_ACTIONS::showFootprintViewer( "cvpcb.Control.ShowFootprintViewer", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::showFootprintViewer( "cvpcb.Control.ShowFootprintViewer",
0, "", AS_GLOBAL, 0, "",
_( "View selected footprint" ), _( "View selected footprint" ),
_( "View the selected footprint in the footprint viewer" ), _( "View the selected footprint in the footprint viewer" ),
show_footprint_xpm ); show_footprint_xpm );
// Actions to handle management tasks // Actions to handle management tasks
TOOL_ACTION CVPCB_ACTIONS::showEquFileTable( "cvpcb.Control.ShowEquFileTable", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::showEquFileTable( "cvpcb.Control.ShowEquFileTable",
0, "", AS_GLOBAL, 0, "",
_( "Manage Footprint Association Files" ), _( "Manage Footprint Association Files" ),
_( "Configure footprint association file (.equ) list. These files are " _( "Configure footprint association file (.equ) list. These files are "
"used to automatically assign footprint names from symbol values." ), "used to automatically assign footprint names from symbol values." ),
library_table_xpm ); library_table_xpm );
TOOL_ACTION CVPCB_ACTIONS::saveAssociations( "cvpcb.Control.SaveAssocations", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::saveAssociations( "cvpcb.Control.SaveAssocations",
AS_GLOBAL,
MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ), MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ),
_( "Save to Schematic" ), _( "Save to Schematic" ),
_( "Save footprint associations in schematic symbol footprint fields" ), _( "Save footprint associations in schematic symbol footprint fields" ),
save_xpm ); save_xpm );
// Actions to navigate the display // Actions to navigate the display
TOOL_ACTION CVPCB_ACTIONS::changeFocusRight( "cvpcb.Control.changeFocusRight", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::changeFocusRight( "cvpcb.Control.changeFocusRight",
AS_GLOBAL,
WXK_TAB, "", WXK_TAB, "",
"", "",
"", "",
nullptr, AF_NONE, nullptr, AF_NONE,
(void*) CVPCB_MAINFRAME::CHANGE_FOCUS_RIGHT ); (void*) CVPCB_MAINFRAME::CHANGE_FOCUS_RIGHT );
TOOL_ACTION CVPCB_ACTIONS::changeFocusLeft( "cvpcb.Control.changeFocusLeft", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::changeFocusLeft( "cvpcb.Control.changeFocusLeft",
AS_GLOBAL,
MD_SHIFT + WXK_TAB, "", MD_SHIFT + WXK_TAB, "",
"", "",
"", "",
@ -84,15 +87,15 @@ TOOL_ACTION CVPCB_ACTIONS::changeFocusLeft( "cvpcb.Control.changeFocusLeft", AS_
(void*) CVPCB_MAINFRAME::CHANGE_FOCUS_LEFT ); (void*) CVPCB_MAINFRAME::CHANGE_FOCUS_LEFT );
// Actions to navigate the component list // Actions to navigate the component list
TOOL_ACTION CVPCB_ACTIONS::gotoNextNA( "cvpcb.Control.GotoNextNA", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::gotoNextNA( "cvpcb.Control.GotoNextNA",
0, "", AS_GLOBAL, 0, "",
_( "Select next unassociated symbol" ), _( "Select next unassociated symbol" ),
_( "Select next unassociated symbol" ), _( "Select next unassociated symbol" ),
right_xpm, AF_NONE, right_xpm, AF_NONE,
(void*) CVPCB_MAINFRAME::ITEM_NEXT ); (void*) CVPCB_MAINFRAME::ITEM_NEXT );
TOOL_ACTION CVPCB_ACTIONS::gotoPreviousNA( "cvpcb.Control.GotoPreviousNA", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::gotoPreviousNA( "cvpcb.Control.GotoPreviousNA",
0, "", AS_GLOBAL, 0, "",
_( "Select previous unassociated symbol" ), _( "Select previous unassociated symbol" ),
_( "Select previous unassociated symbol" ), _( "Select previous unassociated symbol" ),
left_xpm, AF_NONE, left_xpm, AF_NONE,
@ -100,26 +103,28 @@ TOOL_ACTION CVPCB_ACTIONS::gotoPreviousNA( "cvpcb.Control.GotoPreviousNA", AS_GL
// Actions to modify component associations // Actions to modify component associations
TOOL_ACTION CVPCB_ACTIONS::associate( "cvpcb.Association.Associate", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::associate( "cvpcb.Association.Associate",
AS_GLOBAL,
WXK_RETURN, "", WXK_RETURN, "",
_( "Associate footprint" ), _( "Associate footprint" ),
_( "Associate selected footprint with selected components" ), _( "Associate selected footprint with selected components" ),
auto_associe_xpm ); auto_associe_xpm );
TOOL_ACTION CVPCB_ACTIONS::autoAssociate( "cvpcb.Association.AutoAssociate", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::autoAssociate( "cvpcb.Association.AutoAssociate",
0, "", AS_GLOBAL, 0, "",
_( "Automatically associate footprints" ), _( "Automatically associate footprints" ),
_( "Perform automatic footprint association" ), _( "Perform automatic footprint association" ),
auto_associe_xpm ); auto_associe_xpm );
TOOL_ACTION CVPCB_ACTIONS::deleteAssoc( "cvpcb.Association.Delete", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::deleteAssoc( "cvpcb.Association.Delete",
AS_GLOBAL,
WXK_DELETE, "", WXK_DELETE, "",
_( "Delete association" ), _( "Delete association" ),
_( "Delete selected footprint associations" ), _( "Delete selected footprint associations" ),
delete_association_xpm ); delete_association_xpm );
TOOL_ACTION CVPCB_ACTIONS::deleteAll( "cvpcb.Association.DeleteAll", AS_GLOBAL, TOOL_ACTION CVPCB_ACTIONS::deleteAll( "cvpcb.Association.DeleteAll",
0, "", AS_GLOBAL, 0, "",
_( "Delete all footprint associations" ), _( "Delete all footprint associations" ),
_( "Delete all footprint associations" ), _( "Delete all footprint associations" ),
delete_association_xpm ); delete_association_xpm );

6
include/tools_holder.h
View File

@ -43,9 +43,9 @@ protected:
TOOL_DISPATCHER* m_toolDispatcher; TOOL_DISPATCHER* m_toolDispatcher;
std::vector<std::string> m_toolStack; // Stack of user-level "tools". Not to be confused std::vector<std::string> m_toolStack; // Stack of user-level "tools". Not to be confused
// with TOOL_BASE-derived instances, many of which // with a stack of TOOL_BASE instances, because many
// implement multiple user-level "tools". The user- // of them implement multiple user-level "tools". The
// level "tools" are TOOL_ACTIONSs internally. // user-level "tools" equate to ACTIONs.
bool m_immediateActions; // Preference for immediate actions. If false, the bool m_immediateActions; // Preference for immediate actions. If false, the
// first invocation of a hotkey will just select the // first invocation of a hotkey will just select the