Tag stable version 9.0.8.

Currently translated at 100.0% (10123 of 10123 strings)

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

.gitlab/Windows-CI.yml

@@ -8,6 +8,7 @@ win64_build:
   interruptible: false
   image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/ltsc2022-msvc:latest
   variables:
+    VCPKG_BINARY_SOURCES: 'nuget,gitlab,readwrite'
     # Switch the compressor to fastzip and reduce the compression level
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "fast"
@@ -23,6 +24,7 @@ win64_build:
   script:
     - C:\builder\build.ps1 -Env -Arch x64
     - $vcpkgCache=Join-Path -Path (Get-Location) -ChildPath ".vcpkgCache";$env:VCPKG_DEFAULT_BINARY_CACHE=$vcpkgCache;New-Item -ItemType Directory -Force -Path $vcpkgCache
+    - nuget.exe sources add -Name gitlab -Source "https://gitlab.com/api/v4/projects/27426693/packages/nuget/index.json"  -UserName gitlab-ci-token -Password $env:CI_JOB_TOKEN
     - mkdir -p build/windows -Force
     - cd build/windows
     - cmake `
@@ -34,6 +36,8 @@ win64_build:
       -DKICAD_BUILD_PNS_DEBUG_TOOL=ON `
       -DKICAD_USE_3DCONNEXION=ON `
       -DVCPKG_BUILD_TYPE=debug `
+      -DVCPKG_INSTALL_OPTIONS="--x-abi-tools-use-exact-versions" `
+      -DVCPKG_OVERLAY_TRIPLETS="$Env:CI_PROJECT_DIR/tools/custom_vcpkg_triplets" `
       ../../
     - cmake --build . 2>&1 | tee compilation_log.txt
     - cd ../../

.gitlab/doxygen.yml

@@ -1,7 +1,7 @@
 build_doxygen_docker:
-  image: docker:stable
+  image: docker:24.0.5-cli
   services:
-    - docker:dind
+    - docker:24.0.5-dind
   stage: build
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_JOB_NAME == "doxygen"

3d-viewer/3d_rendering/raytracing/render_3d_raytrace_base.cpp

@@ -486,9 +486,12 @@ void RENDER_3D_RAYTRACE_BASE::renderBlockTracing( uint8_t* ptrPBO, signed int iB
     // Initialize ray packets
     const SFVEC2UI& blockPos = m_blockPositions[iBlock];
     const SFVEC2I blockPosI = SFVEC2I( blockPos.x + m_xoffset, blockPos.y + m_yoffset );
+    const SFVEC2F randDisp = ( m_camera.GetProjection() == PROJECTION_TYPE::ORTHO ) ?
+                             SFVEC2F( 0.0f, 0.0f ) :
+                             SFVEC2F( DISP_FACTOR, DISP_FACTOR );
 
-    RAYPACKET blockPacket( m_camera, (SFVEC2F) blockPosI + SFVEC2F( DISP_FACTOR, DISP_FACTOR ),
-                           SFVEC2F( DISP_FACTOR, DISP_FACTOR ) /* Displacement random factor */ );
+    RAYPACKET blockPacket( m_camera, (SFVEC2F) blockPosI + randDisp,
+                           randDisp /* Displacement random factor */ );
 
 
     HITINFO_PACKET hitPacket_X0Y0[RAYPACKET_RAYS_PER_PACKET];
@@ -566,7 +569,7 @@ void RENDER_3D_RAYTRACE_BASE::renderBlockTracing( uint8_t* ptrPBO, signed int iB
         HITINFO_PACKET_init( hitPacket_AA_X1Y1 );
 
         RAYPACKET blockPacket_AA_X1Y1( m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.5f, 0.5f ),
-                                       SFVEC2F( DISP_FACTOR, DISP_FACTOR ) );
+                                       randDisp );
 
         if( !m_accelerator->Intersect( blockPacket_AA_X1Y1, hitPacket_AA_X1Y1 ) )
         {
@@ -603,16 +606,16 @@ void RENDER_3D_RAYTRACE_BASE::renderBlockTracing( uint8_t* ptrPBO, signed int iB
         RAY blockRayPck_AA_X1Y1_half[RAYPACKET_RAYS_PER_PACKET];
 
         RAYPACKET_InitRays_with2DDisplacement(
-                m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.5f - DISP_FACTOR, DISP_FACTOR ),
-                SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y0 );
+                m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.5f - randDisp.x, randDisp.y ),
+                randDisp, blockRayPck_AA_X1Y0 );
 
         RAYPACKET_InitRays_with2DDisplacement(
-                m_camera, (SFVEC2F) blockPosI + SFVEC2F( DISP_FACTOR, 0.5f - DISP_FACTOR ),
-                SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X0Y1 );
+                m_camera, (SFVEC2F) blockPosI + SFVEC2F( randDisp.x, 0.5f - randDisp.y ),
+                randDisp, blockRayPck_AA_X0Y1 );
 
         RAYPACKET_InitRays_with2DDisplacement(
-                m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.25f - DISP_FACTOR, 0.25f - DISP_FACTOR ),
-                SFVEC2F( DISP_FACTOR, DISP_FACTOR ), blockRayPck_AA_X1Y1_half );
+                m_camera, (SFVEC2F) blockPosI + SFVEC2F( 0.25f - randDisp.x, 0.25f - randDisp.y ),
+                randDisp, blockRayPck_AA_X1Y1_half );
 
         renderAntiAliasPackets( bgColor, hitPacket_X0Y0, hitPacket_AA_X1Y1, blockRayPck_AA_X1Y0,
                                 hitColor_AA_X1Y0 );

3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp

@@ -202,6 +202,10 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
 
 EDA_3D_VIEWER_FRAME::~EDA_3D_VIEWER_FRAME()
 {
+    // Shutdown all running tools
+    if( m_toolManager )
+        m_toolManager->ShutdownAllTools();
+
     Prj().GetProjectFile().m_Viewports3D = m_appearancePanel->GetUserViewports();
 
     m_canvas->SetEventDispatcher( nullptr );

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -185,6 +185,10 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
 
 PANEL_PREVIEW_3D_MODEL::~PANEL_PREVIEW_3D_MODEL()
 {
+    // Shutdown all running tools
+    if( m_toolManager )
+        m_toolManager->ShutdownAllTools();
+
     // Restore the 3D viewer Render settings, that can be modified by the panel tools
     if( m_boardAdapter.m_Cfg )
         m_boardAdapter.m_Cfg->m_Render = m_initialRender;
@@ -657,6 +661,12 @@ void PANEL_PREVIEW_3D_MODEL::UpdateDummyFootprint( bool aReloadRequired )
 }
 
 
+void PANEL_PREVIEW_3D_MODEL::SetEmbeddedFilesDelegate( EMBEDDED_FILES* aDelegate )
+{
+    m_dummyBoard->SetEmbeddedFilesDelegate( aDelegate );
+}
+
+
 void PANEL_PREVIEW_3D_MODEL::onModify()
 {
     KIWAY_HOLDER* kiwayHolder = dynamic_cast<KIWAY_HOLDER*>( wxGetTopLevelParent( this ) );

3d-viewer/dialogs/panel_preview_3d_model.h

@@ -59,6 +59,7 @@ wxDECLARE_EVENT( wxCUSTOM_PANEL_SHOWN_EVENT, wxCommandEvent );
 class WX_INFOBAR;
 class S3D_CACHE;
 class FILENAME_RESOLVER;
+class EMBEDDED_FILES;
 class BOARD;
 class BOARD_ADAPTER;
 class FOOTPRINT;
@@ -97,6 +98,8 @@ public:
      */
     void UpdateDummyFootprint( bool aRelaodRequired = true );
 
+    void SetEmbeddedFilesDelegate( EMBEDDED_FILES* aDelegate );
+
     /**
      * Get the dummy footprint that is used for previewing the 3D model.
      * We use this to hold the temporary 3D model shapes.

CMakeLists.txt

@@ -22,7 +22,12 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-cmake_minimum_required( VERSION 3.21 FATAL_ERROR )
+if( MSVC )
+    # CMake 3.28.1 or higher required for MSVC ARM builds for armasm64.exe support
+    cmake_minimum_required( VERSION 3.28.1 FATAL_ERROR )
+else()
+    cmake_minimum_required( VERSION 3.21 FATAL_ERROR )
+endif()
 
 # Generate DEPFILES without transforming relative paths
 cmake_policy( SET CMP0116 OLD )

CMakeSettings.json.sample

@@ -6,7 +6,12 @@
     },
     {
       "environment": "vcpkg",
-      "VcPkgDir": "D:/vcpkg/"
+      "VcPkgDir": "D:/vcpkg/",
+      "VCPKG_BINARY_SOURCES": "nuget,kicad-gitlab,read"
+    },
+    {
+      "environment": "swig",
+      "SwigExePath": "D:/swigwin-4.1.1/swig.exe"
     }
   ],
   "configurations": [
@@ -14,7 +19,7 @@
       "name": "x64-Debug",
       "generator": "Ninja",
       "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64_x64", "vcpkg" ],
+      "inheritEnvironments": [ "msvc_x64_x64", "vcpkg", "swig"],
       "buildRoot": "${env.BuildDir}\\${name}",
       "installRoot": "${env.InstallDir}\\${name}",
       "cmakeCommandArgs": "",
@@ -30,6 +35,21 @@
           "name": "KICAD_WIN32_DPI_AWARE",
           "value": "ON",
           "type": "BOOL"
+        },
+        {
+          "name": "SWIG_EXECUTABLE",
+          "value": "${env.SwigExePath}",
+          "type": "STRING"
+        },
+        {
+          "name": "VCPKG_OVERLAY_TRIPLETS",
+          "value": "${workspaceRoot}/tools/custom_vcpkg_triplets",
+          "type": "STRING"
+        },
+        {
+          "name": "VCPKG_INSTALL_OPTIONS",
+          "value": "--x-abi-tools-use-exact-versions",
+          "type": "STRING"
         }
       ],
       "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake"
@@ -38,7 +58,7 @@
       "name": "x64-Release",
       "generator": "Ninja",
       "configurationType": "RelWithDebInfo",
-      "inheritEnvironments": [ "msvc_x64_x64", "vcpkg" ],
+      "inheritEnvironments": [ "msvc_x64_x64", "vcpkg", "swig"],
       "buildRoot": "${env.BuildDir}\\${name}",
       "installRoot": "${env.InstallDir}\\${name}",
       "cmakeCommandArgs": "",
@@ -54,6 +74,21 @@
           "name": "KICAD_WIN32_DPI_AWARE",
           "value": "ON",
           "type": "BOOL"
+        },
+        {
+          "name": "SWIG_EXECUTABLE",
+          "value": "${env.SwigExePath}",
+          "type": "STRING"
+        },
+        {
+          "name": "VCPKG_OVERLAY_TRIPLETS",
+          "value": "${workspaceRoot}/tools/custom_vcpkg_triplets",
+          "type": "STRING"
+        },
+        {
+          "name": "VCPKG_INSTALL_OPTIONS",
+          "value": "--x-abi-tools-use-exact-versions",
+          "type": "STRING"
         }
       ],
       "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake"

api/proto/board/board_commands.proto

@@ -42,12 +42,45 @@ message BoardStackupResponse
   kiapi.board.BoardStackup stackup = 1;
 }
 
+// Changes the stackup for the given board according to the contents of the message (**not yet implemented**)
+// WARNING: any existing content on layers that are removed by this call is deleted.  This operation cannot be undone.
+// Returns BoardStackupResponse with the updated stackup, in normalized form
 message UpdateBoardStackup
 {
   kiapi.common.types.DocumentSpecifier board = 1;
   kiapi.board.BoardStackup stackup = 2;
 }
 
+message GetBoardEnabledLayers
+{
+  kiapi.common.types.DocumentSpecifier board = 1;
+}
+
+message BoardEnabledLayersResponse
+{
+  // The number of copper layers enabled in this board.
+  uint32 copper_layer_count = 1;
+
+  // A list of all layers enabled in this board, including copper layers and ones which cannot be disabled.
+  repeated kiapi.board.types.BoardLayer layers = 2;
+}
+
+// Changes which layers are enabled in the board stackup
+// WARNING: any existing content on layers that are removed by this call is deleted.  This operation cannot be undone.
+// Returns BoardEnabledLayersResponse with the updated layer set.
+message SetBoardEnabledLayers
+{
+  kiapi.common.types.DocumentSpecifier board = 1;
+
+  // The number of copper layers to enable in the board.  Currently, this must be an even number >= 2.
+  uint32 copper_layer_count = 2;
+
+  // The non-copper layers to enable.  Note that any copper layers in this list are ignored; copper layers are enabled
+  // by setting copper_layer_count.  Note that the F/B.Courtyard, Edge.Cuts, and Margin layers cannot be disabled and
+  // will be present in the board even if they are omitted from this list.
+  repeated kiapi.board.types.BoardLayer layers = 3;
+}
+
 message GetGraphicsDefaults
 {
   kiapi.common.types.DocumentSpecifier board = 1;
@@ -82,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
  */

api/proto/board/board_types.proto

@@ -464,6 +464,18 @@ message ThermalSpokeSettings
   kiapi.common.types.Distance gap = 3;
 }
 
+message SymbolPinInfo
+{
+  // The pin name for the associated symbol pin, if one exists
+  string name = 1;
+
+  // The electrical type of the associated symbol pin, if one exists (EPT_UNKNOWN if not)
+  kiapi.common.types.ElectricalPinType type = 2;
+
+  // True if the pin is attached to a no-connect marker in the schematic
+  bool no_connect = 3;
+}
+
 message Pad
 {
   kiapi.common.types.KIID id = 1;
@@ -481,6 +493,10 @@ message Pad
 
   // Since: 9.0.4
   kiapi.common.types.Distance pad_to_die_length = 9;
+
+  // Information about the associated symbol pin, if one exists
+  // Since: 9.0.7
+  SymbolPinInfo symbol_pin = 10;
 }
 
 enum ZoneType
@@ -830,6 +846,9 @@ message FootprintAttributes
   bool exempt_from_courtyard_requirement = 6;
   bool do_not_populate = 7;
   FootprintMountingStyle mounting_style = 8;
+
+  // Since: 9.0.7
+  bool allow_soldermask_bridges = 9;
 }
 
 message NetTieDefinition
@@ -902,4 +921,19 @@ message FootprintInstance
 
   // The sheet path to the associated symbol for this footprint instance, if one exists
   kiapi.common.types.SheetPath symbol_path = 13;
+
+  // The name of the hierarchical sheet the associated symbol for this footprint exists on,
+  // or the empty string if there is no associated symbol
+  // Since: 9.0.7
+  string symbol_sheet_name = 14;
+
+  // The filename of the hierarchical sheet the associated symbol for this footprint exists on,
+  // or the empty string if there is no associated symbol
+  // Since: 9.0.7
+  string symbol_sheet_filename = 15;
+
+  // The the footprint filters given by the symbol this footprint is associated with,
+  // or the empty string if there is no associated symbol
+  // Since: 9.0.7
+  string symbol_footprint_filters = 16;
 }

api/proto/common/types/base_types.proto

@@ -451,3 +451,25 @@ enum MapMergeMode
   // The existing map will be cleared and replaced with the incoming map
   MMM_REPLACE = 2;
 }
+
+enum ElectricalPinType
+{
+  EPT_UNKNOWN = 0;
+  EPT_INPUT = 1;
+  EPT_OUTPUT = 2;
+  EPT_BIDIRECTIONAL = 3;
+  EPT_TRISTATE = 4;
+  EPT_PASSIVE = 5;
+
+  // A free pin is not internally connected and may connect to any net (route-through)
+  EPT_FREE = 6;
+
+  EPT_UNSPECIFIED = 7;
+  EPT_POWER_INPUT = 8;
+  EPT_POWER_OUTPUT = 9;
+  EPT_OPEN_COLLECTOR = 10;
+  EPT_OPEN_EMITTER = 11;
+
+  // A no-connect pin should not be connected to any net
+  EPT_NO_CONNECT = 12;
+}

bitmap2component/bitmap2cmp_frame.cpp

@@ -205,7 +205,12 @@ BITMAP2CMP_FRAME::BITMAP2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
 
 BITMAP2CMP_FRAME::~BITMAP2CMP_FRAME()
 {
+    // Shutdown all running tools
+    if( m_toolManager )
+        m_toolManager->ShutdownAllTools();
+
     SaveSettings( config() );
+
     /*
      * This needed for OSX: avoids further OnDraw processing after this
      * destructor and before the native window is destroyed

cmake/ConfigurePlatform.cmake

@@ -36,7 +36,13 @@ if( MSVC )
         set( KICAD_HOST_ARCH "x64" )
         set( KICAD_HOST_ARCH_X64 1 )
     else()
-        message(FATAL_ERROR "Failed to determine the host architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+        message(FATAL_ERROR "Failed to determine the host architecture: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+    endif()
+
+    if( NOT KICAD_BUILD_ARCH STREQUAL KICAD_HOST_ARCH )
+        set( CMAKE_CROSSCOMPILING TRUE )
+
+        string(TOUPPER ${KICAD_BUILD_ARCH} CMAKE_SYSTEM_PROCESSOR)
     endif()
 else()
     if ( NOT CMAKE_SIZEOF_VOID_P EQUAL 8 )
@@ -58,38 +64,18 @@ if( MSVC )
     # cmake release AND when MSVC ships said cmake release
     if(KICAD_BUILD_ARCH_ARM)
         message( "Configuring ARM assembler" )
-        # Explicitly specify the assembler to be used for Arm32 compile
-        file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\HostX86\\arm\\armasm.exe" CMAKE_ASM_COMPILER)
-
-        set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER})
-        message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}")
-
-        # Enable generic assembly compilation to avoid CMake generate VS proj files that explicitly
-        # use ml[64].exe as the assembler.
-        enable_language(ASM)
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "")
-        set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -g <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
 
+        enable_language(ASM_MARMASM)
+        # Bugfix for CMake < 29.1
+        set(ASM_DIALECT "_MARMASM")
+        set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
     elseif(KICAD_BUILD_ARCH_ARM64)
         message( "Configuring ARM64 assembler" )
 
-        # Explicitly specify the assembler to be used for Arm64 compile
-        file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\HostX86\\arm64\\armasm64.exe" CMAKE_ASM_COMPILER)
-
-        set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER})
-        message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}")
-
-        # Enable generic assembly compilation to avoid CMake generate VS proj files that explicitly
-        # use ml[64].exe as the assembler.
-        enable_language(ASM)
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    "")
-        set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "")
-        set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -g <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
+        enable_language(ASM_MARMASM)
+        # Bugfix for CMake < 29.1
+        set(ASM_DIALECT "_MARMASM")
+        set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
     else()
         message( "Configuring MASM assembler" )
         if(KICAD_BUILD_ARCH_X86)

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

@@ -2,7 +2,7 @@
 #  This program source code file is part of KICAD, a free EDA CAD application.
 #
 #  Copyright (C) 2016 Wayne Stambaugh <stambaughw@gmail.com>
-#  Copyright (C) 2016-2023, 2024 KiCad Developers, see AUTHORS.txt for contributors.
+#  Copyright (C) 2016-2023, 2024, 2025 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
@@ -37,7 +37,7 @@
 # KiCad.
 #
 # Note: This version string should follow the semantic versioning system
-set( KICAD_SEMANTIC_VERSION "9.0.4" )
+set( KICAD_SEMANTIC_VERSION "9.0.8" )
 
 # Default the version to the semantic version.
 # This is overridden by the git repository tag though (if using git)

cmake/MSVCAssemblyHelper.cmake

@@ -1,51 +0,0 @@
-# compile_asm(TARGET target ASM_FILES file1 [file2 ...] OUTPUT_OBJECTS [variableName])
-# CMake does not support the ARM or ARM64 assemblers on Windows when using the
-# MSBuild generator. When the MSBuild generator is in use, we manually compile the assembly files
-# using this function.
-#
-# Borrowed from dotnet/runtime, licensed under MIT
-# Copyright (c) .NET Foundation and Contributors
-# https://github.com/dotnet/runtime/blob/main/eng/native/functions.cmake
-function(compile_asm)
-  set(options "")
-  set(oneValueArgs TARGET OUTPUT_OBJECTS)
-  set(multiValueArgs ASM_FILES)
-  cmake_parse_arguments(COMPILE_ASM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGV})
-
-  get_include_directories_asm(ASM_INCLUDE_DIRECTORIES)
-
-  set (ASSEMBLED_OBJECTS "")
-
-  foreach(ASM_FILE ${COMPILE_ASM_ASM_FILES})
-    get_filename_component(name ${ASM_FILE} NAME_WE)
-    # Produce object file where CMake would store .obj files for an OBJECT library.
-    # ex: artifacts\obj\coreclr\windows.arm64.Debug\src\vm\wks\cee_wks.dir\Debug\AsmHelpers.obj
-    set (OBJ_FILE "${CMAKE_CURRENT_BINARY_DIR}/${COMPILE_ASM_TARGET}.dir/${CMAKE_CFG_INTDIR}/${name}.obj")
-
-    # Need to compile asm file using custom command as include directories are not provided to asm compiler
-    add_custom_command(OUTPUT ${OBJ_FILE}
-                        COMMAND "${CMAKE_ASM_COMPILER}" -g ${ASM_INCLUDE_DIRECTORIES} -o ${OBJ_FILE} ${ASM_FILE}
-                        DEPENDS ${ASM_FILE}
-                        COMMENT "Assembling ${ASM_FILE} ---> \"${CMAKE_ASM_COMPILER}\" -g ${ASM_INCLUDE_DIRECTORIES} -o ${OBJ_FILE} ${ASM_FILE}")
-
-    # mark obj as source that does not require compile
-    set_source_files_properties(${OBJ_FILE} PROPERTIES EXTERNAL_OBJECT TRUE)
-
-    # Add the generated OBJ in the dependency list so that it gets consumed during linkage
-    list(APPEND ASSEMBLED_OBJECTS ${OBJ_FILE})
-  endforeach()
-
-  set(${COMPILE_ASM_OUTPUT_OBJECTS} ${ASSEMBLED_OBJECTS} PARENT_SCOPE)
-endfunction()
-
-
-# Build a list of include directories for consumption by the assembler
-function(get_include_directories_asm IncludeDirectories)
-    get_directory_property(dirs INCLUDE_DIRECTORIES)
-
-    foreach(dir IN LISTS dirs)
-      list(APPEND INC_DIRECTORIES -I${dir};)
-    endforeach()
-
-    set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE)
-endfunction(get_include_directories_asm)

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

@@ -102,6 +102,7 @@ static const wxChar EnableDesignBlocks[] = wxT( "EnableDesignBlocks" );
 static const wxChar EnableGenerators[] = wxT( "EnableGenerators" );
 static const wxChar EnableLibWithText[] = wxT( "EnableLibWithText" );
 static const wxChar EnableLibDir[] = wxT( "EnableLibDir" );
+static const wxChar LibraryTableEditor[] = wxT( "LibraryTableEditor" );
 static const wxChar EnableEeschemaPrintCairo[] = wxT( "EnableEeschemaPrintCairo" );
 static const wxChar EnableEeschemaExportClipboardCairo[] = wxT( "EnableEeschemaExportClipboardCairo" );
 static const wxChar DisambiguationTime[] = wxT( "DisambiguationTime" );
@@ -120,6 +121,8 @@ static const wxChar EnableExtensionSnaps[] = wxT( "EnableExtensionSnaps" );
 static const wxChar ExtensionSnapTimeoutMs[] = wxT( "ExtensionSnapTimeoutMs" );
 static const wxChar ExtensionSnapActivateOnHover[] = wxT( "ExtensionSnapActivateOnHover" );
 static const wxChar EnableSnapAnchorsDebug[] = wxT( "EnableSnapAnchorsDebug" );
+static const wxChar SnapHysteresis[] = wxT( "SnapHysteresis" );
+static const wxChar SnapToAnchorMargin[] = wxT( "SnapToAnchorMargin" );
 static const wxChar MinParallelAngle[] = wxT( "MinParallelAngle" );
 static const wxChar HoleWallPaintingMultiplier[] = wxT( "HoleWallPaintingMultiplier" );
 static const wxChar MsgPanelShowUuids[] = wxT( "MsgPanelShowUuids" );
@@ -130,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
 
@@ -262,6 +266,7 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_EnableGenerators          = false;
     m_EnableLibWithText         = false;
     m_EnableLibDir              = false;
+    m_LibraryTableEditor        = false;
 
     m_EnableEeschemaPrintCairo  = true;
     m_EnableEeschemaExportClipboardCairo = true;
@@ -299,6 +304,8 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_ExtensionSnapTimeoutMs = 500;
     m_ExtensionSnapActivateOnHover = true;
     m_EnableSnapAnchorsDebug = false;
+    m_SnapHysteresis = 5;
+    m_SnapToAnchorMargin = 1.1;
 
     m_MinParallelAngle = 0.001;
     m_HoleWallPaintingMultiplier = 1.5;
@@ -316,6 +323,7 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_MaxPastedTextLength = 100;
 
     m_PNSProcessClusterTimeout = 100; // Default: 100 ms
+    m_FollowBranchTimeout = 500; // Default: 500 ms
 
     loadFromConfigFile();
 }
@@ -512,6 +520,9 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::EnableLibDir,
                                                 &m_EnableLibDir, m_EnableLibDir ) );
 
+    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::LibraryTableEditor,
+                                                &m_LibraryTableEditor, m_LibraryTableEditor ) );
+
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::EnableEeschemaPrintCairo,
                                                 &m_EnableEeschemaPrintCairo,
                                                 m_EnableEeschemaPrintCairo ) );
@@ -577,6 +588,14 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
                                                 &m_EnableSnapAnchorsDebug,
                                                 m_EnableSnapAnchorsDebug ) );
 
+    configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::SnapHysteresis,
+                                               &m_SnapHysteresis, m_SnapHysteresis,
+                                               0, 100 ) );
+
+    configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::SnapToAnchorMargin,
+                                                  &m_SnapToAnchorMargin, m_SnapToAnchorMargin,
+                                                  1.0, 2.0 ) );
+
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MinParallelAngle,
                                                   &m_MinParallelAngle, m_MinParallelAngle,
                                                   0.0, 45.0 ) );
@@ -614,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_enums.cpp

@@ -26,6 +26,7 @@
 #include <core/typeinfo.h>
 #include <font/text_attributes.h>
 #include <layer_ids.h>
+#include <pin_type.h>
 #include <stroke_params.h>
 
 using namespace kiapi;
@@ -498,3 +499,54 @@ types::StrokeLineStyle ToProtoEnum( LINE_STYLE aValue )
                      "Unhandled case in ToProtoEnum<LINE_STYLE>");
     }
 }
+
+
+template<>
+ELECTRICAL_PINTYPE FromProtoEnum( types::ElectricalPinType aValue )
+{
+    switch( aValue )
+    {
+    case types::ElectricalPinType::EPT_INPUT:           return ELECTRICAL_PINTYPE::PT_INPUT;
+    case types::ElectricalPinType::EPT_OUTPUT:          return ELECTRICAL_PINTYPE::PT_OUTPUT;
+    case types::ElectricalPinType::EPT_BIDIRECTIONAL:   return ELECTRICAL_PINTYPE::PT_BIDI;
+    case types::ElectricalPinType::EPT_TRISTATE:        return ELECTRICAL_PINTYPE::PT_TRISTATE;
+    case types::ElectricalPinType::EPT_PASSIVE:         return ELECTRICAL_PINTYPE::PT_PASSIVE;
+    case types::ElectricalPinType::EPT_FREE:            return ELECTRICAL_PINTYPE::PT_NIC;
+    case types::ElectricalPinType::EPT_UNSPECIFIED:     return ELECTRICAL_PINTYPE::PT_UNSPECIFIED;
+    case types::ElectricalPinType::EPT_POWER_INPUT:     return ELECTRICAL_PINTYPE::PT_POWER_IN;
+    case types::ElectricalPinType::EPT_POWER_OUTPUT:    return ELECTRICAL_PINTYPE::PT_POWER_OUT;
+    case types::ElectricalPinType::EPT_OPEN_COLLECTOR:  return ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR;
+    case types::ElectricalPinType::EPT_OPEN_EMITTER:    return ELECTRICAL_PINTYPE::PT_OPENEMITTER;
+    case types::ElectricalPinType::EPT_NO_CONNECT:      return ELECTRICAL_PINTYPE::PT_NC;
+    case types::ElectricalPinType::EPT_UNKNOWN:
+    default:
+        wxCHECK_MSG( false, ELECTRICAL_PINTYPE::PT_UNSPECIFIED,
+                     "Unhandled case in FromProtoEnum<types::ElectricalPinType>" );
+    }
+}
+
+
+template<>
+types::ElectricalPinType ToProtoEnum( ELECTRICAL_PINTYPE aValue )
+{
+    switch( aValue )
+    {
+    case ELECTRICAL_PINTYPE::PT_INPUT:         return types::ElectricalPinType::EPT_INPUT;
+    case ELECTRICAL_PINTYPE::PT_OUTPUT:        return types::ElectricalPinType::EPT_OUTPUT;
+    case ELECTRICAL_PINTYPE::PT_BIDI:          return types::ElectricalPinType::EPT_BIDIRECTIONAL;
+    case ELECTRICAL_PINTYPE::PT_TRISTATE:      return types::ElectricalPinType::EPT_TRISTATE;
+    case ELECTRICAL_PINTYPE::PT_PASSIVE:       return types::ElectricalPinType::EPT_PASSIVE;
+    case ELECTRICAL_PINTYPE::PT_NIC:           return types::ElectricalPinType::EPT_FREE;
+    case ELECTRICAL_PINTYPE::PT_UNSPECIFIED:   return types::ElectricalPinType::EPT_UNSPECIFIED;
+    case ELECTRICAL_PINTYPE::PT_POWER_IN:      return types::ElectricalPinType::EPT_POWER_INPUT;
+    case ELECTRICAL_PINTYPE::PT_POWER_OUT:     return types::ElectricalPinType::EPT_POWER_OUTPUT;
+    case ELECTRICAL_PINTYPE::PT_OPENCOLLECTOR: return types::ElectricalPinType::EPT_OPEN_COLLECTOR;
+    case ELECTRICAL_PINTYPE::PT_OPENEMITTER:   return types::ElectricalPinType::EPT_OPEN_EMITTER;
+    case ELECTRICAL_PINTYPE::PT_NC:            return types::ElectricalPinType::EPT_NO_CONNECT;
+    // Inherit shouldn't be serialized, it's an internal flag
+    case ELECTRICAL_PINTYPE::PT_INHERIT:
+    default:
+        wxCHECK_MSG( false, types::ElectricalPinType::EPT_UNKNOWN,
+                     "Unhandled case in ToProtoEnum<ELECTRICAL_PINTYPE>");
+    }
+}

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 );
         }
@@ -241,4 +241,14 @@ KICOMMON_API void PackSheetPath( types::SheetPath& aOutput, const KIID_PATH& aIn
         aOutput.add_path()->set_value( entry.AsStdString() );
 }
 
+KICOMMON_API KIID_PATH UnpackSheetPath( const types::SheetPath& aInput )
+{
+    KIID_PATH output;
+
+    for( const types::KIID& sheet : aInput.path() )
+        output.push_back( KIID( sheet.value() ) );
+
+    return output;
+}
+
 } // namespace kiapi::common

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/clipboard.cpp

@@ -24,6 +24,7 @@
 #include "clipboard.h"
 
 #include <wx/clipbrd.h>
+#include <wx/dataobj.h>
 #include <wx/image.h>
 #include <wx/log.h>
 
@@ -84,10 +85,10 @@ std::unique_ptr<wxImage> GetImageFromClipboard()
     {
         if( wxTheClipboard->IsSupported( wxDF_BITMAP ) )
         {
-            wxImageDataObject data;
+            wxBitmapDataObject data;
             if( wxTheClipboard->GetData( data ) )
             {
-                image = std::make_unique<wxImage>( data.GetImage() );
+                image = std::make_unique<wxImage>( data.GetBitmap().ConvertToImage() );
             }
         }
         else if( wxTheClipboard->IsSupported( wxDF_FILENAME ) )

common/database/database_connection.cpp

@@ -161,7 +161,7 @@ bool DATABASE_CONNECTION::Connect()
             m_conn = std::make_unique<nanodbc::connection>( cs, m_timeout );
         }
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         return false;
@@ -188,7 +188,7 @@ bool DATABASE_CONNECTION::Disconnect()
     {
         m_conn->disconnect();
     }
-    catch( boost::locale::conv::conversion_error& exc )
+    catch( std::exception& exc )
     {
         wxLogTrace( traceDatabase, wxT( "Disconnect() error \"%s\" occured." ), exc.what() );
         return false;
@@ -250,7 +250,7 @@ bool DATABASE_CONNECTION::CacheTableInfo( const std::string& aTable,
             return false;
         }
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase, wxT( "Exception while caching table info: %s" ), m_lastError );
@@ -277,8 +277,9 @@ bool DATABASE_CONNECTION::getQuoteChar()
 
         wxLogTrace( traceDatabase, wxT( "Quote char retrieved: %c" ), m_quoteChar );
     }
-    catch( nanodbc::database_error& )
+    catch( std::exception& e )
     {
+        m_lastError = e.what();
         wxLogTrace( traceDatabase, wxT( "Exception while querying quote char: %s" ), m_lastError );
         return false;
     }
@@ -401,14 +402,14 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
         statement.prepare( *m_conn, query );
         statement.bind( 0, aWhere.second.c_str() );
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase, wxT( "Exception while preparing statement for SelectOne: %s" ),
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
-        m_conn->disconnect();
+        Disconnect();
 
         return false;
     }
@@ -422,14 +423,14 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
     {
         results = nanodbc::execute( statement );
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase, wxT( "Exception while executing statement for SelectOne: %s" ),
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
-        m_conn->disconnect();
+        Disconnect();
 
         return false;
     }
@@ -480,7 +481,7 @@ bool DATABASE_CONNECTION::SelectOne( const std::string& aTable,
             }
         }
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase, wxT( "Exception while parsing results from SelectOne: %s" ),
@@ -507,7 +508,7 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
     {
         statement.prepare( query );
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase,
@@ -515,7 +516,7 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
-        m_conn->disconnect();
+        Disconnect();
 
         return false;
     }
@@ -526,7 +527,7 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
     {
         results = nanodbc::execute( statement );
     }
-    catch( nanodbc::database_error& e )
+    catch( std::exception& e )
     {
         m_lastError = e.what();
         wxLogTrace( traceDatabase,
@@ -534,7 +535,7 @@ bool DATABASE_CONNECTION::selectAllAndCache( const std::string& aTable, const st
                     m_lastError );
 
         // Exception may be due to a connection error; nanodbc won't auto-reconnect
-        m_conn->disconnect();
+        Disconnect();
 
         return false;
     }

common/design_block_lib_table.cpp

@@ -631,7 +631,8 @@ bool DESIGN_BLOCK_LIB_TABLE::LoadGlobalTable( DESIGN_BLOCK_LIB_TABLE& aTable )
     {
         tableExists = false;
 
-        if( !fn.DirExists() && !fn.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
+        if( !wxFileName::DirExists( fn.GetPath() )
+            && !wxFileName::Mkdir( fn.GetPath(), 0x777, wxPATH_MKDIR_FULL ) )
         {
             THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path '%s'." ),
                                               fn.GetPath() ) );

common/dialog_about/AboutDialog_main.cpp

@@ -909,7 +909,13 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
 #define FOOTPRINT_LIB_CONTRIBUTION _( "Footprints" )
     aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "Scripts by Maui" ),
                                          MODELS_3D_CONTRIBUTION,
-                                         wxS( "https://gitlab.com/kicad/libraries/kicad-footprint-generator" ) ) );
+                                         wxS( "https://github.com/easyw" ) ) );
+    aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "Hasan Yavuz Özderya" ),
+                                         MODELS_3D_CONTRIBUTION,
+                                         wxS( "https://bitbucket.org/hyOzd/freecad-macros/src/master/" ) ) );
+    aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitHub contributors" ),
+                                         MODELS_3D_CONTRIBUTION,
+                                         wxS( "https://github.com/easyw/kicad-3d-models-in-freecad/graphs/contributors" ) ) );
     aInfo.AddLibrarian( new CONTRIBUTOR( wxS( "GitLab contributors" ),
                                          MODELS_3D_CONTRIBUTION,
                                          wxS( "https://gitlab.com/kicad/libraries/kicad-packages3D/-/graphs/master" ) ) );

common/dialog_about/dialog_about.cpp

@@ -22,7 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-
 #include <build_version.h>
 #include <eda_base_frame.h>
 #include <wx/clipbrd.h>
@@ -108,8 +107,20 @@ DIALOG_ABOUT::DIALOG_ABOUT( EDA_BASE_FRAME *aParent, ABOUT_APP_INFO& aAppInfo )
     m_titleName = aParent->GetAboutTitle();
     m_untranslatedTitleName = aParent->GetUntranslatedAboutTitle();
     m_staticTextAppTitle->SetLabel( m_titleName );
+
+    // On windows, display the number of GDI objects in use. Can be useful when some GDI objects
+    // are not displayed because the max count of GDI objects (usually 10000) is reached
+    // So displaying this number can help to diagnose strange display issues
+    wxString extraInfo;
+
+    #if defined( _WIN32 )
+    uint32_t gdi_count = GetGuiResources( GetCurrentProcess(), GR_GDIOBJECTS );
+    extraInfo.Printf( _( "GDI objects in use %u" ), gdi_count );
+    extraInfo.Prepend( wxT( "\n" ) );
+    #endif
+
     m_staticTextBuildVersion->SetLabel( wxS( "Version: " ) + m_info.GetBuildVersion() );
-    m_staticTextLibVersion->SetLabel( m_info.GetLibVersion() );
+    m_staticTextLibVersion->SetLabel( m_info.GetLibVersion() + extraInfo );
 
     SetTitle( wxString::Format( _( "About %s" ), m_titleName ) );
     createNotebooks();

common/dialog_shim.cpp

@@ -494,14 +494,17 @@ int DIALOG_SHIM::ShowModal()
 }
 
 /*
-    Quasi-Modal Mode Explained:
+    QuasiModal Mode Explained:
 
     The gtk calls in wxDialog::ShowModal() cause event routing problems if that
     modal dialog then tries to use KIWAY_PLAYER::ShowModal().  The latter shows up
     and mostly works but does not respond to the window decoration close button.
     There is no way to get around this without reversing the gtk calls temporarily.
 
-    Quasi-Modal mode is our own almost modal mode which disables only the parent
+    There are also issues with the Scintilla text editor putting up autocomplete
+    popups, which appear behind the dialog window if QuasiModal is not used.
+
+    QuasiModal mode is our own almost modal mode which disables only the parent
     of the DIALOG_SHIM, leaving other frames operable and while staying captured in the
     nested event loop.  This avoids the gtk calls and leaves event routing pure
     and sufficient to operate the KIWAY_PLAYER::ShowModal() properly.  When using
@@ -749,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;
@@ -760,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_global_design_block_lib_table_config.cpp

@@ -27,6 +27,8 @@
 
 #include "design_block_lib_table.h"
 
+#include <kiplatform/io.h>
+
 
 DIALOG_GLOBAL_DESIGN_BLOCK_LIB_TABLE_CONFIG::DIALOG_GLOBAL_DESIGN_BLOCK_LIB_TABLE_CONFIG(
         wxWindow* aParent ) :
@@ -106,8 +108,8 @@ bool DIALOG_GLOBAL_DESIGN_BLOCK_LIB_TABLE_CONFIG::TransferDataFromWindow()
         // Create the config path if it doesn't already exist.
         wxFileName designBlockTableFileName = DESIGN_BLOCK_LIB_TABLE::GetGlobalTableFileName();
 
-        if( !designBlockTableFileName.DirExists()
-            && !designBlockTableFileName.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
+        if( !wxFileName::DirExists( designBlockTableFileName.GetPath() )
+            && !wxFileName::Mkdir( designBlockTableFileName.GetPath(), 0x777, wxPATH_MKDIR_FULL ) )
         {
             DisplayError( this, wxString::Format( _( "Cannot create global library table '%s'." ),
                                                   designBlockTableFileName.GetPath() ) );
@@ -124,6 +126,9 @@ bool DIALOG_GLOBAL_DESIGN_BLOCK_LIB_TABLE_CONFIG::TransferDataFromWindow()
                                       fn.GetFullPath(), designBlockTableFileName.GetFullPath() ) );
             return false;
         }
+
+        // Ensure the copied file is writable
+        KIPLATFORM::IO::MakeWriteable( designBlockTableFileName.GetFullPath() );
     }
 
     // Load the successfully copied design block library table file.  This should not fail since the

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/eda_view_switcher.cpp

@@ -36,7 +36,8 @@
 EDA_VIEW_SWITCHER::EDA_VIEW_SWITCHER( wxWindow* aParent, const wxArrayString& aItems,
                                       wxKeyCode aCtrlKey ) :
         EDA_VIEW_SWITCHER_BASE( aParent ),
-        m_tabState( true ),
+        // Start with the tab marked as "up" so the initial ctrl-tab press advances selection.
+        m_tabState( false ),
         m_receivingEvents( false ),
         m_ctrlKey( aCtrlKey )
 {

common/dialogs/panel_embedded_files.cpp

@@ -21,6 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include <eda_item.h>
+#include <confirm.h>
 #include <bitmaps.h>
 #include <dialogs/panel_embedded_files.h>
 #include <embedded_files.h>
@@ -88,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() )
     {
@@ -97,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 ) );
@@ -129,6 +148,7 @@ PANEL_EMBEDDED_FILES::~PANEL_EMBEDDED_FILES()
 {
     // Remove the GRID_TRICKS handler
     m_files_grid->PopEventHandler( true );
+    delete m_localFiles;
 }
 
 
@@ -161,9 +181,7 @@ void PANEL_EMBEDDED_FILES::resizeGrid()
 bool PANEL_EMBEDDED_FILES::TransferDataToWindow()
 {
     m_files_grid->ClearGrid();
-
-    if( m_files_grid->GetNumberRows() > 0 )
-        m_files_grid->DeleteRows( 0, m_files_grid->GetNumberRows() );
+    m_files_grid->ClearRows();
 
     int ii = 0;
     for( auto& [name, file] : m_localFiles->EmbeddedFileMap() )
@@ -187,6 +205,51 @@ bool PANEL_EMBEDDED_FILES::TransferDataToWindow()
 
 bool PANEL_EMBEDDED_FILES::TransferDataFromWindow()
 {
+    std::optional<bool> deleteReferences;
+
+    auto confirmDelete =
+            [&]() -> bool
+            {
+                if( EDA_ITEM* parent = dynamic_cast<EDA_ITEM*>( m_files ) )
+                {
+                    if( parent->Type() == PCB_T )
+                    {
+                        return IsOK( m_parent, _( "Deleted embedded files are also referenced in some footprints.\n"
+                                                  "Delete from footprints as well?" ) );
+                    }
+                    else if( parent->Type() == SCHEMATIC_T )
+                    {
+                        return IsOK( m_parent, _( "Deleted embedded files are also referenced in some symbols.\n"
+                                                  "Delete from symbols as well?" ) );
+                    }
+                }
+
+                wxFAIL_MSG( wxT( "Unexpected embedded files owner" ) );
+                return false;
+            };
+
+    for( const auto& [name, file] : m_files->EmbeddedFileMap() )
+    {
+        if( !m_localFiles->HasFile( name ) )
+        {
+            m_files->RunOnNestedEmbeddedFiles(
+                    [&]( EMBEDDED_FILES* nested_files )
+                    {
+                        if( nested_files->HasFile( name ) )
+                        {
+                            if( !deleteReferences.has_value() )
+                                deleteReferences = confirmDelete();
+
+                            if( deleteReferences.value() )
+                                nested_files->RemoveFile( name, true );
+                        }
+                    } );
+        }
+
+        if( deleteReferences.has_value() && deleteReferences.value() == false )
+            break;
+    }
+
     m_files->ClearEmbeddedFiles();
 
     std::vector<EMBEDDED_FILES::EMBEDDED_FILE*> files;
@@ -197,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 );
     }
@@ -247,11 +313,6 @@ void PANEL_EMBEDDED_FILES::onFontEmbedClick( wxCommandEvent& event )
                                                                     font->GetFileName() ) );
                 continue;
             }
-
-            m_files_grid->AppendRows( 1 );
-            int ii = m_files_grid->GetNumberRows() - 1;
-            m_files_grid->SetCellValue( ii, 0, result->name );
-            m_files_grid->SetCellValue( ii, 1, result->GetLink() );
         }
     }
 
@@ -338,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++ )
@@ -369,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

@@ -141,6 +141,7 @@ void EDA_BASE_FRAME::commonInit( FRAME_T aFrameType )
     m_isNonUserClose    = false;
     m_autoSaveTimer     = new wxTimer( this, ID_AUTO_SAVE_TIMER );
     m_autoSaveRequired  = false;
+    m_autoSavePermissionError = false;
     m_mruPath           = PATHS::GetDefaultUserProjectsPath();
     m_frameSize         = defaultSize( aFrameType, this );
     m_displayIndex      = -1;
@@ -219,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();
 
@@ -1063,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_shape.cpp

@@ -2339,10 +2339,10 @@ static struct EDA_SHAPE_DESC
 
         if( lineStyleEnum.Choices().GetCount() == 0 )
         {
-            lineStyleEnum.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
-                         .Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
-                         .Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
-                         .Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
+            lineStyleEnum.Map( LINE_STYLE::SOLID,      _HKI( "Solid" ) )
+                         .Map( LINE_STYLE::DASH,       _HKI( "Dashed" ) )
+                         .Map( LINE_STYLE::DOT,        _HKI( "Dotted" ) )
+                         .Map( LINE_STYLE::DASHDOT,    _HKI( "Dash-Dot" ) )
                          .Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
         }
 

common/eda_text.cpp

@@ -1323,18 +1323,18 @@ static struct EDA_TEXT_DESC
 
         if( h_inst.Choices().GetCount() == 0)
         {
-            h_inst.Map( GR_TEXT_H_ALIGN_LEFT,   _( "Left" ) );
-            h_inst.Map( GR_TEXT_H_ALIGN_CENTER, _( "Center" ) );
-            h_inst.Map( GR_TEXT_H_ALIGN_RIGHT,  _( "Right" ) );
+            h_inst.Map( GR_TEXT_H_ALIGN_LEFT,   _HKI( "Left" ) );
+            h_inst.Map( GR_TEXT_H_ALIGN_CENTER, _HKI( "Center" ) );
+            h_inst.Map( GR_TEXT_H_ALIGN_RIGHT,  _HKI( "Right" ) );
         }
 
         auto& v_inst = ENUM_MAP<GR_TEXT_V_ALIGN_T>::Instance();
 
         if( v_inst.Choices().GetCount() == 0)
         {
-            v_inst.Map( GR_TEXT_V_ALIGN_TOP,    _( "Top" ) );
-            v_inst.Map( GR_TEXT_V_ALIGN_CENTER, _( "Center" ) );
-            v_inst.Map( GR_TEXT_V_ALIGN_BOTTOM, _( "Bottom" ) );
+            v_inst.Map( GR_TEXT_V_ALIGN_TOP,    _HKI( "Top" ) );
+            v_inst.Map( GR_TEXT_V_ALIGN_CENTER, _HKI( "Center" ) );
+            v_inst.Map( GR_TEXT_V_ALIGN_BOTTOM, _HKI( "Bottom" ) );
         }
 
         PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();

common/eda_units.cpp

@@ -599,6 +599,85 @@ double EDA_UNIT_UTILS::UI::DoubleValueFromString( const EDA_IU_SCALE& aIuScale,
 }
 
 
+bool EDA_UNIT_UTILS::UI::DoubleValueFromString( const EDA_IU_SCALE& aIuScale, const wxString& aTextValue,
+                                                double& aDoubleValue )
+{
+    double dtmp = 0;
+
+    // Acquire the 'right' decimal point separator
+    const struct lconv* lc = localeconv();
+
+    wxChar      decimal_point = lc->decimal_point[0];
+    wxString    buf( aTextValue.Strip( wxString::both ) );
+
+    // Convert any entered decimal point separators to the 'right' one
+    buf.Replace( wxT( "." ), wxString( decimal_point, 1 ) );
+    buf.Replace( wxT( "," ), wxString( decimal_point, 1 ) );
+
+    // Find the end of the numeric part
+    unsigned brk_point = 0;
+
+    while( brk_point < buf.Len() )
+    {
+        wxChar ch = buf[brk_point];
+
+        if( !( (ch >= '0' && ch <= '9') || (ch == decimal_point) || (ch == '-') || (ch == '+') ) )
+            break;
+
+        ++brk_point;
+    }
+
+    if( brk_point == 0 )
+        return false;
+
+    // Extract the numeric part
+    buf.Left( brk_point ).ToDouble( &dtmp );
+
+    // Check the unit designator
+    wxString  unit( buf.Mid( brk_point ).Strip( wxString::both ).Lower() );
+    EDA_UNITS units;
+
+    //check for um, μm (µ is MICRO SIGN) and µm (µ is GREEK SMALL LETTER MU) for micrometre
+    if( unit == wxT( "um" ) || unit == wxT( "\u00B5m" ) || unit == wxT( "\u03BCm" ) )
+    {
+        units = EDA_UNITS::UM;
+    }
+    else if( unit == wxT( "mm" ) )
+    {
+        units = EDA_UNITS::MM;
+    }
+    else if( unit == wxT( "cm" ) )
+    {
+        units = EDA_UNITS::CM;
+    }
+    else if( unit == wxT( "mil" ) || unit == wxT( "mils" ) || unit == wxT( "thou" ) )
+    {
+        units = EDA_UNITS::MILS;
+    }
+    else if( unit == wxT( "in" ) || unit == wxT( "\"" ) )
+    {
+        units = EDA_UNITS::INCH;
+    }
+    else if( unit == wxT( "oz" ) ) // 1 oz = 1.37 mils
+    {
+        units = EDA_UNITS::MILS;
+        dtmp *= 1.37;
+    }
+    else if( unit == wxT( "ra" ) ) // Radians
+    {
+        units = EDA_UNITS::DEGREES;
+        dtmp *= 180.0f / M_PI;
+    }
+    else
+    {
+        return false;
+    }
+
+    aDoubleValue = FromUserUnit( aIuScale, units, dtmp );
+    return true;
+}
+
+
 long long int EDA_UNIT_UTILS::UI::ValueFromString( const EDA_IU_SCALE& aIuScale, EDA_UNITS aUnits,
                                                    const wxString& aTextValue, EDA_DATA_TYPE aType )
 {

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/font/outline_font.cpp

@@ -355,7 +355,7 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
                                                 // contents
 
     hb_font_t* referencedFont = hb_ft_font_create_referenced( face );
-    hb_ft_font_set_funcs( referencedFont );
+
     hb_shape( referencedFont, buf, nullptr, 0 );
 
     unsigned int         glyphCount;
@@ -376,10 +376,6 @@ VECTOR2I OUTLINE_FONT::getTextAsGlyphsUnlocked( BOX2I* aBBox,
 
     for( unsigned int i = 0; i < glyphCount; i++ )
     {
-        // Don't process glyphs that were already included in a previous cluster
-        if( i > 0 && glyphInfo[i].cluster == glyphInfo[i-1].cluster )
-            continue;
-
         if( aGlyphs )
         {
             GLYPH_CACHE_KEY key = { face, glyphInfo[i].codepoint, scaleFactor, m_forDrawingSheet,
@@ -557,9 +553,8 @@ void OUTLINE_FONT::RenderToOpenGLCanvas( KIGFX::OPENGL_GAL& aGal, const wxString
 
     std::lock_guard<std::mutex> guard( m_freeTypeMutex );
 
-    hb_font_t*           referencedFont = hb_ft_font_create_referenced( m_face );
+    hb_font_t* referencedFont = hb_ft_font_create_referenced( m_face );
 
-    hb_ft_font_set_funcs( referencedFont );
     hb_shape( referencedFont, buf, nullptr, 0 );
 
     const double mirror_factor = ( aIsMirrored ? 1 : -1 );

common/fp_lib_table.cpp

@@ -628,7 +628,8 @@ bool FP_LIB_TABLE::LoadGlobalTable( FP_LIB_TABLE& aTable )
     {
         tableExists = false;
 
-        if( !fn.DirExists() && !fn.Mkdir( 0x777, wxPATH_MKDIR_FULL ) )
+        if( !wxFileName::DirExists( fn.GetPath() )
+            && !wxFileName::Mkdir( fn.GetPath(), 0x777, wxPATH_MKDIR_FULL ) )
         {
             THROW_IO_ERROR( wxString::Format( _( "Cannot create global library table path '%s'." ),
                                               fn.GetPath() ) );

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>
@@ -322,6 +323,12 @@ void CAIRO_GAL_BASE::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& a
 }
 
 
+void CAIRO_GAL_BASE::DrawHoleWall( const VECTOR2D& aCenterPoint, double aRadius, double aWallWidth )
+{
+    DrawCircle( aCenterPoint, aRadius + aWallWidth );
+}
+
+
 void CAIRO_GAL_BASE::DrawCircle( const VECTOR2D& aCenterPoint, double aRadius )
 {
     syncLineWidth();
@@ -1644,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 );
 }
 
@@ -1740,6 +1751,8 @@ void CAIRO_GAL_BASE::DrawGrid()
         return;
 
     VECTOR2D gridScreenSize( m_gridSize );
+    gridScreenSize = VECTOR2D( std::max( 1.0, gridScreenSize.x ),
+                               std::max( 1.0, gridScreenSize.y ) );
 
     double gridThreshold = KiROUND( computeMinGridSpacing() / m_worldScale );
 

common/gal/graphics_abstraction_layer.cpp

@@ -67,6 +67,7 @@ GAL::GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions ) :
     SetLayerDepth( 0.0 );
     SetFlip( false, false );
     SetLineWidth( 1.0f );
+    SetMinLineWidth( 1.0f );
     computeWorldScale();
     SetAxesEnabled( false );
 
@@ -75,6 +76,8 @@ GAL::GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions ) :
     SetCoarseGrid( 10 );
     m_gridLineWidth = 0.5f;
     m_gridStyle = GRID_STYLE::LINES;
+    m_gridSize = VECTOR2D( 1.0, 1.0 );
+    m_gridOffset = VECTOR2D( 0.0, 0.0 );
     m_gridMinSpacing = 10;
 
     // Initialize the cursor shape

common/gal/opengl/opengl_gal.cpp

@@ -413,10 +413,13 @@ OPENGL_GAL::OPENGL_GAL( const KIGFX::VC_SETTINGS& aVcSettings, GAL_DISPLAY_OPTIO
     SetTarget( TARGET_NONCACHED );
 
     // Avoid uninitialized variables:
-    ufm_worldPixelSize = 1;
-    ufm_screenPixelSize = 1;
-    ufm_pixelSizeMultiplier = 1;
-    ufm_antialiasingOffset = 1;
+    ufm_worldPixelSize = -1;
+    ufm_screenPixelSize = -1;
+    ufm_pixelSizeMultiplier = -1;
+    ufm_antialiasingOffset = -1;
+    ufm_minLinePixelWidth = -1;
+    ufm_fontTexture = -1;
+    ufm_fontTextureWidth = -1;
     m_swapInterval  = 0;
 }
 
@@ -672,14 +675,6 @@ void OPENGL_GAL::BeginDrawing()
             glActiveTexture( GL_TEXTURE0 );
         }
 
-        // Set shader parameter
-        GLint ufm_fontTexture = m_shader->AddParameter( "u_fontTexture" );
-        GLint ufm_fontTextureWidth = m_shader->AddParameter( "u_fontTextureWidth" );
-        ufm_worldPixelSize = m_shader->AddParameter( "u_worldPixelSize" );
-        ufm_screenPixelSize = m_shader->AddParameter( "u_screenPixelSize" );
-        ufm_pixelSizeMultiplier = m_shader->AddParameter( "u_pixelSizeMultiplier" );
-        ufm_antialiasingOffset = m_shader->AddParameter( "u_antialiasingOffset" );
-
         m_shader->Use();
         m_shader->SetParameter( ufm_fontTexture, (int) FONT_TEXTURE_UNIT );
         m_shader->SetParameter( ufm_fontTextureWidth, (int) font_image.width );
@@ -700,6 +695,7 @@ void OPENGL_GAL::BeginDrawing()
     renderingOffset.x *= screenPixelSize.x;
     renderingOffset.y *= screenPixelSize.y;
     m_shader->SetParameter( ufm_antialiasingOffset, renderingOffset );
+    m_shader->SetParameter( ufm_minLinePixelWidth, GetMinLineWidth() );
     m_shader->Deactivate();
 
     // Something between BeginDrawing and EndDrawing seems to depend on
@@ -716,6 +712,18 @@ void OPENGL_GAL::BeginDrawing()
 #endif /* KICAD_GAL_PROFILE */
 }
 
+void OPENGL_GAL::SetMinLineWidth( float aLineWidth )
+{
+    GAL::SetMinLineWidth( aLineWidth );
+
+    if( m_shader && ufm_minLinePixelWidth != -1 )
+    {
+        m_shader->Use();
+        m_shader->SetParameter( ufm_minLinePixelWidth, aLineWidth );
+        m_shader->Deactivate();
+    }
+}
+
 
 void OPENGL_GAL::EndDrawing()
 {
@@ -907,6 +915,25 @@ void OPENGL_GAL::DrawCircle( const VECTOR2D& aCenterPoint, double aRadius )
 }
 
 
+void OPENGL_GAL::DrawHoleWall( const VECTOR2D& aCenterPoint, double aHoleRadius,
+                               double aWallWidth )
+{
+    if( m_isFillEnabled )
+    {
+        m_currentManager->Color( m_fillColor.r, m_fillColor.g, m_fillColor.b, m_fillColor.a );
+
+        m_currentManager->Shader( SHADER_HOLE_WALL, 1.0, aHoleRadius, aWallWidth );
+        m_currentManager->Vertex( aCenterPoint.x, aCenterPoint.y, m_layerDepth );
+
+        m_currentManager->Shader( SHADER_HOLE_WALL, 2.0, aHoleRadius, aWallWidth );
+        m_currentManager->Vertex( aCenterPoint.x, aCenterPoint.y, m_layerDepth );
+
+        m_currentManager->Shader( SHADER_HOLE_WALL, 3.0, aHoleRadius, aWallWidth );
+        m_currentManager->Vertex( aCenterPoint.x, aCenterPoint.y, m_layerDepth );
+    }
+}
+
+
 void OPENGL_GAL::drawCircle( const VECTOR2D& aCenterPoint, double aRadius, bool aReserve )
 {
     if( m_isFillEnabled )
@@ -2662,6 +2689,10 @@ void OPENGL_GAL::blitCursor()
     glLineWidth( 1.0 );
     glColor4d( color.r, color.g, color.b, color.a );
 
+    glMatrixMode( GL_PROJECTION );
+    glPushMatrix();
+    glTranslated( 0, 0, -0.5 );
+
     glBegin( GL_LINES );
     glVertex2d( cursorCenter.x, cursorBegin.y );
     glVertex2d( cursorCenter.x, cursorEnd.y );
@@ -2669,6 +2700,8 @@ void OPENGL_GAL::blitCursor()
     glVertex2d( cursorBegin.x, cursorCenter.y );
     glVertex2d( cursorEnd.x, cursorCenter.y );
     glEnd();
+
+    glPopMatrix();
 }
 
 
@@ -2753,6 +2786,9 @@ void OPENGL_GAL::init()
     if( !m_shader->IsLinked() && !m_shader->Link() )
         throw std::runtime_error( "Cannot link the shaders!" );
 
+    // Set up shader parameters after linking
+    setupShaderParameters();
+
     // Check if video card supports textures big enough to fit the font atlas
     int maxTextureSize;
     glGetIntegerv( GL_MAX_TEXTURE_SIZE, &maxTextureSize );
@@ -2781,6 +2817,19 @@ void OPENGL_GAL::init()
 }
 
 
+void OPENGL_GAL::setupShaderParameters()
+{
+    // Initialize shader uniform parameter locations
+    ufm_fontTexture = m_shader->AddParameter( "u_fontTexture" );
+    ufm_fontTextureWidth = m_shader->AddParameter( "u_fontTextureWidth" );
+    ufm_worldPixelSize = m_shader->AddParameter( "u_worldPixelSize" );
+    ufm_screenPixelSize = m_shader->AddParameter( "u_screenPixelSize" );
+    ufm_pixelSizeMultiplier = m_shader->AddParameter( "u_pixelSizeMultiplier" );
+    ufm_antialiasingOffset = m_shader->AddParameter( "u_antialiasingOffset" );
+    ufm_minLinePixelWidth = m_shader->AddParameter( "u_minLinePixelWidth" );
+}
+
+
 // Callback functions for the tesselator.  Compare Redbook Chapter 11.
 void CALLBACK VertexCallback( GLvoid* aVertexPtr, void* aData )
 {

common/gal/shaders/kicad_frag.glsl

@@ -35,6 +35,7 @@ const float SHADER_FILLED_CIRCLE        = 2.0;
 const float SHADER_STROKED_CIRCLE       = 3.0;
 const float SHADER_FONT                 = 4.0;
 const float SHADER_LINE_A               = 5.0;
+const float SHADER_HOLE_WALL            = 11.0;
 
 varying vec4 v_shaderParams;
 varying vec2 v_circleCoords;
@@ -124,6 +125,10 @@ void main()
     {
         strokedCircle( v_circleCoords, v_shaderParams[2], v_shaderParams[3] );
     }
+    else if( mode == SHADER_HOLE_WALL )
+    {
+        strokedCircle( v_circleCoords, v_shaderParams[2], v_shaderParams[3] );
+    }
     else if( mode == SHADER_FONT )
     {
         vec2 tex           = v_shaderParams.yz;

common/gal/shaders/kicad_vert.glsl

@@ -36,6 +36,7 @@ const float SHADER_LINE_C               = 7.0;
 const float SHADER_LINE_D               = 8.0;
 const float SHADER_LINE_E               = 9.0;
 const float SHADER_LINE_F               = 10.0;
+const float SHADER_HOLE_WALL            = 11.0;
 
 // Minimum line width
 const float MIN_WIDTH = 1.0;
@@ -72,8 +73,8 @@ void computeLineCoords( bool posture, vec2 vs, vec2 vp, vec2 texcoord, vec2 dir,
     vec2 s = sign( vec2( gl_ModelViewProjectionMatrix[0][0], gl_ModelViewProjectionMatrix[1][1] ) );
 
 
-    if( pixelWidth < 1.0 )
-        pixelWidth = 1.0;
+    if( pixelWidth < u_minLinePixelWidth )
+        pixelWidth = u_minLinePixelWidth;
 
     if ( pixelWidth > 1.0 || u_pixelSizeMultiplier > 1.0 )
     {
@@ -126,8 +127,59 @@ void computeCircleCoords( float mode, float vertexIndex, float radius, float lin
 
     vec4 adjust = vec4(-1, -1, 0, 0);
 
-    if( pixelWidth < 1.0 )
-        pixelWidth = 1.0;
+    if( pixelWidth < u_minLinePixelWidth )
+        pixelWidth = u_minLinePixelWidth;
+
+    if( vertexIndex == 1.0 )
+    {
+        v_circleCoords = vec2( -sqrt( 3.0 ), -1.0 );
+        delta = vec4( -pixelR * sqrt(3.0), -pixelR, 0, 0 );
+    }
+    else if( vertexIndex == 2.0 )
+    {
+        v_circleCoords = vec2( sqrt( 3.0 ), -1.0 );
+        delta = vec4( pixelR * sqrt( 3.0 ), -pixelR, 0, 0 );
+    }
+    else if( vertexIndex == 3.0 )
+    {
+        v_circleCoords = vec2( 0.0, 2.0 );
+        delta = vec4( 0, 2 * pixelR, 0, 0 );
+    }
+    else if( vertexIndex == 4.0 )
+    {
+        v_circleCoords = vec2( -sqrt( 3.0 ), 0.0 );
+        delta = vec4( 0, 0, 0, 0 );
+    }
+    else if( vertexIndex == 5.0 )
+    {
+        v_circleCoords = vec2( sqrt( 3.0 ), 0.0 );
+        delta = vec4( 0, 0, 0, 0 );
+    }
+    else if( vertexIndex == 6.0 )
+    {
+        v_circleCoords = vec2( 0.0, 2.0 );
+        delta = vec4( 0, 0, 0, 0 );
+    }
+
+    v_shaderParams[2] = pixelR;
+    v_shaderParams[3] = pixelWidth;
+
+    delta.x *= u_screenPixelSize.x;
+    delta.y *= u_screenPixelSize.y;
+
+    gl_Position = center + delta + adjust;
+    gl_FrontColor = gl_Color;
+}
+
+void computeHoleWallCoords( float vertexIndex, float radius, float lineWidth )
+{
+    vec4 delta;
+    vec4 center = roundv( gl_ModelViewProjectionMatrix * gl_Vertex + vec4(1, 1, 0, 0), u_screenPixelSize );
+    float pixelWidth = roundr( lineWidth / u_worldPixelSize, 1.0 );
+    if( pixelWidth < u_minLinePixelWidth )
+        pixelWidth = u_minLinePixelWidth;
+    float pixelR = roundr( radius / u_worldPixelSize, 1.0 ) + pixelWidth;
+    vec4 adjust = vec4(-1, -1, 0, 0);
 
     if( vertexIndex == 1.0 )
     {
@@ -195,6 +247,8 @@ void main()
         computeLineCoords( posture,  vs, vp,   vec2( -1,  1 ), vec2( -1, 0 ), lineWidth, true );
     else if( mode == SHADER_LINE_F )
         computeLineCoords( posture,  -vs, vp,  vec2(  1,  1 ), vec2( -1, 0 ), lineWidth, false );
+    else if( mode == SHADER_HOLE_WALL )
+        computeHoleWallCoords( v_shaderParams.y, v_shaderParams.z, v_shaderParams.w );
     else if( mode == SHADER_FILLED_CIRCLE || mode == SHADER_STROKED_CIRCLE)
         computeCircleCoords( mode, v_shaderParams.y, v_shaderParams.z, v_shaderParams.w );
     else

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

@@ -40,7 +40,7 @@
 
 KIGIT_COMMON::KIGIT_COMMON( git_repository* aRepo ) :
         m_repo( aRepo ), m_connType( GIT_CONN_TYPE::GIT_CONN_LOCAL ), m_testedTypes( 0 ),
-        m_nextPublicKey( 0 )
+        m_nextPublicKey( 0 ), m_secretFetched( false )
 {}
 
 KIGIT_COMMON::KIGIT_COMMON( const KIGIT_COMMON& aOther ) :
@@ -55,7 +55,8 @@ KIGIT_COMMON::KIGIT_COMMON( const KIGIT_COMMON& aOther ) :
         // The mutex is default-initialized, not copied
         m_gitActionMutex(),
         m_publicKeys( aOther.m_publicKeys ),
-        m_nextPublicKey( aOther.m_nextPublicKey )
+        m_nextPublicKey( aOther.m_nextPublicKey ),
+        m_secretFetched( aOther.m_secretFetched )
 {
 }
 
@@ -100,6 +101,25 @@ wxString KIGIT_COMMON::GetCurrentBranchName() const
 }
 
 
+wxString KIGIT_COMMON::GetPassword()
+{
+    if( !m_secretFetched )
+    {
+        if( m_connType != GIT_CONN_TYPE::GIT_CONN_LOCAL && !m_remote.IsEmpty() )
+        {
+            wxString secret;
+
+            if( KIPLATFORM::SECRETS::GetSecret( m_remote, m_username, secret ) )
+                m_password = secret;
+        }
+
+        m_secretFetched = true;
+    }
+
+    return m_password;
+}
+
+
 std::vector<wxString> KIGIT_COMMON::GetBranchNames() const
 {
     if( !m_repo )
@@ -238,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 )
@@ -266,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() );
@@ -351,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;
@@ -645,6 +669,10 @@ void KIGIT_COMMON::UpdateCurrentBranchInfo()
     wxString remote_name = GetRemotename();
     git_remote* remote = nullptr;
 
+    m_remote.clear();
+    m_password.clear();
+    m_secretFetched = false;
+
     if( git_remote_lookup( &remote, m_repo, remote_name.ToStdString().c_str() ) == GIT_OK )
     {
         const char* url = git_remote_url( remote );
@@ -655,9 +683,6 @@ void KIGIT_COMMON::UpdateCurrentBranchInfo()
         git_remote_free( remote );
     }
 
-    // Find the stored password if it exists
-    KIPLATFORM::SECRETS::GetSecret( m_remote, m_username, m_password );
-
     updateConnectionType();
     updatePublicKeys();
 }
@@ -748,6 +773,8 @@ void KIGIT_COMMON::updateConnectionType()
                 m_hostname = host;
         }
     }
+
+    m_secretFetched = !m_password.IsEmpty();
 }
 
 

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>
@@ -89,11 +90,11 @@ public:
     };
 
     wxString GetUsername() const { return m_username; }
-    wxString GetPassword() const { return m_password; }
+    wxString GetPassword();
     GIT_CONN_TYPE GetConnType() const;
 
-    void SetUsername( const wxString& aUsername ) { m_username = aUsername; }
-    void SetPassword( const wxString& aPassword ) { m_password = aPassword; }
+    void SetUsername( const wxString& aUsername ) { m_username = aUsername; m_secretFetched = false; }
+    void SetPassword( const wxString& aPassword ) { m_password = aPassword; m_secretFetched = true; }
     void SetSSHKey( const wxString& aSSHKey );
 
     // Holds a temporary variable that can be used by the authentication callback
@@ -127,6 +128,8 @@ public:
     void SetRemote( const wxString& aRemote )
     {
         m_remote = aRemote;
+        m_password.clear();
+        m_secretFetched = false;
         updateConnectionType();
     }
 
@@ -136,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();
@@ -170,6 +179,9 @@ private:
 
     std::vector<wxString> m_publicKeys;
     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

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/http_lib/http_lib_connection.cpp

@@ -40,19 +40,11 @@ HTTP_LIB_CONNECTION::HTTP_LIB_CONNECTION( const HTTP_LIB_SOURCE& aSource, bool a
     m_source = aSource;
 
     if( aTestConnectionNow )
-    {
-        ValidateHTTPLibraryEndpoints();
-    }
+        validateHttpLibraryEndpoints();
 }
 
 
-HTTP_LIB_CONNECTION::~HTTP_LIB_CONNECTION()
-{
-    // Do nothing
-}
-
-
-bool HTTP_LIB_CONNECTION::ValidateHTTPLibraryEndpoints()
+bool HTTP_LIB_CONNECTION::validateHttpLibraryEndpoints()
 {
     m_endpointValid = false;
     std::string res = "";
@@ -78,11 +70,8 @@ bool HTTP_LIB_CONNECTION::ValidateHTTPLibraryEndpoints()
             nlohmann::json response = nlohmann::json::parse( res );
 
             // Check that the endpoints exist, if not fail.
-            if( !response.at( http_endpoint_categories ).empty()
-                && !response.at( http_endpoint_parts ).empty() )
-            {
+            if( !response.at( "categories" ).empty() && !response.at( "parts" ).empty() )
                 m_endpointValid = true;
-            }
         }
     }
     catch( const std::exception& e )
@@ -90,29 +79,19 @@ bool HTTP_LIB_CONNECTION::ValidateHTTPLibraryEndpoints()
         m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response:  %s" ) + "\n",
                                          e.what(), res );
 
-        wxLogTrace( traceHTTPLib,
-                    wxT( "ValidateHTTPLibraryEndpoints: Exception occurred while testing the API "
-                         "connection: %s" ),
+        wxLogTrace( traceHTTPLib, wxT( "validateHttpLibraryEndpoints: Exception while testing API connection: %s" ),
                     m_lastError );
 
         m_endpointValid = false;
     }
 
     if( m_endpointValid )
-    {
         syncCategories();
-    }
 
     return m_endpointValid;
 }
 
 
-bool HTTP_LIB_CONNECTION::IsValidEndpoint() const
-{
-    return m_endpointValid;
-}
-
-
 bool HTTP_LIB_CONNECTION::syncCategories()
 {
     if( !IsValidEndpoint() )
@@ -124,7 +103,7 @@ bool HTTP_LIB_CONNECTION::syncCategories()
     std::string res = "";
 
     std::unique_ptr<KICAD_CURL_EASY> curl = createCurlEasyObject();
-    curl->SetURL( m_source.root_url + http_endpoint_categories + ".json" );
+    curl->SetURL( m_source.root_url + "categories.json" );
 
     try
     {
@@ -133,9 +112,7 @@ bool HTTP_LIB_CONNECTION::syncCategories()
         res = curl->GetBuffer();
 
         if( !checkServerResponse( curl ) )
-        {
             return false;
-        }
 
         nlohmann::json response = nlohmann::json::parse( res );
 
@@ -162,9 +139,7 @@ bool HTTP_LIB_CONNECTION::syncCategories()
         m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response:  %s" ) + "\n",
                                          e.what(), res );
 
-        wxLogTrace( traceHTTPLib,
-                    wxT( "syncCategories: Exception occurred while syncing categories: %s" ),
-                    m_lastError );
+        wxLogTrace( traceHTTPLib, wxT( "syncCategories: Exception while syncing categories: %s" ), m_lastError );
 
         m_categories.clear();
 
@@ -187,8 +162,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
     if( m_cachedParts.find( aPartID ) != m_cachedParts.end() )
     {
         // check if it's outdated, if so re-fetch
-        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached )
-            < m_source.timeout_parts )
+        if( std::difftime( std::time( nullptr ), m_cachedParts[aPartID].lastCached ) < m_source.timeout_parts )
         {
             aFetchedPart = m_cachedParts[aPartID];
             return true;
@@ -198,7 +172,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
     std::string res = "";
 
     std::unique_ptr<KICAD_CURL_EASY> curl = createCurlEasyObject();
-    std::string url = m_source.root_url + fmt::format( "{}/{}.json", http_endpoint_parts, aPartID );
+    std::string url = m_source.root_url + fmt::format( "parts/{}.json", aPartID );
     curl->SetURL( url );
 
     try
@@ -208,9 +182,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
         res = curl->GetBuffer();
 
         if( !checkServerResponse( curl ) )
-        {
             return false;
-        }
 
         nlohmann::ordered_json response = nlohmann::ordered_json::parse( res );
         std::string    key = "";
@@ -225,13 +197,9 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
 
         // API might not want to return an optional name.
         if( response.contains( "name" ) )
-        {
             aFetchedPart.name = response.at( "name" );
-        }
         else
-        {
             aFetchedPart.name = aFetchedPart.id;
-        }
 
         aFetchedPart.symbolIdStr = response.at( "symbolIdStr" );
 
@@ -285,18 +253,36 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
             }
 
             // Add field to fields list
-            aFetchedPart.fields.push_back(
-                    std::make_pair( key, std::make_tuple( value, visible ) ) );
+            aFetchedPart.fields.push_back( std::make_pair( key, std::make_tuple( value, visible ) ) );
+        }
+
+        if( response.contains( "description" ) )
+            aFetchedPart.desc = response.at( "description" );
+
+        if( response.contains( "keywords" ) )
+            aFetchedPart.keywords = response.at( "keywords" );
+
+        if( response.contains( "footprint_filters" ) )
+        {
+            nlohmann::json filters_json = response.at( "footprint_filters" );
+
+            if( filters_json.is_array() )
+            {
+                for( const auto& val : filters_json )
+                    aFetchedPart.fp_filters.push_back( val );
+            }
+            else
+            {
+                aFetchedPart.fp_filters.push_back( filters_json );
+            }
         }
     }
     catch( const std::exception& e )
     {
-        m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response:  %s" ) + "\n",
+        m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response: %s" ) + "\n",
                                          e.what(), res );
 
-        wxLogTrace( traceHTTPLib,
-                    wxT( "SelectOne: Exception occurred while retrieving part from REST API: %s" ),
-                    m_lastError );
+        wxLogTrace( traceHTTPLib, wxT( "SelectOne: Exception while fetching part: %s" ), m_lastError );
 
         return false;
     }
@@ -307,8 +293,7 @@ bool HTTP_LIB_CONNECTION::SelectOne( const std::string& aPartID, HTTP_LIB_PART&
 }
 
 
-bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
-                                     std::vector<HTTP_LIB_PART>& aParts )
+bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY& aCategory, std::vector<HTTP_LIB_PART>& aParts )
 {
     if( !IsValidEndpoint() )
     {
@@ -320,8 +305,7 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
 
     std::unique_ptr<KICAD_CURL_EASY> curl = createCurlEasyObject();
 
-    curl->SetURL( m_source.root_url
-                  + fmt::format( "{}/category/{}.json", http_endpoint_parts, aCategory.id ) );
+    curl->SetURL( m_source.root_url + fmt::format( "parts/category/{}.json", aCategory.id ) );
 
     try
     {
@@ -339,21 +323,13 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
             part.id = item.at( "id" );
 
             if( item.contains( "description" ) )
-            {
-                // At this point we don't display anything so just set it to false
-                part.fields.push_back( std::make_pair(
-                        "description", std::make_tuple( item.at( "description" ), false ) ) );
-            }
+                part.desc = item.at( "description" );
 
             // API might not want to return an optional name.
             if( item.contains( "name" ) )
-            {
                 part.name = item.at( "name" );
-            }
             else
-            {
                 part.name = part.id;
-            }
 
             // add to cache
             m_cache[part.name] = std::make_tuple( part.id, aCategory.id );
@@ -363,11 +339,10 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
     }
     catch( const std::exception& e )
     {
-        m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response:  %s" ) + "\n",
+        m_lastError += wxString::Format( _( "Error: %s" ) + "\n" + _( "API Response: %s" ) + "\n",
                                          e.what(), res );
 
-        wxLogTrace( traceHTTPLib, wxT( "Exception occurred while syncing parts from REST API: %s" ),
-                    m_lastError );
+        wxLogTrace( traceHTTPLib, wxT( "Exception occurred while syncing parts: %s" ), m_lastError );
 
         return false;
     }
@@ -379,6 +354,7 @@ bool HTTP_LIB_CONNECTION::SelectAll( const HTTP_LIB_CATEGORY&    aCategory,
 bool HTTP_LIB_CONNECTION::checkServerResponse( std::unique_ptr<KICAD_CURL_EASY>& aCurl )
 {
     int statusCode = aCurl->GetResponseStatusCode();
+
     if( statusCode != 200 )
     {
         m_lastError += wxString::Format( _( "API responded with error code: %s" ) + "\n",

common/http_lib/http_lib_settings.cpp

@@ -35,10 +35,9 @@ const int httplibSchemaVersion = 1;
 HTTP_LIB_SETTINGS::HTTP_LIB_SETTINGS( const std::string& aFilename ) :
         JSON_SETTINGS( aFilename, SETTINGS_LOC::NONE, httplibSchemaVersion )
 {
-    m_params.emplace_back( new PARAM<std::string>( "source.type", &sourceType, "" ) );
+    m_params.emplace_back( new PARAM<std::string>( "source.type", &m_sourceType, "" ) );
 
-    m_params.emplace_back(
-            new PARAM<std::string>( "source.api_version", &m_Source.api_version, "" ) );
+    m_params.emplace_back( new PARAM<std::string>( "source.api_version", &m_Source.api_version, "" ) );
 
     m_params.emplace_back( new PARAM<std::string>( "source.root_url", &m_Source.root_url, "" ) );
 
@@ -46,8 +45,7 @@ HTTP_LIB_SETTINGS::HTTP_LIB_SETTINGS( const std::string& aFilename ) :
 
     m_params.emplace_back( new PARAM<int>( "source.timeout_parts_seconds", &m_Source.timeout_parts, 30 ) );
 
-    m_params.emplace_back( new PARAM<int>( "source.timeout_categories_seconds",
-                                           &m_Source.timeout_categories, 600 ) );
+    m_params.emplace_back( new PARAM<int>( "source.timeout_categories_seconds", &m_Source.timeout_categories, 600 ) );
 
 }
 

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_ascii_parser.cpp

@@ -119,7 +119,10 @@ std::map<wxString, wxString> ALTIUM_ASCII_PARSER::ReadProperties()
             if( canonicalKey == wxT( "DESIGNATOR" ) || canonicalKey == wxT( "NAME" )
                 || canonicalKey == wxT( "TEXT" ) )
             {
-                if( kv[ wxT( "RECORD" ) ] != wxT( "4" ) )
+                wxString recordType = kv[ wxT( "RECORD" ) ];
+
+                // RECORD=33 (FILE_NAME) stores Windows-formatted paths; keep the backslashes intact.
+                if( recordType != wxT( "4" ) && recordType != wxT( "33" ) )
                     value = AltiumPropertyToKiCadString( value );
             }
         }

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/io/eagle/eagle_parser.cpp

@@ -327,7 +327,8 @@ bool EURN::IsValid() const
         "footprint",
         "library",
         "package",
-        "symbol"
+        "symbol",
+        "fs.file"
     };
 
     if( validAssetTypes.count( assetType ) == 0 )
@@ -407,11 +408,29 @@ EROT Convert<EROT>( const wxString& aRot )
 
     value.spin    = aRot.find( 'S' ) != aRot.npos;
     value.mirror  = aRot.find( 'M' ) != aRot.npos;
-    value.degrees = strtod( aRot.c_str()
-                            + 1                        // skip leading 'R'
-                            + int( value.spin )       // skip optional leading 'S'
-                            + int( value.mirror ),    // skip optional leading 'M'
-                            nullptr );
+
+    size_t rPos = aRot.find( 'R' );
+
+    if( rPos == wxString::npos )
+    {
+        value.degrees = 0.0;
+        return value;
+    }
+
+    // Calculate the offset after 'R', 'S', and 'M'
+    size_t offset;
+
+    for( offset = 0; offset < aRot.size(); offset++ )
+    {
+        if( wxIsdigit( aRot[offset] ) )
+            break;
+    }
+
+    wxString degreesStr = aRot.Mid( offset );
+
+    // Use locale-independent conversion
+    if( !degreesStr.ToCDouble( &value.degrees ) )
+        value.degrees = 0.0;
 
     return value;
 }

common/io/eagle/eagle_parser.h

@@ -428,6 +428,9 @@ struct EAGLE_BASE
  *   The "/<VERSION>" is omitted when referencing the asset without specifying a particular version.
  *   For example, "urn:adsk.eagle:component:60986/2" references version 2 of component 60986 and
  *   "urn:adsk.eagle:library:60968" references library 60986 without specifying a version.
+ * 
+ * Autodesk Fusion can use a different format instead, e.g.:
+ * "urn:adsk.wipprod:fs.file:vf.RSKzNVZVQPeDNm7Bnfr3WQ"
  */
 struct EURN : public EAGLE_BASE
 {

common/io/easyedapro/easyedapro_import_utils.cpp

@@ -72,7 +72,17 @@ EASYEDAPRO::ProjectToSelectorDialog( const nlohmann::json& aProject, bool aPcbOn
 
     std::map<wxString, EASYEDAPRO::PRJ_SCHEMATIC> prjSchematics = aProject.at( "schematics" );
     std::map<wxString, EASYEDAPRO::PRJ_BOARD>     prjBoards = aProject.at( "boards" );
-    std::map<wxString, wxString>                  prjPcbNames = aProject.at( "pcbs" );
+
+    std::map<wxString, wxString>       prjPcbNames;
+    std::map<wxString, nlohmann::json> prjPcbs = aProject.at( "pcbs" );
+
+    for( const auto& [pcbUuid, pcbJsonEntry] : prjPcbs )
+    {
+        if( pcbJsonEntry.is_string() )
+            prjPcbNames.emplace( pcbUuid, pcbJsonEntry );
+        else if( pcbJsonEntry.is_object() )
+            prjPcbNames.emplace( pcbUuid, pcbJsonEntry.at( "title" ) );
+    }
 
     for( const auto& [prjName, board] : prjBoards )
     {

common/io/easyedapro/easyedapro_parser.cpp

@@ -220,7 +220,7 @@ void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::PRJ_SYMBOL& d )
     if( j.at( "type" ).is_number() )
         d.type = j.at( "type" );
 
-    if( j.at( "tags" ).is_object() )
+    if( j.find( "tags" ) != j.end() && j.at( "tags" ).is_object() )
         d.tags = j.at( "tags" );
 
     if( j.find( "custom_tags" ) != j.end() && j.at( "custom_tags" ).is_object() )
@@ -249,7 +249,7 @@ void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::PRJ_FOOTPRINT&
     if( j.at( "type" ).is_number() )
         d.type = j.at( "type" );
 
-    if( j.at( "tags" ).is_object() )
+    if( j.find( "tags" ) != j.end() && j.at( "tags" ).is_object() )
         d.tags = j.at( "tags" );
 
     if( j.find( "custom_tags" ) != j.end() && j.at( "custom_tags" ).is_object() )
@@ -275,7 +275,7 @@ void EASYEDAPRO::from_json( const nlohmann::json& j, EASYEDAPRO::PRJ_DEVICE& d )
     if( j.at( "version" ).is_string() )
         d.version = j.at( "version" ).get<wxString>();
 
-    if( j.at( "tags" ).is_object() )
+    if( j.find( "tags" ) != j.end() && j.at( "tags" ).is_object() )
         d.tags = j.at( "tags" );
 
     if( j.find( "custom_tags" ) != j.end() && j.at( "custom_tags" ).is_object() )

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/job_export_pcb_odb.cpp

@@ -41,7 +41,7 @@ JOB_EXPORT_PCB_ODB::JOB_EXPORT_PCB_ODB() :
         m_filename(),
         m_drawingSheet(),
         m_units( ODB_UNITS::MM ),
-        m_precision( 2 ),
+        m_precision( 4 ),
         m_compressionMode( ODB_COMPRESSION::ZIP )
 {
     m_params.emplace_back( new JOB_PARAM<wxString>( "drawing_sheet", &m_drawingSheet, m_drawingSheet ) );

common/jobs/job_pcb_render.cpp

@@ -85,6 +85,7 @@ JOB_PCB_RENDER::JOB_PCB_RENDER() :
 {
     m_params.emplace_back( new JOB_PARAM<FORMAT>( "format", &m_format, m_format ) );
     m_params.emplace_back( new JOB_PARAM<std::string>( "preset", &m_appearancePreset, m_appearancePreset ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "use_board_stackup_colors", &m_useBoardStackupColors, m_useBoardStackupColors ) );
     m_params.emplace_back( new JOB_PARAM<QUALITY>( "quality", &m_quality, m_quality ) );
     m_params.emplace_back( new JOB_PARAM<BG_STYLE>( "bg_style", &m_bgStyle, m_bgStyle ) );
     m_params.emplace_back( new JOB_PARAM<SIDE>( "side", &m_side, m_side ) );

common/jobs/job_pcb_render.h

@@ -87,6 +87,7 @@ public:
     int         m_width = 0;
     int         m_height = 0;
     std::string m_appearancePreset;
+    bool        m_useBoardStackupColors = true;
     SIDE        m_side = SIDE::TOP;
     double      m_zoom = 1.0;
     bool        m_perspective = false;

common/jobs/job_rc.cpp

@@ -39,7 +39,7 @@ JOB_RC::JOB_RC( const std::string& aType ) :
         m_units( JOB_RC::UNITS::MM ),
         m_severity( RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING ),
         m_format( OUTPUT_FORMAT::REPORT ),
-        m_exitCodeViolations( false )
+        m_exitCodeViolations( true ) // this ensures GUI jobs default to treat violations as job failure, cli will default false elsewhere
 {
     m_params.emplace_back( new JOB_PARAM<UNITS>( "units", &m_units, m_units ) );
     m_params.emplace_back( new JOB_PARAM<int>( "severity", &m_severity, m_severity ) );

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

@@ -24,6 +24,7 @@
 #include <wx/zipstrm.h>
 #include <gestfich.h>
 #include <common.h>
+#include <wildcards_and_files_ext.h>
 
 JOBS_OUTPUT_ARCHIVE::JOBS_OUTPUT_ARCHIVE() :
     JOBS_OUTPUT_HANDLER(),
@@ -41,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;
@@ -52,6 +55,8 @@ bool JOBS_OUTPUT_ARCHIVE::HandleOutputs( const wxString& baseTempPath, PROJECT*
     if( outputPath.StartsWith( "~" ) )
         outputPath.Replace( "~", wxGetHomeDir(), false );
 
+    outputPath = EnsureFileExtension( outputPath, FILEEXT::ArchiveFileExtension );
+
     wxFFileOutputStream ostream( outputPath );
 
     if( !ostream.IsOk() ) // issue to create the file. Perhaps not writable dir

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.cpp

@@ -134,29 +134,12 @@ LIB_TREE_NODE::LIB_TREE_NODE()
 
 LIB_TREE_NODE_UNIT::LIB_TREE_NODE_UNIT( LIB_TREE_NODE* aParent, LIB_TREE_ITEM* aItem, int aUnit )
 {
-    static void* locale = nullptr;
-    static wxString namePrefix;
-
-    // Fetching translations can take a surprising amount of time when loading libraries,
-    // so only do it when necessary.
-    if( Pgm().GetLocale() != locale )
-    {
-        namePrefix = _( "Unit" );
-        locale = Pgm().GetLocale();
-    }
-
     m_Parent = aParent;
     m_Type = TYPE::UNIT;
 
     m_Unit = aUnit;
     m_LibId = aParent->m_LibId;
-
-    m_Name = namePrefix + " " + aItem->GetUnitReference( aUnit );
-
-    if( aItem->HasUnitDisplayName( aUnit ) )
-        m_Desc = aItem->GetUnitDisplayName( aUnit );
-    else
-        m_Desc = wxEmptyString;
+    m_Name = aItem->GetUnitName( aUnit );
 
     m_IntrinsicRank = -aUnit;
 }

common/lib_tree_model_adapter.cpp

@@ -32,6 +32,7 @@
 #include <wx/wupdlock.h>
 #include <wx/settings.h>
 #include <wx/dc.h>
+#include <wx/log.h>
 #include <string_utils.h>
 
 
@@ -47,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
@@ -308,6 +322,15 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( const wxString& aSearch, bool a
 
     const LIB_TREE_NODE* firstMatch = ShowResults();
 
+#ifdef __WXGTK__
+    // Ensure the control is repainted with the updated data.  Without an explicit
+    // refresh the Gtk port can display stale rows until the user interacts with
+    // them, leading to mismatched tree contents.
+    m_widget->Refresh();
+    m_widget->Update();
+    wxYield();
+#endif
+
     if( firstMatch )
     {
         wxDataViewItem item = ToItem( firstMatch );

common/libeval_compiler/libeval_compiler.cpp

@@ -1150,7 +1150,9 @@ void UOP::Exec( CONTEXT* ctx )
         return;
 
     case TR_OP_METHOD_CALL:
-        m_func( ctx, m_ref.get() );
+        if( m_func )
+            m_func( ctx, m_ref.get() );
+
         return;
 
     default:
@@ -1283,9 +1285,8 @@ VALUE* UCODE::Run( CONTEXT* ctx )
     }
     catch(...)
     {
-        // rules which fail outright should not be fired
-        std::unique_ptr<VALUE> temp_false = std::make_unique<VALUE>( 0 );
-        return ctx->StoreValue( temp_false.get() );
+        // rules which fail outright should not be fired; return 0/false
+        return ctx->StoreValue( new VALUE( 0 ) );
     }
 
     if( ctx->SP() == 1 )
@@ -1301,8 +1302,7 @@ VALUE* UCODE::Run( CONTEXT* ctx )
         wxASSERT( ctx->SP() == 1 );
 
         // non-well-formed rules should not be fired on a release build
-        std::unique_ptr<VALUE> temp_false = std::make_unique<VALUE>( 0 );
-        return ctx->StoreValue( temp_false.get() );
+        return ctx->StoreValue( new VALUE( 0 ) );
     }
 }
 

common/netclass.cpp

@@ -278,7 +278,7 @@ bool NETCLASS::ContainsNetclassWithName( const wxString& netclass ) const
     return std::any_of( m_constituents.begin(), m_constituents.end(),
                         [&netclass]( const NETCLASS* nc )
                         {
-                            return nc && nc->GetName() == netclass;
+                            return nc && nc->GetName().Matches( netclass );
                         } );
 }
 

common/paths.cpp

@@ -22,6 +22,7 @@
 #include <wx/stdpaths.h>
 #include <wx/string.h>
 #include <wx/utils.h>
+#include <wx/msgdlg.h>
 
 #include <kiplatform/environment.h>
 #include <paths.h>
@@ -151,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).
@@ -191,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 )
@@ -201,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();
@@ -361,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" ) );
@@ -502,6 +537,25 @@ void PATHS::EnsureUserPathsExist()
     EnsurePathExists( GetDefaultUserFootprintsPath() );
     EnsurePathExists( GetDefaultUser3DModelsPath() );
     EnsurePathExists( GetDefault3rdPartyPath() );
+
+#ifdef _WIN32
+    // Warn about Controlled folder access
+    wxFileName tmp;
+    getUserDocumentPath( tmp );
+
+    if( !tmp.DirExists() )
+    {
+        wxString msg = wxString::Format(
+                _( "KiCad was unable to use '%s'.\n"
+                   "\n"
+                   "1. Disable 'Controlled folder access' in Windows settings or Group Policy\n"
+                   "2. Make sure no other antivirus software interferes with KiCad\n"
+                   "3. Make sure you have correct permissions set up" ),
+                tmp.GetPath() );
+
+        wxMessageBox( msg, _( "Warning" ), wxICON_WARNING );
+    }
+#endif
 }
 
 
@@ -530,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
@@ -622,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.
@@ -657,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/pin_type.h

@@ -55,6 +55,31 @@ enum class ELECTRICAL_PINTYPE
 
 #define ELECTRICAL_PINTYPES_TOTAL ( static_cast<int>( ELECTRICAL_PINTYPE::PT_LAST_OPTION ) + 1 )
 
+inline wxString GetCanonicalElectricalTypeName( ELECTRICAL_PINTYPE aType )
+{
+    // These strings are the canonical name of the electrictal type
+    // Not translated, no space in name, only ASCII chars.
+    // to use when the string name must be known and well defined
+    // must have same order than enum ELECTRICAL_PINTYPE (see sch_pin.h)
+    static const wxChar* msgPinElectricType[] =
+    {
+        wxT( "input" ),
+        wxT( "output" ),
+        wxT( "bidirectional" ),
+        wxT( "tri_state" ),
+        wxT( "passive" ),
+        wxT( "free" ),
+        wxT( "unspecified" ),
+        wxT( "power_in" ),
+        wxT( "power_out" ),
+        wxT( "open_collector" ),
+        wxT( "open_emitter" ),
+        wxT( "no_connect" )
+    };
+
+    return msgPinElectricType[static_cast<int>( aType )];
+}
+
 enum class GRAPHIC_PINSHAPE
 {
     LINE,

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/plotters/PDF_plotter.cpp

@@ -415,7 +415,7 @@ void PDF_PLOTTER::PlotPoly( const std::vector<VECTOR2I>& aCornerList, FILL_T aFi
     if( aFill == FILL_T::NO_FILL )
         fputs( "S\n", m_workFile );
     else if( aWidth == 0 )
-        fputs( "f\n", m_workFile );
+        fputs( "h f\n", m_workFile );
     else
         fputs( "b\n", m_workFile );
 }

common/plotters/SVG_plotter.cpp

@@ -683,10 +683,10 @@ void SVG_PLOTTER::PlotImage( const wxImage& aImage, const VECTOR2I& aPos, double
         img_stream.CopyTo( buffer.data(), buffer.size() );
         base64::encode( buffer, encoded );
 
+        VECTOR2D pos = userToDeviceCoordinates( start );
         fprintf( m_outputFile,
                  "<image x=\"%f\" y=\"%f\" xlink:href=\"data:image/png;base64,",
-                 userToDeviceSize( start.x ),
-                 userToDeviceSize( start.y ) );
+                 pos.x, pos.y );
 
         for( size_t i = 0; i < encoded.size(); i++ )
         {

common/preview_items/construction_geom.cpp

@@ -24,6 +24,7 @@
 #include "preview_items/construction_geom.h"
 
 #include <layer_ids.h>
+#include <utility>
 #include <gal/graphics_abstraction_layer.h>
 #include <geometry/shape_utils.h>
 #include <preview_items/item_drawing_utils.h>
@@ -39,9 +40,15 @@ CONSTRUCTION_GEOM::CONSTRUCTION_GEOM() :
 }
 
 
-void CONSTRUCTION_GEOM::AddDrawable( const DRAWABLE& aItem, bool aPersistent )
+void CONSTRUCTION_GEOM::AddDrawable( const DRAWABLE& aItem, bool aPersistent, int aLineWidth )
 {
-    m_drawables.push_back( { aItem, aPersistent } );
+    m_drawables.push_back( { aItem, aPersistent, aLineWidth } );
+}
+
+
+void CONSTRUCTION_GEOM::SetSnapGuides( std::vector<SNAP_GUIDE> aGuides )
+{
+    m_snapGuides = std::move( aGuides );
 }
 
 
@@ -90,6 +97,7 @@ void CONSTRUCTION_GEOM::ViewDraw( int aLayer, VIEW* aView ) const
     for( const DRAWABLE_INFO& drawable : m_drawables )
     {
         gal.SetStrokeColor( drawable.IsPersistent ? m_persistentColor : m_color );
+        gal.SetLineWidth( drawable.LineWidth );
 
         std::visit(
                 [&]( const auto& visited )
@@ -139,9 +147,17 @@ void CONSTRUCTION_GEOM::ViewDraw( int aLayer, VIEW* aView ) const
                 drawable.Item );
     }
 
+    for( const SNAP_GUIDE& guide : m_snapGuides )
+    {
+        gal.SetStrokeColor( guide.Color );
+        gal.SetLineWidth( guide.LineWidth );
+        gal.DrawLine( guide.Segment.A, guide.Segment.B );
+    }
+
     if( haveSnapLine )
     {
         gal.SetStrokeColor( m_persistentColor );
+        gal.SetLineWidth( 2 );
 
         const int dashSizeBasis = aView->ToWorld( 12 );
         const int snapOriginMarkerSize = aView->ToWorld( 16 );

common/preview_items/ruler_item.cpp

@@ -335,7 +335,86 @@ void RULER_ITEM::ViewDraw( int aLayer, KIGFX::VIEW* aView ) const
     VECTOR2D rulerVec( end - origin );
 
     wxArrayString cursorStrings = GetDimensionStrings();
-    DrawTextNextToCursor( aView, end, -rulerVec, cursorStrings, drawingDropShadows );
+
+    // Choose a text quadrant that keeps the measurement text on-screen while avoiding
+    // overlapping the ruler geometry.  Start with the preferred direction (away from the
+    // origin) and fall back to other quadrants as needed to keep the label visible.
+    int      prefX = rulerVec.y < 0.0 ? -1 : 1;
+    int      prefY = rulerVec.x < 0.0 ? 1 : -1;
+
+    double      scale = gal->GetWorldScale();
+
+    TEXT_DIMS     dims = GetConstantGlyphHeight( gal );
+    KIFONT::FONT* font = KIFONT::FONT::GetFont();
+    double        width = 0.0;
+
+    for( const wxString& s : cursorStrings )
+    {
+        VECTOR2I extents = font->StringBoundaryLimits( s, dims.GlyphSize, dims.StrokeWidth, false, false,
+                                                       KIFONT::METRICS::Default() );
+        width = std::max( width, (double) extents.x );
+    }
+
+    double height = dims.LinePitch * cursorStrings.size();
+
+    // Convert to screen coordinates for visibility checks
+    VECTOR2D cursorScreen = gal->ToScreen( end );
+    VECTOR2I screenSize = gal->GetScreenPixelSize();
+    double   offsetX = 15.0;                   // same as DrawTextNextToCursor()
+    double   offsetY = dims.LinePitch * scale; // vertical spacing from cursor
+
+    auto fits = [&]( int sx, int sy )
+    {
+        double left, right, top, bottom;
+        double xStart = cursorScreen.x + ( sx < 0 ? offsetX : -offsetX );
+
+        if( sx < 0 )
+        {
+            left = xStart;
+            right = left + width * scale;
+        }
+        else
+        {
+            right = xStart;
+            left = right - width * scale;
+        }
+
+        if( sy > 0 ) // above cursor
+        {
+            bottom = cursorScreen.y - offsetY;
+            top = bottom - height * scale;
+        }
+        else // below cursor
+        {
+            top = cursorScreen.y + offsetY;
+            bottom = top + height * scale;
+        }
+
+        return left >= 0 && right <= screenSize.x && top >= 0 && bottom <= screenSize.y;
+    };
+
+    std::vector<VECTOR2I> candidates = { { prefX, prefY }, { -prefX, prefY },
+                                         { prefX, -prefY }, { -prefX, -prefY } };
+
+    VECTOR2I  chosen = candidates[0];
+    double    bestDot = -1.0;
+
+    for( const VECTOR2I& c : candidates )
+    {
+        double dot = c.x * prefX + c.y * prefY;
+
+        if( dot >= 0 && fits( c.x, c.y ) )
+        {
+            if( dot > bestDot )
+            {
+                bestDot = dot;
+                chosen = c;
+            }
+        }
+    }
+
+    VECTOR2D quadrant( chosen.x, chosen.y );
+    DrawTextNextToCursor( aView, end, quadrant, cursorStrings, drawingDropShadows );
 
     // basic tick size
     double minorTickLen = 5.0 / gal->GetWorldScale();

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/properties/pg_properties.cpp

@@ -254,9 +254,11 @@ wxPGProperty* PGPropertyFactory( const PROPERTY_BASE* aProperty, EDA_DRAW_FRAME*
         // Enum property
         if( aProperty->HasChoices() )
         {
+            const_cast<PROPERTY_BASE*>( aProperty )->TranslateChoices();
+
             // I do not know why enum property takes a non-const reference to wxPGChoices..
             ret = new wxEnumProperty( wxPG_LABEL, wxPG_LABEL,
-                    const_cast<wxPGChoices&>( aProperty->Choices() ) );
+                                      const_cast<wxPGChoices&>( aProperty->Choices() ) );
         }
         else if( typeId == TYPE_HASH( int ) || typeId == TYPE_HASH( long ) )
         {

common/properties/property_mgr.cpp

@@ -25,10 +25,15 @@
 #include <properties/property.h>
 
 #include <algorithm>
+#include <ranges>
 #include <utility>
 #include <wx/wx.h>
 
-static wxString EMPTY_STRING( wxEmptyString );
+
+// Global to prevent simultaneous multi-threaded static initialization
+static const std::vector<PROPERTY_BASE*>   EMPTY_PROP_LIST;
+static const std::map<PROPERTY_BASE*, int> EMPTY_PROP_DISPLAY_ORDER;
+std::vector<wxString>                      EMPTY_GROUP_DISPLAY_ORDER;
 
 
 void PROPERTY_MANAGER::RegisterType( TYPE_ID aType, const wxString& aName )
@@ -38,13 +43,6 @@ void PROPERTY_MANAGER::RegisterType( TYPE_ID aType, const wxString& aName )
 }
 
 
-const wxString& PROPERTY_MANAGER::ResolveType( TYPE_ID aType ) const
-{
-    auto it = m_classNames.find( aType );
-    return it != m_classNames.end() ? it->second : EMPTY_STRING;
-}
-
-
 PROPERTY_BASE* PROPERTY_MANAGER::GetProperty( TYPE_ID aType, const wxString& aProperty ) const
 {
     if( m_dirty )
@@ -67,31 +65,29 @@ PROPERTY_BASE* PROPERTY_MANAGER::GetProperty( TYPE_ID aType, const wxString& aPr
 }
 
 
-const PROPERTY_LIST& PROPERTY_MANAGER::GetProperties( TYPE_ID aType ) const
+const std::vector<PROPERTY_BASE*>& PROPERTY_MANAGER::GetProperties( TYPE_ID aType ) const
 {
     if( m_dirty )
         const_cast<PROPERTY_MANAGER*>( this )->Rebuild();
 
-    static const PROPERTY_LIST empty;
     auto it = m_classes.find( aType );
 
     if( it == m_classes.end() )
-        return empty;
+        return EMPTY_PROP_LIST;
 
     return it->second.m_allProperties;
 }
 
 
-const PROPERTY_DISPLAY_ORDER& PROPERTY_MANAGER::GetDisplayOrder( TYPE_ID aType ) const
+const std::map<PROPERTY_BASE*, int>& PROPERTY_MANAGER::GetDisplayOrder( TYPE_ID aType ) const
 {
     if( m_dirty )
         const_cast<PROPERTY_MANAGER*>( this )->Rebuild();
 
-    static const PROPERTY_DISPLAY_ORDER empty;
     auto it = m_classes.find( aType );
 
     if( it == m_classes.end() )
-        return empty;
+        return EMPTY_PROP_DISPLAY_ORDER;
 
     return it->second.m_displayOrder;
 }
@@ -102,11 +98,10 @@ const std::vector<wxString>& PROPERTY_MANAGER::GetGroupDisplayOrder( TYPE_ID aTy
     if( m_dirty )
         const_cast<PROPERTY_MANAGER*>( this )->Rebuild();
 
-    static const std::vector<wxString> empty;
     auto it = m_classes.find( aType );
 
     if( it == m_classes.end() )
-        return empty;
+        return EMPTY_GROUP_DISPLAY_ORDER;
 
     return it->second.m_groupDisplayOrder;
 }
@@ -122,7 +117,7 @@ const void* PROPERTY_MANAGER::TypeCast( const void* aSource, TYPE_ID aBase, TYPE
     if( classDesc == m_classes.end() )
         return aSource;
 
-    auto& converters = classDesc->second.m_typeCasts;
+    const std::map<TYPE_ID, std::unique_ptr<TYPE_CAST_BASE>>& converters = classDesc->second.m_typeCasts;
     auto converter = converters.find( aTarget );
 
     if( converter == converters.end() )     // explicit type cast not found
@@ -135,8 +130,9 @@ const void* PROPERTY_MANAGER::TypeCast( const void* aSource, TYPE_ID aBase, TYPE
 PROPERTY_BASE& PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wxString& aGroup )
 {
     const wxString& name = aProperty->Name();
-    TYPE_ID hash = aProperty->OwnerHash();
-    CLASS_DESC& classDesc = getClass( hash );
+    TYPE_ID         hash = aProperty->OwnerHash();
+    CLASS_DESC&     classDesc = getClass( hash );
+
     classDesc.m_ownProperties.emplace( name, aProperty );
     classDesc.m_ownDisplayOrder.emplace_back( aProperty );
 
@@ -153,8 +149,8 @@ PROPERTY_BASE& PROPERTY_MANAGER::AddProperty( PROPERTY_BASE* aProperty, const wx
 }
 
 
-PROPERTY_BASE& PROPERTY_MANAGER::ReplaceProperty( size_t aBase, const wxString& aName,
-                                                  PROPERTY_BASE* aNew, const wxString& aGroup )
+PROPERTY_BASE& PROPERTY_MANAGER::ReplaceProperty( size_t aBase, const wxString& aName, PROPERTY_BASE* aNew,
+                                                  const wxString& aGroup )
 {
     CLASS_DESC& classDesc = getClass( aNew->OwnerHash() );
     classDesc.m_replaced.insert( std::make_pair( aBase, aName ) );
@@ -164,31 +160,30 @@ PROPERTY_BASE& PROPERTY_MANAGER::ReplaceProperty( size_t aBase, const wxString&
 
 void PROPERTY_MANAGER::AddTypeCast( TYPE_CAST_BASE* aCast )
 {
-    TYPE_ID derivedHash = aCast->DerivedHash();
+    TYPE_ID     derivedHash = aCast->DerivedHash();
     CLASS_DESC& classDesc = getClass( aCast->BaseHash() );
-    auto& typeCasts = classDesc.m_typeCasts;
-    wxASSERT_MSG( typeCasts.count( derivedHash ) == 0, "Such converter already exists" );
-    typeCasts.emplace( derivedHash, aCast );
+
+    wxASSERT_MSG( classDesc.m_typeCasts.count( derivedHash ) == 0, wxT( "Such converter already exists" ) );
+    classDesc.m_typeCasts.emplace( derivedHash, aCast );
 }
 
 
 void PROPERTY_MANAGER::InheritsAfter( TYPE_ID aDerived, TYPE_ID aBase )
 {
-    wxASSERT_MSG( aDerived != aBase, "Class cannot inherit from itself" );
+    wxASSERT_MSG( aDerived != aBase, wxT( "Class cannot inherit from itself" ) );
 
     CLASS_DESC& derived = getClass( aDerived );
-    CLASS_DESC& base = getClass( aBase );
-    derived.m_bases.push_back( base );
+    derived.m_bases.push_back( getClass( aBase ) );
     m_dirty = true;
 
     wxASSERT_MSG( derived.m_bases.size() == 1 || derived.m_typeCasts.count( aBase ) == 1,
-                  "You need to add a TYPE_CAST for classes inheriting from multiple bases" );
+                  wxT( "You need to add a TYPE_CAST for classes inheriting from multiple bases" ) );
 }
 
 
 void PROPERTY_MANAGER::Mask( TYPE_ID aDerived, TYPE_ID aBase, const wxString& aName )
 {
-    wxASSERT_MSG( aDerived != aBase, "Class cannot mask from itself" );
+    wxASSERT_MSG( aDerived != aBase, wxT( "Class cannot mask from itself" ) );
 
     CLASS_DESC& derived = getClass( aDerived );
     derived.m_maskedBaseProperties.insert( std::make_pair( aBase, aName ) );
@@ -196,11 +191,10 @@ void PROPERTY_MANAGER::Mask( TYPE_ID aDerived, TYPE_ID aBase, const wxString& aN
 }
 
 
-void PROPERTY_MANAGER::OverrideAvailability( TYPE_ID aDerived, TYPE_ID aBase,
-                                             const wxString& aName,
+void PROPERTY_MANAGER::OverrideAvailability( TYPE_ID aDerived, TYPE_ID aBase, const wxString& aName,
                                              std::function<bool( INSPECTABLE* )> aFunc )
 {
-    wxASSERT_MSG( aDerived != aBase, "Class cannot override from itself" );
+    wxASSERT_MSG( aDerived != aBase, wxT( "Class cannot override from itself" ) );
 
     CLASS_DESC& derived = getClass( aDerived );
     derived.m_availabilityOverrides[std::make_pair( aBase, aName )] = std::move( aFunc );
@@ -208,11 +202,10 @@ void PROPERTY_MANAGER::OverrideAvailability( TYPE_ID aDerived, TYPE_ID aBase,
 }
 
 
-void PROPERTY_MANAGER::OverrideWriteability( TYPE_ID aDerived, TYPE_ID aBase,
-                                             const wxString& aName,
+void PROPERTY_MANAGER::OverrideWriteability( TYPE_ID aDerived, TYPE_ID aBase, const wxString& aName,
                                              std::function<bool( INSPECTABLE* )> aFunc )
 {
-    wxASSERT_MSG( aDerived != aBase, "Class cannot override from itself" );
+    wxASSERT_MSG( aDerived != aBase, wxT( "Class cannot override from itself" ) );
 
     CLASS_DESC& derived = getClass( aDerived );
     derived.m_writeabilityOverrides[std::make_pair( aBase, aName )] = std::move( aFunc );
@@ -220,16 +213,14 @@ void PROPERTY_MANAGER::OverrideWriteability( TYPE_ID aDerived, TYPE_ID aBase,
 }
 
 
-bool PROPERTY_MANAGER::IsAvailableFor( TYPE_ID aItemClass, PROPERTY_BASE* aProp,
-                                       INSPECTABLE* aItem )
+bool PROPERTY_MANAGER::IsAvailableFor( TYPE_ID aItemClass, PROPERTY_BASE* aProp, INSPECTABLE* aItem )
 {
     if( !aProp->Available( aItem ) )
         return false;
 
     CLASS_DESC& derived = getClass( aItemClass );
 
-    auto it = derived.m_availabilityOverrides.find( std::make_pair( aProp->BaseHash(),
-                                                                    aProp->Name() ) );
+    auto it = derived.m_availabilityOverrides.find( std::make_pair( aProp->BaseHash(), aProp->Name() ) );
 
     if( it != derived.m_availabilityOverrides.end() )
         return it->second( aItem );
@@ -238,16 +229,14 @@ bool PROPERTY_MANAGER::IsAvailableFor( TYPE_ID aItemClass, PROPERTY_BASE* aProp,
 }
 
 
-bool PROPERTY_MANAGER::IsWriteableFor( TYPE_ID aItemClass, PROPERTY_BASE* aProp,
-                                       INSPECTABLE* aItem )
+bool PROPERTY_MANAGER::IsWriteableFor( TYPE_ID aItemClass, PROPERTY_BASE* aProp, INSPECTABLE* aItem )
 {
     if( !aProp->Writeable( aItem ) )
         return false;
 
     CLASS_DESC& derived = getClass( aItemClass );
 
-    auto it = derived.m_writeabilityOverrides.find( std::make_pair( aProp->BaseHash(),
-                                                                    aProp->Name() ) );
+    auto it = derived.m_writeabilityOverrides.find( std::make_pair( aProp->BaseHash(), aProp->Name() ) );
 
     if( it != derived.m_writeabilityOverrides.end() )
         return it->second( aItem );
@@ -265,7 +254,7 @@ bool PROPERTY_MANAGER::IsOfType( TYPE_ID aDerived, TYPE_ID aBase ) const
     wxCHECK( derived != m_classes.end(), false );   // missing class description
 
     // traverse the hierarchy seeking for the base class
-    for( auto& base : derived->second.m_bases )
+    for( const std::reference_wrapper<CLASS_DESC>& base : derived->second.m_bases )
     {
         if( IsOfType( base.get().m_id, aBase ) )
             return true;
@@ -297,8 +286,8 @@ PROPERTY_MANAGER::CLASS_DESC& PROPERTY_MANAGER::getClass( TYPE_ID aTypeId )
 
 void PROPERTY_MANAGER::CLASS_DESC::rebuild()
 {
-    PROPERTY_SET replaced;
-    PROPERTY_SET masked;
+    std::set<std::pair<size_t, wxString>> replaced;
+    std::set<std::pair<size_t, wxString>> masked;
     m_allProperties.clear();
     collectPropsRecur( m_allProperties, replaced, m_displayOrder, masked );
 
@@ -338,10 +327,10 @@ void PROPERTY_MANAGER::CLASS_DESC::rebuild()
 }
 
 
-void PROPERTY_MANAGER::CLASS_DESC::collectPropsRecur( PROPERTY_LIST& aResult,
-                                                      PROPERTY_SET& aReplaced,
-                                                      PROPERTY_DISPLAY_ORDER& aDisplayOrder,
-                                                      PROPERTY_SET& aMasked ) const
+void PROPERTY_MANAGER::CLASS_DESC::collectPropsRecur( std::vector<PROPERTY_BASE*>& aResult,
+                                                      std::set<std::pair<size_t, wxString>>& aReplaced,
+                                                      std::map<PROPERTY_BASE*, int>& aDisplayOrder,
+                                                      std::set<std::pair<size_t, wxString>>& aMasked ) const
 {
     for( const std::pair<size_t, wxString>& replacedEntry : m_replaced )
         aReplaced.emplace( replacedEntry );
@@ -371,8 +360,8 @@ void PROPERTY_MANAGER::CLASS_DESC::collectPropsRecur( PROPERTY_LIST& aResult,
 
     for( PROPERTY_BASE* property : m_ownDisplayOrder )
     {
-        PROPERTY_SET::key_type propertyKey = std::make_pair( property->OwnerHash(),
-                                                             property->Name() );
+        std::set<std::pair<size_t, wxString>>::key_type propertyKey = std::make_pair( property->OwnerHash(),
+                                                                                      property->Name() );
         // Do not store replaced properties
         if( aReplaced.count( propertyKey ) )
             continue;
@@ -386,28 +375,8 @@ void PROPERTY_MANAGER::CLASS_DESC::collectPropsRecur( PROPERTY_LIST& aResult,
     }
 
     // Iterate backwards so that replaced properties appear before base properties
-    for( auto it = m_bases.rbegin(); it != m_bases.rend(); ++it )
-        it->get().collectPropsRecur( aResult, aReplaced, aDisplayOrder, aMasked );
-}
-
-
-std::vector<TYPE_ID> PROPERTY_MANAGER::GetMatchingClasses( PROPERTY_BASE* aProperty )
-{
-    std::vector<TYPE_ID> ids;
-
-/*
-    for( auto& cls : m_classes )
-    {
-        CLASS_INFO info;
-
-        for( auto prop : cls.second.m_allProperties )
-            info.properties.push_back(prop);
-
-
-    }
- */
-
-    return ids;
+    for( std::reference_wrapper<CLASS_DESC> base : std::ranges::reverse_view( m_bases ) )
+        base.get().collectPropsRecur( aResult, aReplaced, aDisplayOrder, aMasked );
 }
 
 
@@ -458,7 +427,7 @@ void PROPERTY_MANAGER::PropertyChanged( INSPECTABLE* aObject, PROPERTY_BASE* aPr
 PROPERTY_COMMIT_HANDLER::PROPERTY_COMMIT_HANDLER( COMMIT* aCommit )
 {
     wxCHECK2_MSG( PROPERTY_MANAGER::Instance().m_managedCommit == nullptr,
-                  return, "Can't have more than one managed commit at a time!" );
+                  return, wxT( "Can't have more than one managed commit at a time!" ) );
 
     PROPERTY_MANAGER::Instance().m_managedCommit = aCommit;
 }
@@ -467,7 +436,7 @@ PROPERTY_COMMIT_HANDLER::PROPERTY_COMMIT_HANDLER( COMMIT* aCommit )
 PROPERTY_COMMIT_HANDLER::~PROPERTY_COMMIT_HANDLER()
 {
     wxASSERT_MSG( PROPERTY_MANAGER::Instance().m_managedCommit != nullptr,
-                  "Something went wrong: m_managedCommit already null!" );
+                  wxT( "Something went wrong: m_managedCommit already null!" ) );
 
     PROPERTY_MANAGER::Instance().m_managedCommit = nullptr;
 }

common/rc_item.cpp

@@ -174,6 +174,9 @@ void RC_ITEM::GetJsonViolation( RC_JSON::VIOLATION& aViolation, UNITS_PROVIDER*
     aViolation.type = GetSettingsKey();
     aViolation.excluded = ( m_parent && m_parent->IsExcluded() );
 
+    if( m_parent && m_parent->IsExcluded() && !m_parent->GetComment().IsEmpty() )
+        aViolation.comment = m_parent->GetComment();
+
     EDA_ITEM* mainItem = nullptr;
     EDA_ITEM* auxItem = nullptr;
 

common/reporter.cpp

@@ -65,12 +65,6 @@ REPORTER& WX_TEXT_CTRL_REPORTER::Report( const wxString& aText, SEVERITY aSeveri
 }
 
 
-bool WX_TEXT_CTRL_REPORTER::HasMessage() const
-{
-    return !m_textCtrl->IsEmpty();
-}
-
-
 REPORTER& WX_STRING_REPORTER::Report( const wxString& aText, SEVERITY aSeverity )
 {
     REPORTER::Report( aText, aSeverity );
@@ -93,12 +87,6 @@ void WX_STRING_REPORTER::Clear()
 }
 
 
-bool WX_STRING_REPORTER::HasMessage() const
-{
-    return !m_string.IsEmpty();
-}
-
-
 REPORTER& NULL_REPORTER::Report( const wxString& aText, SEVERITY aSeverity )
 {
     return REPORTER::Report( aText, aSeverity );
@@ -211,6 +199,17 @@ REPORTER& WXLOG_REPORTER::GetInstance()
 }
 
 
+REPORTER& REDIRECT_REPORTER::Report( const wxString& aText, SEVERITY aSeverity )
+{
+    REPORTER::Report( aText, aSeverity );
+
+    if( m_redirectTarget )
+        m_redirectTarget->Report( aText, aSeverity );
+
+    return *this;
+}
+
+
 REPORTER& STATUSBAR_REPORTER::Report( const wxString& aText, SEVERITY aSeverity )
 {
     REPORTER::Report( aText, aSeverity );
@@ -220,12 +219,3 @@ REPORTER& STATUSBAR_REPORTER::Report( const wxString& aText, SEVERITY aSeverity
 
     return *this;
 }
-
-
-bool STATUSBAR_REPORTER::HasMessage() const
-{
-    if( m_statusBar )
-        return !m_statusBar->GetStatusText( m_position ).IsEmpty();
-
-    return false;
-}

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();
+                } );
     }
 }