Commit 60a6be33 authored by charras's avatar charras
Browse files

eeschema, fixed : after a change in library list (Preference menu) the library... 

eeschema, fixed : after a change in library list (Preference menu) the library cache was the first in priority list (now it is the last ,as it does)
parent 035b5102

eeschema/class_library.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -48,9 +48,9 @@ bool operator!=( const CMP_LIBRARY& aLibrary, const wxChar* aName ) 
bool operator<( const CMP_LIBRARY& aItem1, const CMP_LIBRARY& aItem2 )

bool operator<( const CMP_LIBRARY& aItem1, const CMP_LIBRARY& aItem2 )

{

{

    /* The cache library always is sorted to the end of the library list. */

    /* The cache library always is sorted to the end of the library list. */

    if( aItem1.IsCache() )

        return true;

    if( aItem2.IsCache() )

    if( aItem2.IsCache() )

        return true;

    if( aItem1.IsCache() )

        return false;

        return false;





    /* If the sort order array isn't set, then sort alphabetically except. */

    /* If the sort order array isn't set, then sort alphabetically except. */

eeschema/dialog_edit_component_in_lib.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( WinEDA_Libed 
{

{

	m_Parent = aParent;

	m_Parent = aParent;

	m_RecreateToolbar = false;

	m_RecreateToolbar = false;

	m_AliasLocation = -1;





	Init();

	Init();

eeschema/eelibs_read_libraryfiles.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -106,15 +106,16 @@ Error: %s" ), 
    CMP_LIBRARY::GetLibraryList().sort();

    CMP_LIBRARY::GetLibraryList().sort();





#ifdef __WXDEBUG__

#ifdef __WXDEBUG__

    wxLogDebug( wxT( "Requested component library sort order." ) );

    wxLogDebug( wxT( "LoadLibraries () requested component library sort order:" ) );





    for( size_t i = 0; i < sortOrder.GetCount(); i++ )

    for( size_t i = 0; i < sortOrder.GetCount(); i++ )

        wxLogDebug( wxT( "    " ) + sortOrder[i] );

        wxLogDebug( wxT( "    " ) + sortOrder[i] );





    wxLogDebug( wxT( "Component library sort order:" ) );

    wxLogDebug( wxT( "Real component library sort order:" ) );





    for ( i = CMP_LIBRARY::GetLibraryList().begin();

    for ( i = CMP_LIBRARY::GetLibraryList().begin();

          i < CMP_LIBRARY::GetLibraryList().end(); i++ )

          i < CMP_LIBRARY::GetLibraryList().end(); i++ )

        wxLogDebug( wxT( "    " ) + i->GetName() );

        wxLogDebug( wxT( "    " ) + i->GetName() );

    wxLogDebug( wxT( "end LoadLibraries ()" ) );

#endif

#endif

}
 
}

eeschema/files-io.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, 
    {

    {

        wxString errMsg;

        wxString errMsg;





        wxLogDebug( wxT( "Load schematic cache library file <%s>" ),

        wxLogDebug( wxT( "LoadOneEEProject() load schematic cache library file <%s>" ),

                    GetChars( fn.GetFullPath() ) );

                    GetChars( fn.GetFullPath() ) );

        msg = wxT( "Load " ) + fn.GetFullPath();

        msg = wxT( "Load " ) + fn.GetFullPath();