CvPcb filtering and other minor improvements.

* Change filtering from single selection to logically and each filter type.
* Remove clear filtering button and logic.
* Filter buttons now behave as true toggle buttons.
* Improve list control pane focus following when using arrow keys to change
  list pane.
* Remove unused parameters from list box constructors.
* Make tab key behave like right arrow key when moving focus to next list
  pane.
* Make list pane focus wrap around to next or previous control.
* Simplify component list filtering code.
* Improve status bar updating.
* Tell Bazaar to ignore .downloads-by-cmake instead of downloads-by-cmake.

.bzrignore

 include/boost
-downloads-by-cmake
+.downloads-by-cmake
 common/netlist_keywords.*
 common/netlist_lexer.h
 common/pcb_plot_params_lexer.h

cvpcb/class_components_listbox.cpp

-/*************************************************************************/
-/* listboxes.cpp: class for displaying footprint list and component list */
-/*************************************************************************/
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * @file class_components_listbox.h
+ */
 
 #include <fctsys.h>
 #include <wxstruct.h>
@@ -8,15 +31,11 @@
 #include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <cvstruct.h>
+#include <cvpcb_id.h>
 
 
-/**************************************************/
-/* ListBox handling the schematic components list */
-/**************************************************/
-
 COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
-                                        const wxPoint& loc, const wxSize& size,
-                                        int nbitems, wxString choice[] ) :
+                                        const wxPoint& loc, const wxSize& size ) :
     ITEMS_LISTBOX_BASE( parent, id, loc, size, LISTB_STYLE & ~wxLC_SINGLE_SEL )
 {
 }
@@ -27,12 +46,10 @@ COMPONENTS_LISTBOX::~COMPONENTS_LISTBOX()
 }
 
 
-/* Build the events table for the schematic components list box
- */
-
 BEGIN_EVENT_TABLE( COMPONENTS_LISTBOX, ITEMS_LISTBOX_BASE )
     EVT_SIZE( ITEMS_LISTBOX_BASE::OnSize )
     EVT_CHAR( COMPONENTS_LISTBOX::OnChar )
+    EVT_LIST_ITEM_SELECTED( ID_CVPCB_COMPONENT_LIST, COMPONENTS_LISTBOX::OnSelectComponent )
 END_EVENT_TABLE()
 
 
@@ -53,6 +70,7 @@ void COMPONENTS_LISTBOX::SetString( unsigned linecount, const wxString& text )
 {
     if( linecount >= m_ComponentList.Count() )
         linecount = m_ComponentList.Count() - 1;
+
     if( linecount >= 0 )
         m_ComponentList[linecount] = text;
 }
@@ -65,19 +83,12 @@ void COMPONENTS_LISTBOX::AppendLine( const wxString& text )
 }
 
 
-/*
- * Overlaid function: MUST be provided in wxLC_VIRTUAL mode
- * because real data are not handled by ITEMS_LISTBOX_BASE
- */
 wxString COMPONENTS_LISTBOX::OnGetItemText( long item, long column ) const
 {
     return m_ComponentList.Item( item );
 }
 
 
-/*
- * Enable or disable an item
- */
 void COMPONENTS_LISTBOX::SetSelection( unsigned index, bool State )
 {
     if( (int) index >= GetCount() )
@@ -87,6 +98,7 @@ void COMPONENTS_LISTBOX::SetSelection( unsigned index, bool State )
     {
         Select( index, State );
         EnsureVisible( index );
+
 #ifdef __WXMAC__
         Update();
 #endif
@@ -94,23 +106,23 @@ void COMPONENTS_LISTBOX::SetSelection( unsigned index, bool State )
 }
 
 
-/**
- * Function OnChar
- * called on a key pressed
- * Call default handler for some special keys,
- * and for "ascii" keys, select the first component
- * that the name starts by the letter.
- * This is the defaut behaviour of a listbox, but because we use
- * virtual lists, the listbox does not know anything to what is displayed,
- * we must handle this behaviour here.
- * Furthermore the reference of components is not at the beginning of
- * displayed lines (the first word is the line number)
- */
 void COMPONENTS_LISTBOX::OnChar( wxKeyEvent& event )
 {
     int key = event.GetKeyCode();
+
     switch( key )
     {
+    case WXK_TAB:
+    case WXK_RIGHT:
+    case WXK_NUMPAD_RIGHT:
+        GetParent()->m_FootprintList->SetFocus();
+        return;
+
+    case WXK_LEFT:
+    case WXK_NUMPAD_LEFT:
+        GetParent()->m_LibraryList->SetFocus();
+        return;
+
     case WXK_HOME:
     case WXK_END:
     case WXK_UP:
@@ -120,47 +132,48 @@ void COMPONENTS_LISTBOX::OnChar( wxKeyEvent& event )
         event.Skip();
         return;
 
-        case WXK_LEFT:
-        case WXK_NUMPAD_LEFT:
-            GetParent()->m_LibraryList->SetFocus();
-            return;
-
-        case WXK_RIGHT:
-        case WXK_NUMPAD_RIGHT:
-            GetParent()->m_FootprintList->SetFocus();
-            return;
 
     default:
         break;
     }
 
     // Search for an item name starting by the key code:
-    key = toupper(key);
+    key = toupper( key );
+
     for( unsigned ii = 0; ii < m_ComponentList.GetCount(); ii++ )
     {
-        wxString text = m_ComponentList.Item(ii);
-        /* search for the start char of the footprint name.
-         * we must skip the line number
-        */
-        text.Trim(false);      // Remove leading spaces in line
+        wxString text = m_ComponentList.Item( ii );
+
+        // Search for the start char of the footprint name.  Skip the line number.
+        text.Trim( false );      // Remove leading spaces in line
         unsigned jj = 0;
+
         for( ; jj < text.Len(); jj++ )
         {   // skip line number
             if( text[jj] == ' ' )
                 break;
         }
+
         for( ; jj < text.Len(); jj++ )
         {   // skip blanks
             if( text[jj] != ' ' )
                 break;
         }
-        int start_char = toupper(text[jj]);
-        if ( key == start_char )
+
+        int start_char = toupper( text[jj] );
+
+        if( key == start_char )
         {
             Focus( ii );
             SetSelection( ii, true );   // Ensure visible
             break;
         }
     }
+}
 
+
+void COMPONENTS_LISTBOX::OnSelectComponent( wxListEvent& event )
+{
+    SetFocus();
+    GetParent()->OnSelectComponent( event );
 }

cvpcb/class_library_listbox.cpp

@@ -33,19 +33,17 @@
 #include <cvpcb.h>
 #include <cvpcb_mainframe.h>
 #include <cvstruct.h>
+#include <cvpcb_id.h>
 
 
 /***************************************/
 /* ListBox handling the library list */
 /***************************************/
 
-LIBRARY_LISTBOX::LIBRARY_LISTBOX( CVPCB_MAINFRAME* parent,
-                                        wxWindowID id, const wxPoint& loc,
-                                        const wxSize& size,
-                                        int nbitems, wxString choice[] ) :
+LIBRARY_LISTBOX::LIBRARY_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
+                                  const wxPoint& loc, const wxSize& size ) :
     ITEMS_LISTBOX_BASE( parent, id, loc, size )
 {
-    //ListLibraries();
 }
 
 
@@ -54,24 +52,19 @@ LIBRARY_LISTBOX::~LIBRARY_LISTBOX()
 }
 
 
-/*
- * Return number of items
- */
 int LIBRARY_LISTBOX::GetCount()
 {
-    return m_LibraryList.Count();
+    return m_libraryList.Count();
 }
 
 
-/*
- * Change an item text
- */
 void LIBRARY_LISTBOX::SetString( unsigned linecount, const wxString& text )
 {
-    if( linecount >= m_LibraryList.Count() )
-        linecount = m_LibraryList.Count() - 1;
+    if( linecount >= m_libraryList.Count() )
+        linecount = m_libraryList.Count() - 1;
+
     if( linecount >= 0 )
-        m_LibraryList[linecount] = text;
+        m_libraryList[linecount] = text;
 }
 
 
@@ -82,7 +75,7 @@ wxString LIBRARY_LISTBOX::GetSelectedLibrary()
 
     if( ii >= 0 )
     {
-        libraryName = m_LibraryList[ii];
+        libraryName = m_libraryList[ii];
     }
 
     return libraryName;
@@ -91,23 +84,17 @@ wxString LIBRARY_LISTBOX::GetSelectedLibrary()
 
 void LIBRARY_LISTBOX::AppendLine( const wxString& text )
 {
-    m_LibraryList.Add( text );
-    SetItemCount( m_LibraryList.Count() );
+    m_libraryList.Add( text );
+    SetItemCount( m_libraryList.Count() );
 }
 
 
-/*
- * Overlaid function: MUST be provided in wxLC_VIRTUAL mode
- * because real data is not handled by ITEMS_LISTBOX_BASE
- */
 wxString LIBRARY_LISTBOX::OnGetItemText( long item, long column ) const
 {
-    return m_LibraryList.Item( item );
+    return m_libraryList.Item( item );
 }
 
-/*
- * Enable or disable an item
- */
+
 void LIBRARY_LISTBOX::SetSelection( unsigned index, bool State )
 {
     if( (int) index >= GetCount() )
@@ -126,83 +113,69 @@ void LIBRARY_LISTBOX::SetSelection( unsigned index, bool State )
 }
 
 
-void LIBRARY_LISTBOX::SetLibraryList( wxArrayString list )
+void LIBRARY_LISTBOX::SetLibraryList( const wxArrayString& aList )
 {
-    wxString msg;
     int oldSelection = GetSelection();
 
-    m_LibraryList.Clear();
-
-    for( unsigned ii = 0; ii < list.GetCount(); ii++ )
-    {
-        msg = list.Item(ii);
-        m_LibraryList.Add( msg );
-    }
+    m_libraryList = aList;
 
-    SetItemCount(list.GetCount());
+    SetItemCount( m_libraryList.GetCount() );
 
     if(  GetCount() == 0 || oldSelection < 0 || oldSelection >= GetCount() )
         SetSelection( 0, true );
+
     Refresh();
 }
 
 
-/**************************************/
-/* Event table for the library list */
-/**************************************/
-
 BEGIN_EVENT_TABLE( LIBRARY_LISTBOX, ITEMS_LISTBOX_BASE )
     EVT_SIZE( ITEMS_LISTBOX_BASE::OnSize )
     EVT_CHAR( LIBRARY_LISTBOX::OnChar )
+    EVT_LIST_ITEM_SELECTED( ID_CVPCB_LIBRARY_LIST, LIBRARY_LISTBOX::OnSelectLibrary )
 END_EVENT_TABLE()
 
 
-/**
- * Function OnChar
- * called on a key pressed
- * Call default handler for some special keys,
- * and for "ascii" keys, select the first footprint
- * that the name starts by the letter.
- * This is the defaut behaviour of a listbox, but because we use
- * virtual lists, the listbox does not know anything to what is displayed,
- * we must handle this behaviour here.
- * Furthermore the footprint name is not at the beginning of
- * displayed lines (the first word is the line number)
- */
 void LIBRARY_LISTBOX::OnChar( wxKeyEvent& event )
 {
     int key = event.GetKeyCode();
+
     switch( key )
     {
+    case WXK_TAB:
     case WXK_RIGHT:
     case WXK_NUMPAD_RIGHT:
         GetParent()->m_ListCmp->SetFocus();
         return;
 
+    case WXK_LEFT:
+    case WXK_NUMPAD_LEFT:
+        GetParent()->m_FootprintList->SetFocus();
+        return;
+
     case WXK_HOME:
     case WXK_END:
     case WXK_UP:
     case WXK_DOWN:
     case WXK_PAGEUP:
     case WXK_PAGEDOWN:
-        case WXK_LEFT:
-        case WXK_NUMPAD_LEFT:
         event.Skip();
         return;
 
     default:
         break;
     }
+
     // Search for an item name starting by the key code:
     key = toupper(key);
-    for( unsigned ii = 0; ii < m_LibraryList.GetCount(); ii++ )
+
+    for( unsigned ii = 0; ii < m_libraryList.GetCount(); ii++ )
     {
-        wxString text = m_LibraryList.Item(ii);
-        /* search for the start char of the footprint name.
-         * we must skip the line number
-        */
-        text.Trim(false);      // Remove leading spaces in line
+        wxString text = m_libraryList.Item( ii );
+
+        // Search for the start char of the footprint name.  Skip the line number.
+        text.Trim( false );      // Remove leading spaces in line
         unsigned jj = 0;
+
         for( ; jj < text.Len(); jj++ )
         {
             // skip line number
@@ -217,6 +190,7 @@ void LIBRARY_LISTBOX::OnChar( wxKeyEvent& event )
         }
 
         int start_char = toupper( text[jj] );
+
         if( key == start_char )
         {
             Focus( ii );
@@ -225,3 +199,10 @@ void LIBRARY_LISTBOX::OnChar( wxKeyEvent& event )
         }
     }
 }
+
+
+void LIBRARY_LISTBOX::OnSelectLibrary( wxListEvent& event )
+{
+    SetFocus();
+    GetParent()->OnSelectComponent( event );
+}

cvpcb/cvpcb_mainframe.h

@@ -45,6 +45,7 @@ class FOOTPRINTS_LISTBOX;
 class COMPONENTS_LISTBOX;
 class LIBRARY_LISTBOX;
 class DISPLAY_FOOTPRINTS_FRAME;
+class COMPONENT;
 
 
 /**
@@ -52,8 +53,9 @@ class DISPLAY_FOOTPRINTS_FRAME;
  */
 class CVPCB_MAINFRAME : public EDA_BASE_FRAME
 {
-public:
+    wxArrayString             m_footprintListEntries;
 
+public:
     bool                      m_KeepCvpcbOpen;
     FOOTPRINTS_LISTBOX*       m_FootprintList;
     LIBRARY_LISTBOX*          m_LibraryList;
@@ -81,9 +83,6 @@ public:
     CVPCB_MAINFRAME( const wxString& title, long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
     ~CVPCB_MAINFRAME();
 
-    void             OnLeftClick( wxListEvent& event );
-    void             OnLeftDClick( wxListEvent& event );
-
     /**
      * Function OnSelectComponent
      * Called when clicking on a component in component list window
@@ -275,6 +274,8 @@ public:
      */
     void SendMessageToEESCHEMA();
 
+    COMPONENT* GetSelectedComponent();
+
     DECLARE_EVENT_TABLE()
 };
 

cvpcb/cvstruct.h

@@ -29,6 +29,7 @@
 #define CVSTRUCT_H
 
 #include <wx/listctrl.h>
+
 #include <cvpcb.h>
 
 /*  Forward declarations of all top-level window classes. */
@@ -45,7 +46,7 @@ class ITEMS_LISTBOX_BASE : public wxListView
 public:
     ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
                         const wxPoint& aLocation, const wxSize& aSize,
-                        long aStyle = wxLC_SINGLE_SEL);
+                        long aStyle = wxLC_SINGLE_SEL );
 
     ~ITEMS_LISTBOX_BASE();
 
@@ -55,48 +56,54 @@ public:
     virtual CVPCB_MAINFRAME* GetParent();
 };
 
+
 /******************************************/
 /* ListBox showing the list of footprints */
 /******************************************/
-
 class FOOTPRINTS_LISTBOX : public ITEMS_LISTBOX_BASE
 {
 private:
-    wxArrayString  m_FullFootprintList;
-    wxArrayString  m_FilteredFootprintList;
-public:
-    wxArrayString* m_ActiveFootprintList;
-    bool           m_UseFootprintFullList;
+    wxArrayString  m_footprintList;
 
 public:
+    enum FP_FILTER_T
+    {
+        UNFILTERED   = 0,
+        BY_COMPONENT = 0x0001,
+        BY_PIN_COUNT = 0x0002,
+        BY_LIBRARY   = 0x0004,
+    };
+
     FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
-                        const wxPoint& loc, const wxSize& size,
-                        int nbitems, wxString choice[] );
+                        const wxPoint& loc, const wxSize& size );
     ~FOOTPRINTS_LISTBOX();
 
     int      GetCount();
     void     SetSelection( unsigned index, bool State = true );
     void     SetString( unsigned linecount, const wxString& text );
     void     AppendLine( const wxString& text );
-    void     SetFootprintFullList( FOOTPRINT_LIST& list );
-    void     SetFootprintFilteredList( COMPONENT*      aComponent,
-                                       FOOTPRINT_LIST& aList );
-    void     SetFootprintFilteredByPinCount( COMPONENT*      aComponent,
-                                             FOOTPRINT_LIST& aList );
-    void     SetFootprintFilteredByLibraryList( FOOTPRINT_LIST& list,
-                                                wxString SelectedLibrary  );
 
     /**
-     * Set the footprint list. We can have 2 footprint list:
-     *  The full footprint list
-     *  The filtered footprint list (if the current selected component has a
-     * filter for footprints)
-     *  @param FullList true = full footprint list, false = filtered footprint list
-     *  @param Redraw = true to redraw the window
+     * Function SetFootprints
+     * populates the wxListCtrl with the footprints from \a aList that meet the filter
+     * criteria defined by \a aFilterType.
+     *
+     * @param aList is a #FOOTPRINT_LIST item containing the footprints.
+     * @param aLibName is wxString containing the name of the selected library.  Can be
+     *                 wxEmptyString.
+     * @param aComponent is the #COMPONENT used by the filtering criteria.  Can be NULL.
+     * @param aFilterType defines the criteria to filter \a aList.
      */
-    void     SetActiveFootprintList( bool FullList, bool Redraw = false );
+    void     SetFootprints( FOOTPRINT_LIST& aList, const wxString& aLibName,
+                            COMPONENT* aComponent, int aFilterType );
 
     wxString GetSelectedFootprint();
+
+    /**
+     * Function OnGetItemText
+     * this overloaded function MUST be provided for the wxLC_VIRTUAL mode
+     * because real data is not handled by ITEMS_LISTBOX_BASE
+     */
     wxString OnGetItemText( long item, long column ) const;
 
     // Events functions:
@@ -107,43 +114,54 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
+
 /******************************************/
 /* ListBox showing the list of library */
 /******************************************/
-
 class LIBRARY_LISTBOX : public ITEMS_LISTBOX_BASE
 {
-//private:
-
-public:
-    wxArrayString  m_LibraryList;
+    wxArrayString  m_libraryList;
 
 public:
     LIBRARY_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
-                     const wxPoint& loc, const wxSize& size,
-                     int nbitems, wxString choice[] );
+                     const wxPoint& loc, const wxSize& size );
     ~LIBRARY_LISTBOX();
 
     int      GetCount();
     void     SetSelection( unsigned index, bool State = true );
     void     SetString( unsigned linecount, const wxString& text );
     void     AppendLine( const wxString& text );
-    void     SetLibraryList( wxArrayString list );
+    void     SetLibraryList( const wxArrayString& aList );
 
     wxString GetSelectedLibrary();
     wxString OnGetItemText( long item, long column ) const;
 
     // Events functions:
     void     OnLeftClick( wxListEvent& event );
+
+    void     OnSelectLibrary( wxListEvent& event );
+
+    /**
+     * Function OnChar
+     * called on a key pressed
+     * Call default handler for some special keys,
+     * and for "ascii" keys, select the first footprint
+     * that the name starts by the letter.
+     * This is the defaut behaviour of a listbox, but because we use
+     * virtual lists, the listbox does not know anything to what is displayed,
+     * we must handle this behaviour here.
+     * Furthermore the footprint name is not at the beginning of
+     * displayed lines (the first word is the line number)
+     */
     void     OnChar( wxKeyEvent& event );
 
     DECLARE_EVENT_TABLE()
 };
 
+
 /****************************************************/
 /* ListBox showing the list of schematic components */
 /****************************************************/
-
 class COMPONENTS_LISTBOX : public ITEMS_LISTBOX_BASE
 {
 public:
@@ -153,21 +171,45 @@ public:
 public:
 
     COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
-                        const wxPoint& loc, const wxSize& size,
-                        int nbitems, wxString choice[] );
+                        const wxPoint& loc, const wxSize& size );
 
     ~COMPONENTS_LISTBOX();
 
     void     Clear();
     int      GetCount();
+
+    /**
+     * Function OnGetItemText
+     * this overloaded function MUST be provided for the wxLC_VIRTUAL mode
+     * because real data is not handled by ITEMS_LISTBOX_BASE
+     */
     wxString OnGetItemText( long item, long column ) const;
+
+    /*
+     * Enable or disable an item
+     */
     void     SetSelection( unsigned index, bool State = true );
     void     SetString( unsigned linecount, const wxString& text );
     void     AppendLine( const wxString& text );
 
     // Events functions:
+
+    /**
+     * Function OnChar
+     * called on a key pressed
+     * Call default handler for some special keys,
+     * and for "ascii" keys, select the first component
+     * that the name starts by the letter.
+     * This is the default behavior of a listbox, but because we use
+     * virtual lists, the listbox does not know anything to what is displayed,
+     * we must handle this behavior here.
+     * Furthermore the reference of components is not at the beginning of
+     * displayed lines (the first word is the line number)
+     */
     void     OnChar( wxKeyEvent& event );
 
+    void     OnSelectComponent( wxListEvent& event );
+
     DECLARE_EVENT_TABLE()
 };
 

cvpcb/listboxes.cpp

@@ -83,90 +83,3 @@ CVPCB_MAINFRAME* ITEMS_LISTBOX_BASE::GetParent()
 {
     return (CVPCB_MAINFRAME*) wxListView::GetParent();
 }
-
-
-/*
- * Create or update the schematic components list.
- */
-void CVPCB_MAINFRAME::BuildCmpListBox()
-{
-    COMPONENT*  component;
-    wxString    msg;
-    wxSize      size( 10, 10 );
-    wxFont      guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-
-    if( m_ListCmp == NULL )
-    {
-        m_ListCmp = new COMPONENTS_LISTBOX( this, ID_CVPCB_COMPONENT_LIST,
-                                            wxDefaultPosition, size,
-                                            0, NULL );
-        m_ListCmp->SetFont( wxFont( guiFont.GetPointSize(),
-                                    wxFONTFAMILY_MODERN,
-                                    wxFONTSTYLE_NORMAL,
-                                    wxFONTWEIGHT_NORMAL ) );
-    }
-
-    m_ListCmp->m_ComponentList.Clear();
-
-    for( unsigned i = 0;  i < m_netlist.GetCount();  i++ )
-    {
-        component = m_netlist.GetComponent( i );
-
-        msg.Printf( CMP_FORMAT, m_ListCmp->GetCount() + 1,
-                    GetChars( component->GetReference() ),
-                    GetChars( component->GetValue() ),
-                    GetChars( component->GetFootprintName() ) );
-        m_ListCmp->m_ComponentList.Add( msg );
-    }
-
-    m_ListCmp->SetItemCount( m_ListCmp->m_ComponentList.Count() );
-    m_ListCmp->SetSelection( 0, true );
-}
-
-
-/*
- * Create or update the footprint list.
- */
-void CVPCB_MAINFRAME::BuildFOOTPRINTS_LISTBOX()
-{
-    wxString msg;
-    wxSize   size( 10, 10 );
-    wxFont   guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-
-    if( m_FootprintList == NULL )
-    {
-        m_FootprintList = new FOOTPRINTS_LISTBOX( this, ID_CVPCB_FOOTPRINT_LIST,
-                                                  wxDefaultPosition, size,
-                                                  0, NULL );
-        m_FootprintList->SetFont( wxFont( guiFont.GetPointSize(),
-                                          wxFONTFAMILY_MODERN,
-                                          wxFONTSTYLE_NORMAL,
-                                          wxFONTWEIGHT_NORMAL ) );
-    }
-
-    m_FootprintList->SetFootprintFullList( m_footprints );
-    DisplayStatus();
-}
-
-/*
- * Create or update the library list.
- */
-void CVPCB_MAINFRAME::BuildLIBRARY_LISTBOX()
-{
-    wxString msg;
-    wxSize   size( 10, 10 );
-    wxFont   guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
-
-    if( m_LibraryList == NULL )
-    {
-        m_LibraryList = new LIBRARY_LISTBOX( this, ID_CVPCB_LIBRARY_LIST,
-                                             wxDefaultPosition, size,
-                                             0 , NULL );
-        m_LibraryList->SetFont( wxFont( guiFont.GetPointSize(),
-                                        wxFONTFAMILY_MODERN,
-                                        wxFONTSTYLE_NORMAL,
-                                        wxFONTWEIGHT_NORMAL ) );
-    }
-
-    m_LibraryList->SetLibraryList( m_ModuleLibNames );
-}

cvpcb/tool_cvpcb.cpp

@@ -94,36 +94,30 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
                             KiBitmap( module_filtered_list_xpm ),
                             wxNullBitmap,
                             true, NULL,
-                            _( "Display the filtered footprint list for the current component" ),
+                            _( "Filter the footprint list for the current component key words" ),
                             wxEmptyString );
 
     m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST,
                             KiBitmap( module_pin_filtered_list_xpm ),
                             wxNullBitmap,
                             true, NULL,
-                            _( "Display the filtered footprint list by pin count for the current component" ),
+                            _( "Filter the footprint list by pin count for the current component" ),
                             wxEmptyString );
 
     m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST,
                             KiBitmap( module_library_list_xpm ),
                             wxNullBitmap, true, NULL,
-                            _( "Display the footprint list from selected library" ),
-                            wxEmptyString );
-
-    m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
-                            KiBitmap( module_full_list_xpm ),
-                            wxNullBitmap, true, NULL,
-                            _( "Display the full footprint list (without filtering)" ),
+                            _( "Filter the footprint list by the selected library" ),
                             wxEmptyString );
 
     if( config )
     {
         wxString key = wxT( FILTERFOOTPRINTKEY );
         int      opt = config->Read( key, (long) 1 );
-        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST, opt == 3 );
-        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, opt == 2 );
-        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, opt == 1 );
-        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, opt == 0 );
+
+        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_BY_LIBRARY_LIST, opt & 4 );
+        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, opt & 2 );
+        m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, opt & 1 );
     }
 
     // after adding the buttons to the toolbar, must call Realize() to reflect the changes

pcbnew/netlist_reader.cpp

@@ -92,6 +92,24 @@ const COMPONENT_NET& COMPONENT::GetNet( const wxString& aPinName )
 }
 
 
+bool COMPONENT::MatchesFootprintFilters( const wxString& aFootprintName ) const
+{
+    if( m_footprintFilters.GetCount() == 0 )
+        return true;
+
+    // The matching is case insensitive
+    wxString name = aFootprintName.Upper();
+
+    for( unsigned ii = 0; ii < m_footprintFilters.GetCount(); ii++ )
+    {
+        if( name.Matches( m_footprintFilters[ii].Upper() ) )
+            return true;
+    }
+
+    return false;
+}
+
+
 #if defined(DEBUG)
 void COMPONENT::Show( int aNestLevel, REPORTER& aReporter )
 {

pcbnew/netlist_reader.h

@@ -197,6 +197,14 @@ public:
 
     const wxArrayString& GetFootprintFilters() const { return m_footprintFilters; }
 
+    /**
+     * Function MatchesFootprintFilters
+     *
+     * @return true if \a aFootprintName matches any of the footprint filters or no footprint
+     *         filters are defined.
+     */
+    bool MatchesFootprintFilters( const wxString& aFootprintName ) const;
+
     MODULE* GetModule( bool aRelease = false )
     {
         return ( aRelease ) ? m_footprint.release() : m_footprint.get();