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

Formatting.

This commit is contained in:
Jeff Young 2020-12-12 21:54:47 +00:00
parent 7565f60a03
commit 1db7ffad5e
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/symbol_editor/symbol_library_manager.cpp
View File

@ -178,7 +178,7 @@ bool SYMBOL_LIBRARY_MANAGER::SaveLibrary( const wxString& aLibrary, const wxStri
PROPERTIES properties; PROPERTIES properties;
properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" ); properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" );
for( auto part : getOriginalParts( aLibrary ) ) for( LIB_PART* part : getOriginalParts( aLibrary ) )
{ {
LIB_PART* newSymbol; LIB_PART* newSymbol;

8
eeschema/symbol_editor/symbol_library_manager.h
View File

@ -104,8 +104,11 @@ public:
/** /**
* Updates the SYMBOL_LIBRARY_MANAGER data to synchronize with Symbol Library Table. * Updates the SYMBOL_LIBRARY_MANAGER data to synchronize with Symbol Library Table.
*/ */
void Sync( bool aForce = false, std::function<void(int, int, const wxString&)> aProgressCallback void Sync( bool aForce = false,
= [](int, int, const wxString&){} ); std::function<void( int, int, const wxString& )> aProgressCallback
= []( int, int, const wxString& )
{
} );
int GetHash() const; int GetHash() const;
@ -481,7 +484,6 @@ private:
wxString m_currentPart; ///< Currently modified library wxString m_currentPart; ///< Currently modified library
wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER> m_adapter; wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER> m_adapter;
}; };
#endif /* SYMBOL_LIBRARY_MANAGER_H */ #endif /* SYMBOL_LIBRARY_MANAGER_H */

16
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -780,7 +780,8 @@ void PANEL_FP_LIB_TABLE::browseLibrariesHandler( wxCommandEvent& event )
if( fileType.m_IsFile ) if( fileType.m_IsFile )
{ {
wxFileDialog dlg( this, title, cfg->m_lastFootprintLibDir, wxEmptyString, wxFileDialog dlg( this, title, cfg->m_lastFootprintLibDir, wxEmptyString,
fileType.m_FileFilter, wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE ); fileType.m_FileFilter,
wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE );
int result = dlg.ShowModal(); int result = dlg.ShowModal();
@ -794,7 +795,7 @@ void PANEL_FP_LIB_TABLE::browseLibrariesHandler( wxCommandEvent& event )
else else
{ {
wxDirDialog dlg( nullptr, title, cfg->m_lastFootprintLibDir, wxDirDialog dlg( nullptr, title, cfg->m_lastFootprintLibDir,
wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST ); wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST );
int result = dlg.ShowModal(); int result = dlg.ShowModal();
@ -817,11 +818,11 @@ void PANEL_FP_LIB_TABLE::browseLibrariesHandler( wxCommandEvent& event )
traverser.GetPaths( failedDirs ); traverser.GetPaths( failedDirs );
wxString detailedMsg = _( "The following directories could not be opened: \n" ); wxString detailedMsg = _( "The following directories could not be opened: \n" );
for( auto& path : failedDirs ) for( const wxString& path : failedDirs )
detailedMsg << path << "\n"; detailedMsg << path << "\n";
DisplayErrorMessage( this, _( "Failed to open directories to look for libraries" ), DisplayErrorMessage( this, _( "Failed to open directories to look for libraries" ),
detailedMsg ); detailedMsg );
} }
} }
else else
@ -854,8 +855,11 @@ void PANEL_FP_LIB_TABLE::browseLibrariesHandler( wxCommandEvent& event )
if( !applyToAll ) if( !applyToAll )
{ {
// The cancel button adds the library to the table anyway // The cancel button adds the library to the table anyway
addDuplicates = ( OKOrCancelDialog( this, warning, wxString::Format( msg, nickname ), addDuplicates = ( OKOrCancelDialog( this, warning,
detailedMsg, _( "Skip" ), _( "Add Anyway" ), &applyToAll ) == wxID_CANCEL ); wxString::Format( msg, nickname ),
detailedMsg,
_( "Skip" ), _( "Add Anyway" ),
&applyToAll ) == wxID_CANCEL );
} }
doAdd = addDuplicates; doAdd = addDuplicates;