Translated using Weblate (Lithuanian)

Currently translated at 95.4% (9663 of 10123 strings)

Translation: KiCad EDA/v9
Translate-URL: https://hosted.weblate.org/projects/kicad/v9/lt/

api/proto/board/board_commands.proto

@@ -115,6 +115,20 @@ message SetBoardOrigin
   kiapi.common.types.Vector2 origin = 3;
 }
 
+message GetBoardLayerName
+{
+  kiapi.common.types.DocumentSpecifier board = 1;
+
+  kiapi.board.types.BoardLayer layer = 2;
+}
+
+message BoardLayerNameResponse
+{
+  // The name of the layer shown in the KiCad GUI, which may be a default value like "F.Cu" or may
+  // have been customized by the user.
+  string name = 1;
+}
+
 /*
  * Net management
  */

cmake/BuildSteps/CreateDocsetDoxyfile.cmake

@@ -51,5 +51,7 @@ DOCSET_BUNDLE_ID        = ${DOCSET_BUNDLE_ID}
 DISABLE_INDEX           = YES
 GENERATE_TREEVIEW       = NO
 SEARCHENGINE            = NO
-GENERATE_TAGFILE        = ${DOXY_TAG_FILE}"
+GENERATE_TAGFILE        = ${DOXY_TAG_FILE}
+# Doxygen-awesome doesn't look great without the index
+HTML_EXTRA_STYLESHEET   = "
     )

cmake/FindOCC.cmake

@@ -28,18 +28,12 @@
 
 # Set the needed libraries
 set( OCC_LIBS_COMMON
-    TKBinL
-    TKBin
-    TKBinTObj
-    TKBinXCAF
     TKBool
     TKBO
     TKBRep
     TKCAF
     TKCDF
     TKernel
-    TKFeat
-    TKFillet
     TKG2d
     TKG3d
     TKGeomAlgo
@@ -48,22 +42,13 @@ set( OCC_LIBS_COMMON
     TKLCAF
     TKMath
     TKMesh
-    TKMeshVS
-    TKOffset
-    TKOpenGl
     TKPrim
     TKRWMesh
     TKService
     TKShHealing
-    TKTObj
     TKTopAlgo
     TKV3d
     TKXCAF
-    TKXMesh
-    TKXmlL
-    TKXml
-    TKXmlTObj
-    TKXmlXCAF
     TKXSBase
 )
 
@@ -140,6 +125,7 @@ else(WIN32)
     /usr
     /usr/local
     /usr/local/opencascade
+    /usr/opencascade
     /opt/opencascade
     /opt/opencascade/lin64/gcc
     PATH_SUFFIXES lib

cmake/KiCadVersion.cmake

@@ -37,7 +37,7 @@
 # KiCad.
 #
 # Note: This version string should follow the semantic versioning system
-set( KICAD_SEMANTIC_VERSION "9.0.7-rc2" )
+set( KICAD_SEMANTIC_VERSION "9.0.8-unknown" )
 
 # Default the version to the semantic version.
 # This is overridden by the git repository tag though (if using git)

cmake/Warnings.cmake

@@ -184,6 +184,13 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         set( HAVE_WIMPLICIT_FLOAT_CONVERSION true )
     endif()
 
+    CHECK_CXX_COMPILER_FLAG( "-Wambiguous-conditional" COMPILER_SUPPORTS_WAMBIGUOUS_CONDITIONAL )
+
+    # Add this to match MSVC's warning about ambiguous conditionals
+    if( COMPILER_SUPPORTS_WAMBIGUOUS_CONDITIONAL )
+        set( WARN_FLAGS_CXX "${WARN_FLAGS_CXX} -Wambiguous-conditional" )
+    endif()
+
     # See if the compiler will throw warnings on these conversions
     CHECK_CXX_COMPILER_FLAG( "-Wunused-const-variable" COMPILER_SUPPORTS_WUNUSED_CONST_VARIABLE )
 

common/CMakeLists.txt

@@ -11,6 +11,7 @@ include_directories(
     ./dialogs
     ./widgets
     ./dialog_about
+    ${CMAKE_SOURCE_DIR}/libs/sexpr/include
     ${CMAKE_SOURCE_DIR}/resources/bitmaps_png
     ${CMAKE_SOURCE_DIR}/3d-viewer
     ${CMAKE_SOURCE_DIR}/pcbnew
@@ -128,6 +129,7 @@ set( KICOMMON_SRCS
     widgets/kistatusbar.cpp
     widgets/number_badge.cpp
     widgets/progress_reporter_base.cpp
+    widgets/report_severity.cpp
     widgets/std_bitmap_button.cpp
     widgets/ui_common.cpp
     widgets/wx_html_report_panel.cpp
@@ -237,6 +239,7 @@ target_link_libraries( kicommon
     fmt::fmt
     CURL::libcurl
     picosha2
+    sexpr
     ${ZSTD_LIBRARY}
     ${wxWidgets_LIBRARIES}
     ${LIBGIT2_LIBRARIES}

common/advanced_config.cpp

@@ -133,6 +133,7 @@ static const wxChar ExcludeFromSimulationLineWidth[] = wxT( "ExcludeFromSimulati
 static const wxChar GitIconRefreshInterval[] = wxT( "GitIconRefreshInterval" );
 static const wxChar MaxPastedTextLength[] = wxT( "MaxPastedTextLength" );
 static const wxChar PNSProcessClusterTimeout[] = wxT( "PNSProcessClusterTimeout" );
+static const wxChar FollowBranchTimeout[] = wxT( "FollowBranchTimeoutMs" );
 
 } // namespace KEYS
 
@@ -322,6 +323,7 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_MaxPastedTextLength = 100;
 
     m_PNSProcessClusterTimeout = 100; // Default: 100 ms
+    m_FollowBranchTimeout = 500; // Default: 500 ms
 
     loadFromConfigFile();
 }
@@ -631,6 +633,9 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::PNSProcessClusterTimeout,
                                                &m_PNSProcessClusterTimeout, 100, 10, 10000 ) );
 
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::FollowBranchTimeout,
+                                               &m_FollowBranchTimeout, 500, 50, 5000 ) );
+
     // Special case for trace mask setting...we just grab them and set them immediately
     // Because we even use wxLogTrace inside of advanced config
     wxString traceMasks;

common/api/api_utils.cpp

@@ -122,10 +122,9 @@ KICOMMON_API void PackPolyLine( types::PolyLine& aOutput, const SHAPE_LINE_CHAIN
         if( vertex < 0 )
             break;
 
-        types::PolyLineNode* node = aOutput.mutable_nodes()->Add();
-
-        if( aSlc.IsPtOnArc( vertex ) )
+        if( aSlc.IsArcStart( vertex ) )
         {
+            types::PolyLineNode* node = aOutput.mutable_nodes()->Add();
             const SHAPE_ARC& arc = aSlc.Arc( aSlc.ArcIndex( vertex ) );
             node->mutable_arc()->mutable_start()->set_x_nm( arc.GetP0().x );
             node->mutable_arc()->mutable_start()->set_y_nm( arc.GetP0().y );
@@ -134,8 +133,9 @@ KICOMMON_API void PackPolyLine( types::PolyLine& aOutput, const SHAPE_LINE_CHAIN
             node->mutable_arc()->mutable_end()->set_x_nm( arc.GetP1().x );
             node->mutable_arc()->mutable_end()->set_y_nm( arc.GetP1().y );
         }
-        else
+        else if( !aSlc.IsPtOnArc( vertex ) )
         {
+            types::PolyLineNode* node = aOutput.mutable_nodes()->Add();
             node->mutable_point()->set_x_nm( aSlc.CPoint( vertex ).x );
             node->mutable_point()->set_y_nm( aSlc.CPoint( vertex ).y );
         }

common/array_axis.cpp

@@ -37,7 +37,11 @@ static bool schemeNonUnitColsStartAt0( ARRAY_AXIS::NUMBERING_TYPE type )
 }
 
 
-ARRAY_AXIS::ARRAY_AXIS() : m_type( NUMBERING_TYPE::NUMBERING_NUMERIC ), m_offset( 0 ), m_step( 1 )
+ARRAY_AXIS::ARRAY_AXIS() :
+        m_type( NUMBERING_TYPE::NUMBERING_NUMERIC ),
+        m_offset( 0 ),
+        m_step( 1 ),
+        m_useLowercase( false )
 {
 }
 
@@ -76,7 +80,14 @@ std::optional<int> ARRAY_AXIS::getNumberingOffset( const wxString& str ) const
 
     for( unsigned i = 0; i < str.length(); i++ )
     {
-        int chIndex = alphabet.Find( str[i], false );
+        wxUniChar ch = str[i];
+
+        // For alphabetic types, convert to uppercase for lookup since our alphabets
+        // are defined with uppercase letters. This allows users to enter lowercase.
+        if( !TypeIsNumeric( m_type ) && ch >= 'a' && ch <= 'z' )
+            ch = ch - 'a' + 'A';
+
+        int chIndex = alphabet.Find( ch, false );
 
         if( chIndex == wxNOT_FOUND )
             return std::optional<int>{};
@@ -109,6 +120,18 @@ bool ARRAY_AXIS::SetOffset( const wxString& aOffsetName )
     if( !offset )
         return false;
 
+    // For alphabetic types, check if the user entered lowercase letters.
+    // If so, we'll output lowercase letters as well.
+    if( !TypeIsNumeric( m_type ) && !aOffsetName.IsEmpty() )
+    {
+        wxUniChar firstChar = aOffsetName[0];
+        m_useLowercase = ( firstChar >= 'a' && firstChar <= 'z' );
+    }
+    else
+    {
+        m_useLowercase = false;
+    }
+
     SetOffset( *offset );
     return true;
 }
@@ -140,5 +163,11 @@ wxString ARRAY_AXIS::GetItemNumber( int n ) const
 
     n = m_offset + m_step * n;
 
-    return AlphabeticFromIndex( n, alphabet, nonUnitColsStartAt0 );
+    wxString result = AlphabeticFromIndex( n, alphabet, nonUnitColsStartAt0 );
+
+    // If the user entered a lowercase starting value, output lowercase letters
+    if( m_useLowercase )
+        result = result.Lower();
+
+    return result;
 }

common/bitmap_base.cpp

@@ -450,7 +450,8 @@ void BITMAP_BASE::Rotate( bool aRotateCCW )
         int resY = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONY );
         int unit = m_image->GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT );
 
-        *m_image = m_image->Rotate90( aRotateCCW );
+        // wxImage::Rotate90 parameter is "clockwise", so invert for CCW rotation
+        *m_image = m_image->Rotate90( !aRotateCCW );
 
         m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONUNIT, unit );
         m_image->SetOption( wxIMAGE_OPTION_RESOLUTIONX, resX );

common/dialog_shim.cpp

@@ -752,7 +752,10 @@ void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
 
         for( size_t i = 0; i < m_tabOrder.size(); ++i )
         {
-            if( m_tabOrder[i] == currentWindow )
+            // Check for exact match or if currentWindow is a child of the control
+            // (e.g., the text entry inside a wxComboBox)
+            if( m_tabOrder[i] == currentWindow
+                || ( currentWindow && m_tabOrder[i]->IsDescendant( currentWindow ) ) )
             {
                 currentIdx = (int) i;
                 break;
@@ -763,6 +766,17 @@ void DIALOG_SHIM::OnCharHook( wxKeyEvent& aEvt )
         {
             advance( currentIdx );
 
+            // Skip hidden or disabled controls
+            int startIdx = currentIdx;
+
+            while( !m_tabOrder[currentIdx]->IsShown() || !m_tabOrder[currentIdx]->IsEnabled() )
+            {
+                advance( currentIdx );
+
+                if( currentIdx == startIdx )
+                    break;  // Avoid infinite loop if all controls are hidden
+            }
+
             //todo: We don't currently have non-textentry dialog boxes but this will break if
             // we add them.
 #ifdef __APPLE__

common/dialogs/dialog_hotkey_list.cpp

@@ -39,7 +39,8 @@ DIALOG_LIST_HOTKEYS::DIALOG_LIST_HOTKEYS( EDA_BASE_FRAME* aParent ):
     wxBoxSizer* main_sizer = new wxBoxSizer( wxVERTICAL );
     KIFACE*     kiface = nullptr;
 
-    m_hk_list = new PANEL_HOTKEYS_EDITOR( aParent, this, true );
+    m_hk_list = new PANEL_HOTKEYS_EDITOR( aParent, this );
+    m_hk_list->SetIncludeGestures( true );
 
     wxWindow* kicadMgr_window = wxWindow::FindWindowByName( KICAD_MANAGER_FRAME_NAME );
 
@@ -71,6 +72,7 @@ DIALOG_LIST_HOTKEYS::DIALOG_LIST_HOTKEYS( EDA_BASE_FRAME* aParent ):
 
     wxStdDialogButtonSizer* sdb_sizer = new wxStdDialogButtonSizer;
     sdb_sizer->AddButton( new wxButton( this, wxID_OK ) );
+    sdb_sizer->AddButton( new wxButton( this, wxID_CANCEL ) );
     sdb_sizer->Realize();
 
     main_sizer->Add( sdb_sizer, 0, wxEXPAND | wxALL, margin );

common/dialogs/panel_embedded_files.cpp

@@ -90,8 +90,12 @@ void EMBEDDED_FILES_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
 /* ---------- End of GRID_TRICKS for embedded files grid ---------- */
 
 
-PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aFiles ) :
-        PANEL_EMBEDDED_FILES_BASE( parent ), m_files( aFiles ), m_localFiles( new EMBEDDED_FILES() )
+PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* aParent, EMBEDDED_FILES* aFiles, int aFlags,
+                                            std::vector<const EMBEDDED_FILES*> aInheritedFiles ) :
+        PANEL_EMBEDDED_FILES_BASE( aParent ),
+        m_files( aFiles ),
+        m_localFiles( new EMBEDDED_FILES() ),
+        m_inheritedFiles( std::move( aInheritedFiles ) )
 {
     for( auto& [name, file] : m_files->EmbeddedFileMap() )
     {
@@ -99,6 +103,19 @@ PANEL_EMBEDDED_FILES::PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aF
         m_localFiles->AddFile( newFile );
     }
 
+    for( const EMBEDDED_FILES* inheritedFiles : m_inheritedFiles )
+    {
+        for( auto& [name, file] : inheritedFiles->EmbeddedFileMap() )
+        {
+            if( m_localFiles->HasFile( name ) )
+                continue;
+
+            EMBEDDED_FILES::EMBEDDED_FILE* newFile = new EMBEDDED_FILES::EMBEDDED_FILE( *file );
+            m_localFiles->AddFile( newFile );
+            m_inheritedFileNames.insert( name );
+        }
+    }
+
     // Set up the standard buttons
     m_delete_button->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
     m_browse_button->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
@@ -131,6 +148,7 @@ PANEL_EMBEDDED_FILES::~PANEL_EMBEDDED_FILES()
 {
     // Remove the GRID_TRICKS handler
     m_files_grid->PopEventHandler( true );
+    delete m_localFiles;
 }
 
 
@@ -242,6 +260,9 @@ bool PANEL_EMBEDDED_FILES::TransferDataFromWindow()
 
     for( auto& file : files )
     {
+        if( m_inheritedFileNames.count( file->name ) )
+            continue;
+
         m_files->AddFile( file );
         m_localFiles->RemoveFile( file->name, false );
     }
@@ -378,6 +399,14 @@ bool PANEL_EMBEDDED_FILES::RemoveEmbeddedFile( const wxString& aFileName )
     if( name.StartsWith( FILEEXT::KiCadUriPrefix ) )
         name = name.Mid( FILEEXT::KiCadUriPrefix.size() + 3 );
 
+    if( m_inheritedFileNames.count( name ) )
+    {
+        wxString msg = _( "Embedded files inherited from a parent symbol cannot be removed." );
+
+        DisplayErrorMessage( this, msg );
+        return false;
+    }
+
     int row = std::max( 0, m_files_grid->GetGridCursorRow() );
 
     for( int ii = 0; ii < m_files_grid->GetNumberRows(); ii++ )
@@ -409,14 +438,7 @@ void PANEL_EMBEDDED_FILES::onDeleteEmbeddedFile( wxCommandEvent& event )
 
     wxString name = m_files_grid->GetCellValue( row, 0 );
 
-    m_localFiles->RemoveFile( name );
-
-    m_files_grid->DeleteRows( row );
-
-    if( row < m_files_grid->GetNumberRows() )
-        m_files_grid->SetGridCursor( row, 0 );
-    else if( m_files_grid->GetNumberRows() > 0 )
-        m_files_grid->SetGridCursor( m_files_grid->GetNumberRows() - 1, 0 );
+    RemoveEmbeddedFile( name );
 }
 
 

common/dialogs/panel_embedded_files.h

@@ -24,6 +24,9 @@
 #ifndef PANEL_EMBEDDED_FILES_H
 #define PANEL_EMBEDDED_FILES_H
 
+#include <set>
+#include <vector>
+
 #include <embedded_files.h>
 #include "panel_embedded_files_base.h"
 
@@ -55,7 +58,8 @@ protected:
 class PANEL_EMBEDDED_FILES : public PANEL_EMBEDDED_FILES_BASE
 {
 public:
-    PANEL_EMBEDDED_FILES( wxWindow* parent, EMBEDDED_FILES* aFiles );
+    PANEL_EMBEDDED_FILES( wxWindow* aParent, EMBEDDED_FILES* aFiles, int aFlags = 0,
+                          std::vector<const EMBEDDED_FILES*> aInheritedFiles = {} );
     ~PANEL_EMBEDDED_FILES() override;
 
     bool TransferDataFromWindow() override;
@@ -79,6 +83,8 @@ private:
 
     EMBEDDED_FILES* m_files;
     EMBEDDED_FILES* m_localFiles;
+    std::vector<const EMBEDDED_FILES*> m_inheritedFiles;
+    std::set<wxString>                 m_inheritedFileNames;
 };
 
 

common/dialogs/panel_hotkeys_editor.cpp

@@ -65,11 +65,10 @@ static wxSearchCtrl* CreateTextFilterBox( wxWindow* aParent, const wxString& aDe
 }
 
 
-PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aWindow,
-                                            bool aReadOnly ) :
+PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aWindow ) :
         RESETTABLE_PANEL( aWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize ),
         m_frame( aFrame ),
-        m_readOnly( aReadOnly ),
+        m_includeGestures( false ),
         m_hotkeyStore()
 {
     wxBoxSizer* mainSizer = new wxBoxSizer( wxVERTICAL );
@@ -78,11 +77,10 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW
     m_filterSearch = CreateTextFilterBox( this, _( "Type filter text" ) );
     bMargins->Add( m_filterSearch, 0, wxEXPAND | wxTOP | wxRIGHT, 5 );
 
-    m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore, m_readOnly );
+    m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore );
     bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND | wxTOP | wxRIGHT, 5 );
 
-    if( !m_readOnly )
-        installButtons( bMargins );
+    installButtons( bMargins );
 
     mainSizer->Add( bMargins, 1, wxEXPAND, 0 );
 
@@ -166,7 +164,7 @@ void PANEL_HOTKEYS_EDITOR::installButtons( wxSizer* aSizer )
 
 bool PANEL_HOTKEYS_EDITOR::TransferDataToWindow()
 {
-    m_hotkeyStore.Init( m_actions, m_readOnly );
+    m_hotkeyStore.Init( m_actions, m_includeGestures );
 
     if( !m_hotkeyListCtrl->TransferDataToControl() )
         return false;
@@ -177,9 +175,6 @@ bool PANEL_HOTKEYS_EDITOR::TransferDataToWindow()
 
 bool PANEL_HOTKEYS_EDITOR::TransferDataFromWindow()
 {
-    if( m_readOnly )
-        return true;
-
     if( !m_hotkeyListCtrl->TransferDataFromControl() )
         return false;
 

common/draw_panel_gal.cpp

@@ -626,6 +626,12 @@ void EDA_DRAW_PANEL_GAL::onLostFocus( wxFocusEvent& aEvent )
 
     m_viewControls->CancelDrag();
 
+    // Reset the tool dispatcher's button state when focus is lost. This prevents
+    // the dispatcher from thinking the button is still pressed when focus returns,
+    // which can cause selection and drag operations to stop working.
+    if( m_eventDispatcher )
+        m_eventDispatcher->ResetState();
+
     aEvent.Skip();
 }
 

common/eda_base_frame.cpp

@@ -220,6 +220,12 @@ wxWindow* EDA_BASE_FRAME::findQuasiModalDialog()
 
 void EDA_BASE_FRAME::windowClosing( wxCloseEvent& event )
 {
+    // Guard against re-entrant close events. GTK can deliver a second wxEVT_CLOSE_WINDOW
+    // while we are still processing the first one (e.g. during Destroy() calls), which leads
+    // to use-after-free crashes when child objects have already been torn down.
+    if( m_isClosing )
+        return;
+
     // Don't allow closing when a quasi-modal is open.
     wxWindow* quasiModal = findQuasiModalDialog();
 
@@ -1064,7 +1070,7 @@ void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParent
         WX_BUSY_INDICATOR busy_cursor;
 
         WX_TREEBOOK*            book = dlg.GetTreebook();
-        PANEL_HOTKEYS_EDITOR*   hotkeysPanel = new PANEL_HOTKEYS_EDITOR( this, book, false );
+        PANEL_HOTKEYS_EDITOR*   hotkeysPanel = new PANEL_HOTKEYS_EDITOR( this, book );
         KIFACE*                 kiface = nullptr;
         std::vector<int>        expand;
 

common/eda_draw_frame.cpp

@@ -318,7 +318,7 @@ void EDA_DRAW_FRAME::CommonSettingsChanged( int aFlags )
 
     m_galDisplayOptions.ReadCommonConfig( *settings, this );
 
-    GetToolManager()->RunAction( ACTIONS::gridPreset, config()->m_Window.grid.last_size_idx );
+    GetToolManager()->RunAction( ACTIONS::gridPreset, GetWindowSettings( config() )->grid.last_size_idx );
     UpdateGridSelectBox();
 
     if( m_lastToolbarIconSize == 0
@@ -373,7 +373,7 @@ void EDA_DRAW_FRAME::UpdateGridSelectBox()
 
     wxCHECK( config(), /* void */ );
 
-    GRID_MENU::BuildChoiceList( &gridsList, config(), this );
+    GRID_MENU::BuildChoiceList( &gridsList, GetWindowSettings( config() ), this );
 
     for( const wxString& grid : gridsList )
         m_gridSelectBox->Append( grid );
@@ -381,7 +381,7 @@ void EDA_DRAW_FRAME::UpdateGridSelectBox()
     m_gridSelectBox->Append( wxT( "---" ) );
     m_gridSelectBox->Append( _( "Edit Grids..." ) );
 
-    m_gridSelectBox->SetSelection( config()->m_Window.grid.last_size_idx );
+    m_gridSelectBox->SetSelection( GetWindowSettings( config() )->grid.last_size_idx );
 }
 
 
@@ -394,7 +394,7 @@ void EDA_DRAW_FRAME::OnUpdateSelectGrid( wxUpdateUIEvent& aEvent )
 
     wxCHECK( config(), /* void */ );
 
-    int idx = config()->m_Window.grid.last_size_idx;
+    int idx = GetWindowSettings( config() )->grid.last_size_idx;
     idx = std::clamp( idx, 0, (int) m_gridSelectBox->GetCount() - 1 );
 
     if( idx != m_gridSelectBox->GetSelection() )
@@ -414,10 +414,10 @@ void EDA_DRAW_FRAME::OnUpdateSelectZoom( wxUpdateUIEvent& aEvent )
 
     wxCHECK( config(), /* void */ );
 
-    const std::vector<double>& zoomList = config()->m_Window.zoom_factors;
-    int curr_selection = m_zoomSelectBox->GetSelection();
-    int new_selection = 0;      // select zoom auto
-    double last_approx = 1e9;   // large value to start calculation
+    const std::vector<double>& zoomList = GetWindowSettings( config() )->zoom_factors;
+    int                        curr_selection = m_zoomSelectBox->GetSelection();
+    int                        new_selection = 0;      // select zoom auto
+    double                     last_approx = 1e9;      // large value to start calculation
 
     // Search for the nearest available value to the current zoom setting, and select it
     for( size_t jj = 0; jj < zoomList.size(); ++jj )
@@ -484,11 +484,11 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
 }
 
 
-bool EDA_DRAW_FRAME::IsGridVisible() const
+bool EDA_DRAW_FRAME::IsGridVisible()
 {
     wxCHECK( config(), true );
 
-    return config()->m_Window.grid.show;
+    return GetWindowSettings( config() )->grid.show;
 }
 
 
@@ -496,7 +496,7 @@ void EDA_DRAW_FRAME::SetGridVisibility( bool aVisible )
 {
     wxCHECK( config(), /* void */ );
 
-    config()->m_Window.grid.show = aVisible;
+    GetWindowSettings( config() )->grid.show = aVisible;
 
     // Update the display with the new grid
     if( GetCanvas() )
@@ -514,11 +514,11 @@ void EDA_DRAW_FRAME::SetGridVisibility( bool aVisible )
 }
 
 
-bool EDA_DRAW_FRAME::IsGridOverridden() const
+bool EDA_DRAW_FRAME::IsGridOverridden()
 {
     wxCHECK( config(), false );
 
-    return config()->m_Window.grid.overrides_enabled;
+    return GetWindowSettings( config() )->grid.overrides_enabled;
 }
 
 
@@ -526,7 +526,7 @@ void EDA_DRAW_FRAME::SetGridOverrides( bool aOverride )
 {
     wxCHECK( config(), /* void */ );
 
-    config()->m_Window.grid.overrides_enabled = aOverride;
+    GetWindowSettings( config() )->grid.overrides_enabled = aOverride;
 }
 
 
@@ -549,14 +549,14 @@ void EDA_DRAW_FRAME::UpdateZoomSelectBox()
 
     wxCHECK( config(), /* void */ );
 
-    for( unsigned i = 0;  i < config()->m_Window.zoom_factors.size();  ++i )
+    for( unsigned ii = 0;  ii < GetWindowSettings( config() )->zoom_factors.size();  ++ii )
     {
-        double current = config()->m_Window.zoom_factors[i];
+        double current = GetWindowSettings( config() )->zoom_factors[ii];
 
         m_zoomSelectBox->Append( wxString::Format( _( "Zoom %.2f" ), current ) );
 
         if( zoom == current )
-            m_zoomSelectBox->SetSelection( i + 1 );
+            m_zoomSelectBox->SetSelection( ii + 1 );
     }
 }
 

common/eda_text.cpp

@@ -189,14 +189,14 @@ void EDA_TEXT::Serialize( google::protobuf::Any &aContainer ) const
     using namespace kiapi::common;
     types::Text text;
 
-    text.set_text( GetText().ToStdString() );
-    text.set_hyperlink( GetHyperlink().ToStdString() );
+    text.set_text( GetText().ToUTF8() );
+    text.set_hyperlink( GetHyperlink().ToUTF8() );
     PackVector2( *text.mutable_position(), GetTextPos() );
 
     types::TextAttributes* attrs = text.mutable_attributes();
 
     if( GetFont() )
-        attrs->set_font_name( GetFont()->GetName().ToStdString() );
+        attrs->set_font_name( GetFont()->GetName().ToUTF8() );
 
     attrs->set_horizontal_alignment(
             ToProtoEnum<GR_TEXT_H_ALIGN_T, types::HorizontalAlignment>( GetHorizJustify() ) );

common/embedded_files.cpp

@@ -591,6 +591,21 @@ EMBEDDED_FILES::EMBEDDED_FILES( const EMBEDDED_FILES& other ) :
 }
 
 
+EMBEDDED_FILES::EMBEDDED_FILES( const EMBEDDED_FILES& other, bool aDeepCopy ) :
+        m_embedFonts( other.m_embedFonts )
+{
+    if( aDeepCopy )
+    {
+        for( const auto& [name, file] : other.m_files )
+            m_files[name] = new EMBEDDED_FILE( *file );
+
+        m_fontFiles = other.m_fontFiles;
+    }
+
+    m_fileAddedCallback = other.m_fileAddedCallback;
+}
+
+
 // Copy assignment operator
 EMBEDDED_FILES& EMBEDDED_FILES::operator=( const EMBEDDED_FILES& other )
 {

common/gal/cairo/cairo_gal.cpp

@@ -29,6 +29,7 @@
 
 #include <wx/image.h>
 #include <wx/log.h>
+#include <wx/dcclient.h>
 
 #include <gal/cairo/cairo_gal.h>
 #include <gal/cairo/cairo_compositor.h>
@@ -1650,6 +1651,10 @@ void CAIRO_GAL::setCompositor()
 
 void CAIRO_GAL::onPaint( wxPaintEvent& aEvent )
 {
+    // A wxPaintDC must be created in wxEVT_PAINT handlers. Without this, the system keeps
+    // sending paint events because it thinks the window still needs to be painted, causing
+    // high CPU usage in fallback mode (Cairo).
+    wxPaintDC dc( this );
     PostPaint( aEvent );
 }
 

common/gestfich.cpp

@@ -38,12 +38,15 @@
 #include <string_utils.h>
 #include <launch_ext.h>
 #include "wx/tokenzr.h"
+#include <sexpr/sexpr.h>
+#include <sexpr/sexpr_parser.h>
 
 #include <wx/wfstream.h>
 #include <wx/fs_zip.h>
 #include <wx/zipstrm.h>
 
 #include <filesystem>
+#include <core/kicad_algo.h>
 
 void QuoteString( wxString& string )
 {
@@ -302,6 +305,79 @@ void KiCopyFile( const wxString& aSrcPath, const wxString& aDestPath, wxString&
 }
 
 
+static void traverseSEXPR( SEXPR::SEXPR* aNode, const std::function<void( SEXPR::SEXPR* )>& aVisitor )
+{
+    aVisitor( aNode );
+
+    if( aNode->IsList() )
+    {
+        for( unsigned i = 0; i < aNode->GetNumberOfChildren(); i++ )
+            traverseSEXPR( aNode->GetChild( i ), aVisitor );
+    }
+}
+
+
+void CopySexprFile( const wxString& aSrcPath, const wxString& aDestPath,
+                    std::function<bool( const std::string& token, wxString& value )> aCallback,
+                    wxString& aErrors )
+{
+    bool success = false;
+
+    try
+    {
+        SEXPR::PARSER parser;
+        std::unique_ptr<SEXPR::SEXPR> sexpr( parser.ParseFromFile( TO_UTF8( aSrcPath ) ) );
+
+        traverseSEXPR( sexpr.get(),
+                [&]( SEXPR::SEXPR* node )
+                {
+                    if( node->IsList() && node->GetNumberOfChildren() > 1 && node->GetChild( 0 )->IsSymbol() )
+                    {
+                        std::string          token = node->GetChild( 0 )->GetSymbol();
+                        SEXPR::SEXPR_STRING* pathNode = dynamic_cast<SEXPR::SEXPR_STRING*>( node->GetChild( 1 ) );
+                        SEXPR::SEXPR_SYMBOL* symNode = dynamic_cast<SEXPR::SEXPR_SYMBOL*>( node->GetChild( 1 ) );
+                        wxString             path;
+
+                        if( pathNode )
+                            path = pathNode->m_value;
+                        else if( symNode )
+                            path = symNode->m_value;
+
+                        if( aCallback( token, path ) )
+                        {
+                            if( pathNode )
+                                pathNode->m_value = path;
+                            else if( symNode )
+                                symNode->m_value = path;
+                        }
+                    }
+                } );
+
+        wxFFile destFile( aDestPath, "wb" );
+
+        if( destFile.IsOpened() )
+            success = destFile.Write( sexpr->AsString( 0 ) );
+
+        // wxFFile dtor will close the file
+    }
+    catch( ... )
+    {
+        success = false;
+    }
+
+    if( !success )
+    {
+        wxString msg;
+
+        if( !aErrors.empty() )
+            aErrors += wxS( "\n" );
+
+        msg.Printf( _( "Cannot copy file '%s'." ), aDestPath );
+        aErrors += msg;
+    }
+}
+
+
 wxString QuoteFullPath( wxFileName& fn, wxPathFormat format )
 {
     return wxT( "\"" ) + fn.GetFullPath( format ) + wxT( "\"" );
@@ -347,8 +423,7 @@ bool RmDirRecursive( const wxString& aFileName, wxString* aErrors )
     catch( const fs::filesystem_error& e )
     {
         if( aErrors )
-            *aErrors = wxString::Format( _( "Error removing directory '%s': %s" ),
-                                         aFileName, e.what() );
+            *aErrors = wxString::Format( _( "Error removing directory '%s': %s" ), aFileName, e.what() );
 
         return false;
     }
@@ -357,7 +432,8 @@ bool RmDirRecursive( const wxString& aFileName, wxString* aErrors )
 }
 
 
-bool CopyDirectory( const wxString& aSourceDir, const wxString& aDestDir, wxString& aErrors )
+bool CopyDirectory( const wxString& aSourceDir, const wxString& aDestDir,
+                    const std::vector<wxString>& aPathsWithOverwriteDisallowed, wxString& aErrors )
 {
     wxDir dir( aSourceDir );
 
@@ -380,23 +456,25 @@ bool CopyDirectory( const wxString& aSourceDir, const wxString& aDestDir, wxStri
 
     while( cont )
     {
-        wxString sourcePath = aSourceDir + wxFileName::GetPathSeparator() + filename;
+        wxString sourcePath = dir.GetNameWithSep() + filename;
         wxString destPath = aDestDir + wxFileName::GetPathSeparator() + filename;
 
         if( wxFileName::DirExists( sourcePath ) )
         {
             // Recursively copy subdirectories
-            if( !CopyDirectory( sourcePath, destPath, aErrors ) )
+            if( !CopyDirectory( sourcePath, destPath, aPathsWithOverwriteDisallowed, aErrors ) )
                 return false;
         }
         else
         {
             // Copy files
-            if( !wxCopyFile( sourcePath, destPath ) )
+            if( alg::contains( aPathsWithOverwriteDisallowed, sourcePath ) && wxFileExists( destPath ) )
             {
-                aErrors += wxString::Format( _( "Could not copy file: %s to %s" ),
-                                             sourcePath,
-                                             destPath );
+                // Presumably user does not want an error on a no-overwrite condition....
+            }
+            else if( !wxCopyFile( sourcePath, destPath ) )
+            {
+                aErrors += wxString::Format( _( "Could not copy file: %s to %s" ), sourcePath, destPath );
                 return false;
             }
         }
@@ -408,8 +486,8 @@ bool CopyDirectory( const wxString& aSourceDir, const wxString& aDestDir, wxStri
 }
 
 
-bool CopyFilesOrDirectory( const wxString& aSourcePath, const wxString& aDestDir, wxString& aErrors,
-                           int& aFileCopiedCount, const std::vector<wxString>& aExclusions )
+bool CopyFilesOrDirectory( const wxString& aSourcePath, const wxString& aDestDir, bool aAllowOverwrites,
+                           wxString& aErrors, std::vector<wxString>& aPathsWritten )
 {
     // Parse source path and determine if it's a directory
     wxFileName sourceFn( aSourcePath );
@@ -417,85 +495,72 @@ bool CopyFilesOrDirectory( const wxString& aSourcePath, const wxString& aDestDir
     bool       isSourceDirectory = wxFileName::DirExists( sourcePath );
     wxString   baseDestDir = aDestDir;
 
-    auto performCopy = [&]( const wxString& src, const wxString& dest ) -> bool
-    {
-        if( wxCopyFile( src, dest ) )
-        {
-            aFileCopiedCount++;
-            return true;
-        }
-
-        aErrors += wxString::Format( _( "Could not copy file: %s to %s" ), src, dest );
-        aErrors += wxT( "\n" );
-        return false;
-    };
-
-    auto processEntries = [&]( const wxString& srcDir, const wxString& pattern,
-                               const wxString& destDir ) -> bool
-    {
-        wxDir dir( srcDir );
-
-        if( !dir.IsOpened() )
-        {
-            aErrors += wxString::Format( _( "Could not open source directory: %s" ), srcDir );
-            aErrors += wxT( "\n" );
-            return false;
-        }
-
-        wxString filename;
-        bool     success = true;
-
-        // Find all entries matching pattern (files + directories + hidden items)
-        bool cont = dir.GetFirst( &filename, pattern, wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN );
-
-        while( cont )
-        {
-            const wxString entrySrc = srcDir + wxFileName::GetPathSeparator() + filename;
-            const wxString entryDest = destDir + wxFileName::GetPathSeparator() + filename;
-
-            // Apply exclusion filters
-            bool exclude =
-                    filename.Matches( wxT( "~*.lck" ) ) || filename.Matches( wxT( "*.lck" ) );
-
-            for( const auto& exclusion : aExclusions )
+    auto performCopy =
+            [&]( const wxString& src, const wxString& dest ) -> bool
             {
-                if( entrySrc.Matches( exclusion ) )
+                if( wxCopyFile( src, dest, aAllowOverwrites ) )
                 {
-                    exclude = true;
-                    break;
+                    aPathsWritten.push_back( dest );
+                    return true;
                 }
-            }
 
-            if( !exclude )
+                aErrors += wxString::Format( _( "Could not copy file: %s to %s" ), src, dest );
+                aErrors += wxT( "\n" );
+                return false;
+            };
+
+    auto processEntries =
+            [&]( const wxString& srcDir, const wxString& pattern, const wxString& destDir ) -> bool
             {
-                if( wxFileName::DirExists( entrySrc ) )
+                wxDir dir( srcDir );
+
+                if( !dir.IsOpened() )
                 {
-                    // Recursively process subdirectories
-                    if( !CopyFilesOrDirectory( entrySrc, destDir, aErrors, aFileCopiedCount,
-                                               aExclusions ) )
-                    {
-                        aErrors += wxString::Format( _( "Could not copy directory: %s to %s" ),
-                                                     entrySrc, entryDest );
-                        aErrors += wxT( "\n" );
-
-                        success = false;
-                    }
+                    aErrors += wxString::Format( _( "Could not open source directory: %s" ), srcDir );
+                    aErrors += wxT( "\n" );
+                    return false;
                 }
-                else
+
+                wxString filename;
+                bool     success = true;
+
+                // Find all entries matching pattern (files + directories + hidden items)
+                bool cont = dir.GetFirst( &filename, pattern, wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN );
+
+                while( cont )
                 {
-                    // Copy individual files
-                    if( !performCopy( entrySrc, entryDest ) )
+                    const wxString entrySrc = srcDir + wxFileName::GetPathSeparator() + filename;
+                    const wxString entryDest = destDir + wxFileName::GetPathSeparator() + filename;
+
+                    if( !filename.Matches( wxT( "~*.lck" ) ) && !filename.Matches( wxT( "*.lck" ) ) )
                     {
-                        success = false;
+                        if( wxFileName::DirExists( entrySrc ) )
+                        {
+                            // Recursively process subdirectories
+                            if( !CopyFilesOrDirectory( entrySrc, destDir, aAllowOverwrites, aErrors, aPathsWritten ) )
+                            {
+                                aErrors += wxString::Format( _( "Could not copy directory: %s to %s" ),
+                                                             entrySrc, entryDest );
+                                aErrors += wxT( "\n" );
+
+                                success = false;
+                            }
+                        }
+                        else
+                        {
+                            // Copy individual files
+                            if( !performCopy( entrySrc, entryDest ) )
+                            {
+                                success = false;
+                            }
+                        }
                     }
+
+                    cont = dir.GetNext( &filename );
                 }
-            }
 
-            cont = dir.GetNext( &filename );
-        }
-
-        return success;
-    };
+                return success;
+            };
 
     // If copying a directory, append its name to destination path
     if( isSourceDirectory )
@@ -507,8 +572,7 @@ bool CopyFilesOrDirectory( const wxString& aSourcePath, const wxString& aDestDir
     // Create destination directory hierarchy
     if( !wxFileName::Mkdir( baseDestDir, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) )
     {
-        aErrors +=
-                wxString::Format( _( "Could not create destination directory: %s" ), baseDestDir );
+        aErrors += wxString::Format( _( "Could not create destination directory: %s" ), baseDestDir );
         aErrors += wxT( "\n" );
 
         return false;
@@ -531,6 +595,7 @@ bool CopyFilesOrDirectory( const wxString& aSourcePath, const wxString& aDestDir
 
                 return false;
             }
+
             // Process all matching files in source directory
             return processEntries( dirPath, fileName, baseDestDir );
         }

common/git/git_pull_handler.cpp

@@ -378,6 +378,14 @@ PullResult GIT_PULL_HANDLER::handleFastForward()
 PullResult GIT_PULL_HANDLER::handleMerge( const git_annotated_commit** aMergeHeads,
                                           size_t                       aMergeHeadsCount )
 {
+    if( hasUnstagedChanges( GetRepo() ) )
+    {
+        AddErrorString(
+                _( "Cannot merge: you have unstaged changes. "
+                   "Please commit or stash them before pulling." ) );
+        return PullResult::DirtyWorkdir;
+    }
+
     git_merge_options merge_opts;
     git_merge_options_init( &merge_opts, GIT_MERGE_OPTIONS_VERSION );
 
@@ -481,6 +489,14 @@ PullResult GIT_PULL_HANDLER::handleMerge( const git_annotated_commit** aMergeHea
 
 PullResult GIT_PULL_HANDLER::handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount )
 {
+    if( hasUnstagedChanges( GetRepo() ) )
+    {
+        AddErrorString(
+                _( "Cannot rebase: you have unstaged changes. "
+                   "Please commit or stash them before pulling." ) );
+        return PullResult::DirtyWorkdir;
+    }
+
     // Get the current branch reference
     git_reference* head_ref = nullptr;
 
@@ -563,6 +579,40 @@ PullResult GIT_PULL_HANDLER::handleRebase( const git_annotated_commit** aMergeHe
 }
 
 
+bool GIT_PULL_HANDLER::hasUnstagedChanges( git_repository* aRepo )
+{
+    if( !aRepo )
+        return false;
+
+    git_status_options opts;
+    git_status_init_options( &opts, GIT_STATUS_OPTIONS_VERSION );
+
+    opts.show = GIT_STATUS_SHOW_WORKDIR_ONLY;
+    opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED;
+
+    git_status_list* status_list = nullptr;
+
+    if( git_status_list_new( &status_list, aRepo, &opts ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to get status list: %s", KIGIT_COMMON::GetLastGitError() );
+        return false;
+    }
+
+    KIGIT::GitStatusListPtr status_list_ptr( status_list );
+    size_t count = git_status_list_entrycount( status_list );
+
+    for( size_t ii = 0; ii < count; ++ii )
+    {
+        const git_status_entry* entry = git_status_byindex( status_list, ii );
+
+        if( entry->status & ( GIT_STATUS_WT_MODIFIED | GIT_STATUS_WT_DELETED | GIT_STATUS_WT_TYPECHANGE ) )
+            return true;
+    }
+
+    return false;
+}
+
+
 void GIT_PULL_HANDLER::UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage )
 {
 

common/git/git_pull_handler.h

@@ -43,6 +43,7 @@ struct CommitDetails
 // Enum for result codes, error codes are negative, success codes are positive
 enum class PullResult : int
 {
+    DirtyWorkdir = -3,
     MergeFailed = -2,
     Error = -1,
     Success = 0,
@@ -86,6 +87,8 @@ private:
     PullResult  handleFastForward();
     PullResult  handleMerge( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
     PullResult  handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
+
+    static bool hasUnstagedChanges( git_repository* aRepo );
 };
 
 #endif // _GIT_PULL_HANDLER_H_

common/git/kicad_git_common.cpp

@@ -258,7 +258,7 @@ std::pair<std::set<wxString>,std::set<wxString>> KIGIT_COMMON::GetDifferentFiles
         std::set<wxString> modified_set;
         git_revwalk* walker = nullptr;
 
-        if( !m_repo || !from_oid )
+        if( !m_repo || !from_oid || IsCancelled() )
             return modified_set;
 
         if( git_revwalk_new( &walker, m_repo ) != GIT_OK )
@@ -286,6 +286,10 @@ std::pair<std::set<wxString>,std::set<wxString>> KIGIT_COMMON::GetDifferentFiles
         // iterate over all local commits not in remote
         while( git_revwalk_next( &oid, walker ) == GIT_OK )
         {
+            // Check for cancellation to allow early exit during shutdown
+            if( IsCancelled() )
+                return modified_set;
+
             if( git_commit_lookup( &commit, m_repo, &oid ) != GIT_OK )
             {
                 wxLogTrace( traceGit, "Failed to lookup commit: %s", KIGIT_COMMON::GetLastGitError() );
@@ -371,7 +375,7 @@ std::pair<std::set<wxString>,std::set<wxString>> KIGIT_COMMON::GetDifferentFiles
 
     std::pair<std::set<wxString>,std::set<wxString>> modified_files;
 
-    if( !m_repo )
+    if( !m_repo || IsCancelled() )
         return modified_files;
 
     git_reference* head = nullptr;

common/git/kicad_git_common.h

@@ -26,6 +26,7 @@
 
 #include <git/kicad_git_errors.h>
 
+#include <atomic>
 #include <git2.h>
 #include <mutex>
 #include <set>
@@ -138,6 +139,12 @@ public:
 
     int HandleSSHAgentAuthentication( git_cred** aOut, const wxString& aUsername );
 
+    bool IsCancelled() const { return m_cancel.load(); }
+
+    void SetCancelled( bool aCancel ) { m_cancel.store( aCancel ); }
+
+    std::mutex& GetMutex() { return m_gitActionMutex; }
+
     static wxString GetLastGitError()
     {
         const git_error* error = git_error_last();
@@ -174,6 +181,8 @@ private:
     int m_nextPublicKey;
     bool m_secretFetched;
 
+    std::atomic<bool> m_cancel{ false };
+
     // Create a dummy flag to tell if we have tested ssh agent credentials separately
     // from the ssh key credentials
     static const unsigned KIGIT_CREDENTIAL_SSH_AGENT = 1 << sizeof( m_testedTypes - 1 );

common/hotkeys_basic.cpp

@@ -324,7 +324,9 @@ int KeyCodeFromKeyName( const wxString& keyname )
 void DisplayHotkeyList( EDA_BASE_FRAME* aParent )
 {
     DIALOG_LIST_HOTKEYS dlg( aParent );
-    dlg.ShowModal();
+
+    if( dlg.ShowModal() == wxID_OK )
+        dlg.Kiway().CommonSettingsChanged( HOTKEYS_CHANGED );
 }
 
 

common/import_gfx/graphics_importer_buffer.cpp

@@ -132,10 +132,12 @@ void GRAPHICS_IMPORTER_BUFFER::ImportTo( GRAPHICS_IMPORTER& aImporter )
     // the graphics in the KiCad drawing area.
     else if( aImporter.GetImportOffsetMM() == VECTOR2D( 0, 0 ) )
     {
-        if( boundingBox.GetRight() > std::numeric_limits<int>::max()
-            || boundingBox.GetBottom() > std::numeric_limits<int>::max()
-            || boundingBox.GetLeft() < std::numeric_limits<int>::min()
-            || boundingBox.GetTop() < std::numeric_limits<int>::min() )
+        double iuFactor = aImporter.GetMillimeterToIuFactor();
+
+        if( boundingBox.GetRight() * iuFactor > std::numeric_limits<int>::max()
+            || boundingBox.GetBottom() * iuFactor > std::numeric_limits<int>::max()
+            || boundingBox.GetLeft() * iuFactor < std::numeric_limits<int>::min()
+            || boundingBox.GetTop() * iuFactor < std::numeric_limits<int>::min() )
         {
             VECTOR2D offset = boundingBox.GetOrigin();
             aImporter.SetImportOffsetMM( -offset );

common/io/altium/altium_binary_parser.cpp

@@ -382,7 +382,7 @@ std::map<wxString, wxString> ALTIUM_BINARY_PARSER::ReadProperties(
 
     // we use std::string because std::string can handle NULL-bytes
     // wxString would end the string at the first NULL-byte
-    std::string str = std::string( m_pos, length - ( hasNullByte ? 1 : 0 ) );
+    std::string str = std::string( m_pos, length - ( ( hasNullByte && !isBinary ) ? 1 : 0 ) );
     m_pos += length;
 
     if( isBinary )

common/jobs/job.cpp

@@ -97,27 +97,24 @@ void PrependDirectoryToPath( wxFileName& aFileName, const wxString aDirPath )
 }
 
 
-wxString JOB::GetFullOutputPath( PROJECT* aProject ) const
+wxString JOB::ResolveOutputPath( const wxString& aPath, bool aPathIsDirectory, PROJECT* aProject ) const
 {
     std::function<bool( wxString* )> textResolver =
             [&]( wxString* token ) -> bool
             {
                 if( m_titleBlock.TextVarResolver( token, aProject ) )
                     return true;
-
                 if( aProject )
                     return aProject->TextVarResolver( token );
-
                 return false;
             };
 
-    // use the working output path (nonsaved) over the configured path if its not empty
-    wxString outPath = m_workingOutputPath.IsEmpty() ? m_outputPath : m_workingOutputPath;
+    wxString outPath = aPath;
     outPath = ExpandTextVars( outPath, &textResolver );
 
     if( !m_tempOutputDirectory.IsEmpty() )
     {
-        if( m_outputPathIsDirectory )
+        if( aPathIsDirectory )
         {
             wxFileName fn( outPath );
 
@@ -144,12 +141,19 @@ wxString JOB::GetFullOutputPath( PROJECT* aProject ) const
 
             return fn.GetFullPath();
         }
-	}
+    }
 
     return outPath;
 }
 
 
+wxString JOB::GetFullOutputPath( PROJECT* aProject ) const
+{
+    return ResolveOutputPath( m_workingOutputPath.IsEmpty() ? m_outputPath : m_workingOutputPath,
+                              m_outputPathIsDirectory, aProject );
+}
+
+
 void JOB::SetConfiguredOutputPath( const wxString& aPath )
 {
     m_outputPath = aPath;

common/jobs/job.h

@@ -249,6 +249,8 @@ public:
      */
     wxString GetFullOutputPath( PROJECT* aProject ) const;
 
+    wxString ResolveOutputPath( const wxString& aPath, bool aPathIsDirectory, PROJECT* aProject ) const;
+
     bool GetOutputPathIsDirectory() const { return m_outputPathIsDirectory; }
 
 protected:
@@ -261,6 +263,11 @@ protected:
     wxString m_outputPath;
     bool     m_outputPathIsDirectory;
     wxString m_description;
+
+    /**
+     * The working output path is a transient path that takes priority over the configured
+     * output path when determining where to write output files.
+     */
     wxString m_workingOutputPath;
 
     std::vector<JOB_PARAM_BASE*> m_params;

common/jobs/job_export_pcb_drill.cpp

@@ -70,7 +70,8 @@ JOB_EXPORT_PCB_DRILL::JOB_EXPORT_PCB_DRILL() :
         m_zeroFormat( ZEROS_FORMAT::DECIMAL ),
         m_mapFormat( MAP_FORMAT::PDF ),
         m_gerberPrecision( 5 ),
-        m_generateMap( false )
+        m_generateMap( false ),
+        m_generateReport( false )
 {
     m_params.emplace_back( new JOB_PARAM<bool>( "excellon.mirror_y",
                                                 &m_excellonMirrorY,
@@ -115,6 +116,14 @@ JOB_EXPORT_PCB_DRILL::JOB_EXPORT_PCB_DRILL() :
     m_params.emplace_back( new JOB_PARAM<int>( "gerber_precision",
                                                &m_gerberPrecision,
                                                m_gerberPrecision ) );
+    
+    m_params.emplace_back( new JOB_PARAM<bool>( "generate_report",
+                                                &m_generateReport,
+                                                m_generateReport ) );
+
+    m_params.emplace_back( new JOB_PARAM<wxString>( "report_filename", 
+                                                        &m_reportPath, 
+                                                         m_reportPath ) );
 }
 
 

common/jobs/job_export_pcb_drill.h

@@ -85,6 +85,9 @@ public:
     MAP_FORMAT   m_mapFormat;
     int          m_gerberPrecision;
     bool         m_generateMap;
+
+    bool         m_generateReport;
+    wxString     m_reportPath;
 };
 
 #endif

common/jobs/jobs_output.h

@@ -44,6 +44,7 @@ public:
     virtual bool OutputPrecheck() { return true; }
     virtual bool HandleOutputs( const wxString&                aBaseTempPath,
                                 PROJECT*                       aProject,
+                                const std::vector<wxString>&   aPathsWithOverwriteDisallowed,
                                 const std::vector<JOB_OUTPUT>& aOutputsToHandle ) = 0;
 
     virtual void FromJson( const nlohmann::json& j ) = 0;

common/jobs/jobs_output_archive.cpp

@@ -42,7 +42,9 @@ bool JOBS_OUTPUT_ARCHIVE::OutputPrecheck()
 }
 
 
-bool JOBS_OUTPUT_ARCHIVE::HandleOutputs( const wxString& baseTempPath, PROJECT* aProject,
+bool JOBS_OUTPUT_ARCHIVE::HandleOutputs( const wxString&                baseTempPath,
+                                         PROJECT*                       aProject,
+                                         const std::vector<wxString>&   aPathsWithOverwriteDisallowed,
                                          const std::vector<JOB_OUTPUT>& aOutputsToHandle )
 {
     bool success = true;

common/jobs/jobs_output_archive.h

@@ -32,8 +32,9 @@ public:
         ZIP
     };
 
-    bool HandleOutputs( const wxString& aBaseTempPath,
-                        PROJECT* aProject,
+    bool HandleOutputs( const wxString&                aBaseTempPath,
+                        PROJECT*                       aProject,
+                        const std::vector<wxString>&   aPathsWithOverwriteDisallowed,
                         const std::vector<JOB_OUTPUT>& aOutputsToHandle ) override;
     bool OutputPrecheck() override;
 

common/jobs/jobs_output_folder.cpp

@@ -30,7 +30,9 @@ JOBS_OUTPUT_FOLDER::JOBS_OUTPUT_FOLDER() :
 }
 
 
-bool JOBS_OUTPUT_FOLDER::HandleOutputs( const wxString& baseTempPath, PROJECT* aProject,
+bool JOBS_OUTPUT_FOLDER::HandleOutputs( const wxString&                baseTempPath,
+                                        PROJECT*                       aProject,
+                                        const std::vector<wxString>&   aPathsWithOverwriteDisallowed,
                                         const std::vector<JOB_OUTPUT>& aOutputsToHandle )
 {
     wxString outputPath = ExpandTextVars( m_outputPath, aProject );
@@ -47,7 +49,7 @@ bool JOBS_OUTPUT_FOLDER::HandleOutputs( const wxString& baseTempPath, PROJECT* a
 
     wxString errors;
 
-    if( !CopyDirectory( baseTempPath, outputPath, errors ) )
+    if( !CopyDirectory( baseTempPath, outputPath, aPathsWithOverwriteDisallowed, errors ) )
         return false;
 
     return true;

common/jobs/jobs_output_folder.h

@@ -27,8 +27,9 @@ class JOBS_OUTPUT_FOLDER : public JOBS_OUTPUT_HANDLER
 public:
     JOBS_OUTPUT_FOLDER();
 
-    bool HandleOutputs( const wxString& aBaseTempPath,
-                        PROJECT* aProject,
+    bool HandleOutputs( const wxString&                aBaseTempPath,
+                        PROJECT*                       aProject,
+                        const std::vector<wxString>&   aPathsWithOverwriteDisallowed,
                         const std::vector<JOB_OUTPUT>& aOutputsToHandle ) override;
 
     bool OutputPrecheck() override;

common/kicad_curl/kicad_curl_easy.cpp

@@ -139,6 +139,12 @@ KICAD_CURL_EASY::KICAD_CURL_EASY() :
     curl_easy_setopt( m_CURL, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
 #endif
 
+    // Set connection timeout to prevent long freezes when network is unreachable.
+    // Without this, CURL can wait up to 5 minutes for DNS resolution or connection
+    // establishment, which causes the UI to freeze on macOS when behind a proxy with
+    // restricted internet access.
+    curl_easy_setopt( m_CURL, CURLOPT_CONNECTTIMEOUT, 30L );
+
 #ifdef _WIN32
     long sslOpts = CURLSSLOPT_NATIVE_CA;
 
@@ -345,6 +351,12 @@ bool KICAD_CURL_EASY::SetOutputStream( const std::ostream* aOutput )
 }
 
 
+bool KICAD_CURL_EASY::SetConnectTimeout( long aTimeoutSecs )
+{
+    return setOption( CURLOPT_CONNECTTIMEOUT, aTimeoutSecs ) == CURLE_OK;
+}
+
+
 int KICAD_CURL_EASY::GetTransferTotal( uint64_t& aDownloadedBytes ) const
 {
 #if LIBCURL_VERSION_NUM >= 0x073700 // 7.55.0

common/kiid.cpp

@@ -285,6 +285,17 @@ void KIID::Increment()
 }
 
 
+KIID KIID::Combine( const KIID& aFirst, const KIID& aSecond )
+{
+    KIID result( 0 );
+
+    for( int i = 0; i < 16; ++i )
+        result.m_uuid.data[i] = aFirst.m_uuid.data[i] ^ aSecond.m_uuid.data[i];
+
+    return result;
+}
+
+
 void KIID::CreateNilUuids( bool aNil )
 {
     g_createNilUuids = aNil;

common/lib_tree_model_adapter.cpp

@@ -48,7 +48,20 @@ public:
 
     wxSize GetSize() const override
     {
-        return wxSize( GetOwner()->GetWidth(), GetTextExtent( m_text ).y + 2 );
+        wxSize size( GetOwner()->GetWidth(), GetTextExtent( m_text ).y + 2 );
+
+#if defined( __WXGTK__ ) && !wxCHECK_VERSION( 3, 2, 7 )
+        // Somehow returning 0 or negative width prevents the returned height from
+        // being taken into account at all, even if we return strictly positive
+        // width from later calls to GetSize(), meaning that it's enough to return
+        // 0 from it once to completely break the layout for the entire lifetime of
+        // the control.
+        //
+        // As this is completely unexpected, forcefully prevent this from happening
+        size.IncTo( wxSize( 1, 1 ) );
+#endif
+
+        return size;
     }
 
     bool GetValue( wxVariant& aValue ) const override

common/paths.cpp

@@ -152,6 +152,7 @@ wxString PATHS::GetDefaultUserProjectsPath()
 }
 
 
+#if !defined( __WXMAC__ ) && !defined( __WXMSW__ )
 /**
  * Get the CMake build root directory for the current executable
  * (which assumes the executable is in a build directory).
@@ -192,6 +193,48 @@ static wxString getBuildDirectoryRoot()
 
     return fn.GetPath();
 }
+#elif defined( __WXMAC__ )
+/**
+ * Get the main .app bundle root with symlinks resolved.
+ * Handles both main KiCad binaries and aux binaries inside the bundle.
+ * This is the single source of truth for bundle root resolution on macOS.
+ */
+static wxString getOSXBundleRoot()
+{
+    static wxString bundleRoot;
+
+    if( bundleRoot.empty() )
+    {
+        wxFileName fn( wxStandardPaths::Get().GetExecutablePath() );
+        WX_FILENAME::ResolvePossibleSymlinks( fn );
+        fn.SetFullName( wxEmptyString ); // Remove binary name
+
+        // Navigate from .../Contents/MacOS/ up to the .app bundle root
+        // e.g., /Applications/KiCad/KiCad.app/Contents/MacOS -> /Applications/KiCad/KiCad.app
+        if( fn.GetDirCount() >= 2 && fn.GetDirs().Last() == wxT( "MacOS" ) )
+        {
+            fn.RemoveLastDir(); // MacOS
+            fn.RemoveLastDir(); // Contents
+        }
+
+        // Handle aux binaries inside main bundle
+        // From: .../main.app/Contents/Applications/standalone.app
+        // To:   .../main.app
+        const wxArrayString dirs = fn.GetDirs();
+        if( dirs.GetCount() >= 4 && dirs[dirs.GetCount() - 2] == wxT( "Applications" )
+            && dirs[dirs.GetCount() - 4].Lower().EndsWith( wxT( "app" ) ) )
+        {
+            fn.RemoveLastDir(); // standalone.app
+            fn.RemoveLastDir(); // Applications
+            fn.RemoveLastDir(); // Contents
+        }
+
+        bundleRoot = fn.GetPath();
+    }
+
+    return bundleRoot;
+}
+#endif
 
 
 wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
@@ -202,12 +245,10 @@ wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
     {
         // Allow debugging from build dir by placing relevant files/folders in the build root
 #if defined( __WXMAC__ )
-        wxFileName fn = wxStandardPaths::Get().GetExecutablePath();
-
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
+        wxFileName fn;
+        fn.AssignDir( getOSXBundleRoot() );
+        fn.RemoveLastDir(); // Above the .app bundle
+        fn.RemoveLastDir(); // Above the target subdirectory to build root
         path = fn.GetPath();
 #elif defined( __WXMSW__ )
         path = getWindowsKiCadRoot();
@@ -362,32 +403,25 @@ wxString PATHS::GetStockPlugins3DPath()
 
     fn.AppendDir( wxT( "plugins" ) );
 #elif defined( __WXMAC__ )
-    fn.Assign( wxStandardPaths::Get().GetPluginsDir(), wxEmptyString );
-
-    // This must be mapped to main bundle for everything but kicad.app
-    const wxArrayString dirs = fn.GetDirs();
-
-    // Check if we are the main kicad binary.  in this case, the path will be
-    //     /path/to/bundlename.app/Contents/PlugIns
-    // If we are an aux binary, the path will be something like
-    //     /path/to/bundlename.app/Contents/Applications/<standalone>.app/Contents/PlugIns
-    if( dirs.GetCount() >= 6 &&
-        dirs[dirs.GetCount() - 4] == wxT( "Applications" ) &&
-        dirs[dirs.GetCount() - 6].Lower().EndsWith( wxT( "app" ) ) )
-    {
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.AppendDir( wxT( "PlugIns" ) );
-    }
+    fn.AssignDir( getOSXBundleRoot() );
+    fn.AppendDir( wxT( "Contents" ) );
+    fn.AppendDir( wxT( "PlugIns" ) );
 #else
-    // KICAD_PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
-    // corresponding to the install path used for constructing KICAD_USER_PLUGIN
-    wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR );
-    fn.Assign( tfname, "" );
-    fn.AppendDir( wxT( "kicad" ) );
-    fn.AppendDir( wxT( "plugins" ) );
+    if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
+    {
+        fn.Assign( wxStandardPaths::Get().GetExecutablePath() );
+        fn.AppendDir( wxT( ".." ) );
+        fn.AppendDir( wxT( "plugins" ) );
+    }
+    else
+    {
+        // KICAD_PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path
+        // corresponding to the install path used for constructing KICAD_USER_PLUGIN
+        wxString tfname = wxString::FromUTF8Unchecked( KICAD_PLUGINDIR );
+        fn.Assign( tfname, "" );
+        fn.AppendDir( wxT( "kicad" ) );
+        fn.AppendDir( wxT( "plugins" ) );
+    }
 #endif
 
     fn.AppendDir( wxT( "3d" ) );
@@ -550,28 +584,10 @@ wxString PATHS::GetOSXKicadMachineDataDir()
 
 wxString PATHS::GetOSXKicadDataDir()
 {
-    // According to wxWidgets documentation for GetDataDir:
-    // Mac: appname.app/Contents/SharedSupport bundle subdirectory
-    wxFileName ddir( wxStandardPaths::Get().GetDataDir(), wxEmptyString );
-
-    // This must be mapped to main bundle for everything but kicad.app
-    const wxArrayString dirs = ddir.GetDirs();
-
-    // Check if we are the main kicad binary.  in this case, the path will be
-    //     /path/to/bundlename.app/Contents/SharedSupport
-    // If we are an aux binary, the path will be something like
-    //     /path/to/bundlename.app/Contents/Applications/<standalone>.app/Contents/SharedSupport
-    if( dirs.GetCount() >= 6 &&
-        dirs[dirs.GetCount() - 4] == wxT( "Applications" ) &&
-        dirs[dirs.GetCount() - 6].Lower().EndsWith( wxT( "app" ) ) )
-    {
-        ddir.RemoveLastDir();
-        ddir.RemoveLastDir();
-        ddir.RemoveLastDir();
-        ddir.RemoveLastDir();
-        ddir.AppendDir( wxT( "SharedSupport" ) );
-    }
-
+    wxFileName ddir;
+    ddir.AssignDir( getOSXBundleRoot() );
+    ddir.AppendDir( wxT( "Contents" ) );
+    ddir.AppendDir( wxT( "SharedSupport" ) );
     return ddir.GetPath();
 }
 #endif
@@ -642,33 +658,12 @@ const wxString& PATHS::GetExecutablePath()
 
     if( exe_path.empty() )
     {
+#ifdef __WXMAC__
+        // Use bundle root helper which handles symlink resolution and aux binaries
+        exe_path = getOSXBundleRoot() + wxT( "/" );
+#else
         wxString bin_dir = wxStandardPaths::Get().GetExecutablePath();
 
-#ifdef __WXMAC__
-        // On OSX GetExecutablePath() will always point to main
-        // bundle directory, e.g., /Applications/kicad.app/
-
-        wxFileName fn( bin_dir );
-        WX_FILENAME::ResolvePossibleSymlinks( fn );
-
-        if( fn.GetName() == wxT( "kicad" ) || fn.GetName() == wxT( "kicad-cli" ) )
-        {
-            // kicad launcher, so just remove the Contents/MacOS part
-            fn.RemoveLastDir();
-            fn.RemoveLastDir();
-        }
-        else
-        {
-            // standalone binaries live in Contents/Applications/<standalone>.app/Contents/MacOS
-            fn.RemoveLastDir();
-            fn.RemoveLastDir();
-            fn.RemoveLastDir();
-            fn.RemoveLastDir();
-            fn.RemoveLastDir();
-        }
-
-        bin_dir = fn.GetPath() + wxT( "/" );
-#else
         // Use unix notation for paths. I am not sure this is a good idea,
         // but it simplifies compatibility between Windows and Unices.
         // However it is a potential problem in path handling under Windows.
@@ -677,8 +672,9 @@ const wxString& PATHS::GetExecutablePath()
         // Remove file name form command line:
         while( bin_dir.Last() != '/' && !bin_dir.IsEmpty() )
             bin_dir.RemoveLast();
-#endif
+
         exe_path = bin_dir;
+#endif
     }
 
     return exe_path;

common/pgm_base.cpp

@@ -176,6 +176,8 @@ void PGM_BASE::Destroy()
 #endif
 
     m_pgm_checker.reset();
+
+    m_singleton.Shutdown();
 }
 
 

common/plotters/DXF_plotter.cpp

@@ -141,12 +141,14 @@ void DXF_PLOTTER::SetUnits( DXF_UNITS aUnit )
     case DXF_UNITS::MM:
         m_unitScalingFactor = 0.00254;
         m_measurementDirective = 1;
+        m_insUnits = 4;
         break;
 
     case DXF_UNITS::INCH:
     default:
         m_unitScalingFactor = 0.0001;
         m_measurementDirective = 0;
+        m_insUnits = 1;
     }
 }
 
@@ -219,6 +221,10 @@ bool DXF_PLOTTER::StartPlot( const wxString& aPageNumber )
             "$MEASUREMENT\n"
             "  70\n"
             "%u\n"
+            "  9\n"
+            "$INSUNITS\n"
+            "  70\n"
+            "%u\n"
             "  0\n"
             "ENDSEC\n"
             "  0\n"
@@ -313,7 +319,7 @@ bool DXF_PLOTTER::StartPlot( const wxString& aPageNumber )
             "-0.2\n"
             "  0\n"
             "ENDTAB\n",
-             GetMeasurementDirective() );
+             GetMeasurementDirective(), GetInsUnits() );
 
     // Text styles table
     // Defines 4 text styles, one for each bold/italic combination

common/project/net_settings.cpp

@@ -316,9 +316,12 @@ NET_SETTINGS::NET_SETTINGS( JSON_SETTINGS* aParent, const std::string& aPath ) :
                         wxString pattern = entry["pattern"].get<wxString>();
                         wxString netclass = entry["netclass"].get<wxString>();
 
-                        m_netClassPatternAssignments.push_back(
-                                { std::make_unique<EDA_COMBINED_MATCHER>( pattern, CTX_NETCLASS ),
-                                  netclass } );
+                        // Expand bus patterns so individual bus member nets can be matched
+                        ForEachBusMember( pattern,
+                                          [&]( const wxString& memberPattern )
+                                          {
+                                              addSinglePatternAssignment( memberPattern, netclass );
+                                          } );
                     }
                 }
             },
@@ -557,6 +560,21 @@ bool NET_SETTINGS::HasNetclassLabelAssignment( const wxString& netName ) const
 
 
 void NET_SETTINGS::SetNetclassPatternAssignment( const wxString& pattern, const wxString& netclass )
+{
+    // Expand bus patterns (vector buses and bus groups) to individual member patterns.
+    // This is necessary because the regex/wildcard matchers interpret brackets and braces
+    // as special characters, not as bus notation.
+    ForEachBusMember( pattern,
+                      [&]( const wxString& memberPattern )
+                      {
+                          addSinglePatternAssignment( memberPattern, netclass );
+                      } );
+
+    ClearAllCaches();
+}
+
+
+void NET_SETTINGS::addSinglePatternAssignment( const wxString& pattern, const wxString& netclass )
 {
     // Avoid exact duplicates - these shouldn't cause problems, due to later de-duplication
     // but they are unnecessary.
@@ -569,8 +587,6 @@ void NET_SETTINGS::SetNetclassPatternAssignment( const wxString& pattern, const
     // No assignment, add a new one
     m_netClassPatternAssignments.push_back(
             { std::make_unique<EDA_COMBINED_MATCHER>( pattern, CTX_NETCLASS ), netclass } );
-
-    ClearAllCaches();
 }
 
 
@@ -733,6 +749,44 @@ std::shared_ptr<NETCLASS> NET_SETTINGS::GetEffectiveNetClass( const wxString& aN
     // Handle zero resolved netclasses
     if( resolvedNetclasses.size() == 0 )
     {
+        // For bus patterns, check if all members share the same netclass.
+        // If they do, the bus inherits that netclass for coloring purposes.
+        std::shared_ptr<NETCLASS> sharedNetclass;
+        bool                      allSameNetclass = true;
+        bool                      isBusPattern = false;
+
+        ForEachBusMember( aNetName,
+                          [&]( const wxString& member )
+                          {
+                              // If ForEachBusMember gives us back the same name, it's not a bus.
+                              // Skip to avoid infinite recursion.
+                              if( member == aNetName )
+                                  return;
+
+                              isBusPattern = true;
+
+                              if( !allSameNetclass )
+                                  return;
+
+                              std::shared_ptr<NETCLASS> memberNc = GetEffectiveNetClass( member );
+
+                              if( !sharedNetclass )
+                              {
+                                  sharedNetclass = memberNc;
+                              }
+                              else if( memberNc->GetName() != sharedNetclass->GetName() )
+                              {
+                                  allSameNetclass = false;
+                              }
+                          } );
+
+        if( isBusPattern && allSameNetclass && sharedNetclass
+            && sharedNetclass->GetName() != NETCLASS::Default )
+        {
+            m_effectiveNetclassCache[aNetName] = sharedNetclass;
+            return sharedNetclass;
+        }
+
         m_effectiveNetclassCache[aNetName] = m_defaultNetClass;
 
         return m_defaultNetClass;
@@ -1015,6 +1069,33 @@ static bool isSuperSubOverbar( wxChar c )
 }
 
 
+/**
+ * Check if a character at the given position is escaped by a backslash.
+ *
+ * @param aStr The string to check
+ * @param aPos Position of the character to check
+ * @return true if the character is preceded by a backslash escape
+ */
+static bool isEscaped( const wxString& aStr, size_t aPos )
+{
+    if( aPos == 0 )
+        return false;
+
+    // Count consecutive backslashes before this position
+    int backslashCount = 0;
+    size_t pos = aPos;
+
+    while( pos > 0 && aStr[pos - 1] == '\\' )
+    {
+        backslashCount++;
+        pos--;
+    }
+
+    // If odd number of backslashes, the character is escaped
+    return ( backslashCount % 2 ) == 1;
+}
+
+
 bool NET_SETTINGS::ParseBusVector( const wxString& aBus, wxString* aName,
                                    std::vector<wxString>* aMemberList )
 {
@@ -1032,6 +1113,7 @@ bool NET_SETTINGS::ParseBusVector( const wxString& aBus, wxString* aName,
     long     begin = 0;
     long     end = 0;
     int      braceNesting = 0;
+    bool     inQuotes = false;
 
     prefix.reserve( busLen );
 
@@ -1039,18 +1121,57 @@ bool NET_SETTINGS::ParseBusVector( const wxString& aBus, wxString* aName,
     //
     for( ; i < busLen; ++i )
     {
+        // Handle quoted strings (allows spaces inside)
+        if( aBus[i] == '"' && !isEscaped( aBus, i ) )
+        {
+            inQuotes = !inQuotes;
+            continue;
+        }
+
+        if( inQuotes )
+        {
+            // Inside quotes, add characters directly (including spaces)
+            if( aBus[i] == '\\' && i + 1 < busLen )
+            {
+                // Handle escaped characters inside quotes
+                prefix += aBus[++i];
+            }
+            else
+            {
+                prefix += aBus[i];
+            }
+
+            continue;
+        }
+
         if( aBus[i] == '{' )
         {
             if( i > 0 && isSuperSubOverbar( aBus[i-1] ) )
+            {
                 braceNesting++;
+
+                if( !prefix.IsEmpty() )
+                    prefix.RemoveLast();
+
+                continue;
+            }
             else
                 return false;
         }
         else if( aBus[i] == '}' )
         {
             braceNesting--;
+            continue;
         }
 
+        // Handle backslash-escaped spaces
+        if( aBus[i] == '\\' && i + 1 < busLen && aBus[i + 1] == ' ' )
+        {
+            prefix += aBus[++i];
+            continue;
+        }
+
+        // Unescaped space or ] in bus vector prefix is not allowed
         if( aBus[i] == ' ' || aBus[i] == ']' )
             return false;
 
@@ -1111,6 +1232,9 @@ bool NET_SETTINGS::ParseBusVector( const wxString& aBus, wxString* aName,
         if( aBus[i] == '}' )
         {
             braceNesting--;
+        }
+        else if( aBus[i] == '+' || aBus[i] == '-' || aBus[i] == 'P' || aBus[i] == 'N' )
+        {
             suffix += aBus[i];
         }
         else
@@ -1154,17 +1278,68 @@ bool NET_SETTINGS::ParseBusGroup( const wxString& aGroup, wxString* aName,
     wxString prefix;
     wxString tmp;
     int      braceNesting = 0;
+    bool     inQuotes = false;
 
     prefix.reserve( groupLen );
 
+    // Escape spaces in member names so recursive parsing by ForEachBusMember works correctly.
+    // Both quoted strings and backslash-escaped spaces collapse to bare spaces during parsing,
+    // so we must re-escape them for subsequent ParseBusVector/ParseBusGroup calls.
+    auto escapeSpacesForBus =
+            []( const wxString& aMember ) -> wxString
+            {
+                wxString escaped;
+                escaped.reserve( aMember.length() * 2 );
+
+                for( wxUniChar c : aMember )
+                {
+                    if( c == ' ' )
+                        escaped += wxT( "\\ " );
+                    else
+                        escaped += c;
+                }
+
+                return escaped;
+            };
+
     // Parse prefix
     //
     for( ; i < groupLen; ++i )
     {
+        // Handle quoted strings (allows spaces inside)
+        if( aGroup[i] == '"' && !isEscaped( aGroup, i ) )
+        {
+            inQuotes = !inQuotes;
+            continue;
+        }
+
+        if( inQuotes )
+        {
+            // Inside quotes, add characters directly (including spaces)
+            if( aGroup[i] == '\\' && i + 1 < groupLen )
+            {
+                // Handle escaped characters inside quotes
+                prefix += aGroup[++i];
+            }
+            else
+            {
+                prefix += aGroup[i];
+            }
+
+            continue;
+        }
+
         if( aGroup[i] == '{' )
         {
             if( i > 0 && isSuperSubOverbar( aGroup[i-1] ) )
+            {
                 braceNesting++;
+
+                if( !prefix.IsEmpty() )
+                    prefix.RemoveLast();
+
+                continue;
+            }
             else
                 break;
         }
@@ -1173,6 +1348,14 @@ bool NET_SETTINGS::ParseBusGroup( const wxString& aGroup, wxString* aName,
             braceNesting--;
         }
 
+        // Handle backslash-escaped spaces
+        if( aGroup[i] == '\\' && i + 1 < groupLen && aGroup[i + 1] == ' ' )
+        {
+            prefix += aGroup[++i];
+            continue;
+        }
+
+        // Unescaped space, [, or ] in bus group prefix is not allowed
         if( aGroup[i] == ' ' || aGroup[i] == '[' || aGroup[i] == ']' )
             return false;
 
@@ -1192,12 +1375,44 @@ bool NET_SETTINGS::ParseBusGroup( const wxString& aGroup, wxString* aName,
     if( i >= groupLen )
         return false;
 
+    inQuotes = false;
+
     for( ; i < groupLen; ++i )
     {
+        // Handle quoted strings (allows spaces inside member names)
+        if( aGroup[i] == '"' && !isEscaped( aGroup, i ) )
+        {
+            inQuotes = !inQuotes;
+            continue;
+        }
+
+        if( inQuotes )
+        {
+            // Inside quotes, add characters directly (including spaces)
+            if( aGroup[i] == '\\' && i + 1 < groupLen )
+            {
+                // Handle escaped characters inside quotes
+                tmp += aGroup[++i];
+            }
+            else
+            {
+                tmp += aGroup[i];
+            }
+
+            continue;
+        }
+
         if( aGroup[i] == '{' )
         {
             if( i > 0 && isSuperSubOverbar( aGroup[i-1] ) )
+            {
                 braceNesting++;
+
+                if( !tmp.IsEmpty() )
+                    tmp.RemoveLast();
+
+                continue;
+            }
             else
                 return false;
         }
@@ -1206,21 +1421,29 @@ bool NET_SETTINGS::ParseBusGroup( const wxString& aGroup, wxString* aName,
             if( braceNesting )
             {
                 braceNesting--;
+                continue;
             }
             else
             {
                 if( aMemberList && !tmp.IsEmpty() )
-                    aMemberList->push_back( EscapeString( tmp, CTX_NETNAME ) );
+                    aMemberList->push_back( EscapeString( escapeSpacesForBus( tmp ), CTX_NETNAME ) );
 
                 return true;
             }
         }
 
-        // Commas aren't strictly legal, but we can be pretty sure what the author had in mind.
+        // Handle backslash-escaped spaces in member names
+        if( aGroup[i] == '\\' && i + 1 < groupLen && aGroup[i + 1] == ' ' )
+        {
+            tmp += aGroup[++i];
+            continue;
+        }
+
+        // Unescaped space or comma separates members
         if( aGroup[i] == ' ' || aGroup[i] == ',' )
         {
             if( aMemberList && !tmp.IsEmpty() )
-                aMemberList->push_back( EscapeString( tmp, CTX_NETNAME ) );
+                aMemberList->push_back( EscapeString( escapeSpacesForBus( tmp ), CTX_NETNAME ) );
 
             tmp.Clear();
             continue;
@@ -1231,3 +1454,28 @@ bool NET_SETTINGS::ParseBusGroup( const wxString& aGroup, wxString* aName,
 
     return false;
 }
+
+
+void NET_SETTINGS::ForEachBusMember( const wxString&                              aBusPattern,
+                                     const std::function<void( const wxString& )>& aFunction )
+{
+    std::vector<wxString> members;
+
+    if( ParseBusVector( aBusPattern, nullptr, &members ) )
+    {
+        // Vector bus: call function for each expanded member
+        for( const wxString& member : members )
+            aFunction( member );
+    }
+    else if( ParseBusGroup( aBusPattern, nullptr, &members ) )
+    {
+        // Bus group: recursively expand each member (which may itself be a vector or group)
+        for( const wxString& member : members )
+            ForEachBusMember( member, aFunction );
+    }
+    else
+    {
+        // Not a bus pattern: call function with the original pattern
+        aFunction( aBusPattern );
+    }
+}

common/project/project_file.cpp

@@ -117,6 +117,8 @@ PROJECT_FILE::PROJECT_FILE( const wxString& aFullPath ) :
                     m_LegacyLibNames.push_back( entry.get<wxString>() );
             }, {} ) );
 
+
+
     m_NetSettings = std::make_shared<NET_SETTINGS>( this, "net_settings" );
 
     m_params.emplace_back( new PARAM_LAYER_PRESET( "board.layer_presets", &m_LayerPresets ) );

common/project/project_local_settings.cpp

@@ -45,6 +45,7 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
         m_ShapeOpacity( 1.0 ),
         m_ImageOpacity( 0.6 ),
         m_PcbSelectionFilter(),
+        m_GitIntegrationDisabled( false ),
         m_project( aProject ),
         m_wasMigrated( false )
 {
@@ -207,6 +208,8 @@ PROJECT_LOCAL_SETTINGS::PROJECT_LOCAL_SETTINGS( PROJECT* aProject, const wxStrin
 
     m_params.emplace_back( new PARAM<wxString>( "git.ssh_key", &m_GitSSHKey, "" ) );
 
+    m_params.emplace_back( new PARAM<bool>( "git.integration_disabled", &m_GitIntegrationDisabled, false ) );
+
     m_params.emplace_back( new PARAM<wxString>( "net_inspector_panel.filter_text",
                                                 &m_NetInspectorPanel.filter_text, "" ) );
     m_params.emplace_back( new PARAM<bool>( "net_inspector_panel.filter_by_net_name",

common/properties/pg_editors.cpp

@@ -311,13 +311,21 @@ wxPGWindowList PG_COLOR_EDITOR::CreateControls( wxPropertyGrid* aGrid, wxPGPrope
     editor->SetPosition( aPos );
     editor->SetSize( aSize );
 
+    // Capture property name instead of pointer to avoid dangling pointer if grid is rebuilt
+    wxString propName = colorProp->GetName();
+
     editor->Bind( COLOR_SWATCH_CHANGED,
                   [=]( wxCommandEvent& aEvt )
                   {
-                      wxVariant val;
-                      auto data = new COLOR4D_VARIANT_DATA( editor->GetSwatchColor() );
-                      val.SetData( data );
-                      aGrid->ChangePropertyValue( colorProp, val );
+                      wxPGProperty* prop = aGrid->GetPropertyByName( propName );
+
+                      if( prop )
+                      {
+                          wxVariant val;
+                          auto data = new COLOR4D_VARIANT_DATA( editor->GetSwatchColor() );
+                          val.SetData( data );
+                          aGrid->ChangePropertyValue( prop, val );
+                      }
                   } );
 
 #if wxCHECK_VERSION( 3, 3, 0 )
@@ -330,6 +338,11 @@ wxPGWindowList PG_COLOR_EDITOR::CreateControls( wxPropertyGrid* aGrid, wxPGPrope
                 [=]()
                 {
                     editor->GetNewSwatchColor();
+
+                    wxPGProperty* prop = aGrid->GetPropertyByName( propName );
+
+                    if( prop )
+                        aGrid->DrawItem( prop );
                 } );
     }
 

common/scintilla_tricks.cpp

@@ -206,10 +206,12 @@ void SCINTILLA_TRICKS::onModified( wxStyledTextEvent& aEvent )
     {
         // If the font is larger than the height of a single-line text box we can get issues
         // with the text disappearing every other character due to dodgy scrolling behaviour.
-        CallAfter( [this]()
-                   {
-                       m_te->ScrollToStart();
-                   } );
+        CallAfter(
+                [this]()
+                {
+                    if( !m_te->AutoCompActive() )
+                        m_te->ScrollToStart();
+                } );
     }
 }
 

common/singleton.cpp

@@ -20,18 +20,37 @@
 #include <singleton.h>
 #include <bs_thread_pool.hpp>
 #include <gal/opengl/gl_context_mgr.h>
+#include <thread_pool.h>
 
 
 KICAD_SINGLETON::~KICAD_SINGLETON()
 {
-    // This will wait for all threads to finish and then join them to the main thread
-    delete m_ThreadPool;
+    // Shutdown() should have been called before static destruction.
+    // If not, we still try to clean up, but this may crash on macOS
+    // during static destruction due to condition variable issues.
+    Shutdown();
+}
 
-    m_ThreadPool = nullptr;
 
-    m_GLContextManager->DeleteAll();
-    delete m_GLContextManager;
-    m_GLContextManager = nullptr;
+void KICAD_SINGLETON::Shutdown()
+{
+    // This will wait for all threads to finish and then join them to the main thread.
+    // Must be called before static destruction begins to avoid crashes on macOS.
+    if( m_ThreadPool )
+    {
+        delete m_ThreadPool;
+        m_ThreadPool = nullptr;
+
+        // Clear the cached thread pool pointer to prevent dangling reference
+        InvalidateKiCadThreadPool();
+    }
+
+    if( m_GLContextManager )
+    {
+        m_GLContextManager->DeleteAll();
+        delete m_GLContextManager;
+        m_GLContextManager = nullptr;
+    }
 }
 
 

common/string_utils.cpp

@@ -155,7 +155,7 @@ bool ConvertSmartQuotesAndDashes( wxString* aString )
 
     for( wxString::iterator ii = aString->begin(); ii != aString->end(); ++ii )
     {
-        if( *ii == L'\u00B4' || *ii == L'\u2018' || *ii == L'\u2019' )
+        if( *ii == L'\u2018' || *ii == L'\u2019' )
         {
             *ii = '\'';
             retVal = true;

common/thread_pool.cpp

@@ -26,6 +26,7 @@
 #include <thread_pool.h>
 
 static thread_pool* tp = nullptr;
+static bool         tp_owned = false;  // True if we created the thread pool ourselves
 
 thread_pool& GetKiCadThreadPool()
 {
@@ -36,6 +37,7 @@ thread_pool& GetKiCadThreadPool()
     if( PGM_BASE* pgm = PgmOrNull() )
     {
         tp = &pgm->GetThreadPool();
+        tp_owned = false;
         return *tp;
     }
 
@@ -43,6 +45,20 @@ thread_pool& GetKiCadThreadPool()
     // so we need to create our own thread pool
     int num_threads = std::max( 0, ADVANCED_CFG::GetCfg().m_MaximumThreads );
     tp = new thread_pool( num_threads );
+    tp_owned = true;
 
     return *tp;
 }
+
+
+void InvalidateKiCadThreadPool()
+{
+    // If we own the thread pool (scripting context), delete it
+    if( tp && tp_owned )
+    {
+        delete tp;
+    }
+
+    tp = nullptr;
+    tp_owned = false;
+}

common/tool/action_toolbar.cpp

@@ -477,13 +477,17 @@ void ACTION_TOOLBAR::onToolEvent( wxAuiToolBarEvent& aEvent )
 
     bool handled = false;
 
-    if( m_toolManager && type == wxEVT_COMMAND_TOOL_CLICKED  && id >= TOOL_ACTION::GetBaseUIId() )
+    if( m_toolManager && type == wxEVT_COMMAND_TOOL_CLICKED )
     {
         const auto actionIt = m_toolActions.find( id );
+        const auto cancelIt = m_toolCancellable.find( id );
+
+        // Determine if the tool is actually cancellable
+        bool isCancellable = ( cancelIt != m_toolCancellable.end() ) ? cancelIt->second : false;
 
         // The toolbar item is toggled before the event is sent, so we check for it not being
         // toggled to see if it was toggled originally
-        if( m_toolCancellable[id] && !GetToolToggled( id ) )
+        if( isCancellable && !GetToolToggled( id ) )
         {
             // Send a cancel event
             m_toolManager->CancelTool();

common/tool/common_tools.cpp

@@ -612,6 +612,7 @@ int COMMON_TOOLS::GridProperties( const TOOL_EVENT& aEvent )
     case FRAME_SCH_SYMBOL_EDITOR: showGridPrefs( _( "Symbol Editor" ) );        break;
     case FRAME_PCB_EDITOR:        showGridPrefs( _( "PCB Editor" ) );           break;
     case FRAME_FOOTPRINT_EDITOR:  showGridPrefs( _( "Footprint Editor" ) );     break;
+    case FRAME_FOOTPRINT_VIEWER:  showGridPrefs( _( "Footprint Browser" ) );    break;
     case FRAME_PL_EDITOR:         showGridPrefs( _( "Drawing Sheet Editor" ) ); break;
     case FRAME_GERBER:            showGridPrefs( _( "Gerber Viewer" ) );        break;
     default:                      wxFAIL_MSG( "Unknown frame: " + GetName() );  break;

common/tool/grid_menu.cpp

@@ -59,12 +59,12 @@ void GRID_MENU::UpdateTitle()
 
 void GRID_MENU::update()
 {
-    APP_SETTINGS_BASE* settings = m_parent->config();
-    unsigned int       current = settings->m_Window.grid.last_size_idx + ID_POPUP_GRID_START;
-    wxArrayString      gridsList;
-    int                i = ID_POPUP_GRID_START;
+    WINDOW_SETTINGS* cfg = m_parent->GetWindowSettings( m_parent->config() );
+    unsigned int     current = cfg->grid.last_size_idx + ID_POPUP_GRID_START;
+    wxArrayString    gridsList;
+    int              i = ID_POPUP_GRID_START;
 
-    GRID_MENU::BuildChoiceList( &gridsList, settings, m_parent );
+    GRID_MENU::BuildChoiceList( &gridsList, cfg, m_parent );
 
     while( GetMenuItemCount() > 0 )
         Delete( FindItemByPosition( 0 ) );
@@ -80,8 +80,7 @@ void GRID_MENU::update()
 }
 
 
-void GRID_MENU::BuildChoiceList( wxArrayString* aGridsList, APP_SETTINGS_BASE* aCfg,
-                                 EDA_DRAW_FRAME* aParent )
+void GRID_MENU::BuildChoiceList( wxArrayString* aGridsList, WINDOW_SETTINGS* aCfg, EDA_DRAW_FRAME* aParent )
 {
     wxString     msg;
     EDA_IU_SCALE scale = aParent->GetIuScale();
@@ -90,7 +89,7 @@ void GRID_MENU::BuildChoiceList( wxArrayString* aGridsList, APP_SETTINGS_BASE* a
 
     aParent->GetUnitPair( primaryUnit, secondaryUnit );
 
-    for( GRID& gridSize : aCfg->m_Window.grid.grids )
+    for( GRID& gridSize : aCfg->grid.grids )
     {
         wxString name;
 

common/tool/tool_dispatcher.cpp

@@ -425,6 +425,28 @@ std::optional<TOOL_EVENT> TOOL_DISPATCHER::GetToolEvent( wxKeyEvent* aKeyEvent,
 }
 
 
+void TOOL_DISPATCHER::flushPendingClicks()
+{
+    // When an escape key event arrives, keyboard events can be processed before mouse button
+    // events due to wxWidgets event queue ordering. If a mouse button was pressed and has since
+    // been released (detected via polling), we need to process that click before handling the
+    // escape to maintain proper event ordering.
+    for( BUTTON_STATE* st : m_buttons )
+    {
+        if( st->pressed && !st->GetState() )
+        {
+            st->pressed = false;
+
+            TOOL_EVENT clickEvt( TC_MOUSE, TA_MOUSE_CLICK, st->button );
+            clickEvt.SetMousePosition( st->downPosition );
+            m_toolMgr->ProcessEvent( clickEvt );
+
+            st->dragging = false;
+        }
+    }
+}
+
+
 void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
 {
     bool            motion = false;
@@ -543,6 +565,12 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
 
         keyIsEscape = ( ke->GetKeyCode() == WXK_ESCAPE );
 
+        // When escape is pressed shortly after a mouse click, the keyboard event can be
+        // processed before the mouse button release event. Flush any pending clicks first
+        // to ensure proper event ordering.
+        if( keyIsEscape )
+            flushPendingClicks();
+
         if( KIUI::IsInputControlFocused( focus ) )
         {
             bool enabled = KIUI::IsInputControlEditable( focus );

common/widgets/app_progress_dialog.cpp

@@ -22,9 +22,9 @@
  */
 
 #include <wx/version.h>
+#include <wx/sizer.h>
 #include <widgets/app_progress_dialog.h>
 
-
 APP_PROGRESS_DIALOG::APP_PROGRESS_DIALOG( const wxString& aTitle, const wxString& aMessage,
                                           int aMaximum, wxWindow* aParent,
                                           bool aIndeterminateTaskBarStatus, int aStyle )
@@ -39,6 +39,11 @@ APP_PROGRESS_DIALOG::APP_PROGRESS_DIALOG( const wxString& aTitle, const wxString
     {
         m_appProgressIndicator.Pulse();
     }
+
+    Layout();
+
+    if( GetSizer() )
+        GetSizer()->Fit( this );
 }
 
 

common/widgets/color_swatch.cpp

@@ -208,11 +208,7 @@ void COLOR_SWATCH::setupEvents( bool aTriggerWithSingleClick )
 {
     if( dynamic_cast<DIALOG_SHIM*>( wxGetTopLevelParent( this ) ) )
     {
-        m_swatch->Bind( wxEVT_LEFT_DOWN,
-                        [this] ( wxMouseEvent& aEvt )
-                        {
-                            GetNewSwatchColor();
-                        } );
+        m_swatch->Bind( wxEVT_LEFT_DOWN, &COLOR_SWATCH::onMouseEvent, this );
     }
     else
     {
@@ -220,27 +216,15 @@ void COLOR_SWATCH::setupEvents( bool aTriggerWithSingleClick )
         m_swatch->Bind( wxEVT_LEFT_DOWN, &COLOR_SWATCH::rePostEvent, this );
 
         // bind the events that trigger the dialog
-        m_swatch->Bind( wxEVT_LEFT_DCLICK,
-                        [this] ( wxMouseEvent& aEvt )
-                        {
-                            GetNewSwatchColor();
-                        } );
+        m_swatch->Bind( wxEVT_LEFT_DCLICK, &COLOR_SWATCH::onMouseEvent, this );
 
         if( aTriggerWithSingleClick )
         {
-            m_swatch->Bind( wxEVT_LEFT_UP,
-                        [this] ( wxMouseEvent& aEvt )
-                        {
-                            GetNewSwatchColor();
-                        } );
+            m_swatch->Bind( wxEVT_LEFT_UP, &COLOR_SWATCH::onMouseEvent, this );
         }
     }
 
-    m_swatch->Bind( wxEVT_MIDDLE_DOWN,
-                    [this] ( wxMouseEvent& aEvt )
-                    {
-                        GetNewSwatchColor();
-                    } );
+    m_swatch->Bind( wxEVT_MIDDLE_DOWN, &COLOR_SWATCH::onMouseEvent, this );
 
     m_swatch->Bind( wxEVT_RIGHT_DOWN, &COLOR_SWATCH::rePostEvent, this );
 }
@@ -252,6 +236,12 @@ void COLOR_SWATCH::rePostEvent( wxEvent& aEvent )
 }
 
 
+void COLOR_SWATCH::onMouseEvent( wxEvent& )
+{
+    GetNewSwatchColor();
+}
+
+
 static void sendSwatchChangeEvent( COLOR_SWATCH& aSender )
 {
     wxCommandEvent changeEvt( COLOR_SWATCH_CHANGED, aSender.GetId() );

common/widgets/kistatusbar.cpp

@@ -193,7 +193,12 @@ void KISTATUSBAR::HideBackgroundProgressBar()
 
 void KISTATUSBAR::SetBackgroundProgress( int aAmount )
 {
-    m_backgroundProgressBar->SetValue( aAmount );
+    int value = m_backgroundProgressBar->GetRange();
+
+    if( value <= aAmount )
+        value = aAmount;
+
+    m_backgroundProgressBar->SetValue( value );
 }
 
 

common/widgets/mathplot.cpp

@@ -624,7 +624,11 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
 #else
             int chunkSize = 100000;
 #endif
-            if( dc.GetPen().GetStyle() == wxPENSTYLE_DOT )
+            wxPenStyle penStyle = dc.GetPen().GetStyle();
+            bool isSolidPen = ( penStyle == wxPENSTYLE_SOLID
+                                || penStyle == wxPENSTYLE_TRANSPARENT );
+
+            if( !isSolidPen )
                 chunkSize /= 500;
 
             drawPoints.push_back( pointList[0] );   // push the first point in list
@@ -632,9 +636,11 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
             for( size_t ii = 1; ii < pointList.size()-1; ii++ )
             {
                 // Skip intermediate points between the first point and the last point of the
-                // segment candidate
-                if( drawPoints.back().y == pointList[ii].y &&
-                    drawPoints.back().y == pointList[ii+1].y )
+                // segment candidate. This optimization merges horizontal line segments, which
+                // breaks non-solid pen styles by altering segment lengths.
+                if( isSolidPen
+                    && drawPoints.back().y == pointList[ii].y
+                    && drawPoints.back().y == pointList[ii+1].y )
                 {
                     continue;
                 }

common/widgets/report_severity.cpp

@@ -0,0 +1,53 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright The 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <widgets/report_severity.h>
+#include <wx/intl.h>
+#include <i18n_utility.h>
+#include <vector>
+
+
+wxString formatSeverities( int aSeverities )
+{
+    wxString result;
+    std::vector<wxString> items;
+
+    if( aSeverities & RPT_SEVERITY_ERROR )
+        items.push_back( _( "Errors" ) );
+
+    if( aSeverities & RPT_SEVERITY_WARNING )
+        items.push_back( _( "Warnings" ) );
+
+    if( aSeverities & RPT_SEVERITY_EXCLUSION )
+        items.push_back( _( "Exclusions" ) );
+
+    if( items.empty() )
+        return _( "None" );
+
+    for( size_t i = 0; i < items.size(); i++ )
+    {
+        result += items[i];
+
+        if( i < items.size() - 1 )
+            result += wxS( ", " );
+    }
+
+    return result;
+}
+

common/widgets/widget_hotkey_list.cpp

@@ -513,16 +513,11 @@ bool WIDGET_HOTKEY_LIST::resolveKeyConflicts( TOOL_ACTION* aAction, long aKey )
 }
 
 
-WIDGET_HOTKEY_LIST::WIDGET_HOTKEY_LIST( wxWindow* aParent, HOTKEY_STORE& aHotkeyStore,
-                                        bool aReadOnly ) :
+WIDGET_HOTKEY_LIST::WIDGET_HOTKEY_LIST( wxWindow* aParent, HOTKEY_STORE& aHotkeyStore ) :
         wxTreeListCtrl( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTL_SINGLE ),
-        m_hk_store( aHotkeyStore ),
-        m_readOnly( aReadOnly )
+        m_hk_store( aHotkeyStore )
 {
-    wxString command_header = _( "Command" );
-
-    if( !m_readOnly )
-        command_header << wxS( " " ) << _( "(double-click to edit)" );
+    wxString command_header = _( "Command (double-click to edit)" );
 
     AppendColumn( command_header, 450, wxALIGN_LEFT, wxCOL_RESIZABLE | wxCOL_SORTABLE );
     AppendColumn( _( "Hotkey" ), 120, wxALIGN_LEFT, wxCOL_RESIZABLE | wxCOL_SORTABLE );
@@ -568,13 +563,9 @@ WIDGET_HOTKEY_LIST::WIDGET_HOTKEY_LIST( wxWindow* aParent, HOTKEY_STORE& aHotkey
 
     GetDataView()->SetIndent( 10 );
 
-    if( !m_readOnly )
-    {
-        // The event only apply if the widget is in editable mode
-        Bind( wxEVT_TREELIST_ITEM_ACTIVATED, &WIDGET_HOTKEY_LIST::onActivated, this );
-        Bind( wxEVT_TREELIST_ITEM_CONTEXT_MENU, &WIDGET_HOTKEY_LIST::onContextMenu, this );
-        Bind( wxEVT_MENU, &WIDGET_HOTKEY_LIST::onMenu, this );
-    }
+    Bind( wxEVT_TREELIST_ITEM_ACTIVATED, &WIDGET_HOTKEY_LIST::onActivated, this );
+    Bind( wxEVT_TREELIST_ITEM_CONTEXT_MENU, &WIDGET_HOTKEY_LIST::onContextMenu, this );
+    Bind( wxEVT_MENU, &WIDGET_HOTKEY_LIST::onMenu, this );
 }
 
 

common/widgets/wx_infobar.cpp

@@ -30,6 +30,7 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/timer.h>
+#include <wx/dcclient.h>
 #include <eda_base_frame.h>
 
 #ifdef __WXMSW__
@@ -236,11 +237,28 @@ void WX_INFOBAR::onSize( wxSizeEvent& aEvent )
     if( !sizer )
         return;
 
-    wxSizerItem* text = sizer->GetItem( 1 );
+    // wx3.3 moved the sizer we previously wanted deeper into sizers...
+    // do we actually still need this for wx3.3?
+    #if wxCHECK_VERSION( 3, 3, 0 )
+    wxSizerItem* outerSizer = sizer->GetItem( (size_t) 0 );
+    wxSizerItem* textSizer = nullptr;
 
-    if( text )
+    if (outerSizer->IsSizer())
     {
-        if( auto textCtrl = dynamic_cast<wxStaticText*>( text->GetWindow() ) )
+        wxBoxSizer* innerSizer1 = dynamic_cast<wxBoxSizer*>( outerSizer->GetSizer() );
+        wxBoxSizer* innerSizer2 =
+                dynamic_cast<wxBoxSizer*>( innerSizer1->GetItem((size_t)0)->GetSizer() );
+
+        if( innerSizer2 )
+            textSizer = innerSizer2->GetItem( 1 );
+    }
+    #else
+    wxSizerItem* textSizer = sizer->GetItem( 1 );
+    #endif
+
+    if( textSizer )
+    {
+        if( wxStaticText* textCtrl = dynamic_cast<wxStaticText*>( textSizer->GetWindow() ) )
             textCtrl->SetLabelText( m_message );
     }
 
@@ -257,9 +275,9 @@ void WX_INFOBAR::onSize( wxSizeEvent& aEvent )
     if( barWidth != parentWidth )
         SetSize( parentWidth, GetSize().GetHeight() );
 
-    if( text )
+    if( textSizer )
     {
-        if( auto textCtrl = dynamic_cast<wxStaticText*>( text->GetWindow() ) )
+        if( wxStaticText* textCtrl = dynamic_cast<wxStaticText*>( textSizer->GetWindow() ) )
         {
             // Re-wrap the text (this is done automatically later but we need it now)
             // And count how many lines we need.  If we have embedded newlines, then
@@ -267,10 +285,18 @@ void WX_INFOBAR::onSize( wxSizeEvent& aEvent )
             // min height for the control.  The min height of the text control will be the size
             // of a single line of text.  This assumes that two lines of text are larger
             // than the height of the icon for the bar.
-            textCtrl->Wrap( text->GetSize().GetWidth() );
-            wxString new_text = textCtrl->GetLabel();
-            int      height = ( new_text.Freq( '\n' ) + 1 ) * text->GetMinSize().GetHeight();
-            SetMinSize( wxSize( GetSize().GetWidth(), height ) );
+            textCtrl->Wrap( -1 );
+            wxString wrapped_text = textCtrl->GetLabel();
+            int line_count = wrapped_text.Freq( '\n' ) + 1;
+            int txt_h, txt_v;
+            wxWindowDC dc( textCtrl );
+            dc.GetTextExtent( wxT( "Xp" ), &txt_h, &txt_v );
+
+            int      height = txt_v * line_count;
+            int      margins = txt_v - 1;
+            SetMinSize( wxSize( GetSize().GetWidth(), height + margins ) );
+
+            textCtrl->Wrap( -1 );
         }
     }
 
@@ -323,7 +349,10 @@ void WX_INFOBAR::AddButton( wxButton* aButton )
     element->SetFlag( wxSTRETCH_MASK );
 
     if( IsShownOnScreen() )
-        sizer->Layout();
+    {
+        Layout();
+        sizer->Fit( this );
+    }
 }
 
 
@@ -336,7 +365,10 @@ void WX_INFOBAR::AddButton( wxHyperlinkCtrl* aHypertextButton )
     sizer->Add( aHypertextButton, wxSizerFlags().Centre().Border( wxRIGHT ).Shaped() );
 
     if( IsShownOnScreen() )
-        sizer->Layout();
+    {
+        Layout();
+        sizer->Fit( this );
+    }
 }
 
 
@@ -498,13 +530,13 @@ void INFOBAR_REPORTER::Finalize()
     switch( m_severity )
     {
     case RPT_SEVERITY_UNDEFINED: icon = wxICON_INFORMATION; break;
-    case RPT_SEVERITY_INFO: icon = wxICON_INFORMATION; break;
-    case RPT_SEVERITY_EXCLUSION: icon = wxICON_WARNING; break;
-    case RPT_SEVERITY_ACTION: icon = wxICON_WARNING; break;
-    case RPT_SEVERITY_WARNING: icon = wxICON_WARNING; break;
-    case RPT_SEVERITY_ERROR: icon = wxICON_ERROR; break;
-    case RPT_SEVERITY_IGNORE: icon = wxICON_INFORMATION; break;
-    case RPT_SEVERITY_DEBUG: icon = wxICON_INFORMATION; break;
+    case RPT_SEVERITY_INFO:      icon = wxICON_INFORMATION; break;
+    case RPT_SEVERITY_EXCLUSION: icon = wxICON_WARNING;     break;
+    case RPT_SEVERITY_ACTION:    icon = wxICON_WARNING;     break;
+    case RPT_SEVERITY_WARNING:   icon = wxICON_WARNING;     break;
+    case RPT_SEVERITY_ERROR:     icon = wxICON_ERROR;       break;
+    case RPT_SEVERITY_IGNORE:    icon = wxICON_INFORMATION; break;
+    case RPT_SEVERITY_DEBUG:     icon = wxICON_INFORMATION; break;
     }
 
     if( m_message->EndsWith( wxS( "\n" ) ) )

eeschema/CMakeLists.txt

@@ -32,7 +32,6 @@ include_directories( BEFORE ${INC_BEFORE} )
 include_directories(
     ${CMAKE_SOURCE_DIR}/common
     ${CMAKE_SOURCE_DIR}/common/dialogs
-    ${CMAKE_SOURCE_DIR}/libs/sexpr/include
     ${INC_AFTER}
     ./dialogs
     ./libview
@@ -609,7 +608,6 @@ target_link_libraries( eeschema_kiface
         eeschema_kiface_objects
         markdown_lib
         scripting
-        sexpr
         core
         Boost::headers
         ${wxWidgets_LIBRARIES}

eeschema/bus_alias.h

@@ -45,11 +45,34 @@ public:
         return std::make_shared<BUS_ALIAS>( *this );
     }
 
-    wxString GetName() { return m_name; }
-    void SetName( const wxString& aName ) { m_name = aName; }
+    wxString GetName() const { return m_name; }
+
+    void SetName( const wxString& aName ) { m_name = aName.Strip( wxString::both ); }
 
     const std::vector<wxString>& Members() const { return m_members; }
-    std::vector<wxString>& Members() { return m_members; }
+
+    void SetMembers( const std::vector<wxString>& aMembers )
+    {
+        m_members.clear();
+
+        for( const wxString& member : aMembers )
+        {
+            wxString trimmed = member.Strip( wxString::both );
+
+            if( !trimmed.IsEmpty() )
+                m_members.push_back( trimmed );
+        }
+    }
+
+    void AddMember( const wxString& aMember )
+    {
+        wxString trimmed = aMember.Strip( wxString::both );
+
+        if( !trimmed.IsEmpty() )
+            m_members.push_back( trimmed );
+    }
+
+    void ClearMembers() { m_members.clear(); }
 
     SCH_SCREEN* GetParent() { return m_parent; }
     void SetParent( SCH_SCREEN* aParent ) { m_parent = aParent; }

eeschema/connection_graph.cpp

@@ -151,8 +151,8 @@ bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCheckMultipleDrivers )
                 SCH_PIN* pa = static_cast<SCH_PIN*>( a );
                 SCH_PIN* pb = static_cast<SCH_PIN*>( b );
 
-                bool aPower = pa->GetLibPin()->GetParentSymbol()->IsPower();
-                bool bPower = pb->GetLibPin()->GetParentSymbol()->IsPower();
+                bool aPower = pa->IsOnPowerSymbol();
+                bool bPower = pb->IsOnPowerSymbol();
 
                 if( aPower && !bPower )
                     return true;
@@ -327,6 +327,7 @@ std::vector<SCH_ITEM*> CONNECTION_SUBGRAPH::GetAllBusLabels() const
         {
         case SCH_LABEL_T:
         case SCH_GLOBAL_LABEL_T:
+        case SCH_HIER_LABEL_T:
         {
             CONNECTION_TYPE type = item->Connection( &m_sheet )->Type();
 
@@ -356,6 +357,7 @@ std::vector<SCH_ITEM*> CONNECTION_SUBGRAPH::GetVectorBusLabels() const
         {
         case SCH_LABEL_T:
         case SCH_GLOBAL_LABEL_T:
+        case SCH_HIER_LABEL_T:
         {
             SCH_CONNECTION* label_conn = item->Connection( &m_sheet );
 
@@ -1638,6 +1640,10 @@ void CONNECTION_GRAPH::generateBusAliasMembers()
 
             for( const auto& conn : dummy.Members() )
             {
+                // Only create subgraphs for NET members, not nested buses
+                if( !conn->IsNet() )
+                    continue;
+
                 wxString name = conn->FullLocalName();
 
                 CONNECTION_SUBGRAPH* new_sg = new CONNECTION_SUBGRAPH( this );
@@ -1684,6 +1690,32 @@ void CONNECTION_GRAPH::generateGlobalPowerPinSubGraphs()
     // These are NOT limited to power symbols, we support legacy invisible + power-in pins
     // on non-power symbols.
 
+    // Sort power pins for deterministic processing order. This ensures that when multiple
+    // power pins share the same net name, the same pin consistently creates the subgraph
+    // across different ERC runs.
+    std::sort( m_global_power_pins.begin(), m_global_power_pins.end(),
+               []( const std::pair<SCH_SHEET_PATH, SCH_PIN*>& a,
+                   const std::pair<SCH_SHEET_PATH, SCH_PIN*>& b )
+               {
+                   int pathCmp = a.first.Cmp( b.first );
+
+                   if( pathCmp != 0 )
+                       return pathCmp < 0;
+
+                   const SCH_SYMBOL* symA = static_cast<const SCH_SYMBOL*>( a.second->GetParentSymbol() );
+                   const SCH_SYMBOL* symB = static_cast<const SCH_SYMBOL*>( b.second->GetParentSymbol() );
+
+                   wxString refA = symA ? symA->GetRef( &a.first, false ) : wxString();
+                   wxString refB = symB ? symB->GetRef( &b.first, false ) : wxString();
+
+                   int refCmp = refA.Cmp( refB );
+
+                   if( refCmp != 0 )
+                       return refCmp < 0;
+
+                   return a.second->GetNumber().Cmp( b.second->GetNumber() ) < 0;
+               } );
+
     std::unordered_map<int, CONNECTION_SUBGRAPH*> global_power_pin_subgraphs;
 
     for( const auto& it : m_global_power_pins )
@@ -1692,7 +1724,7 @@ void CONNECTION_GRAPH::generateGlobalPowerPinSubGraphs()
         SCH_PIN*       pin   = it.second;
 
         if( !pin->ConnectedItems( sheet ).empty()
-          && !pin->GetLibPin()->GetParentSymbol()->IsPower() )
+          && !pin->IsOnPowerSymbol() )
         {
             // ERC will warn about this: user has wired up an invisible pin
             continue;
@@ -1707,7 +1739,7 @@ void CONNECTION_GRAPH::generateGlobalPowerPinSubGraphs()
         // Proper modern power symbols get their net name from the value field
         // in the symbol, but we support legacy non-power symbols with global
         // power connections based on invisible, power-in, pin's names.
-        if( pin->GetLibPin()->GetParentSymbol()->IsPower() )
+        if( pin->IsOnPowerSymbol() )
             connection->SetName( pin->GetParentSymbol()->GetValue( true, &sheet, false ) );
         else
             connection->SetName( pin->GetShownName() );
@@ -2316,12 +2348,19 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                     if( jj == m_net_name_to_subgraphs_map.end() )
                         continue;
 
-                    for( CONNECTION_SUBGRAPH* old_sg : jj->second )
+                    // Copy the vector to avoid iterator invalidation when recaching
+                    std::vector<CONNECTION_SUBGRAPH*> old_subgraphs = jj->second;
+
+                    for( CONNECTION_SUBGRAPH* old_sg : old_subgraphs )
                     {
                         while( old_sg->m_absorbed )
                             old_sg = old_sg->m_absorbed_by;
 
+                        wxString old_sg_name = old_sg->m_driver_connection->Name();
                         old_sg->m_driver_connection->Clone( *conn );
+
+                        if( old_sg_name != old_sg->m_driver_connection->Name() )
+                            recacheSubgraphName( old_sg, old_sg_name );
                     }
                 }
             }
@@ -2692,9 +2731,30 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
 
     auto propagate_bus_neighbors = [&]( CONNECTION_SUBGRAPH* aParentGraph )
     {
+        // Sort bus neighbors by name to ensure deterministic processing order.
+        // When multiple bus members (e.g., A0, A1, A2, A3) all connect to the same
+        // shorted net in a child sheet, the first one processed "wins" and sets
+        // the net name. Sorting ensures the alphabetically-first name is chosen.
+        std::vector<std::shared_ptr<SCH_CONNECTION>> sortedMembers;
+
         for( const auto& kv : aParentGraph->m_bus_neighbors )
+            sortedMembers.push_back( kv.first );
+
+        std::sort( sortedMembers.begin(), sortedMembers.end(),
+                   []( const std::shared_ptr<SCH_CONNECTION>& a,
+                       const std::shared_ptr<SCH_CONNECTION>& b )
+                   {
+                       return a->Name() < b->Name();
+                   } );
+
+        for( const std::shared_ptr<SCH_CONNECTION>& member_conn : sortedMembers )
         {
-            for( CONNECTION_SUBGRAPH* neighbor : kv.second )
+            const auto& kv_it = aParentGraph->m_bus_neighbors.find( member_conn );
+
+            if( kv_it == aParentGraph->m_bus_neighbors.end() )
+                continue;
+
+            for( CONNECTION_SUBGRAPH* neighbor : kv_it->second )
             {
                 // May have been absorbed but won't have been deleted
                 while( neighbor->m_absorbed )
@@ -2705,12 +2765,12 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                 // Now member may be out of date, since we just cloned the
                 // connection from higher up in the hierarchy.  We need to
                 // figure out what the actual new connection is.
-                SCH_CONNECTION* member = matchBusMember( parent, kv.first.get() );
+                SCH_CONNECTION* member = matchBusMember( parent, member_conn.get() );
 
                 if( !member )
                 {
                     // Try harder: we might match on a secondary driver
-                    for( CONNECTION_SUBGRAPH* sg : kv.second )
+                    for( CONNECTION_SUBGRAPH* sg : kv_it->second )
                     {
                         if( sg->m_multiple_drivers )
                         {
@@ -2735,7 +2795,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                 if( !member )
                 {
                     wxLogTrace( ConnTrace, wxS( "Could not match bus member %s in %s" ),
-                                kv.first->Name(), parent->Name() );
+                                member_conn->Name(), parent->Name() );
                     continue;
                 }
 
@@ -2749,9 +2809,27 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                 if( neighbor_name == member->Name() )
                     continue;
 
-                // Was this neighbor already updated from a different sheet?  Don't rename it again
+                // Was this neighbor already updated from a different sheet?  Don't rename it again,
+                // unless this same parent bus updated it and the bus member name has since changed
+                // (which can happen when a bus member is renamed via stale member update, issue #18299).
                 if( neighbor_conn->Sheet() != neighbor->m_sheet )
-                    continue;
+                {
+                    // If the neighbor's connection sheet doesn't match this parent bus's sheet,
+                    // it was updated by a different bus entirely. Don't override.
+                    if( neighbor_conn->Sheet() != parent->Sheet() )
+                        continue;
+
+                    // If the neighbor's connection sheet matches this parent bus's sheet but
+                    // the names differ, check if the neighbor's current name still matches
+                    // a member of this bus. If it does, the neighbor was updated by a different
+                    // member of this same bus and we should preserve that (determinism).
+                    // If it doesn't match any member, the bus member was renamed and we should update.
+                    SCH_CONNECTION temp( nullptr, neighbor->m_sheet );
+                    temp.ConfigureFromLabel( neighbor_name );
+
+                    if( matchBusMember( parent, &temp ) )
+                        continue;
+                }
 
                 // Safety check against infinite recursion
                 wxCHECK2_MSG( neighbor_conn->IsNet(), continue,
@@ -2776,6 +2854,17 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph, boo
                     // Recurse onto this neighbor in case it needs to re-propagate
                     neighbor->m_dirty = true;
                     propagateToNeighbors( neighbor, aForce );
+
+                    // After hierarchy propagation, the neighbor's connection may have been
+                    // updated to a higher-priority driver (e.g., a power symbol discovered
+                    // through hierarchical sheet pins). If so, update the bus member to match.
+                    // This ensures that net names propagate correctly through bus connections
+                    // that span hierarchical boundaries (issue #18119).
+                    if( neighbor_conn->Name() != member->Name() )
+                    {
+                        member->Clone( *neighbor_conn );
+                        stale_bus_members.insert( member );
+                    }
                 }
             }
         }
@@ -3775,7 +3864,7 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph
         // net items by name, because usually failing to connect them graphically is a mistake
         if( pin && !has_other_connections
                 && !pin->IsGlobalPower()
-                && !pin->GetLibPin()->GetParentSymbol()->IsPower() )
+                && !pin->IsOnPowerSymbol() )
         {
             wxString name = pin->Connection( &sheet )->Name();
             wxString local_name = pin->Connection( &sheet )->Name( true );
@@ -3814,7 +3903,7 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph
                 // We only apply this test to power symbols, because other symbols have
                 // pins that are meant to be dangling, but the power symbols have pins
                 // that are *not* meant to be dangling.
-                if( testPin->GetLibPin()->GetParentSymbol()->IsPower()
+                if( testPin->IsOnPowerSymbol()
                     && testPin->ConnectedItems( sheet ).empty()
                     && settings.IsTestEnabled( ERCE_PIN_NOT_CONNECTED ) )
                 {

eeschema/cross-probing.cpp

@@ -1058,6 +1058,27 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
         SyncView();
         break;
 
+    case MAIL_SCH_NAVIGATE_TO_SHEET:
+    {
+        wxString targetFile( payload );
+
+        for( SCH_SHEET_PATH& sheetPath : Schematic().Hierarchy() )
+        {
+            SCH_SCREEN* screen = sheetPath.LastScreen();
+
+            if( screen && screen->GetFileName() == targetFile )
+            {
+                m_toolManager->RunAction<SCH_SHEET_PATH*>( SCH_ACTIONS::changeSheet, &sheetPath );
+                payload = "success";
+                Raise();
+                return;
+            }
+        }
+
+        payload.clear();
+        break;
+    }
+
     default:;
 
     }

eeschema/dialogs/dialog_change_symbols.cpp

@@ -640,15 +640,6 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit,
         screen->Remove( symbol );
         SCH_SYMBOL* symbol_copy = static_cast<SCH_SYMBOL*>( symbol->Clone() );
         aCommit->Modified( symbol, symbol_copy, screen );
-
-        CONNECTION_GRAPH*           connectionGraph = screen->Schematic()->ConnectionGraph();
-
-        // When we replace the lib symbol below, we free the associated pins if the new symbol has
-        // fewer than the original.  This will cause the connection graph to be out of date unless
-        // we replace references in the graph to the old symbol/pins with references to the ones
-        // stored in the undo stack.
-        if( connectionGraph )
-            connectionGraph->ExchangeItem( symbol, symbol_copy );
     }
 
     for( const auto& [ symbol, symbol_change_info ] : symbols )

eeschema/dialogs/dialog_erc.cpp

@@ -49,7 +49,7 @@
 #include <wx/filedlg.h>
 #include <wx/hyperlink.h>
 #include <wx/msgdlg.h>
-#include <wx/wupdlock.h>
+#include <sch_edit_tool.h>
 
 
 wxDEFINE_EVENT( EDA_EVT_CLOSE_ERC_DIALOG, wxCommandEvent );
@@ -93,6 +93,10 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
     m_markerDataView->AssociateModel( m_markerTreeModel );
     m_markerTreeModel->Update( m_markerProvider, m_severities );
 
+    // Prevent RTL locales from mirroring the text in the data views
+    m_markerDataView->SetLayoutDirection( wxLayout_LeftToRight );
+    m_ignoredList->SetLayoutDirection( wxLayout_LeftToRight );
+
     m_ignoredList->InsertColumn( 0, wxEmptyString, wxLIST_FORMAT_LEFT, DEFAULT_SINGLE_COL_WIDTH );
 
     if( m_currentSchematic == g_lastERCSchematic )
@@ -124,13 +128,14 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
 
     UpdateAnnotationWarning();
 
-    Layout();
-
     SetFocus();
 
     syncCheckboxes();
     updateDisplayedCounts();
 
+    Layout();
+    GetSizer()->Fit( this );
+
     // Now all widgets have the size fixed, call FinishDialogSettings
     finishDialogSettings();
 }
@@ -1041,7 +1046,7 @@ void DIALOG_ERC::deleteAllMarkers( bool aIncludeExclusions )
     // Clear current selection list to avoid selection of deleted items
     // Freeze to avoid repainting the dialog, which can cause a RePaint()
     // of the screen as well
-    wxWindowUpdateLocker updateLock( this );
+    Freeze();
 
     m_parent->GetToolManager()->RunAction( SCH_ACTIONS::clearSelection );
 
@@ -1049,6 +1054,8 @@ void DIALOG_ERC::deleteAllMarkers( bool aIncludeExclusions )
 
     SCH_SCREENS screens( m_parent->Schematic().Root() );
     screens.DeleteAllMarkers( MARKER_BASE::MARKER_ERC, aIncludeExclusions );
+
+    Thaw();
 }
 
 
@@ -1074,7 +1081,7 @@ void DIALOG_ERC::OnSaveReport( wxCommandEvent& aEvent )
         fn.MakeAbsolute( prj_path );
     }
 
-    ERC_REPORT reportWriter( &m_parent->Schematic(), m_parent->GetUserUnits() );
+    ERC_REPORT reportWriter( &m_parent->Schematic(), m_parent->GetUserUnits(), m_markerProvider );
 
     bool success = false;
     if( fn.GetExt() == FILEEXT::JsonFileExtension )

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -41,6 +41,7 @@
 #include <project_sch.h>
 #include <refdes_utils.h>
 #include <dialog_sim_model.h>
+#include <vector>
 
 #include <panel_embedded_files.h>
 #include <settings/settings_manager.h>
@@ -69,7 +70,19 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
     m_delayedFocusPage( -1 ),
     m_fpFilterTricks( std::make_unique<LISTBOX_TRICKS>( *this, *m_FootprintFilterListBox ) )
 {
-    m_embeddedFiles = new PANEL_EMBEDDED_FILES( m_NoteBook, m_libEntry );
+    std::vector<const EMBEDDED_FILES*> inheritedEmbeddedFiles;
+
+    if( std::shared_ptr<LIB_SYMBOL> parent = m_libEntry->GetParent().lock() )
+    {
+        while( parent )
+        {
+            inheritedEmbeddedFiles.push_back( parent->GetEmbeddedFiles() );
+            parent = parent->GetParent().lock();
+        }
+    }
+
+    m_embeddedFiles = new PANEL_EMBEDDED_FILES( m_NoteBook, m_libEntry, 0,
+                                                std::move( inheritedEmbeddedFiles ) );
     m_NoteBook->AddPage( m_embeddedFiles, _( "Embedded Files" ) );
 
     // Give a bit more room for combobox editors
@@ -436,7 +449,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataFromWindow()
     if( !wxDialog::TransferDataFromWindow() )
         return false;
 
-    if( !m_grid->CommitPendingChanges() )
+    if( !m_grid->CommitPendingChanges() || !m_embeddedFiles->TransferDataFromWindow() )
         return false;
 
     wxString   newName = EscapeString( m_SymbolNameCtrl->GetValue(), CTX_LIBID );

eeschema/dialogs/dialog_line_properties.cpp

@@ -129,7 +129,10 @@ bool DIALOG_LINE_PROPERTIES::TransferDataFromWindow()
 
     for( SCH_LINE* line : m_lines )
     {
-        commit.Modify( line, m_frame->GetScreen() );
+        // Commit the change only if the line is not new. If new this is useless
+        // and can create dangling pointers if the line creation is aborted
+        if( !line->HasFlag( IS_NEW ) )
+            commit.Modify( line, m_frame->GetScreen() );
 
         if( !m_width.IsIndeterminate() )
             line->SetLineWidth( std::max( 0, m_width.GetIntValue() ) );

eeschema/dialogs/dialog_sch_import_settings.cpp

@@ -59,8 +59,7 @@ void DIALOG_SCH_IMPORT_SETTINGS::OnBrowseClicked( wxCommandEvent& event )
     fn.SetExt( FILEEXT::ProjectFileExtension );
 
     wxFileDialog dlg( this, _( "Import Settings From" ), fn.GetPath(), fn.GetFullName(),
-                      FILEEXT::ProjectFileWildcard(),
-                      wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
+                      FILEEXT::ProjectFileWildcard(), wxFD_OPEN | wxFD_FILE_MUST_EXIST );
 
     if( dlg.ShowModal() == wxID_OK )
         m_filePathCtrl->SetValue( dlg.GetPath() );

eeschema/dialogs/dialog_schematic_find.cpp

@@ -85,6 +85,28 @@ DIALOG_SCH_FIND::DIALOG_SCH_FIND( SCH_EDIT_FRAME* aParent, SCH_SEARCH_DATA* aDat
     GetSizer()->Fit( this ); // Needed on Ubuntu/Unity to display the dialog
 
     Connect( wxEVT_CHAR, wxKeyEventHandler( DIALOG_SCH_FIND::OnChar ), nullptr, this );
+
+    // Set up tab order for proper keyboard navigation.
+    // This is needed because wxComboBox on GTK has issues with Tab key navigation.
+    m_tabOrder = {
+        m_comboFind,
+        m_comboReplace,
+        m_radioForward,
+        m_radioBackward,
+        m_checkMatchCase,
+        m_checkWholeWord,
+        m_checkRegexMatch,
+        m_checkAllPins,
+        m_checkAllFields,
+        m_checkCurrentSheetOnly,
+        m_checkSelectedOnly,
+        m_checkReplaceReferences,
+        m_checkConnections,
+        m_buttonFind,
+        m_buttonReplace,
+        m_buttonReplaceAll,
+        m_buttonCancel
+    };
 }
 
 

eeschema/dialogs/dialog_sim_model.cpp

@@ -89,8 +89,21 @@ DIALOG_SIM_MODEL<T>::DIALOG_SIM_MODEL( wxWindow* aParent, EDA_BASE_FRAME* aFrame
     }
 
     if( EMBEDDED_FILES* symbolEmbeddedFiles = aSymbol.GetEmbeddedFiles() )
+    {
         m_filesStack.push_back( symbolEmbeddedFiles );
 
+        if constexpr (std::is_same_v<T, SCH_SYMBOL>)
+        {
+            SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( &aSymbol );
+            symbol->GetLibSymbolRef()->AppendParentEmbeddedFiles( m_filesStack );
+        }
+        else if constexpr (std::is_same_v<T, LIB_SYMBOL>)
+        {
+            LIB_SYMBOL* symbol = static_cast<LIB_SYMBOL*>( &aSymbol );
+            symbol->AppendParentEmbeddedFiles( m_filesStack );
+        }
+    }
+
     m_libraryModelsMgr.SetFilesStack( m_filesStack );
     m_builtinModelsMgr.SetFilesStack( m_filesStack );
 
@@ -387,7 +400,7 @@ bool DIALOG_SIM_MODEL<T>::TransferDataFromWindow()
     SIM_MODEL::SetFieldValue( m_fields, SIM_LIBRARY::LIBRARY_FIELD, path, false );
     SIM_MODEL::SetFieldValue( m_fields, SIM_LIBRARY::NAME_FIELD, name, false );
 
-    if( isIbisLoaded() )
+    if( isIbisLoaded() && !m_libraryModelsMgr.GetModels().empty() )
     {
         int      idx = 0;
         wxString sel = m_modelListBox->GetStringSelection();
@@ -839,7 +852,25 @@ bool DIALOG_SIM_MODEL<T>::loadLibrary( const wxString& aLibraryPath, REPORTER& a
     m_libraryModelsMgr.SetLibrary( aLibraryPath, aReporter );
 
     if( aReporter.HasMessageOfSeverity( RPT_SEVERITY_UNDEFINED | RPT_SEVERITY_ERROR ) )
+    {
+        m_libraryModelsMgr.Clear();
+
+        if( m_modelListBox->GetSelection() != wxNOT_FOUND )
+            m_modelListBox->SetSelection( wxNOT_FOUND );
+
+        if( m_modelListBox->GetCount() )
+            m_modelListBox->Clear();
+
+        wxArrayString emptyArray;
+        m_pinModelCombobox->Set( emptyArray );
+        m_pinCombobox->Set( emptyArray );
+        m_pinModelCombobox->SetSelection( -1 );
+        m_pinCombobox->SetSelection( -1 );
+        m_waveformChoice->Clear();
+        m_prevLibrary.Clear();
+
         return false;
+    }
 
     std::string modelName = SIM_MODEL::GetFieldValue( &m_fields, SIM_LIBRARY::NAME_FIELD );
 
@@ -1124,7 +1155,12 @@ SIM_MODEL& DIALOG_SIM_MODEL<T>::curModel() const
         wxString sel = m_modelListBox->GetStringSelection();
 
         if( m_modelListBoxEntryToLibraryIdx.contains( sel ) )
-            return m_libraryModelsMgr.GetModels().at( m_modelListBoxEntryToLibraryIdx.at( sel ) ).get();
+        {
+            int idx = m_modelListBoxEntryToLibraryIdx.at( sel );
+
+            if( idx >= 0 && idx < (int) m_libraryModelsMgr.GetModels().size() )
+                return m_libraryModelsMgr.GetModels().at( idx ).get();
+        }
     }
     else
     {

eeschema/dialogs/panel_setup_buses.cpp

@@ -284,10 +284,10 @@ void PANEL_SETUP_BUSES::OnRemoveMember( wxCommandEvent& aEvent )
 
     // Update the member list of the current bus alias from the members grid
     const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ m_lastAlias ];
-    alias->Members().clear();
+    alias->ClearMembers();
 
     for( int ii = 0; ii < m_membersGrid->GetNumberRows(); ++ii )
-        alias->Members().push_back( m_membersGrid->GetCellValue( ii, 0 ) );
+        alias->AddMember( m_membersGrid->GetCellValue( ii, 0 ) );
 
     if( m_membersGrid->GetNumberRows() > 0 )
     {
@@ -347,7 +347,7 @@ void PANEL_SETUP_BUSES::OnMemberGridCellChanging( wxGridEvent& event )
 
         const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ m_lastAlias ];
 
-        alias->Members().clear();
+        alias->ClearMembers();
 
         for( int ii = 0; ii < m_membersGrid->GetNumberRows(); ++ii )
         {
@@ -363,11 +363,11 @@ void PANEL_SETUP_BUSES::OnMemberGridCellChanging( wxGridEvent& event )
                 }
 
                 while( tok.HasMoreTokens() )
-                    alias->Members().push_back( tok.GetNextToken() );
+                    alias->AddMember( tok.GetNextToken() );
             }
             else
             {
-                alias->Members().push_back( m_membersGrid->GetCellValue( ii, 0 ) );
+                alias->AddMember( m_membersGrid->GetCellValue( ii, 0 ) );
             }
         }
     }
@@ -525,16 +525,9 @@ void PANEL_SETUP_BUSES::updateAliasMembers( int aAliasIndex )
     {
         const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[aAliasIndex];
 
-        alias->Members().clear();
+        alias->ClearMembers();
 
         for( int ii = 0; ii < m_membersGrid->GetNumberRows(); ++ii )
-        {
-            wxString memberValue = m_membersGrid->GetCellValue( ii, 0 );
-
-            if( !memberValue.empty() )
-            {
-                alias->Members().push_back( memberValue );
-            }
-        }
+            alias->AddMember( m_membersGrid->GetCellValue( ii, 0 ) );
     }
 }

eeschema/eeschema.cpp

@@ -527,19 +527,6 @@ void IFACE::OnKifaceEnd()
 }
 
 
-static void traverseSEXPR( SEXPR::SEXPR* aNode,
-                           const std::function<void( SEXPR::SEXPR* )>& aVisitor )
-{
-    aVisitor( aNode );
-
-    if( aNode->IsList() )
-    {
-        for( unsigned i = 0; i < aNode->GetNumberOfChildren(); i++ )
-            traverseSEXPR( aNode->GetChild( i ), aVisitor );
-    }
-}
-
-
 void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProjectName,
                         const wxString& aNewProjectBasePath, const wxString& aNewProjectName,
                         const wxString& aSrcFilePath, wxString& aErrors )
@@ -576,16 +563,18 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
             return;
         }
 
-        // Sheet paths when auto-generated are relative to the root, so those will stay
-        // pointing to whatever they were pointing at.
-        // The author can create their own absolute and relative sheet paths.  Absolute
-        // sheet paths aren't an issue, and relative ones will continue to work as long
-        // as the author didn't include any '..'s.  If they did, it's still not clear
-        // whether they should be adjusted or not (as the author may be duplicating an
-        // entire tree with several projects within it), so we leave this as an exercise
-        // to the author.
+        CopySexprFile( aSrcFilePath, destFile.GetFullPath(),
+                [&]( const std::string& token, wxString& value ) -> bool
+                {
+                    if( token == "project" && value == aProjectName )
+                    {
+                        value = aNewProjectName;
+                        return true;
+                    }
 
-        KiCopyFile( aSrcFilePath, destFile.GetFullPath(), aErrors );
+                    return false;
+                },
+                aErrors );
     }
     else if( ext == FILEEXT::SchematicSymbolFileExtension )
     {
@@ -606,67 +595,37 @@ void IFACE::SaveFileAs( const wxString& aProjectBasePath, const wxString& aProje
     }
     else if( ext == FILEEXT::NetlistFileExtension )
     {
-        bool success = false;
-
         if( destFile.GetName() == aProjectName )
-            destFile.SetName( aNewProjectName  );
+            destFile.SetName( aNewProjectName );
 
-        try
-        {
-            SEXPR::PARSER parser;
-            std::unique_ptr<SEXPR::SEXPR> sexpr( parser.ParseFromFile( TO_UTF8( aSrcFilePath ) ) );
-
-            traverseSEXPR( sexpr.get(), [&]( SEXPR::SEXPR* node )
+        CopySexprFile( aSrcFilePath, destFile.GetFullPath(),
+                [&]( const std::string& token, wxString& value ) -> bool
                 {
-                    if( node->IsList() && node->GetNumberOfChildren() > 1
-                            && node->GetChild( 0 )->IsSymbol()
-                            && node->GetChild( 0 )->GetSymbol() == "source" )
+                    if( token == "source" )
                     {
-                        auto pathNode = dynamic_cast<SEXPR::SEXPR_STRING*>( node->GetChild( 1 ) );
-                        auto symNode = dynamic_cast<SEXPR::SEXPR_SYMBOL*>( node->GetChild( 1 ) );
-                        wxString path;
-
-                        if( pathNode )
-                            path = pathNode->m_value;
-                        else if( symNode )
-                            path = symNode->m_value;
-
-                        if( path == aProjectName + wxS( ".sch" ) )
-                            path = aNewProjectName + wxS( ".sch" );
-                        else if( path == aProjectBasePath + "/" + aProjectName + wxS( ".sch" ) )
-                            path = aNewProjectBasePath + "/" + aNewProjectName + wxS( ".sch" );
-                        else if( path.StartsWith( aProjectBasePath ) )
-                            path.Replace( aProjectBasePath, aNewProjectBasePath, false );
-
-                        if( pathNode )
-                            pathNode->m_value = path;
-                        else if( symNode )
-                            symNode->m_value = path;
+                        for( const wxString& extension : { wxT( ".sch" ), wxT( ".kicad_sch" ) } )
+                        {
+                            if( value == aProjectName + extension )
+                            {
+                                value = aNewProjectName + extension;
+                                return true;
+                            }
+                            else if( value == aProjectBasePath + "/" + aProjectName + extension )
+                            {
+                                value = aNewProjectBasePath + "/" + aNewProjectName + extension;
+                                return true;
+                            }
+                            else if( value.StartsWith( aProjectBasePath ) )
+                            {
+                                value.Replace( aProjectBasePath, aNewProjectBasePath, false );
+                                return true;
+                            }
+                        }
                     }
-                } );
 
-            wxFFile destNetList( destFile.GetFullPath(), "wb" );
-
-            if( destNetList.IsOpened() )
-                success = destNetList.Write( sexpr->AsString( 0 ) );
-
-            // wxFFile dtor will close the file
-        }
-        catch( ... )
-        {
-            success = false;
-        }
-
-        if( !success )
-        {
-            wxString msg;
-
-            if( !aErrors.empty() )
-                aErrors += wxS( "\n" );
-
-            msg.Printf( _( "Cannot copy file '%s'." ), destFile.GetFullPath() );
-            aErrors += msg;
-        }
+                    return false;
+                },
+                aErrors );
     }
     else if( destFile.GetName() == FILEEXT::SymbolLibraryTableFileName )
     {

eeschema/eeschema_config.cpp

@@ -240,9 +240,12 @@ void SCH_EDIT_FRAME::saveProjectSettings()
 void SCH_EDIT_FRAME::SaveProjectLocalSettings()
 {
     PROJECT_LOCAL_SETTINGS& localSettings = Prj().GetLocalSettings();
-    SCH_SELECTION_TOOL*     selTool = GetToolManager()->GetTool<SCH_SELECTION_TOOL>();
 
-    localSettings.m_SchSelectionFilter = selTool->GetFilter();
+    if( TOOL_MANAGER* toolMgr = GetToolManager() )
+    {
+        if( SCH_SELECTION_TOOL* selTool = toolMgr->GetTool<SCH_SELECTION_TOOL>() )
+            localSettings.m_SchSelectionFilter = selTool->GetFilter();
+    }
 }
 
 

eeschema/eeschema_jobs_handler.cpp

@@ -339,6 +339,15 @@ int EESCHEMA_JOBS_HANDLER::JobExportPlot( JOB* aJob )
     case JOB_PAGE_SIZE::PAGE_SIZE_AUTO: pageSizeSelect = PageFormatReq::PAGE_SIZE_AUTO; break;
     }
 
+    if( !aPlotJob->GetOutputPathIsDirectory() && aPlotJob->GetConfiguredOutputPath().IsEmpty() )
+    {
+        wxFileName fn = sch->GetFileName();
+        fn.SetName( fn.GetName() );
+        fn.SetExt( GetDefaultPlotExtension( format ) );
+
+        aPlotJob->SetConfiguredOutputPath( fn.GetFullName() );
+    }
+
     wxString outPath = aPlotJob->GetFullOutputPath( &sch->Prj() );
 
     if( !PATHS::EnsurePathExists( outPath, !aPlotJob->GetOutputPathIsDirectory() ) )
@@ -547,13 +556,21 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
     // Build our data model
     FIELDS_EDITOR_GRID_DATA_MODEL dataModel( referenceList, nullptr );
 
-    // Mandatory fields + quantity virtual field first
+    // Mandatory fields first
     for( int fieldId : MANDATORY_FIELDS )
     {
         dataModel.AddColumn( GetCanonicalFieldName( fieldId ),
                              GetDefaultFieldName( fieldId, DO_TRANSLATE ), false );
     }
 
+    // Generated/virtual fields (e.g. ${QUANTITY}, ${ITEM_NUMBER}) present only in the fields table
+    dataModel.AddColumn( FIELDS_EDITOR_GRID_DATA_MODEL::QUANTITY_VARIABLE,
+                         GetGeneratedFieldDisplayName( FIELDS_EDITOR_GRID_DATA_MODEL::QUANTITY_VARIABLE ),
+                         false );
+    dataModel.AddColumn( FIELDS_EDITOR_GRID_DATA_MODEL::ITEM_NUMBER_VARIABLE,
+                         GetGeneratedFieldDisplayName( FIELDS_EDITOR_GRID_DATA_MODEL::ITEM_NUMBER_VARIABLE ),
+                         false );
+
     // User field names in symbols second
     std::set<wxString> userFieldNames;
 
@@ -1189,7 +1206,7 @@ int EESCHEMA_JOBS_HANDLER::JobSchErc( JOB* aJob )
                                           markersProvider->GetCount() ),
                         RPT_SEVERITY_INFO );
 
-    ERC_REPORT reportWriter( sch, units );
+    ERC_REPORT reportWriter( sch, units, markersProvider );
 
     bool wroteReport = false;
 

eeschema/erc/erc.cpp

@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <numeric>
+#include <set>
 
 #include "connection_graph.h"
 #include "kiface_ids.h"
@@ -913,6 +914,28 @@ int ERC_TESTER::TestNoConnectPins()
         {
             if( pair.second.size() > 1 )
             {
+                bool all_nc = true;
+
+                for( SCH_ITEM* item : pair.second )
+                {
+                    if( item->Type() != SCH_PIN_T )
+                    {
+                        all_nc = false;
+                        break;
+                    }
+
+                    SCH_PIN* pin = static_cast<SCH_PIN*>( item );
+
+                    if( pin->GetType() != ELECTRICAL_PINTYPE::PT_NC )
+                    {
+                        all_nc = false;
+                        break;
+                    }
+                }
+
+                if( all_nc )
+                    continue;
+
                 err_count++;
 
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_NOCONNECT_CONNECTED );
@@ -1222,6 +1245,83 @@ int ERC_TESTER::TestMultUnitPinConflicts()
 }
 
 
+int ERC_TESTER::TestDuplicatePinNets()
+{
+    int errors = 0;
+
+    for( const SCH_SHEET_PATH& sheet : m_sheetList )
+    {
+        SCH_SCREEN* screen = sheet.LastScreen();
+
+        for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
+        {
+            SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
+            LIB_SYMBOL* libSymbol = symbol->GetLibSymbolRef().get();
+
+            if( !libSymbol )
+                continue;
+
+            std::vector<SCH_PIN*> pins = symbol->GetPins( &sheet );
+
+            std::map<wxString, std::vector<std::pair<SCH_PIN*, wxString>>> pinsByNumber;
+
+            for( SCH_PIN* pin : pins )
+            {
+                SCH_CONNECTION* conn = pin->Connection( &sheet );
+                wxString        netName = conn ? conn->GetNetName() : wxString();
+
+                pinsByNumber[pin->GetNumber()].emplace_back( pin, netName );
+            }
+
+            for( const auto& [pinNumber, pinNetPairs] : pinsByNumber )
+            {
+                if( pinNetPairs.size() < 2 )
+                    continue;
+
+                wxString firstNet = pinNetPairs[0].second;
+                bool     hasDifferentNets = false;
+                SCH_PIN* conflictPin = nullptr;
+
+                for( size_t i = 1; i < pinNetPairs.size(); i++ )
+                {
+                    if( pinNetPairs[i].second != firstNet )
+                    {
+                        hasDifferentNets = true;
+                        conflictPin = pinNetPairs[i].first;
+                        break;
+                    }
+                }
+
+                if( hasDifferentNets )
+                {
+                    std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_DUPLICATE_PIN_ERROR );
+                    wxString msg;
+
+                    msg.Printf( _( "Pin %s on symbol '%s' is connected to different nets: %s and %s" ),
+                                pinNumber,
+                                symbol->GetRef( &sheet ),
+                                firstNet.IsEmpty() ? _( "<no net>" ) : firstNet,
+                                pinNetPairs[1].second.IsEmpty() ? _( "<no net>" ) : pinNetPairs[1].second );
+
+                    ercItem->SetErrorMessage( msg );
+                    ercItem->SetItems( pinNetPairs[0].first, conflictPin );
+                    ercItem->SetSheetSpecificPath( sheet );
+                    ercItem->SetItemsSheetPaths( sheet, sheet );
+
+                    SCH_MARKER* marker = new SCH_MARKER( std::move( ercItem ),
+                                                         pinNetPairs[0].first->GetPosition() );
+                    screen->Append( marker );
+                    errors++;
+                }
+            }
+        }
+    }
+
+    return errors;
+}
+
+
+
 int ERC_TESTER::TestSameLocalGlobalLabel()
 {
     int errCount = 0;
@@ -1488,21 +1588,14 @@ int ERC_TESTER::TestLibSymbolIssues()
             if( m_settings.IsTestEnabled( ERCE_LIB_SYMBOL_MISMATCH ) )
             {
                 // We have to check for duplicate pins first as they will cause Compare() to fail.
+                // Symbols with duplicate pins are valid if those pins share the same net, so we
+                // only skip the comparison here. The actual error checking for duplicate pins on
+                // different nets is done in TestDuplicatePinNets().
                 std::vector<wxString> messages;
                 UNITS_PROVIDER        unitsProvider( schIUScale, EDA_UNITS::MILS );
                 CheckDuplicatePins( libSymbolInSchematic, messages, &unitsProvider );
 
-                if( !messages.empty() )
-                {
-                    std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_DUPLICATE_PIN_ERROR );
-                    ercItem->SetItems( symbol );
-                    msg.Printf( _( "Symbol '%s' has multiple pins with the same pin number" ),
-                                UnescapeString( symbolName ) );
-                    ercItem->SetErrorMessage( msg );
-
-                    markers.emplace_back( new SCH_MARKER( ercItem, symbol->GetPosition() ) );
-                }
-                else if( flattenedSymbol->Compare( *libSymbolInSchematic, flags ) != 0 )
+                if( messages.empty() && flattenedSymbol->Compare( *libSymbolInSchematic, flags ) != 0 )
                 {
                     std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_LIB_SYMBOL_MISMATCH );
                     ercItem->SetItems( symbol );
@@ -1873,6 +1966,9 @@ void ERC_TESTER::RunTests( DS_PROXY_VIEW_ITEM* aDrawingSheet, SCH_EDIT_FRAME* aE
     if( m_settings.IsTestEnabled( ERCE_DIFFERENT_UNIT_NET ) )
         TestMultUnitPinConflicts();
 
+    if( m_settings.IsTestEnabled( ERCE_DUPLICATE_PIN_ERROR ) )
+        TestDuplicatePinNets();
+
     // Test pins on each net against the pin connection table
     if( m_settings.IsTestEnabled( ERCE_PIN_TO_PIN_ERROR )
         || m_settings.IsTestEnabled( ERCE_POWERPIN_NOT_DRIVEN )

eeschema/erc/erc.h

@@ -112,6 +112,14 @@ public:
      */
     int TestMultUnitPinConflicts();
 
+    /**
+     * Checks if duplicate pin numbers within a symbol are connected to different nets.
+     * Symbols may have multiple pins with the same number if they are all connected to
+     * the same net. If duplicate pins are on different nets, an error is reported.
+     * @return the error count
+     */
+    int TestDuplicatePinNets();
+
     /**
      * Checks for global and local labels with the same name
      * @return the error count

eeschema/erc/erc_item.cpp

@@ -62,7 +62,7 @@ ERC_ITEM ERC_ITEM::powerpinNotDriven( ERCE_POWERPIN_NOT_DRIVEN,
         wxT( "power_pin_not_driven" ) );
 
 ERC_ITEM ERC_ITEM::duplicatePinError( ERCE_DUPLICATE_PIN_ERROR,
-        _HKI( "Multiple pins with the same pin number" ),
+        _HKI( "Duplicate pins with different nets" ),
         wxT( "duplicate_pins" ) );
 
 ERC_ITEM ERC_ITEM::pinTableWarning( ERCE_PIN_TO_PIN_WARNING,

eeschema/erc/erc_report.cpp

@@ -32,12 +32,25 @@
 #include <macros.h>
 #include <json_common.h>
 #include <rc_json_schema.h>
+#include <widgets/report_severity.h>
 
 
-ERC_REPORT::ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits ) :
+ERC_REPORT::ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits,
+                        std::shared_ptr<RC_ITEMS_PROVIDER> aMarkersProvider ) :
         m_sch( aSchematic ),
-        m_reportUnits( aReportUnits )
+        m_reportUnits( aReportUnits ),
+        m_markersProvider( std::move( aMarkersProvider ) ),
+        m_reportedSeverities( 0 )
 {
+    if( !m_markersProvider )
+    {
+        // When no provider is supplied, fall back to creating one with default severities.
+        // This allows test code to get a basic report without needing to set up a provider.
+        m_markersProvider = std::make_shared<SHEETLIST_ERC_ITEMS_PROVIDER>( m_sch );
+        m_markersProvider->SetSeverities( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING );
+    }
+
+    m_reportedSeverities = m_markersProvider->GetSeverities();
 }
 
 
@@ -48,6 +61,9 @@ wxString ERC_REPORT::GetTextReport()
     wxString msg = wxString::Format( _( "ERC report (%s, Encoding UTF8)\n" ),
                                      GetISO8601CurrentDateTime() );
 
+    msg += wxString::Format( _( "Report includes: %s\n" ),
+                             formatSeverities( m_reportedSeverities ) );
+
     std::map<KIID, EDA_ITEM*> itemMap;
 
     int            err_count = 0;
@@ -59,14 +75,11 @@ wxString ERC_REPORT::GetTextReport()
 
     ERC_SETTINGS& settings = m_sch->ErcSettings();
 
-    SHEETLIST_ERC_ITEMS_PROVIDER errors( m_sch );
-    errors.SetSeverities( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING );
-
     std::map<SCH_SHEET_PATH, std::vector<ERC_ITEM*>> orderedItems;
 
-    for( int i = 0; i < errors.GetCount(); ++i )
+    for( int i = 0; i < m_markersProvider->GetCount(); ++i )
     {
-        if( auto item = dynamic_cast<ERC_ITEM*>( errors.GetItem( i ).get() ) )
+        if( auto item = dynamic_cast<ERC_ITEM*>( m_markersProvider->GetItem( i ).get() ) )
         {
             if( item->MainItemHasSheetPath() )
                 orderedItems[item->GetMainItemSheetPath()].emplace_back( item );
@@ -132,19 +145,26 @@ bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
     reportHead.kicad_version = GetMajorMinorPatchVersion();
     reportHead.coordinate_units = EDA_UNIT_UTILS::GetLabel( m_reportUnits );
 
+    // Document which severities are included in this report
+    if( m_reportedSeverities & RPT_SEVERITY_ERROR )
+        reportHead.included_severities.push_back( wxS( "error" ) );
+
+    if( m_reportedSeverities & RPT_SEVERITY_WARNING )
+        reportHead.included_severities.push_back( wxS( "warning" ) );
+
+    if( m_reportedSeverities & RPT_SEVERITY_EXCLUSION )
+        reportHead.included_severities.push_back( wxS( "exclusion" ) );
+
     SCH_SHEET_LIST sheetList = m_sch->Hierarchy();
     sheetList.FillItemMap( itemMap );
 
     ERC_SETTINGS& settings = m_sch->ErcSettings();
 
-    SHEETLIST_ERC_ITEMS_PROVIDER errors( m_sch );
-    errors.SetSeverities( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING );
-
     std::map<SCH_SHEET_PATH, std::vector<ERC_ITEM*>> orderedItems;
 
-    for( int i = 0; i < errors.GetCount(); ++i )
+    for( int i = 0; i < m_markersProvider->GetCount(); ++i )
     {
-        if( auto item = dynamic_cast<ERC_ITEM*>( errors.GetItem( i ).get() ) )
+        if( auto item = dynamic_cast<ERC_ITEM*>( m_markersProvider->GetItem( i ).get() ) )
         {
             if( item->MainItemHasSheetPath() )
                 orderedItems[item->GetMainItemSheetPath()].emplace_back( item );

eeschema/erc/erc_report.h

@@ -30,7 +30,8 @@ class RC_ITEMS_PROVIDER;
 class ERC_REPORT
 {
 public:
-    ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits );
+    ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits,
+                std::shared_ptr<RC_ITEMS_PROVIDER> aMarkersProvider = nullptr );
 
     /**
      * Returns the ERC report in "text" (human readable) format
@@ -56,6 +57,8 @@ public:
 private:
     SCHEMATIC*                         m_sch;
     EDA_UNITS                          m_reportUnits;
+    std::shared_ptr<RC_ITEMS_PROVIDER> m_markersProvider;
+    int                                m_reportedSeverities;
 };
 
 

eeschema/erc/erc_settings.cpp

@@ -265,8 +265,8 @@ ERC_SETTINGS::~ERC_SETTINGS()
 
 SEVERITY ERC_SETTINGS::GetSeverity( int aErrorCode ) const
 {
-    // Special-case duplicate pin error.  Unique pin names are required by KiCad, so this
-    // is always an error.
+    // Special-case duplicate pin error. Multiple pins with the same number are allowed
+    // if they share the same net, but having them on different nets is always an error.
     if( aErrorCode == ERCE_DUPLICATE_PIN_ERROR )
     {
         return RPT_SEVERITY_ERROR;
@@ -408,6 +408,12 @@ void SHEETLIST_ERC_ITEMS_PROVIDER::SetSeverities( int aSeverities )
 }
 
 
+int SHEETLIST_ERC_ITEMS_PROVIDER::GetSeverities() const
+{
+    return m_severities;
+}
+
+
 int SHEETLIST_ERC_ITEMS_PROVIDER::GetCount( int aSeverity ) const
 {
     if( aSeverity < 0 )

eeschema/erc/erc_settings.h

@@ -256,6 +256,8 @@ public:
 
     void SetSeverities( int aSeverities ) override;
 
+    int GetSeverities() const override;
+
     int GetCount( int aSeverity = -1 ) const override;
 
     std::shared_ptr<RC_ITEM> GetItem( int aIndex ) const override;

eeschema/files-io.cpp

@@ -794,6 +794,11 @@ bool SCH_EDIT_FRAME::saveSchematicFile( SCH_SHEET* aSheet, const wxString& aSave
 
     IO_RELEASER<SCH_IO> pi( SCH_IO_MGR::FindPlugin( pluginType ) );
 
+    // On Windows, ensure the target file is writeable by clearing problematic attributes like
+    // hidden or read-only. This can happen when files are synced via cloud services.
+    if( schematicFileName.FileExists() )
+        KIPLATFORM::IO::MakeWriteable( schematicFileName.GetFullPath() );
+
     try
     {
         pi->SaveSchematicFile( schematicFileName.GetFullPath(), aSheet, &Schematic() );

eeschema/lib_symbol.cpp

@@ -165,9 +165,10 @@ LIB_SYMBOL::LIB_SYMBOL( const wxString& aName, LIB_SYMBOL* aParent, SYMBOL_LIB*
 }
 
 
-LIB_SYMBOL::LIB_SYMBOL( const LIB_SYMBOL& aSymbol, SYMBOL_LIB* aLibrary ) :
+LIB_SYMBOL::LIB_SYMBOL( const LIB_SYMBOL& aSymbol, SYMBOL_LIB* aLibrary,
+                        bool aCopyEmbeddedFiles ) :
     SYMBOL( aSymbol ),
-    EMBEDDED_FILES( aSymbol ),
+    EMBEDDED_FILES( aSymbol, aCopyEmbeddedFiles ),
     m_me( this, null_deleter() )
 {
     m_library        = aLibrary;
@@ -418,6 +419,12 @@ std::unique_ptr< LIB_SYMBOL > LIB_SYMBOL::Flatten() const
         retv->SetKeyWords( m_keyWords.IsEmpty() ? parent->GetKeyWords() : m_keyWords );
         retv->SetFPFilters( m_fpFilters.IsEmpty() ? parent->GetFPFilters() : m_fpFilters );
 
+        for( const auto& file : EmbeddedFileMap() )
+        {
+            EMBEDDED_FILES::EMBEDDED_FILE* newFile = new EMBEDDED_FILES::EMBEDDED_FILE( *file.second );
+            retv->AddFile( newFile );
+        }
+
         retv->SetExcludedFromSim( parent->GetExcludedFromSim() );
         retv->SetExcludedFromBOM( parent->GetExcludedFromBOM() );
         retv->SetExcludedFromBoard( parent->GetExcludedFromBoard() );
@@ -1964,6 +1971,18 @@ const EMBEDDED_FILES* LIB_SYMBOL::GetEmbeddedFiles() const
 }
 
 
+void LIB_SYMBOL::AppendParentEmbeddedFiles( std::vector<EMBEDDED_FILES*>& aStack ) const
+{
+    std::shared_ptr<LIB_SYMBOL> parent = m_parent.lock();
+
+    while( parent )
+    {
+        aStack.push_back( parent->GetEmbeddedFiles() );
+        parent = parent->GetParent().lock();
+    }
+}
+
+
 std::set<KIFONT::OUTLINE_FONT*> LIB_SYMBOL::GetFonts() const
 {
     using EMBEDDING_PERMISSION = KIFONT::OUTLINE_FONT::EMBEDDING_PERMISSION;

eeschema/lib_symbol.h

@@ -84,7 +84,8 @@ public:
     LIB_SYMBOL( const wxString& aName, LIB_SYMBOL* aParent = nullptr,
                 SYMBOL_LIB* aLibrary = nullptr );
 
-    LIB_SYMBOL( const LIB_SYMBOL& aSymbol, SYMBOL_LIB* aLibrary = nullptr );
+    LIB_SYMBOL( const LIB_SYMBOL& aSymbol, SYMBOL_LIB* aLibrary = nullptr,
+                bool aCopyEmbeddedFiles = true );
 
     virtual ~LIB_SYMBOL()
     {}
@@ -358,6 +359,7 @@ public:
 
     EMBEDDED_FILES* GetEmbeddedFiles() override;
     const EMBEDDED_FILES* GetEmbeddedFiles() const;
+    void AppendParentEmbeddedFiles( std::vector<EMBEDDED_FILES*>& aStack ) const;
 
     void EmbedFonts() override;
 

eeschema/netlist_exporters/netlist_exporter_allegro.cpp

@@ -337,10 +337,10 @@ void NETLIST_EXPORTER_ALLEGRO::toAllegroPackages()
                                           SCH_SHEET_PATH>>( groupCount, ( *it ) ) );
                 it = m_orderedSymbolsSheetpath.erase( it );
 
-                if( std::distance( it, m_orderedSymbolsSheetpath.begin() ) > 0 )
-                    it--;
-                else if( it == m_orderedSymbolsSheetpath.end() )
+                if( m_orderedSymbolsSheetpath.size() == 0 )
                     break;
+                else
+                    it--;   // we want to test the new it element, so compensate the next ++it
             }
         }
         groupCount++;
@@ -526,6 +526,14 @@ void NETLIST_EXPORTER_ALLEGRO::toAllegroPackages()
         wxString value = iter->second.m_value;
         wxString tolerance = iter->second.m_tolerance;
 
+        // Remove quotes in value (can be added by formatText), if any.
+        // (they are already in print format string)
+        if( value.StartsWith( "'" ) and value.EndsWith( "'" ) )
+        {
+            value.Remove( 0, 1 );
+            value.RemoveLast();
+        }
+
         if( value.IsEmpty() && tolerance.IsEmpty() )
         {
             fmt::print( m_f, "! '{}' ; ", TO_UTF8( deviceType ) );
@@ -562,7 +570,11 @@ wxString NETLIST_EXPORTER_ALLEGRO::formatText( wxString aString )
     if( aString.IsEmpty() )
         return wxEmptyString;
 
-    aString.Replace( "\u03BC", "u" );
+    // Replace 'µ' ("\u00b5") by 'u' to keep ASCII7 constraint
+    wxString mu = "µ";      // also could be "\u03BC" (grec symbol mu);
+    aString.Replace( mu, "u" );
+    mu = "\u03BC";          // grec mu
+    aString.Replace( mu, "u" );
 
     std::regex reg( "[!']|[^ -~]" );
     wxString   processedString = wxString( std::regex_replace( std::string( aString ), reg, "?" ) );

eeschema/sch_commit.cpp

@@ -321,6 +321,19 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
 
                 wxCHECK2( itemCopy, continue );
 
+#if 0
+                // While this keeps us from marking documents modified when someone OK's a dialog with
+                // no changes, it depends on our various SCH_ITEM::operator=='s being bullet-proof. They
+                // currently aren't.
+                if( *itemCopy == *schItem )
+                {
+                    // No actual changes made; short-circuit undo
+                    delete ent.m_copy;
+                    ent.m_copy = nullptr;
+                    break;
+                }
+#endif
+
                 SCH_SHEET_PATH currentSheet;
 
                 if( frame )
@@ -332,7 +345,6 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
                     updateConnectivityFlag();
                 }
 
-
                 if( schItem->Type() == SCH_SHEET_T )
                 {
                     const SCH_SHEET* modifiedSheet = static_cast<const SCH_SHEET*>( schItem );
@@ -406,14 +418,19 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
     {
         if( frame )
         {
-            frame->SaveCopyInUndoList( undoList, UNDO_REDO::UNSPECIFIED, false, dirtyConnectivity );
+            if( undoList.GetCount() > 0 )
+            {
+                frame->SaveCopyInUndoList( undoList, UNDO_REDO::UNSPECIFIED, false, dirtyConnectivity );
+
+                if( !( aCommitFlags & SKIP_SET_DIRTY ) )
+                    frame->OnModify();
+            }
 
             if( dirtyConnectivity )
             {
                 wxLogTrace( wxS( "CONN_PROFILE" ),
                             wxS( "SCH_COMMIT::pushSchEdit() %s clean up connectivity rebuild." ),
-                            ( connectivityCleanUp == LOCAL_CLEANUP ) ? wxS( "local" )
-                                                                     : wxS( "global" ) );
+                            ( connectivityCleanUp == LOCAL_CLEANUP ) ? wxS( "local" ) : wxS( "global" ) );
                 frame->RecalculateConnections( this, connectivityCleanUp );
             }
         }
@@ -430,12 +447,6 @@ void SCH_COMMIT::pushSchEdit( const wxString& aMessage, int aCommitFlags )
     if( frame && frame->GetCanvas() )
         frame->GetCanvas()->Refresh();
 
-    if( !( aCommitFlags & SKIP_SET_DIRTY ) )
-    {
-        if( frame )
-            frame->OnModify();
-    }
-
     clear();
 }
 

eeschema/sch_connection.cpp

@@ -444,19 +444,22 @@ void SCH_CONNECTION::AppendInfoToMsgPanel( std::vector<MSG_PANEL_ITEM>& aList )
 
     aList.emplace_back( _( "Connection Name" ), UnescapeString( Name() ) );
 
-    if( std::shared_ptr<BUS_ALIAS> alias = m_graph->GetBusAlias( m_name ) )
+    if( IsBus() )
     {
-        msg.Printf( _( "Bus Alias %s Members" ), m_name );
-        aList.emplace_back( msg, boost::algorithm::join( alias->Members(), " " ) );
-    }
-    else if( NET_SETTINGS::ParseBusGroup( m_name, &group_name, &group_members ) )
-    {
-        for( const wxString& group_member : group_members )
+        if( std::shared_ptr<BUS_ALIAS> alias = m_graph->GetBusAlias( m_name ) )
         {
-            if( std::shared_ptr<BUS_ALIAS> group_alias = m_graph->GetBusAlias( group_member ) )
+            msg.Printf( _( "Bus Alias %s Members" ), m_name );
+            aList.emplace_back( msg, boost::algorithm::join( alias->Members(), " " ) );
+        }
+        else if( NET_SETTINGS::ParseBusGroup( m_name, &group_name, &group_members ) )
+        {
+            for( const wxString& group_member : group_members )
             {
-                msg.Printf( _( "Bus Alias %s Members" ), group_alias->GetName() );
-                aList.emplace_back( msg, boost::algorithm::join( group_alias->Members(), " " ) );
+                if( std::shared_ptr<BUS_ALIAS> group_alias = m_graph->GetBusAlias( group_member ) )
+                {
+                    msg.Printf( _( "Bus Alias %s Members" ), group_alias->GetName() );
+                    aList.emplace_back( msg, boost::algorithm::join( group_alias->Members(), " " ) );
+                }
             }
         }
     }

eeschema/sch_edit_frame.cpp

@@ -1616,7 +1616,10 @@ void SCH_EDIT_FRAME::RefreshOperatingPointDisplay()
                 embeddedFilesStack.push_back( m_schematic->GetEmbeddedFiles() );
 
                 if( EMBEDDED_FILES* symbolEmbeddedFiles = symbol->GetEmbeddedFiles() )
+                {
                     embeddedFilesStack.push_back( symbolEmbeddedFiles );
+                    symbol->GetLibSymbolRef()->AppendParentEmbeddedFiles( embeddedFilesStack );
+                }
 
                 simLibMgr.SetFilesStack( embeddedFilesStack );
 
@@ -1976,6 +1979,13 @@ void SCH_EDIT_FRAME::ShowChangedLanguage()
 }
 
 
+void SCH_EDIT_FRAME::ProjectChanged()
+{
+    if( m_designBlocksPane )
+        m_designBlocksPane->RefreshLibs();
+}
+
+
 void SCH_EDIT_FRAME::UpdateNetHighlightStatus()
 {
     if( !GetHighlightedConnection().IsEmpty() )

eeschema/sch_edit_frame.h

@@ -805,6 +805,8 @@ public:
 
     void ShowChangedLanguage() override;
 
+    void ProjectChanged() override;
+
     void SetScreen( BASE_SCREEN* aScreen ) override;
 
     const BOX2I GetDocumentExtents( bool aIncludeAllVisible = true ) const override;

eeschema/sch_field.cpp

@@ -953,7 +953,10 @@ void SCH_FIELD::OnScintillaCharAdded( SCINTILLA_TRICKS* aScintillaTricks,
                     embeddedFilesStack.push_back( schematic->GetEmbeddedFiles() );
 
                     if( EMBEDDED_FILES* symbolEmbeddedFiles = symbol->GetEmbeddedFiles() )
+                    {
                         embeddedFilesStack.push_back( symbolEmbeddedFiles );
+                        symbol->GetLibSymbolRef()->AppendParentEmbeddedFiles( embeddedFilesStack );
+                    }
 
                     mgr.SetFilesStack( embeddedFilesStack );
 
@@ -1539,6 +1542,12 @@ void SCH_FIELD::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PLOT_OPTS&
         vjustify = GR_TEXT_V_ALIGN_CENTER;
         textpos = GetBoundingBox().Centre();
     }
+    else if( m_parent && m_parent->Type() == LIB_SYMBOL_T )
+    {
+        // Library-symbol exports (CLI/symbol editor) provide an item offset in the same coordinate
+        // frame as body graphics/pins.  Apply the same transform+offset pipeline to field text.
+        textpos = renderSettings->TransformCoordinate( textpos ) + aOffset;
+    }
     else if( m_parent && m_parent->Type() == SCH_GLOBAL_LABEL_T )
     {
         SCH_GLOBALLABEL* label = static_cast<SCH_GLOBALLABEL*>( m_parent );

eeschema/sch_io/altium/sch_io_altium.cpp

@@ -70,14 +70,6 @@
 #include "sch_io_altium.h"
 
 
-/**
- * Flag to enable Altium schematic debugging output.
- *
- * @ingroup trace_env_vars
- */
-static const wxChar traceAltiumSch[] = wxT( "KICAD_ALTIUM_SCH" );
-
-
 // Harness port object itself does not contain color information about itself
 // It seems altium is drawing harness ports using these colors
 #define HARNESS_PORT_COLOR_DEFAULT_BACKGROUND COLOR4D( 0.92941176470588238, \
@@ -391,17 +383,51 @@ SCH_SHEET* SCH_IO_ALTIUM::LoadSchematicProject( SCHEMATIC* aSchematic, const std
         if( !key.starts_with( "sch" ) )
             continue;
 
+        wxFileName fn( filestring );
+
+        // Check if this file was already loaded as a subsheet of another sheet.
+        // This can happen when the project file lists sheets in an order where a parent
+        // sheet is processed before its subsheets. We need to handle potential case
+        // differences in filenames (e.g., LVDS.SCHDOC vs LVDS.SchDoc).
+        SCH_SCREEN* existingScreen = nullptr;
+        m_rootSheet->SearchHierarchy( fn.GetFullPath(), &existingScreen );
+
+        // If not found, try case-insensitive search by checking all loaded screens.
+        // Compare base names only (without extension) since Altium uses .SchDoc/.SCHDOC
+        // while KiCad uses .kicad_sch
+        if( !existingScreen )
+        {
+            SCH_SCREENS allScreens( m_rootSheet );
+
+            for( SCH_SCREEN* screen = allScreens.GetFirst(); screen; screen = allScreens.GetNext() )
+            {
+                wxFileName screenFn( screen->GetFileName() );
+                wxFileName checkFn( fn.GetFullPath() );
+
+                if( screenFn.GetName().IsSameAs( checkFn.GetName(), false ) )
+                {
+                    existingScreen = screen;
+                    break;
+                }
+            }
+        }
+
+        if( existingScreen )
+            continue;
+
         VECTOR2I pos    = VECTOR2I( x * schIUScale.MilsToIU( 1000 ),
                                     y * schIUScale.MilsToIU( 1000 ) );
 
-        wxFileName                 fn( filestring );
         wxFileName                 kicad_fn( fn );
         std::unique_ptr<SCH_SHEET> sheet = std::make_unique<SCH_SHEET>( m_rootSheet, pos );
         SCH_SCREEN* screen = new SCH_SCREEN( m_schematic );
         sheet->SetScreen( screen );
 
+        // Convert to KiCad project-relative path with .kicad_sch extension
         kicad_fn.SetExt( FILEEXT::KiCadSchematicFileExtension );
         kicad_fn.SetPath( aSchematic->Prj().GetProjectPath() );
+
+        // Sheet uses relative filename, screen uses full path
         sheet->SetFileName( kicad_fn.GetFullName() );
         screen->SetFileName( kicad_fn.GetFullPath() );
 
@@ -410,6 +436,8 @@ SCH_SHEET* SCH_IO_ALTIUM::LoadSchematicProject( SCHEMATIC* aSchematic, const std
         wxString pageNo = wxString::Format( wxT( "%d" ), page++ );
 
         m_sheetPath.push_back( sheet.get() );
+
+        // Parse from the original Altium file location
         ParseAltiumSch( fn.GetFullPath() );
 
         m_sheetPath.SetPageNumber( pageNo );
@@ -422,7 +450,9 @@ SCH_SHEET* SCH_IO_ALTIUM::LoadSchematicProject( SCHEMATIC* aSchematic, const std
         sheet->SetParent( m_sheetPath.Last() );
         SCH_SHEET* sheetPtr = sheet.release();
         currentScreen->Append( sheetPtr );
-        sheets[fn.GetFullPath()] = sheetPtr;
+
+        // Use the KiCad path for the map key since screen filenames use KiCad paths
+        sheets[kicad_fn.GetFullPath()] = sheetPtr;
 
         x += 2;
 
@@ -442,6 +472,32 @@ SCH_SHEET* SCH_IO_ALTIUM::LoadSchematicProject( SCHEMATIC* aSchematic, const std
             getCurrentScreen()->Remove( sheet );
     }
 
+    // If there's only one top-level sheet, make it the root instead of having a dummy root
+    SCH_SCREEN* rootScreen = m_rootSheet->GetScreen();
+    std::vector<SCH_SHEET*> topLevelSheets;
+
+    for( SCH_ITEM* item : rootScreen->Items().OfType( SCH_SHEET_T ) )
+        topLevelSheets.push_back( static_cast<SCH_SHEET*>( item ) );
+
+    if( topLevelSheets.size() == 1 )
+    {
+        SCH_SHEET* singleSheet = topLevelSheets[0];
+
+        // Remove the sheet from the dummy root's screen
+        rootScreen->Remove( singleSheet );
+
+        // Transfer the dummy root's properties to the single sheet
+        singleSheet->SetParent( nullptr );
+
+        // Update the schematic to use the single sheet as the new root
+        m_rootSheet = singleSheet;
+        aSchematic->SetRoot( m_rootSheet );
+
+        // Update m_sheetPath to reflect the new root
+        m_sheetPath.clear();
+        m_sheetPath.push_back( m_rootSheet );
+    }
+
     return m_rootSheet;
 }
 
@@ -539,6 +595,37 @@ SCH_SHEET* SCH_IO_ALTIUM::LoadSchematicFile( const wxString& aFileName, SCHEMATI
     else
         ParseAltiumSch( aFileName );
 
+    // Convert hierarchical labels to global labels on top-level sheets.
+    // Top-level sheets have no parent, so hierarchical labels don't make sense.
+    if( aFileName.empty() )
+    {
+        for( SCH_ITEM* item : rootScreen->Items().OfType( SCH_SHEET_T ) )
+        {
+            SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
+            SCH_SCREEN* screen = sheet->GetScreen();
+
+            if( !screen )
+                continue;
+
+            std::vector<SCH_HIERLABEL*> hierLabels;
+
+            for( SCH_ITEM* labelItem : screen->Items().OfType( SCH_HIER_LABEL_T ) )
+                hierLabels.push_back( static_cast<SCH_HIERLABEL*>( labelItem ) );
+
+            for( SCH_HIERLABEL* hierLabel : hierLabels )
+            {
+                SCH_GLOBALLABEL* globalLabel = new SCH_GLOBALLABEL( hierLabel->GetPosition(),
+                                                                     hierLabel->GetText() );
+                globalLabel->SetShape( hierLabel->GetShape() );
+                globalLabel->SetSpinStyle( hierLabel->GetSpinStyle() );
+
+                screen->Remove( hierLabel );
+                screen->Append( globalLabel );
+                delete hierLabel;
+            }
+        }
+    }
+
     if( m_reporter )
     {
         for( auto& [msg, severity] : m_errorMessages )
@@ -660,8 +747,8 @@ void SCH_IO_ALTIUM::CreateAliases()
         std::shared_ptr<BUS_ALIAS> alias = std::make_shared<BUS_ALIAS>( screen);
         alias->SetName( harness.m_name );
 
-        for( auto& port : harness.m_ports )
-            alias->Members().push_back( port.m_name );
+        for( HARNESS::HARNESS_PORT& port : harness.m_ports )
+            alias->AddMember( port.m_name );
 
         screen->AddBusAlias( alias );
 
@@ -847,9 +934,7 @@ void SCH_IO_ALTIUM::ParseAltiumSch( const wxString& aFileName )
         }
         catch( const std::exception& exc )
         {
-            wxLogTrace( traceAltiumSch, wxS( "Unhandled exception in Altium schematic "
-                                             "parsers: %s." ), exc.what() );
-            throw;
+            THROW_IO_ERROR( wxString::Format( _( "Error parsing Altium schematic: %s" ), exc.what() ) );
         }
     }
     else // ASCII
@@ -921,7 +1006,27 @@ void SCH_IO_ALTIUM::ParseAltiumSch( const wxString& aFileName )
             SCH_SCREEN* screen = sheet->GetScreen();
 
             if( sheet->GetName().Trim().empty() )
-                sheet->SetName( loadAltiumFileName.GetName() );
+            {
+                wxString sheetName = loadAltiumFileName.GetName();
+
+                std::set<wxString> sheetNames;
+
+                for( EDA_ITEM* otherItem : currentScreen->Items().OfType( SCH_SHEET_T ) )
+                {
+                    SCH_SHEET* otherSheet = static_cast<SCH_SHEET*>( otherItem );
+                    sheetNames.insert( otherSheet->GetName() );
+                }
+
+                for( int ii = 1; ; ++ii )
+                {
+                    if( sheetNames.find( sheetName ) == sheetNames.end() )
+                        break;
+
+                    sheetName = loadAltiumFileName.GetName() + wxString::Format( wxT( "_%d" ), ii );
+                }
+
+                sheet->SetName( sheetName );
+            }
 
             wxCHECK2( screen, continue );
 
@@ -1540,8 +1645,21 @@ void SCH_IO_ALTIUM::ParseComponent( int aIndex, const std::map<wxString, wxStrin
     for( SCH_FIELD& field : symbol->GetFields() )
         field.SetVisible( false );
 
-    // TODO: keep it simple for now, and only set position.
-    // component->SetOrientation( elem.orientation );
+    int orientation = SYMBOL_ORIENTATION_T::SYM_ORIENT_0;
+
+    switch( elem.orientation )
+    {
+    case 0: orientation = SYMBOL_ORIENTATION_T::SYM_ORIENT_90;  break;
+    case 1: orientation = SYMBOL_ORIENTATION_T::SYM_ORIENT_180; break;
+    case 2: orientation = SYMBOL_ORIENTATION_T::SYM_ORIENT_270; break;
+    case 3: orientation = SYMBOL_ORIENTATION_T::SYM_ORIENT_0;   break;
+    default: break;
+    }
+
+    if( elem.isMirrored )
+        orientation += SYMBOL_ORIENTATION_T::SYM_MIRROR_Y;
+
+    symbol->SetOrientation( orientation );
 
     // If Altium has defined a library from which we have the part,
     // use this as the designated source library.
@@ -1646,28 +1764,28 @@ void SCH_IO_ALTIUM::ParsePin( const std::map<wxString, wxString>& aProperties,
     if( !elem.showPinName )
         pin->SetNameTextSize( 0 );
 
-    VECTOR2I pinLocation = elem.location; // the location given is not the connection point!
+    // Altium gives the pin body end location (elem.location) and the pre-computed
+    // electrical connection point (elem.kicadLocation) which accounts for pin length
+    // with combined integer+fractional arithmetic to avoid rounding errors.
+    VECTOR2I bodyEnd = elem.location;
+    VECTOR2I pinLocation = elem.kicadLocation;
 
     switch( elem.orientation )
     {
     case ASCH_RECORD_ORIENTATION::RIGHTWARDS:
         pin->SetOrientation( PIN_ORIENTATION::PIN_LEFT );
-        pinLocation.x += elem.pinlength;
         break;
 
     case ASCH_RECORD_ORIENTATION::UPWARDS:
         pin->SetOrientation( PIN_ORIENTATION::PIN_DOWN );
-        pinLocation.y -= elem.pinlength;
         break;
 
     case ASCH_RECORD_ORIENTATION::LEFTWARDS:
         pin->SetOrientation( PIN_ORIENTATION::PIN_RIGHT );
-        pinLocation.x -= elem.pinlength;
         break;
 
     case ASCH_RECORD_ORIENTATION::DOWNWARDS:
         pin->SetOrientation( PIN_ORIENTATION::PIN_UP );
-        pinLocation.y += elem.pinlength;
         break;
 
     default:
@@ -1675,10 +1793,20 @@ void SCH_IO_ALTIUM::ParsePin( const std::map<wxString, wxString>& aProperties,
         break;
     }
 
-    // TODO: position can be sometimes off a little bit!
-
     if( schSymbol )
+    {
+        // Both points are in absolute schematic coordinates.  Transform them to library-local
+        // space, then derive the pin orientation from the resulting direction vector.
         pinLocation = GetRelativePosition( pinLocation + m_sheetOffset, schSymbol );
+        bodyEnd = GetRelativePosition( bodyEnd + m_sheetOffset, schSymbol );
+
+        VECTOR2I dir = bodyEnd - pinLocation;
+
+        if( std::abs( dir.x ) >= std::abs( dir.y ) )
+            pin->SetOrientation( dir.x > 0 ? PIN_ORIENTATION::PIN_RIGHT : PIN_ORIENTATION::PIN_LEFT );
+        else
+            pin->SetOrientation( dir.y > 0 ? PIN_ORIENTATION::PIN_DOWN : PIN_ORIENTATION::PIN_UP );
+    }
 
     pin->SetPosition( pinLocation );
 
@@ -1854,6 +1982,91 @@ void SetTextPositioning( EDA_TEXT* text, ASCH_LABEL_JUSTIFICATION justification,
 }
 
 
+// Altium text orientation and justification are in absolute (page) coordinates. KiCad stores
+// field text properties relative to the parent symbol and applies the symbol's transform at
+// render time. This function adjusts the field's stored text angle and justification to
+// compensate for the symbol's orientation so that the final rendered appearance matches the
+// original Altium layout.
+//
+// The compensation follows the same logic as SCH_FIELD::Rotate() but applied in the
+// inverse direction to undo the symbol's rotation effect on text properties.
+void AdjustFieldForSymbolOrientation( SCH_FIELD* aField, const ASCH_SYMBOL& aSymbol )
+{
+    bool isHorizontal = aField->GetTextAngle().IsHorizontal();
+
+    // Altium orientation 0 (RIGHTWARDS) maps to KiCad SYM_ORIENT_90 (CCW). To compensate,
+    // apply CW 90-degree rotation to text properties. Per SCH_FIELD::Rotate(), CW rotation
+    // of horizontal text flips justification; CW rotation of vertical text does not.
+    if( aSymbol.orientation == 0 )
+    {
+        if( isHorizontal )
+        {
+            aField->SetHorizJustify(
+                    static_cast<GR_TEXT_H_ALIGN_T>( -aField->GetHorizJustify() ) );
+        }
+
+        aField->SetTextAngle( isHorizontal ? ANGLE_VERTICAL : ANGLE_HORIZONTAL );
+    }
+    // Altium orientation 1 (UPWARDS) maps to KiCad SYM_ORIENT_180 (two CCW rotations). The
+    // transform [-1,0,0,-1] negates both X and Y, flipping horizontal justification. Apply
+    // one correction for the full 180 degrees regardless of text angle.
+    else if( aSymbol.orientation == 1 )
+    {
+        aField->SetHorizJustify(
+                static_cast<GR_TEXT_H_ALIGN_T>( -aField->GetHorizJustify() ) );
+    }
+    // Altium orientation 2 (LEFTWARDS) maps to KiCad SYM_ORIENT_270 (CW). To compensate,
+    // apply CCW 90-degree rotation to text properties. Per SCH_FIELD::Rotate(), CCW rotation
+    // of vertical text flips justification; CCW rotation of horizontal text does not.
+    else if( aSymbol.orientation == 2 )
+    {
+        if( !isHorizontal )
+        {
+            aField->SetHorizJustify(
+                    static_cast<GR_TEXT_H_ALIGN_T>( -aField->GetHorizJustify() ) );
+        }
+
+        aField->SetTextAngle( isHorizontal ? ANGLE_VERTICAL : ANGLE_HORIZONTAL );
+    }
+    // Altium orientation 3 (DOWNWARDS) maps to KiCad SYM_ORIENT_0 (identity). No rotation
+    // compensation needed.
+
+    // Mirror-Y in KiCad negates the X component of the bounding box, which effectively
+    // flips horizontal justification. Compensate so the rendered text matches Altium.
+    if( aSymbol.isMirrored )
+    {
+        aField->SetHorizJustify(
+                static_cast<GR_TEXT_H_ALIGN_T>( -aField->GetHorizJustify() ) );
+    }
+}
+
+
+// Altium text in symbols uses absolute orientation, but KiCad applies the symbol's transform
+// to library body items via OrientAndMirrorSymbolItems at render time. This function pre-
+// compensates the stored text angle and justification so that after the render-time transform,
+// the final appearance matches the original Altium layout. Position is not adjusted here
+// since GetRelativePosition already handles the positional component.
+void AdjustTextForSymbolOrientation( SCH_TEXT* aText, const ASCH_SYMBOL& aSymbol )
+{
+    int nRenderRotations = ( aSymbol.orientation + 1 ) % 4;
+
+    // Undo mirror first (reverse of render-time application order).
+    // MirrorHorizontally on LAYER_DEVICE text flips H-justify when horizontal
+    // and V-justify when vertical.
+    if( aSymbol.isMirrored )
+    {
+        if( aText->GetTextAngle().IsHorizontal() )
+            aText->FlipHJustify();
+        else
+            aText->SetVertJustify( static_cast<GR_TEXT_V_ALIGN_T>( -aText->GetVertJustify() ) );
+    }
+
+    // The render pipeline applies Rotate90(false) N times; undo with N inverse rotations.
+    for( int i = 0; i < nRenderRotations; i++ )
+        aText->Rotate90( true );
+}
+
+
 bool SCH_IO_ALTIUM::ShouldPutItemOnSheet( int aOwnerindex )
 {
     // No component assigned -> Put on sheet
@@ -1947,6 +2160,14 @@ void SCH_IO_ALTIUM::ParseLabel( const std::map<wxString, wxString>& aProperties,
         textItem->SetUnit( std::max( 0, elem.ownerpartid ) );
         SetTextPositioning( textItem, elem.justification, elem.orientation );
 
+        if( schsym )
+        {
+            const auto& altiumSymIt = m_altiumComponents.find( elem.ownerindex );
+
+            if( altiumSymIt != m_altiumComponents.end() )
+                AdjustTextForSymbolOrientation( textItem, altiumSymIt->second );
+        }
+
         size_t fontId = elem.fontId;
 
         if( m_altiumSheet && fontId > 0 && fontId <= m_altiumSheet->fonts.size() )
@@ -2634,7 +2855,13 @@ void SCH_IO_ALTIUM::ParseArc( const std::map<wxString, wxString>& aProperties,
             arc->SetUnit( std::max( 0, elem.ownerpartid ) );
 
             if( schsym )
+            {
                 center = GetRelativePosition( elem.m_Center + m_sheetOffset, schsym );
+                startOffset = GetRelativePosition( elem.m_Center + startOffset + m_sheetOffset, schsym )
+                              - center;
+                endOffset = GetRelativePosition( elem.m_Center + endOffset + m_sheetOffset, schsym )
+                            - center;
+            }
 
             arc->SetCenter( center );
             arc->SetStart( center + startOffset );
@@ -4234,6 +4461,11 @@ void SCH_IO_ALTIUM::ParseDesignator( const std::map<wxString, wxString>& aProper
     SCH_FIELD* field = symbol->GetField( REFERENCE_FIELD );
     field->SetPosition( elem.location + m_sheetOffset );
     SetTextPositioning( field, elem.justification, elem.orientation );
+
+    const auto& altiumSymIt = m_altiumComponents.find( elem.ownerindex );
+
+    if( altiumSymIt != m_altiumComponents.end() )
+        AdjustFieldForSymbolOrientation( field, altiumSymIt->second );
 }
 
 
@@ -4255,6 +4487,7 @@ void SCH_IO_ALTIUM::ParseLibDesignator( const std::map<wxString, wxString>& aPro
             refField.SetText( elem.text.BeforeLast( '?' ) ); // remove the '?' at the end for KiCad-style
 
         refField.SetPosition( elem.location );
+        SetTextPositioning( &refField, elem.justification, elem.orientation );
 
         if( elem.fontId > 0 && elem.fontId <= static_cast<int>( aFontSizes.size() ) )
         {
@@ -4375,6 +4608,11 @@ void SCH_IO_ALTIUM::ParseParameter( const std::map<wxString, wxString>& aPropert
         field->SetVisible( !elem.isHidden );
         field->SetNameShown( elem.isShowName );
         SetTextPositioning( field, elem.justification, elem.orientation );
+
+        const auto& altiumSymIt = m_altiumComponents.find( elem.ownerindex );
+
+        if( altiumSymIt != m_altiumComponents.end() )
+            AdjustFieldForSymbolOrientation( field, altiumSymIt->second );
     }
 }
 
@@ -4761,10 +4999,18 @@ SCH_IO_ALTIUM::ParseLibFile( const ALTIUM_COMPOUND_FILE& aAltiumLibFile )
             if( valField.GetText().IsEmpty() )
                 valField.SetText( name );
 
+            // Set the symbol name to match the cache key. The directory name (used as cache
+            // key) may differ from the Altium library reference when the original name
+            // contains characters invalid for directory names (like '/').
+            wxString cacheName;
+
             if( symbols.size() == 1 )
-                ret[name] = symbol;
+                cacheName = name;
             else
-                ret[wxString::Format( "%s (Altium Display %zd)", name, ii + 1 )] = symbol;
+                cacheName = wxString::Format( "%s (Altium Display %zd)", name, ii + 1 );
+
+            symbol->SetName( cacheName );
+            ret[cacheName] = symbol;
         }
     }
 
@@ -4839,13 +5085,15 @@ void SCH_IO_ALTIUM::ensureLoadedLibrary( const wxString& aLibraryPath,
     }
     catch( const CFB::CFBException& exception )
     {
+        m_libCache.erase( aLibraryPath );
+        m_timestamps.erase( aLibraryPath );
         THROW_IO_ERROR( exception.what() );
     }
     catch( const std::exception& exc )
     {
-        wxFAIL_MSG( wxString::Format( wxT( "Unhandled exception in Altium schematic parsers: %s." ),
-                                      exc.what() ) );
-        throw;
+        m_libCache.erase( aLibraryPath );
+        m_timestamps.erase( aLibraryPath );
+        THROW_IO_ERROR( wxString::Format( _( "Error parsing Altium library: %s" ), exc.what() ) );
     }
 }
 

eeschema/sch_io/cadstar/cadstar_sch_archive_loader.cpp

@@ -1205,7 +1205,7 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadNets()
             BUS               bus     = Schematic.Buses.at( busTerm.BusID );
 
             if( !alg::contains( m_busesMap.at( bus.ID )->Members(), netName ) )
-                m_busesMap.at( bus.ID )->Members().emplace_back( netName );
+                m_busesMap.at( bus.ID )->AddMember( netName );
 
             SCH_BUS_WIRE_ENTRY* busEntry =
                     new SCH_BUS_WIRE_ENTRY( getKiCadPoint( busTerm.FirstPoint ), false );

eeschema/sch_io/http_lib/sch_io_http_lib.cpp

@@ -81,7 +81,7 @@ void SCH_IO_HTTP_LIB::EnumerateSymbolLib( std::vector<LIB_SYMBOL*>& aSymbolList,
         {
             wxString libIDString( part.name );
 
-            LIB_SYMBOL* symbol = loadSymbolFromPart( libIDString, category, part );
+            LIB_SYMBOL* symbol = loadSymbolFromPart( aLibraryPath, libIDString, category, part );
 
             if( symbol && ( !powerSymbolsOnly || symbol->IsPower() ) )
                 aSymbolList.emplace_back( symbol );
@@ -156,7 +156,7 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::LoadSymbol( const wxString& aLibraryPath, const wxS
 
     wxCHECK( foundCategory, nullptr );
 
-    return loadSymbolFromPart( aAliasName, *foundCategory, result );
+    return loadSymbolFromPart( aLibraryPath, aAliasName, *foundCategory, result );
 }
 
 
@@ -349,7 +349,8 @@ void SCH_IO_HTTP_LIB::syncCache( const HTTP_LIB_CATEGORY& category )
 }
 
 
-LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString& aSymbolName,
+LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString& aLibraryPath,
+                                                 const wxString& aSymbolName,
                                                  const HTTP_LIB_CATEGORY& aCategory,
                                                  const HTTP_LIB_PART& aPart )
 {
@@ -359,6 +360,10 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString& aSymbolName,
 
     std::string symbolIdStr = aPart.symbolIdStr;
 
+    // Extract library nickname from the library path (e.g., "/path/to/W5.kicad_httplib" -> "W5")
+    wxFileName libFileName( aLibraryPath );
+    wxString   libNickname = libFileName.GetName();
+
     // Get or Create the symbol using the found symbol
     if( !symbolIdStr.empty() )
     {
@@ -373,8 +378,10 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString& aSymbolName,
 
             symbol = originalSymbol->Duplicate();
             symbol->SetSourceLibId( symbolId );
+            symbol->SetName( aSymbolName );
 
             LIB_ID libId = symbol->GetLibId();
+            libId.SetLibNickname( libNickname );
             libId.SetSubLibraryName( aCategory.name );
             symbol->SetLibId( libId );
         }
@@ -397,6 +404,7 @@ LIB_SYMBOL* SCH_IO_HTTP_LIB::loadSymbolFromPart( const wxString& aSymbolName,
         symbol = new LIB_SYMBOL( aSymbolName );
 
         LIB_ID libId = symbol->GetLibId();
+        libId.SetLibNickname( libNickname );
         libId.SetSubLibraryName( aCategory.name );
         symbol->SetLibId( libId );
     }

eeschema/sch_io/http_lib/sch_io_http_lib.h

@@ -88,8 +88,8 @@ private:
 
     void syncCache( const HTTP_LIB_CATEGORY& category );
 
-    LIB_SYMBOL* loadSymbolFromPart( const wxString& aSymbolName, const HTTP_LIB_CATEGORY& aCategory,
-                                    const HTTP_LIB_PART& aPart );
+    LIB_SYMBOL* loadSymbolFromPart( const wxString& aLibraryPath, const wxString& aSymbolName,
+                                    const HTTP_LIB_CATEGORY& aCategory, const HTTP_LIB_PART& aPart );
 
 private:
     SYMBOL_LIB_TABLE*                    m_libTable;

eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp

@@ -1497,7 +1497,7 @@ std::shared_ptr<BUS_ALIAS> SCH_IO_KICAD_LEGACY::loadBusAlias( LINE_READER& aRead
         parseUnquotedString( buf, aReader, line, &line, true );
 
         if( !buf.IsEmpty() )
-            busAlias->Members().emplace_back( buf );
+            busAlias->AddMember( buf );
     }
 
     return busAlias;

eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp

@@ -851,7 +851,10 @@ void SCH_IO_KICAD_SEXPR::saveSymbol( SCH_SYMBOL* aSymbol, const SCHEMATIC& aSche
                            return aLhs.m_Path < aRhs.m_Path;
                        } );
 
-            projectName = instances[0].m_ProjectName;
+            if( uuid == rootSheetUuid )
+                projectName = aSchematic.Prj().GetProjectName();
+            else
+                projectName = instances[0].m_ProjectName;
 
             m_out->Print( "(project %s", m_out->Quotew( projectName ).c_str() );