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

Replace DisplayError to an infobar for missing footprint library

This commit is contained in:
Josue Huaroto 2023-08-23 22:05:44 +00:00 committed by Seth Hillbrand
parent db8e15ce88
commit c19804bb95
1 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pcbnew/footprint_viewer_frame.cpp
View File

@ -65,6 +65,9 @@
#include <wx/srchctrl.h> #include <wx/srchctrl.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/hyperlink.h>
#include "invoke_pcb_dialog.h"
using namespace std::placeholders; using namespace std::placeholders;
@ -1059,21 +1062,52 @@ bool FOOTPRINT_VIEWER_FRAME::ShowModal( wxString* aFootprint, wxWindow* aParent
if( fpid.IsValid() ) if( fpid.IsValid() )
{ {
wxString libraryName = fpid.GetLibNickname(); wxString libraryName = fpid.GetLibNickname();
WX_INFOBAR* infobar;
wxHyperlinkCtrl* button;
bool hasInfobar = false;
if( !fpTable->HasLibrary( fpid.GetLibNickname(), false )
|| !fpTable->HasLibrary( fpid.GetLibNickname(), true ) )
{
CreateInfoBar();
if( infobar = GetInfoBar() )
{
hasInfobar = true;
button = new wxHyperlinkCtrl( infobar, wxID_ANY,
_( "Manage symol libraries" ),
wxEmptyString );
button->Bind( wxEVT_COMMAND_HYPERLINK, std::function<void( wxHyperlinkEvent & aEvent )>(
[=]( wxHyperlinkEvent& aEvent )
{
InvokePcbLibTableEditor( &Kiway(), this );
} ) );
}
}
if( !fpTable->HasLibrary( fpid.GetLibNickname(), false ) ) if( !fpTable->HasLibrary( fpid.GetLibNickname(), false ) )
{ {
msg.sprintf( _( "The current configuration does not include library '%s'. Use " if( hasInfobar )
"Manage Footprint Libraries to edit the configuration." ), {
libraryName ); msg.Printf( _( "Footprint library not found. The current configuration does "
DisplayErrorMessage( aParent, _( "Footprint library not found." ), msg ); "not include library '%s'." ), libraryName );
infobar->RemoveAllButtons();
infobar->AddButton( button );
infobar->AddCloseButton();
infobar->ShowMessage( msg, wxICON_INFORMATION );
}
} }
else if ( !fpTable->HasLibrary( fpid.GetLibNickname(), true ) ) else if ( !fpTable->HasLibrary( fpid.GetLibNickname(), true ) )
{ {
msg.sprintf( _( "Library '%s' is not enabled in the current configuration. Use " if( hasInfobar )
"Manage Footprint Libraries to edit the configuration." ), {
libraryName ); msg.Printf( _( "Footprint library not enabled. Library '%s' is not enabled "
DisplayErrorMessage( aParent, _( "Footprint library not enabled." ), msg ); "in the current configuration." ), libraryName );
infobar->RemoveAllButtons();
infobar->AddButton( button );
infobar->AddCloseButton();
infobar->ShowMessage( msg, wxICON_INFORMATION );
}
} }
else else
{ {