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

Update find history in combobox when history item is selected.

This commit is contained in:
Jeff Young 2019-07-26 23:50:51 -06:00
parent 5347c2ad3d
commit 4e40534d21
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/dialogs/dialog_find.cpp
View File

@ -84,6 +84,8 @@ void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
PCB_SCREEN* screen = m_frame->GetScreen(); PCB_SCREEN* screen = m_frame->GetScreen();
int flags = 0; int flags = 0;
wxString msg; wxString msg;
wxString searchString = m_SearchCombo->GetValue();
int index = m_SearchCombo->FindString( searchString, true );
if( m_matchCase->GetValue() ) if( m_matchCase->GetValue() )
flags |= wxFR_MATCHCASE; flags |= wxFR_MATCHCASE;
@ -94,8 +96,18 @@ void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
if( m_wildcards->GetValue() ) if( m_wildcards->GetValue() )
flags |= FR_MATCH_WILDCARD; flags |= FR_MATCH_WILDCARD;
m_frame->GetToolManager()->RunAction( PCB_ACTIONS::selectionClear, true ); if( index == wxNOT_FOUND )
wxString searchString = m_SearchCombo->GetValue(); {
m_SearchCombo->Insert( searchString, 0 );
}
else if( index != 0 )
{
/* Move the search string to the top of the list if it isn't already there. */
m_SearchCombo->Delete( index );
m_SearchCombo->Insert( searchString, 0 );
m_SearchCombo->SetSelection( 0 );
}
wxString last; wxString last;
if( !m_frame->GetFindHistoryList().empty() ) if( !m_frame->GetFindHistoryList().empty() )
@ -111,6 +123,7 @@ void DIALOG_FIND::onButtonFindItemClick( wxCommandEvent& aEvent )
m_frame->GetFindReplaceData().SetFindString( searchString ); m_frame->GetFindReplaceData().SetFindString( searchString );
m_frame->GetFindReplaceData().SetFlags( flags ); m_frame->GetFindReplaceData().SetFlags( flags );
m_frame->GetToolManager()->RunAction( PCB_ACTIONS::selectionClear, true );
m_frame->GetCanvas()->GetViewStart( &screen->m_StartVisu.x, &screen->m_StartVisu.y ); m_frame->GetCanvas()->GetViewStart( &screen->m_StartVisu.x, &screen->m_StartVisu.y );
int count = 0; int count = 0;