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

Correct footprint filter tool name and tooltip. 

Fixes: lp:1842477
* https://bugs.launchpad.net/kicad/+bug/1842477
This commit is contained in:
Jeff Young 2019-09-03 19:32:39 +01:00
parent 54255cffeb
commit d4aa502be1
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cvpcb/toolbars_cvpcb.cpp
View File

@ -64,12 +64,12 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
text->SetFont( m_mainToolBar->GetFont().Bold() );
m_mainToolBar->AddControl( text );
m_mainToolBar->Add( CVPCB_ACTIONS::filterFPbyKeywords, true );
m_mainToolBar->Add( CVPCB_ACTIONS::FilterFPbyFPFilters, true );
m_mainToolBar->Add( CVPCB_ACTIONS::filterFPbyPin, true );
m_mainToolBar->Add( CVPCB_ACTIONS::filterFPbyLibrary, true );
m_mainToolBar->Add( CVPCB_ACTIONS::FilterFPbyLibrary, true );
KiScaledSeparator( m_mainToolBar, this );
m_mainToolBar->Add( CVPCB_ACTIONS::filterFPbyDisplayName, true );
m_mainToolBar->Add( CVPCB_ACTIONS::FilterFPbyTextPattern, true );
m_tcFilterString = new wxTextCtrl( m_mainToolBar, ID_CVPCB_FILTER_TEXT_EDIT );
@ -88,13 +88,13 @@ void CVPCB_MAINFRAME::SyncToolbars()
m_mainToolBar->Toggle( ACTIONS::undo, m_undoList.size() > 0 );
m_mainToolBar->Toggle( ACTIONS::redo, m_redoList.size() > 0 );
m_mainToolBar->Toggle( CVPCB_ACTIONS::filterFPbyKeywords,
m_mainToolBar->Toggle( CVPCB_ACTIONS::FilterFPbyFPFilters,
filterActive( FOOTPRINTS_LISTBOX::FILTERING_BY_COMPONENT_FP_FILTERS ) );
m_mainToolBar->Toggle( CVPCB_ACTIONS::filterFPbyLibrary,
m_mainToolBar->Toggle( CVPCB_ACTIONS::FilterFPbyLibrary,
filterActive( FOOTPRINTS_LISTBOX::FILTERING_BY_LIBRARY ) );
m_mainToolBar->Toggle( CVPCB_ACTIONS::filterFPbyPin,
filterActive( FOOTPRINTS_LISTBOX::FILTERING_BY_PIN_COUNT ) );
m_mainToolBar->Toggle( CVPCB_ACTIONS::filterFPbyDisplayName,
m_mainToolBar->Toggle( CVPCB_ACTIONS::FilterFPbyTextPattern,
filterActive( FOOTPRINTS_LISTBOX::FILTERING_BY_TEXT_PATTERN ) );
m_mainToolBar->Refresh();
}

22
cvpcb/tools/cvpcb_actions.cpp
View File

@ -126,30 +126,30 @@ TOOL_ACTION CVPCB_ACTIONS::deleteAll( "cvpcb.Association.DeleteAll", AS_GLOBAL,
// Actions to filter the footprint list
TOOL_ACTION CVPCB_ACTIONS::filterFPbyKeywords( "cvpcb.Control.FilterFPByKeyword", AS_GLOBAL,
0, "",
_( "Filter by keyword" ),
_( "Filter footprint list by schematic symbol keywords" ),
TOOL_ACTION CVPCB_ACTIONS::FilterFPbyFPFilters( "cvpcb.Control.FilterFPbyFPFilters",
AS_GLOBAL, 0, "",
_( "Use symbol footprint filters" ),
_( "Filter footprint list by footprint filters defined in the symbol" ),
module_filtered_list_xpm, AF_NONE,
(void*) FOOTPRINTS_LISTBOX::FILTERING_BY_COMPONENT_FP_FILTERS );
TOOL_ACTION CVPCB_ACTIONS::filterFPbyPin( "cvpcb.Control.FilterFPByPin", AS_GLOBAL,
0, "",
TOOL_ACTION CVPCB_ACTIONS::filterFPbyPin( "cvpcb.Control.FilterFPByPin",
AS_GLOBAL, 0, "",
_( "Filter by pin count" ),
_( "Filter footprint list by pin count" ),
module_pin_filtered_list_xpm, AF_NONE,
(void*) FOOTPRINTS_LISTBOX::FILTERING_BY_PIN_COUNT );
TOOL_ACTION CVPCB_ACTIONS::filterFPbyLibrary( "cvpcb.Control.FilterFPByLibrary", AS_GLOBAL,
0, "",
TOOL_ACTION CVPCB_ACTIONS::FilterFPbyLibrary( "cvpcb.Control.FilterFPbyLibrary",
AS_GLOBAL, 0, "",
_( "Filter by library" ),
_( "Filter footprint list by library" ),
module_library_list_xpm, AF_NONE,
(void*) FOOTPRINTS_LISTBOX::FILTERING_BY_LIBRARY );
TOOL_ACTION CVPCB_ACTIONS::filterFPbyDisplayName( "cvpcb.Control.FilterFPByDisplayName", AS_GLOBAL,
0, "",
TOOL_ACTION CVPCB_ACTIONS::FilterFPbyTextPattern( "cvpcb.Control.FilterFPbyTextPattern",
AS_GLOBAL, 0, "",
_( "Filter by display name" ),
_( "Filter footprint list using a partial name or a pattern" ),
_( "Filter footprint list using plain text matching or regular expressions" ),
module_name_filtered_list_xpm, AF_NONE,
(void*) FOOTPRINTS_LISTBOX::FILTERING_BY_TEXT_PATTERN );

6
cvpcb/tools/cvpcb_actions.h
View File

@ -66,10 +66,10 @@ public:
static TOOL_ACTION deleteAssoc;
/// Footprint Filtering actions
static TOOL_ACTION filterFPbyKeywords;
static TOOL_ACTION FilterFPbyFPFilters;
static TOOL_ACTION filterFPbyPin;
static TOOL_ACTION filterFPbyLibrary;
static TOOL_ACTION filterFPbyDisplayName;
static TOOL_ACTION FilterFPbyLibrary;
static TOOL_ACTION FilterFPbyTextPattern;
///> @copydoc COMMON_ACTIONS::TranslateLegacyId()
virtual OPT<TOOL_EVENT> TranslateLegacyId( int aId ) override { return OPT<TOOL_EVENT>(); }

6
cvpcb/tools/cvpcb_control.cpp
View File

@ -320,8 +320,8 @@ void CVPCB_CONTROL::setTransitions()
Go( &CVPCB_CONTROL::ToNA, CVPCB_ACTIONS::gotoPreviousNA.MakeEvent() );
// Filter the footprints
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::filterFPbyKeywords.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::filterFPbyLibrary.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::FilterFPbyFPFilters.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::FilterFPbyLibrary.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::filterFPbyPin.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::filterFPbyDisplayName.MakeEvent() );
Go( &CVPCB_CONTROL::ToggleFootprintFilter, CVPCB_ACTIONS::FilterFPbyTextPattern.MakeEvent() );
}