Tag release version 6.0.7.

The json schema for packages implies that kicad min/max version
restriction takes major.minor.patch string but actual logic
only checks major and minor.

This fixes the logic to work with full major.minor.patch tuple.
Additionally the version max logic will substitute missing portions
with 999 for a reasonable default so that say 7.1 is still considered
as >= 7.1.5 when checking for max version.

Reported here
https://forum.kicad.info/t/updating-already-installed-plugins-using-content-manager/35532/5?u=qu1ck

(cherry picked from commit 06028d5015)

.gitlab-ci.yml

@@ -40,6 +40,6 @@ include:
   - local: '/.gitlab/templates.yml'
   - local: '/.gitlab/Fedora-Linux-CI.yml'
   - local: '/.gitlab/Ubuntu-20.04-CI.yml'
-  - local: '/.gitlab/Windows-CI.yml'
+ # - local: '/.gitlab/Windows-CI.yml'
   - local: '/.gitlab/coverity.yml'
   - local: '/.gitlab/linux-metadata-validate.yml'

.gitlab/Fedora-Linux-CI.yml

@@ -1,10 +1,11 @@
 ##########################################################################
 # Build KiCad on Fedora and save the results
 ##########################################################################
-fedora_build_linux:
+.fedora_build_linux_base:
   stage: build
-  tags:
-    - kicad-fedora
+# Don't tag until we have separate CI for MRs
+#  tags:
+#    - kicad-fedora
   image: registry.gitlab.com/kicad/kicad-ci/source_containers/master/fedora:34
   extends: .only_code
   interruptible: false
@@ -22,7 +23,7 @@ fedora_build_linux:
     - cd build/linux
     - cmake
       -G Ninja
-      -DCMAKE_BUILD_TYPE=Debug
+      -DCMAKE_BUILD_TYPE=RelWithDebInfo
       -DKICAD_STDLIB_LIGHT_DEBUG=ON
       -DKICAD_USE_OCC=ON
       -DKICAD_SPICE=ON
@@ -42,15 +43,31 @@ fedora_build_linux:
       - build/linux/pcbnew/_pcbnew.so
       - build/linux/qa/
       - build/linux/compilation_log.txt
+    exclude:
+      - build/linux/**/*.o
+      - build/linux/**/*.a
+
+# This split is to ensure we can always use our runner for our jobs
+fedora_build_linux_kicad:
+  extends: .fedora_build_linux_base
+  tags:
+    - kicad-fedora
+  only:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+
+fedora_build_linux_public:
+  extends: .fedora_build_linux_base
+  except:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+  
 
 # Upload the compilation log in an easily downloadable form
-fedora_report_build_warn:
+.fedora_report_build_warn:
   stage: report
   extends: .only_code
   when: always
-  needs:
-    - job: fedora_build_linux
-      artifacts: true
   script:
     - echo "Uploading compilation log"
     - cp build/linux/compilation_log.txt compilation_log.txt
@@ -61,14 +78,32 @@ fedora_report_build_warn:
     paths:
       - compilation_log.txt
 
+fedora_report_build_warn_kicad:
+  extends: .fedora_report_build_warn
+  tags:
+    - kicad-fedora
+  needs:
+    - job: fedora_build_linux_kicad
+      artifacts: true
+  only:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+
+fedora_report_build_warn_public:
+  extends: .fedora_report_build_warn
+  needs:
+    - job: fedora_build_linux_public
+      artifacts: true
+  except:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+  
+
 # Report on the metrics of the code
-fedora_report_metrics:
+.fedora_report_metrics:
   stage: report
   extends: .only_code
   when: always
-  needs:
-    - job: fedora_build_linux
-      artifacts: true
   script:
     - cat build/linux/compilation_log.txt | { grep "warning:" || test $? = 1; } | awk 'END{print "number_of_fedora_warnings "NR}' > metrics.txt
     - cat metrics.txt
@@ -76,11 +111,30 @@ fedora_report_metrics:
     reports:
       metrics: metrics.txt
 
+fedora_report_metrics_kicad:
+  extends: .fedora_report_metrics
+  tags:
+    - kicad-fedora
+  needs:
+    - job: fedora_build_linux_kicad
+      artifacts: true
+  only:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+
+fedora_report_metrics_public:
+  extends: .fedora_report_metrics
+  needs:
+    - job: fedora_build_linux_public
+      artifacts: true
+  except:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
 
 ##########################################################################
 # Run the code unit tests.
 ##########################################################################
-fedora_qa:
+.fedora_qa:
   extends:
     - .unit_test
     - .only_code
@@ -88,6 +142,23 @@ fedora_qa:
     matrix:
       # The name of the test without the qa_ prefix
       - TEST: [python, common, gerbview, pcbnew, eeschema, kimath, sexpr, kicad2step]
+
+fedora_qa_kicad:
+  extends: .fedora_qa
+  tags:
+    - kicad-fedora
   needs:
-    - job: fedora_build_linux
+    - job: fedora_build_linux_kicad
       artifacts: true
+  only:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"
+
+fedora_qa_public:
+  extends: .fedora_qa
+  needs:
+    - job: fedora_build_linux_public
+      artifacts: true
+  except:    
+    variables:
+      - $CI_PROJECT_ROOT_NAMESPACE == "kicad"

3d-viewer/3d_cache/3d_cache.cpp

@@ -194,12 +194,13 @@ S3D_CACHE::S3D_CACHE()
 
 S3D_CACHE::~S3D_CACHE()
 {
-    COMMON_SETTINGS* commonSettings = Pgm().GetCommonSettings();
-
     FlushCache();
 
     // We'll delete ".3dc" cache files older than this many days
-    int clearCacheInterval = commonSettings->m_System.clear_3d_cache_interval;
+    int clearCacheInterval = 0;
+
+    if( Pgm().GetCommonSettings() )
+        clearCacheInterval = Pgm().GetCommonSettings()->m_System.clear_3d_cache_interval;
 
     // An interval of zero means the user doesn't want to ever clear the cache
 

3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp

@@ -493,15 +493,10 @@ void BOARD_ADAPTER::addPadsWithClearance( const FOOTPRINT* aFootprint,
 {
     for( PAD* pad : aFootprint->Pads() )
     {
-        if( !pad->IsOnLayer( aLayerId ) )
+        if( !pad->FlashLayer( aLayerId ) )
             continue;
 
-        // Skip pad annulus when not connected on this layer (if removing is enabled)
-        if( !pad->FlashLayer( aLayerId ) && IsCopperLayer( aLayerId ) )
-            continue;
-
-        // NPTH pads are not drawn on layers if the
-        // shape size and pos is the same as their hole:
+        // NPTH pads are not drawn on layers if the shape size and pos is the same as their hole:
         if( aSkipNPTHPadsWihNoCopper && ( pad->GetAttribute() == PAD_ATTRIB::NPTH ) )
         {
             if( pad->GetDrillSize() == pad->GetSize() && pad->GetOffset() == wxPoint( 0, 0 ) )
@@ -526,19 +521,28 @@ void BOARD_ADAPTER::addPadsWithClearance( const FOOTPRINT* aFootprint,
             }
         }
 
-        const bool isPlated = ( ( aLayerId == F_Cu ) && pad->FlashLayer( F_Mask ) ) ||
-                              ( ( aLayerId == B_Cu ) && pad->FlashLayer( B_Mask ) );
-
-        if( aSkipPlatedPads && isPlated )
-            continue;
-
-        if( aSkipNonPlatedPads && !isPlated )
-            continue;
-
         wxSize margin( aInflateValue, aInflateValue );
 
         switch( aLayerId )
         {
+        case F_Cu:
+            if( aSkipPlatedPads && pad->FlashLayer( F_Mask ) )
+                continue;
+
+            if( aSkipNonPlatedPads && !pad->FlashLayer( F_Mask ) )
+                continue;
+
+            break;
+
+        case B_Cu:
+            if( aSkipPlatedPads && pad->FlashLayer( B_Mask ) )
+                continue;
+
+            if( aSkipNonPlatedPads && !pad->FlashLayer( B_Mask ) )
+                continue;
+
+            break;
+
         case F_Mask:
         case B_Mask:
             margin.x += pad->GetSolderMaskMargin();

3d-viewer/3d_canvas/create_layer_items.cpp

@@ -549,7 +549,6 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
         for( FOOTPRINT* footprint : m_board->Footprints() )
         {
             addPadsWithClearance( footprint, m_platedPadsFront, F_Cu, 0, true, false, true );
-
             addPadsWithClearance( footprint, m_platedPadsBack, B_Cu, 0, true, false, true );
         }
 
@@ -569,8 +568,8 @@ void BOARD_ADAPTER::createLayers( REPORTER* aStatusReporter )
             // Add pads to polygon list
             for( FOOTPRINT* footprint : m_board->Footprints() )
             {
-                // Note: NPTH pads are not drawn on copper layers when the pad
-                // has same shape as its hole
+                // Note: NPTH pads are not drawn on copper layers when the pad has same shape as
+                // its hole
                 footprint->TransformPadsWithClearanceToPolygon( *layerPoly, curr_layer_id,
                                                                 0, ARC_HIGH_DEF, ERROR_INSIDE,
                                                                 true, renderPlatedPadsAsPlated,

3d-viewer/3d_rendering/opengl/create_scene.cpp

@@ -374,6 +374,22 @@ OPENGL_RENDER_LIST* RENDER_3D_OPENGL::generateLayerList( const BVH_CONTAINER_2D*
 }
 
 
+OPENGL_RENDER_LIST* RENDER_3D_OPENGL::generateEmptyLayerList( PCB_LAYER_ID aLayerId )
+{
+    float layer_z_bot = 0.0f;
+    float layer_z_top = 0.0f;
+
+    getLayerZPos( aLayerId, layer_z_top, layer_z_bot );
+
+    TRIANGLE_DISPLAY_LIST* layerTriangles = new TRIANGLE_DISPLAY_LIST( 1 );
+
+    // store in a list so it will be latter deleted
+    m_triangles.push_back( layerTriangles );
+
+    return new OPENGL_RENDER_LIST( *layerTriangles, m_circleTexture, layer_z_bot, layer_z_top );
+}
+
+
 OPENGL_RENDER_LIST* RENDER_3D_OPENGL::createBoard( const SHAPE_POLY_SET& aBoardPoly,
                                                    const BVH_CONTAINER_2D* aThroughHoles )
 {
@@ -388,9 +404,8 @@ OPENGL_RENDER_LIST* RENDER_3D_OPENGL::createBoard( const SHAPE_POLY_SET& aBoardP
 
     if( listBoardObject2d.size() > 0 )
     {
-        // We will set a unitary Z so it will in future used with transformations
-        // since the board poly will be used not only to draw itself but also the
-        // solder mask layers.
+        // We will set a unitary Z so it will in future used with transformations since the
+        // board poly will be used not only to draw itself but also the solder mask layers.
         const float layer_z_top = 1.0f;
         const float layer_z_bot = 0.0f;
 
@@ -563,7 +578,7 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
         const BVH_CONTAINER_2D* container2d = ii.second;
 
         SHAPE_POLY_SET polyListSubtracted;
-        SHAPE_POLY_SET* aPolyList = nullptr;
+        SHAPE_POLY_SET* polyList = nullptr;
 
         // Load the vertical (Z axis) component of shapes
 
@@ -580,9 +595,8 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
                 {
                     polyListSubtracted.BooleanSubtract( m_boardAdapter.GetThroughHoleOdPolys(),
                                                         SHAPE_POLY_SET::PM_FAST );
-                    polyListSubtracted.BooleanSubtract(
-                            m_boardAdapter.GetOuterNonPlatedThroughHolePoly(),
-                            SHAPE_POLY_SET::PM_FAST );
+                    polyListSubtracted.BooleanSubtract( m_boardAdapter.GetOuterNonPlatedThroughHolePoly(),
+                                                        SHAPE_POLY_SET::PM_FAST );
                 }
 
                 if( m_boardAdapter.GetFlag( FL_SUBTRACT_MASK_FROM_SILK ) )
@@ -600,10 +614,10 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
                 }
             }
 
-            aPolyList = &polyListSubtracted;
+            polyList = &polyListSubtracted;
         }
 
-        OPENGL_RENDER_LIST* oglList = generateLayerList( container2d, aPolyList, layer_id,
+        OPENGL_RENDER_LIST* oglList = generateLayerList( container2d, polyList, layer_id,
                                                          &m_boardAdapter.GetThroughHoleIds() );
 
         if( oglList != nullptr )
@@ -626,6 +640,10 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
 
             m_platedPadsFront = generateLayerList( m_boardAdapter.GetPlatedPadsFront(),
                                                    &polySubtracted, F_Cu );
+
+            // An entry for F_Cu must exist in m_layers or we'll never look at m_platedPadsFront
+            if( m_layers.count( F_Cu ) == 0 )
+                m_layers[F_Cu] = generateEmptyLayerList( F_Cu );
         }
 
         if( m_boardAdapter.GetBackPlatedPadPolys() )
@@ -640,6 +658,10 @@ void RENDER_3D_OPENGL::reload( REPORTER* aStatusReporter, REPORTER* aWarningRepo
 
             m_platedPadsBack = generateLayerList( m_boardAdapter.GetPlatedPadsBack(),
                                                   &polySubtracted, B_Cu );
+
+            // An entry for B_Cu must exist in m_layers or we'll never look at m_platedPadsBack
+            if( m_layers.count( B_Cu ) == 0 )
+                m_layers[B_Cu] = generateEmptyLayerList( B_Cu );
         }
     }
 

3d-viewer/3d_rendering/opengl/layer_triangles.cpp

@@ -650,6 +650,7 @@ GLuint OPENGL_RENDER_LIST::generate_top_or_bot_seg_ends(
 
             glDrawArrays( GL_TRIANGLES, 0, aTriangleContainer->GetVertexSize() );
 
+            glBindTexture( GL_TEXTURE_2D, 0 );
             glDisable( GL_TEXTURE_2D );
             glDisable( GL_ALPHA_TEST );
             glDisable( GL_BLEND );

3d-viewer/3d_rendering/opengl/render_3d_opengl.cpp

@@ -504,7 +504,7 @@ void RENDER_3D_OPENGL::setCopperMaterial()
 void RENDER_3D_OPENGL::setPlatedCopperAndDepthOffset( PCB_LAYER_ID aLayer_id )
 {
     glEnable( GL_POLYGON_OFFSET_FILL );
-    glPolygonOffset(-0.1f, -2.0f );
+    glPolygonOffset( -0.1f, -2.0f );
     setLayerMaterial( aLayer_id );
 }
 
@@ -704,18 +704,16 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
             {
                 pLayerDispList->DrawAllCameraCulled( m_camera.GetPos().z, drawMiddleSegments );
 
-                // Draw copper plated pads
-                if( ( ( layer_id == F_Cu ) || ( layer_id == B_Cu ) ) &&
-                    ( m_platedPadsFront || m_platedPadsBack ) )
-                    setPlatedCopperAndDepthOffset( layer_id );
-
+                // Draw plated pads
                 if( layer_id == F_Cu && m_platedPadsFront )
                 {
+                    setPlatedCopperAndDepthOffset( layer_id );
                     m_platedPadsFront->DrawAllCameraCulled( m_camera.GetPos().z,
                                                             drawMiddleSegments );
                 }
                 else if( layer_id == B_Cu && m_platedPadsBack )
                 {
+                    setPlatedCopperAndDepthOffset( layer_id );
                     m_platedPadsBack->DrawAllCameraCulled( m_camera.GetPos().z,
                                                            drawMiddleSegments );
                 }
@@ -751,16 +749,10 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                                                           viasHolesLayer,
                                                                           m_antiBoard );
 
-                        // Draw copper plated pads
-
-                        if( ( ( layer_id == F_Cu ) || ( layer_id == B_Cu ) ) &&
-                            ( m_platedPadsFront || m_platedPadsBack ) )
-                        {
-                            setPlatedCopperAndDepthOffset( layer_id );
-                        }
-
+                        // Draw plated pads
                         if( layer_id == F_Cu && m_platedPadsFront )
                         {
+                            setPlatedCopperAndDepthOffset( layer_id );
                             m_platedPadsFront->DrawAllCameraCulledSubtractLayer(
                                     drawMiddleSegments,
                                     m_outerThroughHoles,
@@ -769,6 +761,7 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                         }
                         else if( layer_id == B_Cu && m_platedPadsBack )
                         {
+                            setPlatedCopperAndDepthOffset( layer_id );
                             m_platedPadsBack->DrawAllCameraCulledSubtractLayer(
                                     drawMiddleSegments,
                                     m_outerThroughHoles,
@@ -785,21 +778,16 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
                                                                       m_outerThroughHoles,
                                                                       m_antiBoard );
 
-                    // Draw copper plated pads
-                    if( ( ( layer_id == F_Cu ) || ( layer_id == B_Cu ) ) &&
-                        ( m_platedPadsFront || m_platedPadsBack ) )
-                    {
-                        setPlatedCopperAndDepthOffset( layer_id );
-                    }
-
                     if( layer_id == F_Cu && m_platedPadsFront )
                     {
+                        setPlatedCopperAndDepthOffset( layer_id );
                         m_platedPadsFront->DrawAllCameraCulledSubtractLayer( drawMiddleSegments,
                                                                              m_outerThroughHoles,
                                                                              m_antiBoard );
                     }
                     else if( layer_id == B_Cu && m_platedPadsBack )
                     {
+                        setPlatedCopperAndDepthOffset( layer_id );
                         m_platedPadsBack->DrawAllCameraCulledSubtractLayer( drawMiddleSegments,
                                                                             m_outerThroughHoles,
                                                                             m_antiBoard );
@@ -938,7 +926,7 @@ bool RENDER_3D_OPENGL::Redraw( bool aIsMoving, REPORTER* aStatusReporter,
     glTexEnvi( GL_TEXTURE_ENV, GL_SRC0_ALPHA, GL_PRIMARY_COLOR );
     glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA );
     glTexEnvi( GL_TEXTURE_ENV, GL_SRC1_ALPHA, GL_CONSTANT );
-    glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_CONSTANT );
+    glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA );
 
     render3dModels( false, true );
     render3dModels( true, true );

3d-viewer/3d_rendering/opengl/render_3d_opengl.h

@@ -84,6 +84,8 @@ private:
                                            PCB_LAYER_ID aLayerId,
                                            const BVH_CONTAINER_2D* aThroughHoles = nullptr );
 
+    OPENGL_RENDER_LIST* generateEmptyLayerList( PCB_LAYER_ID aLayerId );
+
     void addTopAndBottomTriangles( TRIANGLE_DISPLAY_LIST* aDst, const SFVEC2F& v0,
                                    const SFVEC2F& v1, const SFVEC2F& v2, float top, float bot );
 

3d-viewer/3d_viewer/tools/eda_3d_controller.cpp

@@ -29,6 +29,7 @@
 #include <kiface_base.h>
 #include <tools/eda_3d_controller.h>
 #include "eda_3d_actions.h"
+#include "dialogs/panel_preview_3d_model.h"
 #include <3d_rendering/opengl/render_3d_opengl.h>
 
 
@@ -113,10 +114,36 @@ int EDA_3D_CONTROLLER::Main( const TOOL_EVENT& aEvent )
     // Main loop: keep receiving events
     while( TOOL_EVENT* evt = Wait() )
     {
-        if( evt->IsClick( BUT_RIGHT ) )
+        if( evt->IsCancelInteractive() )
+        {
+            wxWindow* canvas = m_toolMgr->GetToolHolder()->GetToolCanvas();
+            wxWindow* topLevelParent = canvas->GetParent();
+
+            while( topLevelParent && !topLevelParent->IsTopLevel() )
+                topLevelParent = topLevelParent->GetParent();
+
+            if( topLevelParent && dynamic_cast<DIALOG_SHIM*>( topLevelParent ) )
+            {
+                DIALOG_SHIM* dialog = static_cast<DIALOG_SHIM*>( topLevelParent );
+
+                if( dialog->IsQuasiModal() )
+                    dialog->EndQuasiModal( wxID_CANCEL );
+                else
+                    dialog->EndModal( wxID_CANCEL );
+            }
+            else
+            {
+                evt->SetPassEvent();
+            }
+        }
+        else if( evt->IsClick( BUT_RIGHT ) )
+        {
             m_menu.ShowContextMenu();
+        }
         else
+        {
             evt->SetPassEvent();
+        }
     }
 
     return 0;

3d-viewer/dialogs/panel_preview_3d_model.cpp

@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Mario Luzeiro <mrluzeiro@ua.pt>
  * Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2015-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2015-2022 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
@@ -124,8 +124,10 @@ PANEL_PREVIEW_3D_MODEL::PANEL_PREVIEW_3D_MODEL( wxWindow* aParent, PCB_BASE_FRAM
     m_SizerPanelView->Add( m_previewPane, 1, wxEXPAND, 5 );
 
     for( wxEventType eventType : { wxEVT_MENU_OPEN, wxEVT_MENU_CLOSE, wxEVT_MENU_HIGHLIGHT } )
+    {
         Connect( eventType, wxMenuEventHandler( PANEL_PREVIEW_3D_MODEL::OnMenuEvent ), nullptr,
                  this );
+    }
 
 #ifdef __WXOSX__
     // Call layout once to get the proper button sizes after the bitmaps have been set

CMakeLists.txt

@@ -156,6 +156,11 @@ option( KICAD_STEP_EXPORT_LIB
     "Build and use kicad2step as a library, meant for debugging"
     OFF )
 
+cmake_dependent_option( KICAD_WIN32_VERIFY_CODESIGN
+    "When enabled, verifies the code signing signature of certain DLLs loaded during runtime."
+    OFF "WIN32"
+    OFF )
+
 # Global setting: exports are explicit
 set( CMAKE_CXX_VISIBILITY_PRESET "hidden" )
 set( CMAKE_VISIBILITY_INLINES_HIDDEN ON )
@@ -177,6 +182,10 @@ if( KICAD_GAL_PROFILE )
     add_definitions( -DKICAD_GAL_PROFILE )
 endif()
 
+if( KICAD_WIN32_VERIFY_CODESIGN )
+    add_definitions( -DKICAD_WIN32_VERIFY_CODESIGN )
+endif()
+
 # Ensure DEBUG is defined for all platforms in Debug builds
 # change to add_compile_definitions() after minimum required CMake version is 3.12
 set_property( DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:DEBUG> )
@@ -490,9 +499,10 @@ endif()
 # KIFACE_SUFFIX is the file extension used for top level program modules which
 # implement the KIFACE interface.  A valid suffix starts with a period '.'.
 
-if( false )
-    # This is the eventual situation near milestone C) of modular-kicad blueprint.
-    # Until then we use .kiface extension so we don't collide with python DSO.
+if( WIN32 )
+    # We use .kiface extension so we don't collide with python DSO. (Linux/mac issue?)
+    # Windows works fine with the native dll extension
+    # which also resolves metadata issues because windows wants to see the dll extension
     set( KIFACE_SUFFIX  ${CMAKE_SHARED_MODULE_SUFFIX} )
 else()
     # Temporary situation until we can dovetail the python DSO into the kiface DSO.
@@ -769,12 +779,6 @@ set( INC_AFTER
 find_package( SWIG 3.0 REQUIRED )
 include( ${SWIG_USE_FILE} )
 
-# pybind11 is header-only, so include the subdir
-add_subdirectory(thirdparty/pybind11)
-
-# Make sure that we get our pybind11 and not the system pybind11 (ours is patched to work with wx)
-include_directories( BEFORE SYSTEM ${PYBIND11_INCLUDE_DIR} )
-
 set( PythonInterp_FIND_VERSION 3.6 )
 set( PythonLibs_FIND_VERSION 3.6 )
 
@@ -816,6 +820,12 @@ message( STATUS "Python module install path: ${PYTHON_DEST}" )
 
 find_package( PythonLibs 3.6 REQUIRED )
 
+# pybind11 is header-only, so include the subdir
+add_subdirectory(thirdparty/pybind11)
+
+# Make sure that we get our pybind11 and not the system pybind11 (ours is patched to work with wx)
+include_directories( BEFORE SYSTEM ${PYBIND11_INCLUDE_DIR} )
+
 # Infrequently needed headers go at end of search paths, append to INC_AFTER which
 # although is used for all components, should be a harmless hit for something like eeschema
 # so long as unused search paths are at the end like this.
@@ -838,9 +848,11 @@ if( UNIX AND NOT APPLE AND KICAD_SCRIPTING_WXPYTHON )
     endif()
 endif()
 
-message( STATUS "Found ${WXPYTHON_FLAVOR} "
-    "${WXPYTHON_VERSION}/${WXPYTHON_TOOLKIT} "
-    "(wxWidgets ${WXPYTHON_WXVERSION})" )
+if( WXPYTHON_FLAVOR )
+    message( STATUS "Found wxPython ${WXPYTHON_FLAVOR} "
+        "${WXPYTHON_VERSION}/${WXPYTHON_TOOLKIT} "
+        "(wxWidgets ${WXPYTHON_WXVERSION})" )
+endif()
 
 #
 # Find wxWidgets library, required
@@ -1000,7 +1012,10 @@ add_subdirectory( cvpcb )               # must be after pcbnew
 add_subdirectory( kicad )               # should follow pcbnew, eeschema
 add_subdirectory( tools )
 add_subdirectory( utils )
-add_subdirectory( qa )
+
+if( KICAD_BUILD_QA_TESTS )
+    add_subdirectory( qa )
+endif()
 
 # Demos
 if( KICAD_INSTALL_DEMOS )

CMakeModules/BuildSteps/WriteVersionHeader.cmake

@@ -36,9 +36,9 @@ string( REGEX MATCH
 if( CMAKE_MATCH_COUNT EQUAL 3 )
     # Match slot 0 is the full string, so we want slots 1 & 2
     set( KICAD_MAJOR_MINOR_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" )
-    set( KICAD_MAJOR_MINOR_VERSION_TUPLE "{ ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2} }" )
 
     set( KICAD_MAJOR_MINOR_PATCH_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" )
+    set( KICAD_MAJOR_MINOR_PATCH_TUPLE "{ ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}, ${CMAKE_MATCH_3} }" )
 
     set( KICAD_MAJOR_VERSION "${CMAKE_MATCH_1}" )
     set( KICAD_MINOR_VERSION "${CMAKE_MATCH_2}" )
@@ -46,7 +46,7 @@ if( CMAKE_MATCH_COUNT EQUAL 3 )
 
     set( KICAD_WIN32_RC_FILEVER_STR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${KICAD_GIT_REV}\\0" )
     set( KICAD_WIN32_RC_FILEVER     "${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}, ${CMAKE_MATCH_3}, ${KICAD_GIT_REV}" )
-    set( KICAD_WIN32_RC_PRODVER_STR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}\\0" )
+    set( KICAD_WIN32_RC_PRODVER_STR "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}\\0" )
     set( KICAD_WIN32_RC_PRODVER     "${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}, ${CMAKE_MATCH_3}, ${KICAD_GIT_REV}" )
 else()
     message( FATAL_ERROR "Unable to extract major, minor and patch version string" )
@@ -67,7 +67,7 @@ set( _wvh_new_version_text
 #define KICAD_MINOR_VERSION             \"${KICAD_MINOR_VERSION}\"
 #define KICAD_PATCH_VERSION             \"${KICAD_PATCH_VERSION}\"
 #define KICAD_MAJOR_MINOR_VERSION       \"${KICAD_MAJOR_MINOR_VERSION}\"
-#define KICAD_MAJOR_MINOR_VERSION_TUPLE ${KICAD_MAJOR_MINOR_VERSION_TUPLE}
+#define KICAD_MAJOR_MINOR_PATCH_TUPLE   ${KICAD_MAJOR_MINOR_PATCH_TUPLE}
 #define KICAD_WIN32_RC_PRODVER          ${KICAD_WIN32_RC_PRODVER}
 #define KICAD_WIN32_RC_PRODVER_STR      \"${KICAD_WIN32_RC_PRODVER_STR}\"
 #define KICAD_WIN32_RC_FILEVER          ${KICAD_WIN32_RC_FILEVER}

CMakeModules/FindPythonInterp.cmake

@@ -75,11 +75,15 @@ if( ${PYTHON_ROOT_DIR} )
     find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}
         PATHS ${PYTHON_ROOT_DIR}
         NO_DEFAULT_PATH )
+elseif(VCPKG_TOOLCHAIN)
+    # Our VCPKG usage will always place it in a known location
+    find_program(PYTHON_EXECUTABLE
+        NAMES ${_Python_NAMES}
+        PATHS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3"
+    )
 else()
-    if(NOT VCPKG_TOOLCHAIN)
-        # If there is no specific path given, look for python in the path
-        find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
-    endif()
+    # If there is no specific path given, look for python in the path
+    find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
 endif()
 
 # Set up the versions we know about, in the order we will search. Always add
@@ -112,8 +116,6 @@ if(NOT PYTHON_EXECUTABLE)
         list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.2" )
         list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.1" )
         list( APPEND _Python_PPATHS "C:/python/${_CURRENT_VERSION}.0" )
-    elseif(VCPKG_TOOLCHAIN)
-        list( APPEND _Python_PPATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools/python3" )
     else()
         list( APPEND _Python_PPATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] )
     endif()

CMakeModules/FindwxPython.cmake

@@ -40,7 +40,7 @@ if( VCPKG_TOOLCHAIN )
 # python 3.8+ requires us to use python to add additional load directories (PATH no longer supported)
 # vcpkg does not copy all the dlls into the python folder so we need this for development
 # as the wxpython modules need the wxwidgets library DLLs to load
-    set( _py_dll "import os;os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" )
+    set( _py_dll "import os;os.add_dll_directory(\"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" )
 else()
     set( _py_dll "" )
 endif()

CMakeModules/FindwxWidgets.cmake

@@ -231,11 +231,7 @@ endif()
 #=====================================================================
 if(wxWidgets_FIND_STYLE STREQUAL "win32")
   # Useful common wx libs needed by almost all components.
-  if(VCPKG_TOOLCHAIN)
-    set(wxWidgets_COMMON_LIBRARIES libpng16 tiff jpeg zlib libexpat)
-  else()
-    set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
-  endif()
+  set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
 
   # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
   if(NOT wxWidgets_FIND_COMPONENTS)
@@ -258,22 +254,24 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   #-------------------------------------------------------------------
   #
   # Get filename components for a configuration. For example,
-  #   if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
-  #   if _CONFIGURATION = mswu,      then _UNV="",   _UCD=u _DBG=""
+  #   if _CONFIGURATION = mswunivud, then _PF="msw", _UNV=univ, _UCD=u _DBG=d
+  #   if _CONFIGURATION = mswu,      then _PF="msw", _UNV="",   _UCD=u _DBG=""
   #
-  macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
+  macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _PF _UNV _UCD _DBG)
+    DBG_MSG_V(${_CONFIGURATION})
     string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
-    string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
+    string(REGEX REPLACE "[msw|qt].*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
     if(${_UCD} STREQUAL ${_CONFIGURATION})
       set(${_UCD} "")
     endif()
     string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
+    string(REGEX MATCH "^[msw|qt]*" ${_PF} "${_CONFIGURATION}")
   endmacro()
 
   #
   # Find libraries associated to a configuration.
   #
-  macro(WX_FIND_LIBS _UNV _UCD _DBG)
+  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG)
     DBG_MSG_V("m_unv = ${_UNV}")
     DBG_MSG_V("m_ucd = ${_UCD}")
     DBG_MSG_V("m_dbg = ${_DBG}")
@@ -286,7 +284,6 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
         NAMES
         wx${LIB}${_UCD}${_DBG} # for regex
         wx${LIB}${_DBG}
-        ${LIB}${_DBG}          # vcpkg libraries aren't specific to wx
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
@@ -296,6 +293,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     # Find wxWidgets multilib base libraries.
     find_library(WX_base${_DBG}
       NAMES
+      wxbase32${_UCD}${_DBG}
       wxbase31${_UCD}${_DBG}
       wxbase30${_UCD}${_DBG}
       wxbase29${_UCD}${_DBG}
@@ -310,6 +308,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     foreach(LIB net odbc xml)
       find_library(WX_${LIB}${_DBG}
         NAMES
+        wxbase32${_UCD}${_DBG}_${LIB}
         wxbase31${_UCD}${_DBG}_${LIB}
         wxbase30${_UCD}${_DBG}_${LIB}
         wxbase29${_UCD}${_DBG}_${LIB}
@@ -326,13 +325,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     # Find wxWidgets monolithic library.
     find_library(WX_mono${_DBG}
       NAMES
-      wxmsw${_UNV}31${_UCD}${_DBG}
-      wxmsw${_UNV}30${_UCD}${_DBG}
-      wxmsw${_UNV}29${_UCD}${_DBG}
-      wxmsw${_UNV}28${_UCD}${_DBG}
-      wxmsw${_UNV}27${_UCD}${_DBG}
-      wxmsw${_UNV}26${_UCD}${_DBG}
-      wxmsw${_UNV}25${_UCD}${_DBG}
+      wx${_PF}${_UNV}32${_UCD}${_DBG}
+      wx${_PF}${_UNV}31${_UCD}${_DBG}
+      wx${_PF}${_UNV}30${_UCD}${_DBG}
+      wx${_PF}${_UNV}29${_UCD}${_DBG}
+      wx${_PF}${_UNV}28${_UCD}${_DBG}
+      wx${_PF}${_UNV}27${_UCD}${_DBG}
+      wx${_PF}${_UNV}26${_UCD}${_DBG}
+      wx${_PF}${_UNV}25${_UCD}${_DBG}
       PATHS ${WX_LIB_DIR}
       NO_DEFAULT_PATH
       )
@@ -340,16 +340,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 
     # Find wxWidgets multilib libraries.
     foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
-                webview stc ribbon propgrid)
+                stc ribbon propgrid webview)
       find_library(WX_${LIB}${_DBG}
         NAMES
-        wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}26${_UCD}${_DBG}_${LIB}
-        wxmsw${_UNV}25${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}32${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}28${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}27${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}26${_UCD}${_DBG}_${LIB}
+        wx${_PF}${_UNV}25${_UCD}${_DBG}_${LIB}
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
@@ -515,74 +516,6 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       set(WX_LIB_DIR_PREFIX vc)
     endif()
 
-  if(VCPKG_TOOLCHAIN)
-    set(wxWidgets_FOUND TRUE)
-      find_path(wxWidgets_ROOT_DIR
-      NAMES include/wx/wx.h
-      PATHS
-      ENV wxWidgets_ROOT_DIR
-      DOC "wxWidgets base/installation directory"
-      )
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(wxWidgets_LIB_DIR ${wxWidgets_ROOT_DIR}/debug/lib)
-      set(wxWidgets_CONFIGURATION mswud)
-    else()
-      set(wxWidgets_LIB_DIR ${wxWidgets_ROOT_DIR}/lib)
-      set(wxWidgets_CONFIGURATION mswu)
-    endif()
-
-    set(wxWidgets_BIN_DIR ${wxWidgets_ROOT_DIR}/bin)
-    set(wxWidgets_INCLUDE_DIR ${wxWidgets_ROOT_DIR}/include)
-    file(GLOB DLL ${wxWidgets_BIN_DIR}/wxmsw*.dll)
-    if (DLL)
-      set(wxWidgets_DEFINITIONS WXUSINGDLL)
-      DBG_MSG_V("detected SHARED/DLL tree wxWidgets_LIB_DIR=${wxWidgets_LIB_DIR}")
-    endif ()
-    set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR})
-    set(WX_LIB_DIR ${wxWidgets_LIB_DIR})  # needed by macro
-    set(WX_CONFIGURATION_LIST ${wxWidgets_CONFIGURATION})
-
-    # Set wxWidgets lib setup include directory.
-    if (EXISTS ${wxWidgets_INCLUDE_DIR}/wx/setup.h)
-      set(wxWidgets_INCLUDE_DIRS ${wxWidgets_INCLUDE_DIR})
-    else ()
-      DBG_MSG("wxWidgets_FOUND FALSE because ${wxWidgets_INCLUDE_DIR}/wx/setup.h does not exists.")
-      set(wxWidgets_FOUND FALSE)
-    endif ()
-
-    # Set wxWidgets main include directory.
-    if (EXISTS ${wxWidgets_ROOT_DIR}/include/wx/wx.h)
-      list(APPEND wxWidgets_INCLUDE_DIRS ${wxWidgets_ROOT_DIR}/include)
-    else ()
-      DBG_MSG("wxWidgets_FOUND FALSE because wxWidgets_ROOT_DIR=${wxWidgets_ROOT_DIR} has no ${wxWidgets_ROOT_DIR}/include/wx/wx.h")
-      set(wxWidgets_FOUND FALSE)
-    endif ()
-
-    DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
-
-
-    # Get configuration parameters from the name.
-    WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
-
-
-    # Find wxWidgets libraries.
-    WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
-    if (WX_USE_REL_AND_DBG)
-      WX_FIND_LIBS("${UNV}" "${UCD}" "d")
-    endif ()
-
-    # Settings for requested libs (i.e., include dir, libraries, etc.).
-    WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
-
-    # Add necessary definitions for unicode builds
-    if ("${UCD}" STREQUAL "u")
-      list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
-    endif ()
-
-    # Add necessary definitions for debug builds
-    set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
-
-  else()
     if(BUILD_SHARED_LIBS)
       find_path(wxWidgets_LIB_DIR
       NAMES
@@ -617,7 +550,6 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       DOC "Path to wxWidgets libraries"
       NO_DEFAULT_PATH
       )
-    endif()
   endif()
 
     # If wxWidgets_LIB_DIR changed, clear all libraries.
@@ -675,7 +607,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
         endif()
 
         # Get configuration parameters from the name.
-        WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
+        WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} PF UNV UCD DBG)
 
         # Set wxWidgets lib setup include directory.
         if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
@@ -695,9 +627,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
         endif()
 
         # Find wxWidgets libraries.
-        WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
+        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}")
         if(WX_USE_REL_AND_DBG)
-          WX_FIND_LIBS("${UNV}" "${UCD}" "d")
+          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d")
         endif()
 
         # Settings for requested libs (i.e., include dir, libraries, etc.).

CMakeModules/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-2021 KiCad Developers, see AUTHORS.txt for contributors.
+#  Copyright (C) 2016-2022 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 "6.0.2" )
+set( KICAD_SEMANTIC_VERSION "6.0.7" )
 
 # Default the version to the semantic version.
 # This is overridden by the git repository tag though (if using git)

README.md

@@ -16,9 +16,6 @@ KiCad uses a host of CI resources.
 
 GitLab CI pipeline status can be viewed for Linux and Windows builds of the latest commits.
 
-Additional status is available for builds:
-[<img alt="Jenkins" src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.simonrichter.eu%2Fjob%2Fwindows-kicad-ps-pipeline%2F&label=Windows%2C%20MSVC%Nightly&style=plastic">](https://jenkins.simonrichter.eu/job/windows-kicad-ps-pipeline/)
-
 ## Release status
 [![latest released version(s)](https://repology.org/badge/latest-versions/kicad.svg)](https://repology.org/project/kicad/versions)
 [![Release status](https://repology.org/badge/tiny-repos/kicad.svg)](https://repology.org/metapackage/kicad/versions)

bitmaps_png/CMakeLists.txt

@@ -619,8 +619,8 @@ set( TMP_DIR   "${CMAKE_CURRENT_BINARY_DIR}/tmp" )
 # generate logs is useful only if you have problems
 set( CREATE_LOG_FILES true )
 
-set( BITMAP_INFO_FILE "${CMAKE_SOURCE_DIR}/include/bitmaps/bitmap_info.h" )
-set( BITMAP_INFO_TEMPLATE "${CMAKE_SOURCE_DIR}/include/bitmaps/bitmap_info.h.in" )
+set( BITMAP_INFO_FILE "${CMAKE_SOURCE_DIR}/common/bitmap_info.cpp" )
+set( BITMAP_INFO_TEMPLATE "${CMAKE_SOURCE_DIR}/include/bitmaps/bitmap_info.cpp.in" )
 set( BITMAP_INFO_LIST "" )
 
 set( ALL_PNGS "" )
@@ -739,7 +739,7 @@ function( bitmap_dir pngWidth pngHeight bmapList )
             png2png( ${tmpFile} ${pngPath} )
 
             set( bitmapInfo
-            "    { BITMAPS::${bmn}, wxT( \"${pngFile}\" ), ${pngHeight}, wxT( \"${theme}\" ) },\n"
+            "    aBitmapInfoCache[BITMAPS::${bmn}].emplace_back( BITMAPS::${bmn}, wxT( \"${pngFile}\" ), ${pngHeight}, wxT( \"${theme}\" ) );\n"
             )
 
             set( BITMAP_INFO_LIST "${BITMAP_INFO_LIST}${bitmapInfo}" )

common/CMakeLists.txt

@@ -315,6 +315,7 @@ set( COMMON_SRCS
     bin_mod.cpp
     bitmap.cpp
     bitmap_base.cpp
+    bitmap_info.cpp
     bitmap_store.cpp
     board_printout.cpp
     build_version.cpp

common/advanced_config.cpp

@@ -266,12 +266,12 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_DrawArcAccuracy           = 10.0;
     m_DrawArcCenterMaxAngle     = 50.0;
     m_MaxTangentAngleDeviation  = 1.0;
-    m_MaxTrackLengthToKeep      = 0.0001;
+    m_MaxTrackLengthToKeep      = 0.0005;
     m_ExtraZoneDisplayModes     = false;
     m_DrawTriangulationOutlines = false;
 
-    m_ExtraClearance            = 0.0001;
-    m_DRCEpsilon                = 0.0001;   // 0.1um is small enough not to materially violate
+    m_ExtraClearance            = 0.0005;
+    m_DRCEpsilon                = 0.0005;   // 0.5um is small enough not to materially violate
                                             // any constraints.
 
     m_HoleWallThickness         = 0.020;    // IPC-6012 says 15-18um; Cadence says at least
@@ -334,83 +334,83 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     std::vector<PARAM_CFG*> configParams;
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity,
-                                                &m_RealTimeConnectivity, true ) );
+                                                &m_RealTimeConnectivity, m_RealTimeConnectivity ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::ExtraFillMargin,
-                                                  &m_ExtraClearance, 0.0005, 0.0, 1.0 ) );
+                                                  &m_ExtraClearance, m_ExtraClearance, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DRCEpsilon,
-                                                  &m_DRCEpsilon, 0.0005, 0.0, 1.0 ) );
+                                                  &m_DRCEpsilon, m_DRCEpsilon, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::HoleWallThickness,
-                                                  &m_HoleWallThickness, 0.020, 0.0, 1.0 ) );
+                                                  &m_HoleWallThickness, m_HoleWallThickness, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::CoroutineStackSize,
                                                &m_CoroutineStackSize, AC_STACK::default_stack,
                                                AC_STACK::min_stack, AC_STACK::max_stack ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowRouterDebugGraphics,
-                                                &m_ShowRouterDebugGraphics, false ) );
+                                                &m_ShowRouterDebugGraphics, m_ShowRouterDebugGraphics ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::CompactFileSave,
-                                                &m_CompactSave, false ) );
+                                                &m_CompactSave, m_CompactSave ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcAccuracy,
-                                                  &m_DrawArcAccuracy, 10.0, 0.0, 100000.0 ) );
+                                                  &m_DrawArcAccuracy, m_DrawArcAccuracy, 0.0, 100000.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::DrawArcCenterStartEndMaxAngle,
-                                                  &m_DrawArcCenterMaxAngle, 50.0, 0.0, 100000.0 ) );
+                                                  &m_DrawArcCenterMaxAngle, m_DrawArcCenterMaxAngle, 0.0, 100000.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MaxTangentTrackAngleDeviation,
-                                                  &m_MaxTangentAngleDeviation, 1.0, 0.0, 90.0 ) );
+                                                  &m_MaxTangentAngleDeviation, m_MaxTangentAngleDeviation, 0.0, 90.0 ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MaxTrackLengthToKeep,
-                                                  &m_MaxTrackLengthToKeep, 0.0005, 0.0, 1.0 ) );
+                                                  &m_MaxTrackLengthToKeep, m_MaxTrackLengthToKeep, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ExtraZoneDisplayModes,
-                                                &m_ExtraZoneDisplayModes, false ) );
+                                                &m_ExtraZoneDisplayModes, m_ExtraZoneDisplayModes ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::StrokeTriangulation,
-                                                &m_DrawTriangulationOutlines, false ) );
+                                                &m_DrawTriangulationOutlines, m_DrawTriangulationOutlines ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::MinPlotPenWidth,
-                                                  &m_MinPlotPenWidth, 0.0212, 0.0, 1.0 ) );
+                                                  &m_MinPlotPenWidth, m_MinPlotPenWidth, 0.0, 1.0 ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::DebugZoneFiller,
-                                                &m_DebugZoneFiller, false ) );
+                                                &m_DebugZoneFiller, m_DebugZoneFiller ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::DebugPDFWriter,
-                                                &m_DebugPDFWriter, false ) );
+                                                &m_DebugPDFWriter, m_DebugPDFWriter ) );
 
     configParams.push_back( new PARAM_CFG_DOUBLE( true, AC_KEYS::SmallDrillMarkSize,
-                                                  &m_SmallDrillMarkSize, 0.35, 0.0, 3.0 ) );
+                                                  &m_SmallDrillMarkSize, m_SmallDrillMarkSize, 0.0, 3.0 ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::HotkeysDumper,
-                                                &m_HotkeysDumper, false ) );
+                                                &m_HotkeysDumper, m_HotkeysDumper ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::DrawBoundingBoxes,
-                                                &m_DrawBoundingBoxes, false ) );
+                                                &m_DrawBoundingBoxes, m_DrawBoundingBoxes ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowPcbnewExportNetlist,
-                                                &m_ShowPcbnewExportNetlist, false ) );
+                                                &m_ShowPcbnewExportNetlist, m_ShowPcbnewExportNetlist ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::Skip3DModelFileCache,
-                                                &m_Skip3DModelFileCache, false ) );
+                                                &m_Skip3DModelFileCache, m_Skip3DModelFileCache ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::Skip3DModelMemoryCache,
-                                                &m_Skip3DModelMemoryCache, false ) );
+                                                &m_Skip3DModelMemoryCache, m_Skip3DModelMemoryCache ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::HideVersionFromTitle,
-                                                &m_HideVersionFromTitle, false ) );
+                                                &m_HideVersionFromTitle, m_HideVersionFromTitle ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowRepairSchematic,
-                                                &m_ShowRepairSchematic, false ) );
+                                                &m_ShowRepairSchematic, m_ShowRepairSchematic ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowEventCounters,
-                                                &m_ShowEventCounters, false ) );
+                                                &m_ShowEventCounters, m_ShowEventCounters ) );
 
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::AllowManualCanvasScale,
-                                                &m_AllowManualCanvasScale, false ) );
+                                                &m_AllowManualCanvasScale, m_AllowManualCanvasScale ) );
 
     // Special case for trace mask setting...we just grab them and set them immediately
     // Because we even use wxLogTrace inside of advanced config

common/base_units.cpp

@@ -226,22 +226,17 @@ wxString StringFromValue( EDA_UNITS aUnits, double aValue, bool aAddUnitSymbol,
 
     if( value_to_print != 0.0 && fabs( value_to_print ) <= 0.0001 )
     {
-        len = sprintf( buf, "%.10f", value_to_print );
+        len = snprintf( buf, sizeof( buf ) - 1, "%.10f", value_to_print );
 
         while( --len > 0 && buf[len] == '0' )
             buf[len] = '\0';
 
-        if( buf[len]=='.' || buf[len]==',' )
+        if( len >= 0 && ( buf[len]=='.' || buf[len]==',' ) )
             buf[len] = '\0';
-        else
-            ++len;
     }
     else
     {
-        if( aUnits == EDA_UNITS::MILS )
-            len = sprintf( buf, "%.7g", value_to_print );
-        else
-            len = sprintf( buf, "%.10g", value_to_print );
+        snprintf( buf, sizeof( buf ) - 1, "%.10g", value_to_print );
     }
 
     wxString    stringValue( buf, wxConvUTF8 );

common/bitmap_store.cpp

@@ -101,7 +101,7 @@ BITMAP_STORE::BITMAP_STORE()
 {
     wxFileName path( PATHS::GetStockDataPath() + wxT( "/resources" ), IMAGE_ARCHIVE );
 
-    wxLogTrace( traceBitmaps, wxT( "Loading bitmaps from " ) + path.GetFullPath() );
+    wxLogTrace( traceBitmaps, "Loading bitmaps from " + path.GetFullPath() );
 
     m_archive = std::make_unique<ASSET_ARCHIVE>( path.GetFullPath() );
 
@@ -148,8 +148,8 @@ wxImage BITMAP_STORE::getImage( BITMAPS aBitmapId, int aHeight )
 
         if( count < 0 )
         {
-            wxLogTrace( traceBitmaps, wxT( "Bitmap for %d, %d, %s has an info tag with file %s," )
-                        wxT( "but that file could not be found in the archive!" ),
+            wxLogTrace( traceBitmaps, "Bitmap for %d, %d, %s has an info tag with file %s,"
+                        "but that file could not be found in the archive!",
                         aBitmapId, aHeight, m_theme );
             data  = s_imageNotFound;
             count = sizeof( s_imageNotFound );
@@ -158,7 +158,6 @@ wxImage BITMAP_STORE::getImage( BITMAPS aBitmapId, int aHeight )
 
     wxMemoryInputStream is( data, count );
     wxImage image( is, wxBITMAP_TYPE_PNG );
-    wxBitmap bitmap( image );
 
     return image;
 }
@@ -205,7 +204,7 @@ wxString BITMAP_STORE::computeBitmapName( BITMAPS aBitmapId, int aHeight )
 {
     if( !m_bitmapInfoCache.count( aBitmapId ) )
     {
-        wxLogTrace( traceBitmaps, wxT( "No bitmap info available for %d" ), aBitmapId );
+        wxLogTrace( traceBitmaps, "No bitmap info available for %d", aBitmapId );
         return wxEmptyString;
     }
 
@@ -225,7 +224,7 @@ wxString BITMAP_STORE::computeBitmapName( BITMAPS aBitmapId, int aHeight )
 
     if( fn.IsEmpty() )
     {
-        wxLogTrace( traceBitmaps, wxT( "No bitmap found matching ID %d, height %d, theme %s" ),
+        wxLogTrace( traceBitmaps, "No bitmap found matching ID %d, height %d, theme %s",
                     aBitmapId, aHeight, m_theme );
         return m_bitmapInfoCache.at( aBitmapId ).begin()->filename;
     }
@@ -236,6 +235,5 @@ wxString BITMAP_STORE::computeBitmapName( BITMAPS aBitmapId, int aHeight )
 
 void BITMAP_STORE::buildBitmapInfoCache()
 {
-    for( const BITMAP_INFO& entry : g_BitmapInfo )
-        m_bitmapInfoCache[entry.id].emplace_back( entry );
+    BuildBitmapInfo( m_bitmapInfoCache );
 }

common/board_printout.cpp

@@ -1,8 +1,8 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2009 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
- * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2009 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
+ * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
  * Copyright (C) 2018 CERN
  * Author: Maciej Suminski <maciej.suminski@cern.ch>
  *
@@ -70,6 +70,7 @@ BOARD_PRINTOUT::BOARD_PRINTOUT( const BOARD_PRINTOUT_SETTINGS& aParams,
     m_settings( aParams )
 {
     m_view = aView;
+    m_gerbviewPrint = false;
 }
 
 
@@ -85,12 +86,12 @@ void BOARD_PRINTOUT::GetPageInfo( int* minPage, int* maxPage, int* selPageFrom,
 
 void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPageCount )
 {
-    auto dc = GetDC();
+    wxDC* dc = GetDC();
     KIGFX::GAL_DISPLAY_OPTIONS options;
-    auto galPrint = KIGFX::GAL_PRINT::Create( options, dc );
-    auto gal = galPrint->GetGAL();
-    auto printCtx = galPrint->GetPrintCtx();
-    auto painter = getPainter( gal );
+    std::unique_ptr<KIGFX::GAL_PRINT> galPrint = KIGFX::GAL_PRINT::Create( options, dc );
+    KIGFX::GAL* gal = galPrint->GetGAL();
+    KIGFX::PRINT_CONTEXT* printCtx = galPrint->GetPrintCtx();
+    std::unique_ptr<KIGFX::PAINTER> painter = getPainter( gal );
     std::unique_ptr<KIGFX::VIEW> view( m_view->DataReference() );
 
     // Target paper size
@@ -115,6 +116,10 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
     {
         for( int i = 0; i < LAYER_ID_COUNT; ++i )
             dstSettings->SetLayerColor( i, COLOR4D::BLACK );
+
+        // In B&W mode, draw the background only in wxhite, because any other color
+        // will be replaced by a black background
+        dstSettings->SetBackgroundColor( COLOR4D::WHITE );
     }
     else // color enabled
     {
@@ -175,6 +180,11 @@ void BOARD_PRINTOUT::DrawPage( const wxString& aLayerName, int aPageNum, int aPa
     gal->SetClearColor( dstSettings->GetBackgroundColor() );
     gal->ClearScreen();
 
+    if( m_gerbviewPrint )
+        // Mandatory in Gerbview to use the same order for printing as for screen redraw
+        // due to negative objects that need a specific order
+        view->UseDrawPriority( true );
+
     {
         KIGFX::GAL_DRAWING_CONTEXT ctx( gal );
         view->Redraw();

common/dialog_about/AboutDialog_main.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 Rafael Sokolowski <Rafael.Sokolowski@web.de>
- * Copyright (C) 2010-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2010-2022 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
@@ -64,7 +64,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     aInfo.SetAppName( Pgm().App().GetAppName() );
 
     /* Copyright information */
-    aInfo.SetCopyright( "(C) 1992-2021 KiCad Developers Team" );
+    aInfo.SetCopyright( "(C) 1992-2022 KiCad Developers Team" );
 
     /* KiCad build version */
     wxString version;

common/dialog_about/dialog_about.cpp

@@ -419,7 +419,7 @@ void DIALOG_ABOUT::createNotebookHtmlPage( wxNotebook* aParent, const wxString&
 wxStaticText* DIALOG_ABOUT::wxStaticTextRef( wxScrolledWindow* aParent, const wxString& aReference )
 {
     wxStaticText* text = new wxStaticText( aParent, wxID_ANY,
-                                           wxT( "(wxT( " ) + aReference + wxT( " ))" ) );
+                                           wxT( "(" ) + aReference + wxT( ")" ) );
 
     return text;
 }

common/dialog_shim.cpp

@@ -25,6 +25,7 @@
 #include <dialog_shim.h>
 #include <ignore.h>
 #include <kiway_player.h>
+#include <kiway.h>
 #include <pgm_base.h>
 #include <tool/tool_manager.h>
 #include <kiplatform/ui.h>
@@ -122,6 +123,9 @@ DIALOG_SHIM::DIALOG_SHIM( wxWindow* aParent, wxWindowID id, const wxString& titl
     if( kiwayHolder )
         SetKiway( this, &kiwayHolder->Kiway() );
 
+    if( HasKiway() )
+        Kiway().SetBlockingDialog( this );
+
     Bind( wxEVT_CLOSE_WINDOW, &DIALOG_SHIM::OnCloseWindow, this );
     Bind( wxEVT_BUTTON, &DIALOG_SHIM::OnButton, this );
 
@@ -143,6 +147,9 @@ DIALOG_SHIM::~DIALOG_SHIM()
     if( IsQuasiModal() )
         EndQuasiModal( wxID_CANCEL );
 
+    if( HasKiway() )
+        Kiway().SetBlockingDialog( nullptr );
+
     if( m_qmodal_parent_disabler )
         delete m_qmodal_parent_disabler;    // usually NULL by now
 }

common/draw_panel_gal.cpp

@@ -213,6 +213,7 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
     try
     {
         cntUpd.Start();
+
         try
         {
             m_view->UpdateItems();
@@ -229,9 +230,7 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
         cntUpd.Stop();
 
         cntCtx.Start();
-        int cookie = rand();
-        m_gal->LockContext( cookie );
-        m_gal->BeginDrawing();
+        KIGFX::GAL_DRAWING_CONTEXT ctx( m_gal );
         cntCtx.Stop();
 
         if( m_view->IsTargetDirty( KIGFX::TARGET_OVERLAY )
@@ -273,9 +272,6 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
         m_gal->DrawCursor( m_viewControls->GetCursorPosition() );
 
         cntCtxDestroy.Start();
-        m_gal->EndDrawing();
-        m_gal->UnlockContext( cookie );
-        cntCtxDestroy.Stop();
     }
     catch( std::exception& err )
     {
@@ -294,6 +290,9 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
         }
     }
 
+    // ctx goes out of scope here so destructor would be called
+    cntCtxDestroy.Stop();
+
 
     if( isDirty )
     {

common/drawing_sheet/ds_painter.cpp

@@ -152,9 +152,8 @@ wxString DS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase )
                 }
                 else if( m_titleBlock )
                 {
-                    m_titleBlock->TextVarResolver( token, m_project );
                     // no need for tokenUpdated; TextVarResolver() did a full resolve
-                    return true;
+                    return m_titleBlock->TextVarResolver( token, m_project );
                 }
 
                 if( tokenUpdated )

common/eda_doc.cpp

@@ -71,19 +71,14 @@ static const wxFileTypeInfo EDAfallbacks[] =
 };
 
 
-bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT* aProject )
+bool GetAssociatedDocument( wxWindow* aParent, const wxString& aDocName, PROJECT* aProject, SEARCH_STACK* aPaths )
 {
-    SEARCH_STACK* aPaths = nullptr;
     wxString      docname;
     wxString      fullfilename;
     wxString      msg;
     wxString      command;
     bool          success = false;
 
-#if defined( EESCHEMA )
-    SEARCH_STACK* aPaths = aProject ? aProject->SchSearchS() : nullptr;
-#endif
-
     // Is an internet url
     static const std::vector<wxString> url_header =
     {

common/eda_draw_frame.cpp

@@ -387,6 +387,9 @@ void EDA_DRAW_FRAME::OnSelectGrid( wxCommandEvent& event )
 
     UpdateStatusBar();
     m_canvas->Refresh();
+    // Needed on Windows because clicking on m_gridSelectBox remove the focus from m_canvas
+    // (Windows specific
+    m_canvas->SetFocus();
 }
 
 
@@ -463,6 +466,9 @@ void EDA_DRAW_FRAME::OnSelectZoom( wxCommandEvent& event )
     m_toolManager->RunAction( ACTIONS::zoomPreset, true, static_cast<intptr_t>( id ) );
     UpdateStatusBar();
     m_canvas->Refresh();
+    // Needed on Windows because clicking on m_zoomSelectBox remove the focus from m_canvas
+    // (Windows specific
+    m_canvas->SetFocus();
 }
 
 
@@ -694,7 +700,7 @@ void EDA_DRAW_FRAME::SetMsgPanel( EDA_ITEM* aItem )
 
 void EDA_DRAW_FRAME::UpdateMsgPanel()
 {
-    GetToolManager()->PostEvent( EVENTS::SelectedItemsModified );
+    GetToolManager()->ProcessEvent( EVENTS::SelectedItemsModified );
 }
 
 

common/eda_item.cpp

@@ -320,6 +320,7 @@ static struct EDA_ITEM_DESC
             .Map( PCB_FP_SHAPE_T,       _HKI( "Graphic" ) )
             .Map( PCB_FP_ZONE_T,        _HKI( "Zone" ) )
             .Map( PCB_TRACE_T,          _HKI( "Track" ) )
+            .Map( PCB_ARC_T,            _HKI( "Track" ) )
             .Map( PCB_VIA_T,            _HKI( "Via" ) )
             .Map( PCB_MARKER_T,         _HKI( "Marker" ) )
             .Map( PCB_DIM_ALIGNED_T,    _HKI( "Dimension" ) )

common/eda_shape.cpp

@@ -436,6 +436,12 @@ void EDA_SHAPE::SetCenter( const wxPoint& aCenter )
 
 wxPoint EDA_SHAPE::GetArcMid() const
 {
+    // If none of the input data have changed since we loaded the arc,
+    // keep the original mid point data to minimize churn
+    if( m_arcMidData.start == m_start && m_arcMidData.end == m_end
+            && m_arcMidData.center == m_arcCenter )
+        return m_arcMidData.mid;
+
     wxPoint mid = m_start;
     RotatePoint( &mid, m_arcCenter, -GetArcAngle() / 2.0 );
     return mid;
@@ -486,19 +492,35 @@ int EDA_SHAPE::GetRadius() const
 }
 
 
+void EDA_SHAPE::SetCachedArcData( const wxPoint& aStart, const wxPoint& aMid, const wxPoint& aEnd, const wxPoint& aCenter )
+{
+    m_arcMidData.start = aStart;
+    m_arcMidData.end = aEnd;
+    m_arcMidData.center = aCenter;
+    m_arcMidData.mid = aMid;
+}
+
+
 void EDA_SHAPE::SetArcGeometry( const wxPoint& aStart, const wxPoint& aMid, const wxPoint& aEnd )
 {
+    m_arcMidData = {};
     m_start = aStart;
     m_end = aEnd;
     m_arcCenter = CalcArcCenter( aStart, aMid, aEnd );
+    wxPoint new_mid = GetArcMid();
+
     m_endsSwapped = false;
 
-    /**
-     * If the input winding doesn't match our internal winding, the calculated midpoint will end up
-     * on the other side of the arc.  In this case, we need to flip the start/end points and flag this
-     * change for the system
+    // Watch the ordering here.  GetArcMid above needs to be called prior to initializing the
+    // m_arcMidData structure in order to ensure we get the calculated variant, not the cached
+    SetCachedArcData( aStart, aMid, aEnd, m_arcCenter );
+
+    /*
+     * If the input winding doesn't match our internal winding, the calculated midpoint will end
+     * up on the other side of the arc.  In this case, we need to flip the start/end points and
+     * flag this change for the system.
      */
-    wxPoint new_mid = GetArcMid();
+
     VECTOR2D dist( new_mid - aMid );
     VECTOR2D dist2( new_mid - m_arcCenter );
 

common/eda_text.cpp

@@ -188,7 +188,7 @@ bool EDA_TEXT::Replace( const wxFindReplaceData& aSearchData )
 
 void EDA_TEXT::cacheShownText()
 {
-    if( m_text.IsEmpty() || m_text == wxT( "~" ) )     // ~ is legacy empty-string token
+    if( m_text.IsEmpty() )
     {
         m_shown_text = wxEmptyString;
         m_shown_text_has_text_var_refs = false;
@@ -316,7 +316,9 @@ EDA_RECT EDA_TEXT::GetTextBox( int aLine, bool aInvertY ) const
 
         // interline spacing is only *between* lines, so total height is the height of the first
         // line plus the interline distance (with interline spacing) for all subsequent lines
-        textsize.y += KiROUND( ( strings.GetCount() - 1 ) * interline );
+        // Don't add interline spacing to empty textboxes
+        if( strings.GetCount() )
+            textsize.y += KiROUND( ( strings.GetCount() - 1 ) * interline );
     }
 
     rect.SetSize( textsize );

common/filehistory.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 Ian McInerney <Ian.S.McInerney@ieee.org>
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2022 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
@@ -165,6 +165,18 @@ void FILE_HISTORY::doAddClearItem( wxMenu* aMenu )
 }
 
 
+void FILE_HISTORY::UpdateClearText( wxMenu* aMenu, wxString aClearText )
+{
+    size_t      itemPos;
+    wxMenuItem* clearItem = aMenu->FindChildItem( m_clearId, &itemPos );
+
+    if( clearItem && itemPos > 1 )      // clearItem is the last menu, after a separator
+    {
+        clearItem->SetItemLabel( aClearText );
+    }
+}
+
+
 void FILE_HISTORY::ClearFileHistory()
 {
     while( GetCount() > 0 )

common/filename_resolver.cpp

@@ -465,10 +465,10 @@ bool FILENAME_RESOLVER::addPath( const SEARCH_PATH& aPath )
             wxString msg = _( "Alias: " );
             msg.append( tpath.m_Alias );
             msg.append( wxT( "\n" ) );
-            msg.append( _( "This path:wxT( " ) + wxS( " ) " ) );
+            msg.append( _( "This path:" ) + wxS( " " ) );
             msg.append( tpath.m_Pathvar );
             msg.append( wxT( "\n" ) );
-            msg.append( _( "Existing path:wxT( " ) + wxS( " ) " ) );
+            msg.append( _( "Existing path:" ) + wxS( " " ) );
             msg.append( sPL->m_Pathvar );
             wxMessageBox( msg, _( "Bad alias (duplicate name)" ) );
 

common/gal/opengl/shader.cpp

@@ -106,7 +106,7 @@ bool SHADER::Link()
 
     // Check the Link state
     GLint tmp;
-    glGetObjectParameterivARB( programNumber, GL_OBJECT_LINK_STATUS_ARB, &tmp );
+    glGetProgramiv( programNumber, GL_LINK_STATUS, &tmp );
     isShaderLinked = !!tmp;
 
 #ifdef DEBUG

common/grid_tricks.cpp

@@ -642,9 +642,8 @@ void GRID_TRICKS::paste_text( const wxString& cb_text )
 
     for( int row = start_row;  row < end_row;  ++row )
     {
-        // If number of selected rows bigger than count of rows in
-        // the clipboard, paste from the clipboard again and again
-        // while end of the selection is reached.
+        // If number of selected rows is larger than the count of rows on the clipboard, paste
+        // again and again until the end of the selection is reached.
         if( !rows.HasMoreTokens() )
             rows.SetString( cb_text, ROW_SEP, wxTOKEN_RET_EMPTY );
 
@@ -662,9 +661,12 @@ void GRID_TRICKS::paste_text( const wxString& cb_text )
 
         for( int col = start_col;  col < end_col;  ++col )
         {
-            // If number of selected columns bigger than count of columns in
-            // the clipboard, paste from the clipboard again and again while
-            // end of the selection is reached.
+            // Skip hidden columns
+            if( !m_grid->IsColShown( col ) )
+                continue;
+
+            // If number of selected cols is larger than the count of cols on the clipboard,
+            // paste again and again until the end of the selection is reached.
             if( !cols.HasMoreTokens() )
                 cols.SetString( rowTxt, COL_SEP, wxTOKEN_RET_EMPTY );
 

common/kiid.cpp

@@ -40,8 +40,14 @@
 // boost:mt19937 is not thread-safe
 static std::mutex                                           rng_mutex;
 
-// Create only once, as seeding is *very* expensive
-static boost::mt19937                                       rng;
+// Static rng and generators are used because the overhead of constant seeding is expensive
+// We break out the rng separately from the generator because we want to control seeding in cases like unit tests
+#if BOOST_VERSION >= 106700
+static boost::uuids::detail::random_provider                seeder; // required to ensure the rng has a random initial seed
+#else
+static boost::uuids::detail::seed_rng                       seeder; // required to ensure the rng has a random initial seed
+#endif
+static boost::mt19937                                       rng( seeder );
 static boost::uuids::basic_random_generator<boost::mt19937> randomGenerator( rng );
 
 // These don't have the same performance penalty, but we might as well be consistent

common/kiway.cpp

@@ -34,6 +34,7 @@
 #include <core/arraydim.h>
 #include <id.h>
 #include <kiplatform/app.h>
+#include <kiplatform/environment.h>
 #include <settings/settings_manager.h>
 #include <logging.h>
 
@@ -49,7 +50,7 @@ int     KIWAY::m_kiface_version[KIWAY_FACE_COUNT];
 
 
 KIWAY::KIWAY( PGM_BASE* aProgram, int aCtlBits, wxFrame* aTop ):
-    m_program( aProgram ), m_ctl( aCtlBits ), m_top( nullptr )
+    m_program( aProgram ), m_ctl( aCtlBits ), m_top( nullptr ), m_blockingDialog( wxID_NONE )
 {
     SetTop( aTop );     // hook player_destroy_handler() into aTop.
 
@@ -230,6 +231,15 @@ KIFACE* KIWAY::KiFACE( FACE_T aFaceId, bool doLoad )
             }
         }
 
+#ifdef KICAD_WIN32_VERIFY_CODESIGN
+        bool codeSignOk = KIPLATFORM::ENV::VerifyFileSignature( dname );
+        if( !codeSignOk )
+        {
+            msg.Printf( _( "Failed to verify kiface library '%s' signature." ), dname );
+            THROW_IO_ERROR( msg );
+        }
+#endif
+
         wxDynamicLibrary dso;
 
         void*   addr = nullptr;
@@ -596,6 +606,19 @@ void KIWAY::ProjectChanged()
     }
 }
 
+wxWindow* KIWAY::GetBlockingDialog()
+{
+    return wxWindow::FindWindowById( m_blockingDialog );
+}
+
+void KIWAY::SetBlockingDialog( wxWindow* aWin )
+{
+    if( !aWin )
+        m_blockingDialog = wxID_NONE;
+    else
+        m_blockingDialog = aWin->GetId();
+}
+
 
 bool KIWAY::ProcessEvent( wxEvent& aEvent )
 {

common/layer_id.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -23,79 +23,82 @@
 /**
  * Returns the default display name for a given layer.  These are not the same as the canonical
  * name in LSET::Name(), which is used in board files and cannot be translated or changed.
+ * WARNING: do not translate board physical layers names (F.Cu to User.9): because canonical names
+ * are used in files (boards and fab files), using translated names in UI create mistakes for users.
+ * Board physical layers names must be seen as proper nouns.
  */
 wxString LayerName( int aLayer )
 {
     switch( aLayer )
     {
     // PCB_LAYER_ID
-    case F_Cu:              return _( "F.Cu" );
-    case In1_Cu:            return _( "In1.Cu" );
-    case In2_Cu:            return _( "In2.Cu" );
-    case In3_Cu:            return _( "In3.Cu" );
-    case In4_Cu:            return _( "In4.Cu" );
-    case In5_Cu:            return _( "In5.Cu" );
-    case In6_Cu:            return _( "In6.Cu" );
-    case In7_Cu:            return _( "In7.Cu" );
-    case In8_Cu:            return _( "In8.Cu" );
-    case In9_Cu:            return _( "In9.Cu" );
-    case In10_Cu:           return _( "In10.Cu" );
-    case In11_Cu:           return _( "In11.Cu" );
-    case In12_Cu:           return _( "In12.Cu" );
-    case In13_Cu:           return _( "In13.Cu" );
-    case In14_Cu:           return _( "In14.Cu" );
-    case In15_Cu:           return _( "In15.Cu" );
-    case In16_Cu:           return _( "In16.Cu" );
-    case In17_Cu:           return _( "In17.Cu" );
-    case In18_Cu:           return _( "In18.Cu" );
-    case In19_Cu:           return _( "In19.Cu" );
-    case In20_Cu:           return _( "In20.Cu" );
-    case In21_Cu:           return _( "In21.Cu" );
-    case In22_Cu:           return _( "In22.Cu" );
-    case In23_Cu:           return _( "In23.Cu" );
-    case In24_Cu:           return _( "In24.Cu" );
-    case In25_Cu:           return _( "In25.Cu" );
-    case In26_Cu:           return _( "In26.Cu" );
-    case In27_Cu:           return _( "In27.Cu" );
-    case In28_Cu:           return _( "In28.Cu" );
-    case In29_Cu:           return _( "In29.Cu" );
-    case In30_Cu:           return _( "In30.Cu" );
-    case B_Cu:              return _( "B.Cu" );
+    case F_Cu:              return wxT( "F.Cu" );
+    case In1_Cu:            return wxT( "In1.Cu" );
+    case In2_Cu:            return wxT( "In2.Cu" );
+    case In3_Cu:            return wxT( "In3.Cu" );
+    case In4_Cu:            return wxT( "In4.Cu" );
+    case In5_Cu:            return wxT( "In5.Cu" );
+    case In6_Cu:            return wxT( "In6.Cu" );
+    case In7_Cu:            return wxT( "In7.Cu" );
+    case In8_Cu:            return wxT( "In8.Cu" );
+    case In9_Cu:            return wxT( "In9.Cu" );
+    case In10_Cu:           return wxT( "In10.Cu" );
+    case In11_Cu:           return wxT( "In11.Cu" );
+    case In12_Cu:           return wxT( "In12.Cu" );
+    case In13_Cu:           return wxT( "In13.Cu" );
+    case In14_Cu:           return wxT( "In14.Cu" );
+    case In15_Cu:           return wxT( "In15.Cu" );
+    case In16_Cu:           return wxT( "In16.Cu" );
+    case In17_Cu:           return wxT( "In17.Cu" );
+    case In18_Cu:           return wxT( "In18.Cu" );
+    case In19_Cu:           return wxT( "In19.Cu" );
+    case In20_Cu:           return wxT( "In20.Cu" );
+    case In21_Cu:           return wxT( "In21.Cu" );
+    case In22_Cu:           return wxT( "In22.Cu" );
+    case In23_Cu:           return wxT( "In23.Cu" );
+    case In24_Cu:           return wxT( "In24.Cu" );
+    case In25_Cu:           return wxT( "In25.Cu" );
+    case In26_Cu:           return wxT( "In26.Cu" );
+    case In27_Cu:           return wxT( "In27.Cu" );
+    case In28_Cu:           return wxT( "In28.Cu" );
+    case In29_Cu:           return wxT( "In29.Cu" );
+    case In30_Cu:           return wxT( "In30.Cu" );
+    case B_Cu:              return wxT( "B.Cu" );
 
     // Technicals
-    case B_Adhes:           return _( "B.Adhesive" );
-    case F_Adhes:           return _( "F.Adhesive" );
-    case B_Paste:           return _( "B.Paste" );
-    case F_Paste:           return _( "F.Paste" );
-    case B_SilkS:           return _( "B.Silkscreen" );
-    case F_SilkS:           return _( "F.Silkscreen" );
-    case B_Mask:            return _( "B.Mask" );
-    case F_Mask:            return _( "F.Mask" );
+    case B_Adhes:           return wxT( "B.Adhesive" );
+    case F_Adhes:           return wxT( "F.Adhesive" );
+    case B_Paste:           return wxT( "B.Paste" );
+    case F_Paste:           return wxT( "F.Paste" );
+    case B_SilkS:           return wxT( "B.Silkscreen" );
+    case F_SilkS:           return wxT( "F.Silkscreen" );
+    case B_Mask:            return wxT( "B.Mask" );
+    case F_Mask:            return wxT( "F.Mask" );
 
     // Users
-    case Dwgs_User:         return _( "User.Drawings" );
-    case Cmts_User:         return _( "User.Comments" );
-    case Eco1_User:         return _( "User.Eco1" );
-    case Eco2_User:         return _( "User.Eco2" );
-    case Edge_Cuts:         return _( "Edge.Cuts" );
-    case Margin:            return _( "Margin" );
+    case Dwgs_User:         return wxT( "User.Drawings" );
+    case Cmts_User:         return wxT( "User.Comments" );
+    case Eco1_User:         return wxT( "User.Eco1" );
+    case Eco2_User:         return wxT( "User.Eco2" );
+    case Edge_Cuts:         return wxT( "Edge.Cuts" );
+    case Margin:            return wxT( "Margin" );
 
     // Footprint
-    case F_CrtYd:           return _( "F.Courtyard" );
-    case B_CrtYd:           return _( "B.Courtyard" );
-    case F_Fab:             return _( "F.Fab" );
-    case B_Fab:             return _( "B.Fab" );
+    case F_CrtYd:           return wxT( "F.Courtyard" );
+    case B_CrtYd:           return wxT( "B.Courtyard" );
+    case F_Fab:             return wxT( "F.Fab" );
+    case B_Fab:             return wxT( "B.Fab" );
 
     // User definable layers.
-    case User_1:            return _( "User.1" );
-    case User_2:            return _( "User.2" );
-    case User_3:            return _( "User.3" );
-    case User_4:            return _( "User.4" );
-    case User_5:            return _( "User.5" );
-    case User_6:            return _( "User.6" );
-    case User_7:            return _( "User.7" );
-    case User_8:            return _( "User.8" );
-    case User_9:            return _( "User.9" );
+    case User_1:            return wxT( "User.1" );
+    case User_2:            return wxT( "User.2" );
+    case User_3:            return wxT( "User.3" );
+    case User_4:            return wxT( "User.4" );
+    case User_5:            return wxT( "User.5" );
+    case User_6:            return wxT( "User.6" );
+    case User_7:            return wxT( "User.7" );
+    case User_8:            return wxT( "User.8" );
+    case User_9:            return wxT( "User.9" );
 
     // Rescue
     case Rescue:            return _( "Rescue" );

common/paths.cpp

@@ -203,7 +203,7 @@ wxString PATHS::GetStockSymbolsPath()
 {
     wxString path;
 
-    path = GetStockDataPath() + wxT( "/symbols" );
+    path = GetStockEDALibraryPath() + wxT( "/symbols" );
 
     return path;
 }
@@ -213,7 +213,7 @@ wxString PATHS::GetStockFootprintsPath()
 {
     wxString path;
 
-    path = GetStockDataPath() + wxT( "/footprints" );
+    path = GetStockEDALibraryPath() + wxT( "/footprints" );
 
     return path;
 }
@@ -223,7 +223,7 @@ wxString PATHS::GetStock3dmodelsPath()
 {
     wxString path;
 
-    path = GetStockDataPath() + wxT( "/3dmodels" );
+    path = GetStockEDALibraryPath() + wxT( "/3dmodels" );
 
     return path;
 }
@@ -239,6 +239,26 @@ wxString PATHS::GetStockScriptingPath()
 }
 
 
+wxString PATHS::GetStockTemplatesPath()
+{
+    wxString path;
+
+    path = GetStockEDALibraryPath() + wxT( "/template" );
+
+    return path;
+}
+
+
+wxString PATHS::GetLocaleDataPath()
+{
+    wxString path;
+
+    path = GetStockDataPath() + wxT( "/internat" );
+
+    return path;
+}
+
+
 wxString PATHS::GetStockPluginsPath()
 {
     wxFileName fn;

common/pgm_base.cpp

@@ -56,6 +56,7 @@
 #include <settings/settings_manager.h>
 #include <systemdirsappend.h>
 #include <trace_helpers.h>
+#include <paths.h>
 
 
 /**
@@ -383,7 +384,7 @@ void PGM_BASE::SaveCommonSettings()
 
 COMMON_SETTINGS* PGM_BASE::GetCommonSettings() const
 {
-    return m_settings_manager ? GetSettingsManager().GetCommonSettings() : nullptr;
+    return m_settings_manager ? m_settings_manager->GetCommonSettings() : nullptr;
 }
 
 
@@ -540,48 +541,7 @@ void PGM_BASE::SetLanguageIdentifier( int menu_id )
 
 void PGM_BASE::SetLanguagePath()
 {
-    SEARCH_STACK    guesses;
-
-    SystemDirsAppend( &guesses );
-
-    // Add our internat dir to the wxLocale catalog of paths
-    for( unsigned i = 0; i < guesses.GetCount(); i++ )
-    {
-        wxFileName fn( guesses[i], wxEmptyString );
-
-        // Append path for Windows and unix KiCad package install
-        fn.AppendDir( wxT( "share" ) );
-        fn.AppendDir( wxT( "internat" ) );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, wxT( "Adding locale lookup path: " ) + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-
-        // Append path for unix standard install
-        fn.RemoveLastDir();
-        fn.AppendDir( wxT( "kicad" ) );
-        fn.AppendDir( wxT( "internat" ) );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, wxT( "Adding locale lookup path: " ) + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-
-        // Append path for macOS install
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.RemoveLastDir();
-        fn.AppendDir( wxT( "internat" ) );
-
-        if( fn.IsDirReadable() )
-        {
-            wxLogTrace( traceLocale, wxT( "Adding locale lookup path: " ) + fn.GetPath() );
-            wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
-        }
-    }
+    wxLocale::AddCatalogLookupPathPrefix( PATHS::GetLocaleDataPath() );
 
     if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
     {

common/plotters/GERBER_plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -842,8 +842,6 @@ void GERBER_PLOTTER::plotArc( const SHAPE_ARC& aArc, bool aPlotInRegion )
     wxPoint start( aArc.GetP0() );
     wxPoint end( aArc.GetP1() );
     wxPoint center( aArc.GetCenter() );
-    double start_angle = aArc.GetStartAngle();
-    double end_angle = aArc.GetEndAngle();
 
     if( !aPlotInRegion )
         MoveTo( start);
@@ -851,14 +849,20 @@ void GERBER_PLOTTER::plotArc( const SHAPE_ARC& aArc, bool aPlotInRegion )
         LineTo( start );
 
     DPOINT devEnd = userToDeviceCoordinates( end );
-    DPOINT devCenter = userToDeviceCoordinates( center ) - userToDeviceCoordinates( start );
+    DPOINT devCenter = userToDeviceCoordinates( center - start );
+    VECTOR2I arcMidPoint = aArc.GetArcMid();
+
+    // We need to know if the arc is CW or CCW in device coordinates, so build this arc.
+    SHAPE_ARC deviceArc( userToDeviceCoordinates( start ),
+                         userToDeviceCoordinates( wxPoint( arcMidPoint.x, arcMidPoint.y ) ),
+                         devEnd, 0 );
 
     fprintf( m_outputFile, "G75*\n" );        // Multiquadrant (360 degrees) mode
 
-    if( start_angle < end_angle )
-        fprintf( m_outputFile, "G03*\n" );    // Active circular interpolation, CCW
-    else
+    if( deviceArc.IsClockwise() )
         fprintf( m_outputFile, "G02*\n" );    // Active circular interpolation, CW
+    else
+        fprintf( m_outputFile, "G03*\n" );    // Active circular interpolation, CCW
 
     fprintf( m_outputFile, "X%dY%dI%dJ%dD01*\n",
              KiROUND( devEnd.x ), KiROUND( devEnd.y ),
@@ -1010,6 +1014,10 @@ void GERBER_PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill, int
                 const SHAPE_ARC& arc = aPoly.Arc( arcindex );
 
                 plotArc( arc, ii > 0 );
+
+                // skip points on arcs, since we plot the arc itself
+                while( ii+1 < aPoly.PointCount() && arcindex == aPoly.ArcIndex( ii+1 ) )
+                    ii++;
             }
         }
 
@@ -1040,12 +1048,17 @@ void GERBER_PLOTTER::PlotPoly( const SHAPE_LINE_CHAIN& aPoly, FILL_T aFill, int
                 const SHAPE_ARC& arc = aPoly.Arc( arcindex );
 
                 plotArc( arc, ii > 0 );
+
+                // skip points on arcs, since we plot the arc itself
+                while( ii+1 < aPoly.PointCount() && arcindex == aPoly.ArcIndex( ii+1 ) )
+                    ii++;
             }
         }
 
         // Ensure the thick outline is closed for filled polygons
         // (if not filled, could be only a polyline)
-        if( aFill != FILL_T::NO_FILL && ( aPoly.CPoint( 0 ) != aPoly.CPoint( -1 ) ) )
+        if( ( aPoly.CPoint( 0 ) != aPoly.CPoint( -1 ) )
+            && ( aPoly.IsClosed() || aFill != FILL_T::NO_FILL ) )
             LineTo( wxPoint( aPoly.CPoint( 0 ) ) );
 
         PenFinish();
@@ -1239,7 +1252,7 @@ void GERBER_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre, OUTLINE_M
 
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
 
-        Circle( pos, diametre - m_currentPenWidth, FILL_T::NO_FILL, DO_NOT_SET_LINE_WIDTH );
+        Circle( pos, diametre, FILL_T::NO_FILL, DO_NOT_SET_LINE_WIDTH );
     }
     else
     {
@@ -1359,10 +1372,8 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
                 formatNetAttribute( &gbr_metadata->m_NetlistMetadata );
 
             SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
-            Rect( wxPoint( pos.x - (size.x - GetCurrentLineWidth()) / 2,
-                           pos.y - (size.y - GetCurrentLineWidth()) / 2 ),
-                  wxPoint( pos.x + (size.x - GetCurrentLineWidth()) / 2,
-                           pos.y + (size.y - GetCurrentLineWidth()) / 2 ),
+            Rect( wxPoint( pos.x - ( size.x / 2 ), pos.y - ( size.y / 2 ) ),
+                  wxPoint( pos.x + ( size.x / 2 ), pos.y + ( size.y / 2 ) ),
                   FILL_T::NO_FILL, GetCurrentLineWidth() );
         }
         else
@@ -1432,7 +1443,6 @@ void GERBER_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
                                               0.0, 0, 0, GetPlotterArcHighDef(), ERROR_INSIDE );
 
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
-        outline.Inflate( -GetCurrentLineWidth()/2, 16 );
 
         std::vector< wxPoint > cornerList;
         // TransformRoundRectToPolygon creates only one convex polygon
@@ -1644,7 +1654,6 @@ void GERBER_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
     if( aTraceMode != FILLED )
     {
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH, &gbr_metadata );
-        polyshape.Inflate( -GetCurrentLineWidth()/2, 16 );
     }
 
     std::vector< wxPoint > cornerList;

common/plotters/HPGL_plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-2022 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
@@ -486,7 +486,7 @@ void HPGL_PLOTTER::PlotPoly( const std::vector<wxPoint>& aCornerList, FILL_T aFi
         m_current_item->content << hpgl_end_polygon_cmd; // Close, fill polygon and draw outlines
         m_current_item->pen_returns = true;
     }
-    else if( aWidth > 0 )
+    else if( aWidth != 0 )
     {
         // Plot only the polygon outline.
         for( unsigned ii = 1; ii < aCornerList.size(); ii++ )
@@ -659,10 +659,10 @@ void HPGL_PLOTTER::FlashPadCircle( const wxPoint& pos, int diametre,
         // if filled mode, the pen diameter is removed from diameter
         // to keep the pad size
         radius -= KiROUND( penDiameter ) / 2;
-    }
 
-    if( radius < 0 )
-        radius = 0;
+        if( radius < 0 )
+            radius = 0;
+    }
 
     double rsize = userToDeviceSize( radius );
 

common/plotters/PS_plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-2022 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
@@ -127,13 +127,7 @@ void PSLIKE_PLOTTER::FlashPadCircle( const wxPoint& aPadPos, int aDiameter,
     else    // Plot a ring:
     {
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
-        int linewidth = GetCurrentLineWidth();
-
-        // avoid aDiameter <= 1 )
-        if( linewidth > aDiameter-2 )
-            linewidth = aDiameter-2;
-
-        Circle( aPadPos, aDiameter - linewidth, FILL_T::NO_FILL, linewidth );
+        Circle( aPadPos, aDiameter, FILL_T::NO_FILL, GetCurrentLineWidth() );
     }
 
     SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
@@ -152,15 +146,6 @@ void PSLIKE_PLOTTER::FlashPadRect( const wxPoint& aPadPos, const wxSize& aSize,
     else
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
 
-    size.x -= GetCurrentLineWidth();
-    size.y -= GetCurrentLineWidth();
-
-    if( size.x < 1 )
-        size.x = 1;
-
-    if( size.y < 1 )
-        size.y = 1;
-
     int dx = size.x / 2;
     int dy = size.y / 2;
 
@@ -203,9 +188,6 @@ void PSLIKE_PLOTTER::FlashPadRoundRect( const wxPoint& aPadPos, const wxSize& aS
     else
     {
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
-        size.x -= GetCurrentLineWidth();
-        size.y -= GetCurrentLineWidth();
-        aCornerRadius -= GetCurrentLineWidth() / 2;
     }
 
 
@@ -243,8 +225,6 @@ void PSLIKE_PLOTTER::FlashPadCustom( const wxPoint& aPadPos, const wxSize& aSize
     else
     {
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
-        size.x -= GetCurrentLineWidth();
-        size.y -= GetCurrentLineWidth();
     }
 
 
@@ -283,23 +263,6 @@ void PSLIKE_PLOTTER::FlashPadTrapez( const wxPoint& aPadPos, const wxPoint *aCor
     else
     {
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
-        int w = GetCurrentLineWidth();
-
-        // offset polygon by w
-        // coord[0] is assumed the lower left
-        // coord[1] is assumed the upper left
-        // coord[2] is assumed the upper right
-        // coord[3] is assumed the lower right
-
-        /* Trace the outline. */
-        cornerList[0].x += w;
-        cornerList[0].y -= w;
-        cornerList[1].x += w;
-        cornerList[1].y += w;
-        cornerList[2].x -= w;
-        cornerList[2].y += w;
-        cornerList[3].x -= w;
-        cornerList[3].y -= w;
     }
 
     for( int ii = 0; ii < 4; ii++ )

common/plotters/plotter.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2022 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
@@ -93,12 +93,6 @@ DPOINT PLOTTER::userToDeviceCoordinates( const wxPoint& aCoordinate )
 {
     wxPoint pos = aCoordinate - m_plotOffset;
 
-    // Don't allow overflows; they can cause rendering failures in some file viewers
-    // (such as Acrobat)
-    int clampSize = MAX_PAGE_SIZE_MILS * m_IUsPerDecimil * 10 / 2;
-    pos.x = std::max( -clampSize, std::min( pos.x, clampSize ) );
-    pos.y = std::max( -clampSize, std::min( pos.y, clampSize ) );
-
     double x = pos.x * m_plotScale;
     double y = ( m_paperSize.y - pos.y * m_plotScale );
 
@@ -492,7 +486,7 @@ void PLOTTER::sketchOval( const wxPoint& pos, const wxSize& aSize, double orient
     }
 
     deltaxy = size.y - size.x;       /* distance between centers of the oval */
-    radius   = ( size.x - width ) / 2;
+    radius   = size.x / 2;
     cx = -radius;
     cy = -deltaxy / 2;
     RotatePoint( &cx, &cy, orient );

common/plugins/cadstar/cadstar_archive_parser.cpp

@@ -2258,6 +2258,10 @@ void CADSTAR_ARCHIVE_PARSER::ATTRCOLORS::Parse( XNODE* aNode, PARSER_CONTEXT* aC
             attrcol.Parse( cNode, aContext );
             AttributeColors.insert( { attrcol.AttributeID, attrcol } );
         }
+        else if( cNodeName == wxT( "INVISIBLE" ) )
+        {
+            IsVisible = false;
+        }
         else
         {
             THROW_UNKNOWN_NODE_IO_ERROR( cNodeName, aNode->GetName() );

common/plugins/cadstar/cadstar_archive_parser.h

@@ -1253,6 +1253,8 @@ public:
         DFLTSETTINGS DefaultSettings;
         std::map<ATTRIBUTE_ID, ATTRCOL> AttributeColors;
 
+        bool IsVisible = true; // unclear what this represents - maybe all attributes are hidden?
+
         void Parse( XNODE* aNode, PARSER_CONTEXT* aContext ) override;
     };
 

common/plugins/eagle/eagle_parser.cpp

@@ -538,18 +538,20 @@ EDIMENSION::EDIMENSION( wxXmlNode* aDimension )
           y2            %Coord;        #REQUIRED
           x3            %Coord;        #REQUIRED
           y3            %Coord;        #REQUIRED
+          textsize      %Coord;
           layer         %Layer;        #REQUIRED
           dtype         %DimensionType; "parallel"
           >
     */
 
-    x1    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x1" ) );
-    y1    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y1" ) );
-    x2    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x2" ) );
-    y2    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y2" ) );
-    x3    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x3" ) );
-    y3    = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y3" ) );
-    layer = parseRequiredAttribute<int>( aDimension, wxT( "layer" ) );
+    x1       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x1" ) );
+    y1       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y1" ) );
+    x2       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x2" ) );
+    y2       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y2" ) );
+    x3       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "x3" ) );
+    y3       = parseRequiredAttribute<ECOORD>( aDimension, wxT( "y3" ) );
+    textsize = parseOptionalAttribute<ECOORD>( aDimension, wxT( "textsize" ) );
+    layer    = parseRequiredAttribute<int>( aDimension, wxT( "layer" ) );
     dimensionType = parseOptionalAttribute<wxString>( aDimension, wxT( "dtype" ) );
 }
 

common/plugins/eagle/eagle_parser.h

@@ -531,13 +531,13 @@ struct EJUNCTION
 /// Eagle label
 struct ELABEL
 {
-    ECOORD     x;
-    ECOORD     y;
-    ECOORD     size;
-    LAYER_NUM  layer;
-    opt_erot rot;
+    ECOORD       x;
+    ECOORD       y;
+    ECOORD       size;
+    LAYER_NUM    layer;
+    opt_erot     rot;
     opt_wxString xref;
-    wxString netname;
+    wxString     netname;
 
     ELABEL( wxXmlNode* aLabel, const wxString& aNetName );
 };
@@ -619,14 +619,14 @@ struct EATTR
 /// Eagle dimension element
 struct EDIMENSION
 {
-    ECOORD x1;
-    ECOORD y1;
-    ECOORD x2;
-    ECOORD y2;
-    ECOORD x3;
-    ECOORD y3;
-    int    layer;
-
+    ECOORD       x1;
+    ECOORD       y1;
+    ECOORD       x2;
+    ECOORD       y2;
+    ECOORD       x3;
+    ECOORD       y3;
+    opt_ecoord   textsize;
+    int          layer;
     opt_wxString dimensionType;
 
     EDIMENSION( wxXmlNode* aDimension );

common/preview_items/polygon_geom_manager.cpp

@@ -83,7 +83,7 @@ void POLYGON_GEOM_MANAGER::SetLeaderMode( LEADER_MODE aMode )
 
 bool POLYGON_GEOM_MANAGER::IsSelfIntersecting( bool aIncludeLeaderPts ) const
 {
-    auto pts( m_lockedPoints );
+    SHAPE_LINE_CHAIN pts( m_lockedPoints );
 
     if( aIncludeLeaderPts )
     {

common/scintilla_tricks.cpp

@@ -37,6 +37,8 @@ SCINTILLA_TRICKS::SCINTILLA_TRICKS( wxStyledTextCtrl* aScintilla, const wxString
         m_te( aScintilla ),
         m_braces( aBraces ),
         m_lastCaretPos( -1 ),
+        m_lastSelStart( -1 ),
+        m_lastSelEnd( -1 ),
         m_suppressAutocomplete( false ),
         m_singleLine( aSingleLine ),
         m_returnCallback( aReturnCallback )
@@ -337,10 +339,14 @@ void SCINTILLA_TRICKS::onScintillaUpdateUI( wxStyledTextEvent& aEvent )
 
     // Has the caret changed position?
     int caretPos = m_te->GetCurrentPos();
+    int selStart = m_te->GetSelectionStart();
+    int selEnd = m_te->GetSelectionEnd();
 
-    if( m_lastCaretPos != caretPos )
+    if( m_lastCaretPos != caretPos || m_lastSelStart != selStart || m_lastSelEnd != selEnd )
     {
         m_lastCaretPos = caretPos;
+        m_lastSelStart = selStart;
+        m_lastSelEnd = selEnd;
         int bracePos1 = -1;
         int bracePos2 = -1;
 

common/settings/common_settings.cpp

@@ -509,44 +509,7 @@ void COMMON_SETTINGS::InitializeEnvironment()
     path.AppendDir( wxT( "3dmodels" ) );
     addVar( wxT( "KICAD6_3DMODEL_DIR" ), path.GetFullPath() );
 
-    // We don't have just one default template path, so use this logic that originally was in
-    // PGM_BASE::InitPgm to determine the best default template path
-    {
-        // Attempt to find the best default template path.
-        SEARCH_STACK bases;
-        SEARCH_STACK templatePaths;
-
-        SystemDirsAppend( &bases );
-
-        for( unsigned i = 0; i < bases.GetCount(); ++i )
-        {
-            wxFileName fn( bases[i], wxEmptyString );
-
-            // Add KiCad template file path to search path list.
-            fn.AppendDir( "template" );
-
-            // Only add path if exists and can be read by the user.
-            if( fn.DirExists() && fn.IsDirReadable() )
-            {
-                wxLogTrace( tracePathsAndFiles, "Checking template path '%s' exists",
-                            fn.GetPath() );
-                templatePaths.AddPaths( fn.GetPath() );
-            }
-        }
-
-        if( templatePaths.IsEmpty() )
-        {
-            path = basePath;
-            path.AppendDir( "template" );
-        }
-        else
-        {
-            // Take the first one.  There may be more but this will likely be the best option.
-            path.AssignDir( templatePaths[0] );
-        }
-
-        addVar( wxT( "KICAD6_TEMPLATE_DIR" ), path.GetFullPath() );
-    }
+    addVar( wxT( "KICAD6_TEMPLATE_DIR" ), PATHS::GetStockTemplatesPath() );
 
     addVar( wxT( "KICAD_USER_TEMPLATE_DIR" ), PATHS::GetUserTemplatesPath() );
 

common/settings/settings_manager.cpp

@@ -387,6 +387,7 @@ wxString SETTINGS_MANAGER::GetPathForSettingsFile( JSON_SETTINGS* aSettings )
         return GetUserSettingsPath();
 
     case SETTINGS_LOC::PROJECT:
+        // TODO: MDI support
         return Prj().GetProjectPath();
 
     case SETTINGS_LOC::COLORS:
@@ -954,42 +955,48 @@ std::vector<wxString> SETTINGS_MANAGER::GetOpenProjects() const
 }
 
 
-bool SETTINGS_MANAGER::SaveProject( const wxString& aFullPath )
+bool SETTINGS_MANAGER::SaveProject( const wxString& aFullPath, PROJECT* aProject )
 {
+    if( !aProject )
+        aProject = &Prj();
+
     wxString path = aFullPath;
 
     if( path.empty() )
-        path = Prj().GetProjectFullName();
+        path = aProject->GetProjectFullName();
 
     // TODO: refactor for MDI
-    if( Prj().IsReadOnly() )
+    if( aProject->IsReadOnly() )
         return false;
 
     if( !m_project_files.count( path ) )
         return false;
 
     PROJECT_FILE* project     = m_project_files.at( path );
-    wxString      projectPath = GetPathForSettingsFile( project );
+    wxString      projectPath = aProject->GetProjectPath();
 
     project->SaveToFile( projectPath );
-    Prj().GetLocalSettings().SaveToFile( projectPath );
+    aProject->GetLocalSettings().SaveToFile( projectPath );
 
     return true;
 }
 
 
-void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath )
+void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath, PROJECT* aProject )
 {
-    wxString oldName = Prj().GetProjectFullName();
+    if( !aProject )
+        aProject = &Prj();
+
+    wxString oldName = aProject->GetProjectFullName();
 
     if( aFullPath.IsSameAs( oldName ) )
     {
-        SaveProject( aFullPath );
+        SaveProject( aFullPath, aProject );
         return;
     }
 
     // Changing this will cause UnloadProject to not save over the "old" project when loading below
-    Prj().setProjectFullName( aFullPath );
+    aProject->setProjectFullName( aFullPath );
 
     wxFileName fn( aFullPath );
 
@@ -997,14 +1004,14 @@ void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath )
 
     // Ensure read-only flags are copied; this allows doing a "Save As" on a standalong board/sch
     // without creating project files if the checkbox is turned off
-    project->SetReadOnly( Prj().IsReadOnly() );
-    Prj().GetLocalSettings().SetReadOnly( Prj().IsReadOnly() );
+    project->SetReadOnly( aProject->IsReadOnly() );
+    aProject->GetLocalSettings().SetReadOnly( aProject->IsReadOnly() );
 
     project->SetFilename( fn.GetName() );
     project->SaveToFile( fn.GetPath() );
 
-    Prj().GetLocalSettings().SetFilename( fn.GetName() );
-    Prj().GetLocalSettings().SaveToFile( fn.GetPath() );
+    aProject->GetLocalSettings().SetFilename( fn.GetName() );
+    aProject->GetLocalSettings().SaveToFile( fn.GetPath() );
 
     m_project_files[fn.GetFullPath()] = project;
     m_project_files.erase( oldName );
@@ -1014,9 +1021,12 @@ void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath )
 }
 
 
-void SETTINGS_MANAGER::SaveProjectCopy( const wxString& aFullPath )
+void SETTINGS_MANAGER::SaveProjectCopy( const wxString& aFullPath, PROJECT* aProject )
 {
-    PROJECT_FILE* project = m_project_files.at( Prj().GetProjectFullName() );
+    if( !aProject )
+        aProject = &Prj();
+
+    PROJECT_FILE* project = m_project_files.at( aProject->GetProjectFullName() );
     wxString      oldName = project->GetFilename();
     wxFileName    fn( aFullPath );
 
@@ -1027,9 +1037,11 @@ void SETTINGS_MANAGER::SaveProjectCopy( const wxString& aFullPath )
     project->SaveToFile( fn.GetPath() );
     project->SetFilename( oldName );
 
-    Prj().GetLocalSettings().SetFilename( fn.GetName() );
-    Prj().GetLocalSettings().SaveToFile( fn.GetPath() );
-    Prj().GetLocalSettings().SetFilename( oldName );
+    PROJECT_LOCAL_SETTINGS& localSettings = aProject->GetLocalSettings();
+
+    localSettings.SetFilename( fn.GetName() );
+    localSettings.SaveToFile( fn.GetPath() );
+    localSettings.SetFilename( oldName );
 
     project->SetReadOnly( readOnly );
 }

common/single_top.cpp

@@ -96,7 +96,12 @@ static struct PGM_SINGLE_TOP : public PGM_BASE
             KIWAY_PLAYER* frame = (KIWAY_PLAYER*) App().GetTopWindow();
     #endif
             if( frame )
+            {
+                if( wxWindow* blocking_win = frame->Kiway().GetBlockingDialog() )
+                    blocking_win->Close( true );
+
                 frame->OpenProjectFiles( std::vector<wxString>( 1, aFileName ) );
+            }
         }
     }
 

common/string_utils.cpp

@@ -50,6 +50,8 @@ wxString ConvertToNewOverbarNotation( const wxString& aOldStr )
     if( aOldStr == wxT( "~" ) )
         return aOldStr;
 
+    newStr.reserve( aOldStr.length() );
+
     for( wxString::const_iterator chIt = aOldStr.begin(); chIt != aOldStr.end(); ++chIt )
     {
         if( *chIt == '~' )
@@ -140,7 +142,17 @@ bool ConvertSmartQuotesAndDashes( wxString* aString )
 
 wxString EscapeString( const wxString& aSource, ESCAPE_CONTEXT aContext )
 {
-    wxString converted;
+    wxString          converted;
+    std::vector<bool> braceStack;    // true == formatting construct
+
+    auto hasFormattingPrefix =
+            [&]()
+            {
+                static wxString prefixes = wxT( "~_^" );
+                return !converted.IsEmpty() && prefixes.Find( converted.Last() ) >= 0;
+            };
+
+    converted.reserve( aSource.length() );
 
     for( wxUniChar c: aSource )
     {
@@ -155,7 +167,7 @@ wxString EscapeString( const wxString& aSource, ESCAPE_CONTEXT aContext )
         }
         else if( aContext == CTX_LIBID )
         {
-            if( c == '{' )
+            if( c == '{' && !hasFormattingPrefix() )
                 converted += wxT( "{brace}" );
             else if( c == '/' )
                 converted += wxT( "{slash}" );
@@ -223,7 +235,9 @@ wxString EscapeString( const wxString& aSource, ESCAPE_CONTEXT aContext )
                 converted += c;
         }
         else
+        {
             converted += c;
+        }
     }
 
     return converted;
@@ -232,8 +246,16 @@ wxString EscapeString( const wxString& aSource, ESCAPE_CONTEXT aContext )
 
 wxString UnescapeString( const wxString& aSource )
 {
+    size_t sourceLen = aSource.length();
+
+    // smallest escape string is three characters, shortcut everything else
+    if( sourceLen <= 2 )
+    {
+        return aSource;
+    }
+
     wxString newbuf;
-    size_t   sourceLen = aSource.length();
+    newbuf.reserve( sourceLen );
 
     for( size_t i = 0; i < sourceLen; ++i )
     {
@@ -305,6 +327,8 @@ wxString TitleCaps( const wxString& aString )
 
     wxStringSplit( aString, words, ' ' );
 
+    result.reserve( aString.length() );
+
     for( const wxString& word : words )
     {
         if( !result.IsEmpty() )
@@ -423,6 +447,8 @@ std::string EscapedUTF8( const wxString& aString )
 
     std::string ret;
 
+    ret.reserve( utf8.length() + 2 );
+
     ret += '"';
 
     for( std::string::const_iterator it = utf8.begin();  it!=utf8.end();  ++it )
@@ -454,6 +480,8 @@ wxString EscapeHTML( const wxString& aString )
 {
     wxString converted;
 
+    converted.reserve( aString.length() );
+
     for( wxUniChar c : aString )
     {
         if( c == '\"' )

common/tool/action_menu.cpp

@@ -183,21 +183,20 @@ wxMenuItem* ACTION_MENU::Add( const TOOL_ACTION& aAction, bool aIsCheckmarkEntry
 
 wxMenuItem* ACTION_MENU::Add( ACTION_MENU* aMenu )
 {
-    ACTION_MENU* menuCopy = aMenu->Clone();
-    m_submenus.push_back( menuCopy );
+    m_submenus.push_back( aMenu );
 
-    wxASSERT_MSG( !menuCopy->m_title.IsEmpty(), wxT( "Set a title for ACTION_MENU using SetTitle()" ) );
+    wxASSERT_MSG( !aMenu->m_title.IsEmpty(), wxT( "Set a title for ACTION_MENU using SetTitle()" ) );
 
     if( !!aMenu->m_icon )
     {
-        wxMenuItem* newItem = new wxMenuItem( this, -1, menuCopy->m_title );
+        wxMenuItem* newItem = new wxMenuItem( this, -1, aMenu->m_title );
         AddBitmapToMenuItem( newItem, KiBitmap( aMenu->m_icon ) );
-        newItem->SetSubMenu( menuCopy );
+        newItem->SetSubMenu( aMenu );
         return Append( newItem );
     }
     else
     {
-        return AppendSubMenu( menuCopy, menuCopy->m_title );
+        return AppendSubMenu( aMenu, aMenu->m_title );
     }
 }
 

common/tool/action_toolbar.cpp

@@ -335,7 +335,12 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
     // Update the item information
     item->SetShortHelp( aAction.GetDescription() );
     item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
+#if wxCHECK_VERSION( 3, 1, 6 )
+    item->SetDisabledBitmap(
+            MakeDisabledBitmap( item->GetBitmapBundle().GetBitmapFor( GetParent() ) ) );
+#else
     item->SetDisabledBitmap( MakeDisabledBitmap( item->GetBitmap() ) );
+#endif
 
     // Register a new handler with the new UI conditions
     if( m_toolManager )

common/tool/common_control.cpp

@@ -177,6 +177,13 @@ int COMMON_CONTROL::ShowPlayer( const TOOL_EVENT& aEvent )
     if( wxWindow::FindFocus() != editor )
         editor->SetFocus();
 
+    // If the player is currently blocked, focus the user attention on the correct window
+    if( wxWindow* blocking_win = editor->Kiway().GetBlockingDialog() )
+    {
+        blocking_win->Raise();
+        blocking_win->SetFocus();
+    }
+
     return 0;
 }
 

common/tool/conditional_menu.cpp

@@ -144,20 +144,21 @@ void CONDITIONAL_MENU::Evaluate( SELECTION& aSelection )
         switch( entry.Type() )
         {
             case ENTRY::ACTION:
-                menuItem = Add( *entry.Action(), entry.IsCheckmarkEntry() );
+                Add( *entry.Action(), entry.IsCheckmarkEntry() );
                 menu_count++;
                 break;
 
             case ENTRY::MENU:
-                menuItem = Add( entry.Menu() );
+                entry.Menu()->UpdateTitle();
+                Add( entry.Menu()->Clone() );
                 menu_count++;
                 break;
 
             case ENTRY::WXITEM:
                 menuItem = new wxMenuItem( this,
                                            entry.wxItem()->GetId(),
-                                           entry.wxItem()->GetItemLabel(),
-                                           entry.wxItem()->GetHelp(),
+                                           wxGetTranslation( entry.wxItem()->GetItemLabel() ),
+                                           wxGetTranslation( entry.wxItem()->GetHelp() ),
                                            entry.wxItem()->GetKind() );
 
                 if( !!entry.GetIcon() )
@@ -171,7 +172,7 @@ void CONDITIONAL_MENU::Evaluate( SELECTION& aSelection )
 
             case ENTRY::SEPARATOR:
                 if( menu_count )
-                    menuItem = AppendSeparator();
+                    AppendSeparator();
 
                 menu_count = 0;
                 break;

common/tool/grid_menu.cpp

@@ -37,7 +37,7 @@ GRID_MENU::GRID_MENU( EDA_DRAW_FRAME* aParent ) :
         ACTION_MENU( true ),
         m_parent( aParent )
 {
-    SetTitle( _( "Grid" ) );
+    UpdateTitle();
     SetIcon( BITMAPS::grid_select );
 
     APP_SETTINGS_BASE* settings = m_parent->config();
@@ -59,6 +59,12 @@ OPT_TOOL_EVENT GRID_MENU::eventHandler( const wxMenuEvent& aEvent )
 }
 
 
+void GRID_MENU::UpdateTitle()
+{
+    SetTitle( _( "Grid" ) );
+}
+
+
 void GRID_MENU::update()
 {
     APP_SETTINGS_BASE* settings = m_parent->config();

common/tool/tool_dispatcher.cpp

@@ -452,7 +452,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
     {
         wxWindow* holderWindow = dynamic_cast<wxWindow*>( m_toolMgr->GetToolHolder() );
 
-#if defined( _WIN32 )
+#if defined( _WIN32 ) || defined( __WXGTK__ )
         // Mouse events may trigger regardless of window status (windows feature)
         // However we need to avoid focus fighting (especially modals)
         if( holderWindow && KIPLATFORM::UI::IsWindowActive( holderWindow ) )

common/tool/tool_manager.cpp

@@ -206,7 +206,8 @@ TOOL_MANAGER::TOOL_MANAGER() :
         m_warpMouseAfterContextMenu( true ),
         m_menuActive( false ),
         m_menuOwner( -1 ),
-        m_activeState( nullptr )
+        m_activeState( nullptr ),
+        m_shuttingDown( false )
 {
     m_actionMgr = new ACTION_MANAGER( this );
 }
@@ -313,6 +314,9 @@ VECTOR2D TOOL_MANAGER::GetCursorPosition() const
 
 bool TOOL_MANAGER::RunAction( const TOOL_ACTION& aAction, bool aNow, void* aParam )
 {
+    if( m_shuttingDown )
+        return true;
+
     bool       handled = false;
     TOOL_EVENT event = aAction.MakeEvent();
 
@@ -446,10 +450,22 @@ bool TOOL_MANAGER::runTool( TOOL_BASE* aTool )
 
 void TOOL_MANAGER::ShutdownAllTools()
 {
+    m_shuttingDown = true;
+
     // Create a temporary list of tools to iterate over since when the tools shutdown
     // they remove themselves from the list automatically (invalidating the iterator)
     ID_LIST tmpList = m_activeTools;
 
+    // Make sure each tool knows that it is shutting down, so that loops get shut down
+    // at the dispatcher
+    for( auto id : tmpList )
+    {
+        if( m_toolIdIndex.count( id ) == 0 )
+            continue;
+
+        m_toolIdIndex[id]->shutdown = true;
+    }
+
     for( auto id : tmpList )
     {
         ShutdownTool( id );
@@ -949,6 +965,11 @@ TOOL_MANAGER::ID_LIST::iterator TOOL_MANAGER::finishTool( TOOL_STATE* aState )
 
 bool TOOL_MANAGER::ProcessEvent( const TOOL_EVENT& aEvent )
 {
+    // Once the tool manager is shutting down, don't start
+    // activating more tools
+    if( m_shuttingDown )
+        return true;
+
     bool handled = processEvent( aEvent );
 
     TOOL_STATE* activeTool = GetCurrentToolState();

common/tool/zoom_menu.cpp

@@ -40,13 +40,8 @@ ZOOM_MENU::ZOOM_MENU( EDA_DRAW_FRAME* aParent ) :
         ACTION_MENU( true ),
         m_parent( aParent )
 {
-    SetTitle( _( "Zoom" ) );
+    UpdateTitle();
     SetIcon( BITMAPS::zoom_selection );
-
-    int i = ID_POPUP_ZOOM_LEVEL_START + 1;  // 0 reserved for menus which support auto-zoom
-
-    for( double factor : m_parent->config()->m_Window.zoom_factors )
-        Append( i++, wxString::Format( _( "Zoom: %.2f" ), factor ), wxEmptyString, wxITEM_CHECK );
 }
 
 
@@ -58,17 +53,30 @@ OPT_TOOL_EVENT ZOOM_MENU::eventHandler( const wxMenuEvent& aEvent )
 }
 
 
+void ZOOM_MENU::UpdateTitle()
+{
+    SetTitle( _( "Zoom" ) );
+}
+
+
 void ZOOM_MENU::update()
 {
+    Clear();
+
+    int ii = ID_POPUP_ZOOM_LEVEL_START + 1;  // 0 reserved for menus which support auto-zoom
+
+    for( double factor : m_parent->config()->m_Window.zoom_factors )
+        Append( ii++, wxString::Format( _( "Zoom: %.2f" ), factor ), wxEmptyString, wxITEM_CHECK );
+
     double zoom = m_parent->GetCanvas()->GetGAL()->GetZoomFactor();
 
     const std::vector<double>& zoomList = m_parent->config()->m_Window.zoom_factors;
 
-    for( size_t i = 0; i < zoomList.size(); ++i )
+    for( size_t jj = 0; jj < zoomList.size(); ++jj )
     {
         // Search for a value near the current zoom setting:
-        double rel_error = std::fabs( zoomList[i] - zoom ) / zoom;
+        double rel_error = std::fabs( zoomList[jj] - zoom ) / zoom;
         // IDs start with 1 (leaving 0 for auto-zoom)
-        Check( ID_POPUP_ZOOM_LEVEL_START + i + 1, rel_error < 0.1 );
+        Check( ID_POPUP_ZOOM_LEVEL_START + jj + 1, rel_error < 0.1 );
     }
 }

common/view/wx_view_controls.cpp

@@ -36,6 +36,7 @@
 #include <trace_helpers.h>
 #include <settings/common_settings.h>
 #include <math/util.h>      // for KiROUND
+#include <geometry/geometry_utils.h>
 #include <widgets/ui_common.h>
 #include <class_draw_panel_gal.h>
 #include <kiplatform/ui.h>
@@ -300,7 +301,7 @@ void WX_VIEW_CONTROLS::onMotion( wxMouseEvent& aEvent )
     }
 
     if( m_updateCursor )        // do not update the cursor position if it was explicitly set
-        m_cursorPos = m_view->ToWorld( mousePos );
+        m_cursorPos = GetClampedCoords( m_view->ToWorld( mousePos ) );
     else
         m_updateCursor = true;
 
@@ -458,8 +459,8 @@ void WX_VIEW_CONTROLS::onEnter( wxMouseEvent& aEvent )
         return;
     }
 
-#if defined( _WIN32 )
-    // Win32 transmits mouse move and wheel events to all controls below the mouse regardless
+#if defined( _WIN32 ) || defined( __WXGTK__ )
+    // Win32 and some *nix WMs transmit mouse move and wheel events to all controls below the mouse regardless
     // of focus.  Forcing the focus here will cause the EDA FRAMES to immediately become the
     // top level active window.
     if( m_parentPanel->GetParent() != nullptr )
@@ -648,7 +649,7 @@ VECTOR2D WX_VIEW_CONTROLS::GetMousePosition( bool aWorldCoordinates ) const
     wxPoint msp = getMouseScreenPosition();
     VECTOR2D screenPos( msp.x, msp.y );
 
-    return aWorldCoordinates ? m_view->ToWorld( screenPos ) : screenPos;
+    return aWorldCoordinates ? GetClampedCoords( m_view->ToWorld( screenPos ) ) : screenPos;
 }
 
 
@@ -675,7 +676,7 @@ VECTOR2D WX_VIEW_CONTROLS::GetCursorPosition( bool aEnableSnapping ) const
     }
     else
     {
-        return GetRawCursorPosition( aEnableSnapping );
+        return GetClampedCoords( GetRawCursorPosition( aEnableSnapping ) );
     }
 }
 
@@ -685,10 +686,12 @@ void WX_VIEW_CONTROLS::SetCursorPosition( const VECTOR2D& aPosition, bool aWarpV
 {
     m_updateCursor = false;
 
+    VECTOR2D clampedPosition = GetClampedCoords( aPosition );
+
     if( aTriggeredByArrows )
     {
         m_settings.m_lastKeyboardCursorPositionValid = true;
-        m_settings.m_lastKeyboardCursorPosition = aPosition;
+        m_settings.m_lastKeyboardCursorPosition = clampedPosition;
         m_settings.m_lastKeyboardCursorCommand = aArrowCommand;
         m_cursorWarped = false;
     }
@@ -700,8 +703,8 @@ void WX_VIEW_CONTROLS::SetCursorPosition( const VECTOR2D& aPosition, bool aWarpV
         m_cursorWarped = true;
     }
 
-    WarpCursor( aPosition, true, aWarpView );
-    m_cursorPos = aPosition;
+    WarpCursor( clampedPosition, true, aWarpView );
+    m_cursorPos = clampedPosition;
 }
 
 
@@ -710,14 +713,16 @@ void WX_VIEW_CONTROLS::SetCrossHairCursorPosition( const VECTOR2D& aPosition,
 {
     m_updateCursor = false;
 
+    VECTOR2D clampedPosition = GetClampedCoords( aPosition );
+
     const VECTOR2I& screenSize = m_view->GetGAL()->GetScreenPixelSize();
-    BOX2I screen( VECTOR2I( 0, 0 ), screenSize );
-    VECTOR2D screenPos = m_view->ToScreen( aPosition );
+    BOX2I           screen( VECTOR2I( 0, 0 ), screenSize );
+    VECTOR2D        screenPos = m_view->ToScreen( clampedPosition );
 
     if( aWarpView && !screen.Contains( screenPos ) )
-        m_view->SetCenter( aPosition );
+        m_view->SetCenter( clampedPosition );
 
-    m_cursorPos = aPosition;
+    m_cursorPos = clampedPosition;
 }
 
 
@@ -727,14 +732,15 @@ void WX_VIEW_CONTROLS::WarpCursor( const VECTOR2D& aPosition, bool aWorldCoordin
     if( aWorldCoordinates )
     {
         const VECTOR2I& screenSize = m_view->GetGAL()->GetScreenPixelSize();
-        BOX2I screen( VECTOR2I( 0, 0 ), screenSize );
-        VECTOR2D screenPos = m_view->ToScreen( aPosition );
+        BOX2I           screen( VECTOR2I( 0, 0 ), screenSize );
+        VECTOR2D        clampedPosition = GetClampedCoords( aPosition );
+        VECTOR2D        screenPos = m_view->ToScreen( clampedPosition );
 
         if( !screen.Contains( screenPos ) )
         {
             if( aWarpView )
             {
-                m_view->SetCenter( aPosition );
+                m_view->SetCenter( clampedPosition );
                 m_parentPanel->WarpPointer( screenSize.x / 2, screenSize.y / 2 );
             }
         }
@@ -889,7 +895,7 @@ void WX_VIEW_CONTROLS::refreshMouse()
     moveEvent.SetShiftDown( wxGetKeyState( WXK_SHIFT ) );
     moveEvent.SetAltDown( wxGetKeyState( WXK_ALT ) );
 
-    m_cursorPos = m_view->ToWorld( VECTOR2D( msp.x, msp.y ) );
+    m_cursorPos = GetClampedCoords( m_view->ToWorld( VECTOR2D( msp.x, msp.y ) ) );
     wxPostEvent( m_parentPanel, moveEvent );
 }
 
@@ -943,6 +949,8 @@ void WX_VIEW_CONTROLS::UpdateScrollbars()
 
 void WX_VIEW_CONTROLS::ForceCursorPosition( bool aEnabled, const VECTOR2D& aPosition )
 {
+    VECTOR2D clampedPosition = GetClampedCoords( aPosition );
+
     m_settings.m_forceCursorPosition = aEnabled;
-    m_settings.m_forcedPosition = aPosition;
+    m_settings.m_forcedPosition = clampedPosition;
 }

common/widgets/bitmap_toggle.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
  * @author Jon Evans <jon@craftyjon.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -26,6 +26,7 @@
 
 #include <wx/sizer.h>
 #include <wx/statbmp.h>
+#include <wx/timer.h>
 
 wxDEFINE_EVENT( TOGGLE_CHANGED, wxCommandEvent );
 
@@ -35,7 +36,8 @@ BITMAP_TOGGLE::BITMAP_TOGGLE( wxWindow *aParent, wxWindowID aId, const wxBitmap&
         wxPanel( aParent, aId ),
         m_checked( aChecked ),
         m_unchecked_bitmap( aUncheckedBitmap ),
-        m_checked_bitmap( aCheckedBitmap )
+        m_checked_bitmap( aCheckedBitmap ),
+        m_debounce( 0 )
 {
     wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
     SetSizer( sizer );
@@ -47,13 +49,21 @@ BITMAP_TOGGLE::BITMAP_TOGGLE( wxWindow *aParent, wxWindowID aId, const wxBitmap&
     sizer->Add( m_bitmap, 0, 0 );
 
     m_bitmap->Bind( wxEVT_LEFT_UP,
-                    [&]( wxMouseEvent& )
+                    [&]( wxMouseEvent& event )
                     {
+                        wxLongLong now = wxGetLocalTimeMillis();
+
+                        if( now - m_debounce < 50 )
+                            return;
+                        else
+                            m_debounce = now;
+
                         SetValue( !GetValue() );
-                        wxCommandEvent event( TOGGLE_CHANGED );
-                        event.SetInt( m_checked );
-                        event.SetEventObject( this );
-                        wxPostEvent( this, event );
+
+                        wxCommandEvent command( TOGGLE_CHANGED );
+                        command.SetInt( m_checked );
+                        command.SetEventObject( this );
+                        wxPostEvent( this, command );
                     } );
 
     auto passOnEvent =

common/widgets/grid_text_button_helpers.cpp

@@ -59,10 +59,17 @@ wxString GRID_CELL_TEXT_BUTTON::GetValue() const
 void GRID_CELL_TEXT_BUTTON::SetSize( const wxRect& aRect )
 {
     wxRect rect( aRect );
-    rect.Inflate( -1 );
 
 #if defined( __WXMAC__ )
-    rect.Inflate( 3 );      // no FOCUS_RING, even on Mac
+    rect.Inflate( 2 );      // ignore FOCUS_RING
+#elif defined( __WXGTK__ )
+    rect.Inflate( -3 );     // The -3 is a very sad hack here.  Some GTK themes overrun the
+                            // default -1, preventing display.  Unfortunately, we don't appear to
+                            // have a good method of finding the current margin needed.
+                            // Some GTK resize events seem to update the cell size but not all and
+                            // not consistently.
+#else
+    rect.Inflate( -1 );
 #endif
 
     Combo()->SetSize( rect, wxSIZE_ALLOW_MINUS_ONE );
@@ -291,10 +298,11 @@ void GRID_CELL_FOOTPRINT_ID_EDITOR::Create( wxWindow* aParent, wxWindowID aId,
 class TEXT_BUTTON_URL : public wxComboCtrl
 {
 public:
-    TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg ) :
+    TEXT_BUTTON_URL( wxWindow* aParent, DIALOG_SHIM* aParentDlg, SEARCH_STACK* aSearchStack ) :
             wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
                          wxTE_PROCESS_ENTER ),
-            m_dlg( aParentDlg )
+            m_dlg( aParentDlg ),
+            m_searchStack( aSearchStack )
     {
         SetButtonBitmaps( KiBitmap( BITMAPS::www ) );
 
@@ -313,17 +321,18 @@ protected:
         wxString filename = GetValue();
 
         if( !filename.IsEmpty() && filename != wxT( "~" ) )
-            GetAssociatedDocument( m_dlg, GetValue(), &m_dlg->Prj() );
+            GetAssociatedDocument( m_dlg, GetValue(), &m_dlg->Prj(), m_searchStack );
     }
 
     DIALOG_SHIM* m_dlg;
+    SEARCH_STACK* m_searchStack;
 };
 
 
 void GRID_CELL_URL_EDITOR::Create( wxWindow* aParent, wxWindowID aId,
                                    wxEvtHandler* aEventHandler )
 {
-    m_control = new TEXT_BUTTON_URL( aParent, m_dlg );
+    m_control = new TEXT_BUTTON_URL( aParent, m_dlg, m_searchStack );
 
 #if wxUSE_VALIDATORS
     // validate text in textctrl, if validator is set

common/widgets/msgpanel.cpp

@@ -63,7 +63,7 @@ EDA_MSG_PANEL::~EDA_MSG_PANEL()
 int EDA_MSG_PANEL::GetRequiredHeight( wxWindow* aWindow )
 {
     wxSize     fontSizeInPixels;
-    wxScreenDC dc;
+    wxWindowDC dc( aWindow );
 
     dc.SetFont( KIUI::GetControlFont( aWindow ) );
     dc.GetTextExtent( wxT( "W" ), &fontSizeInPixels.x, &fontSizeInPixels.y );

common/widgets/net_selector.cpp

@@ -335,7 +335,12 @@ protected:
             }
         }
 
-        std::sort( netNames.begin(), netNames.end() );
+        std::sort( netNames.begin(), netNames.end(),
+                []( const wxString& lhs, const wxString& rhs )
+                {
+                    return StrNumCmp( lhs, rhs, true /* ignore case */ ) < 0;
+                } );
+
 
         // Special handling for <no net>
         if( filter.IsEmpty() || wxString( NO_NET ).MakeLower().Matches( filter ) )

common/widgets/progress_reporter_base.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2017 CERN
- * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  *
@@ -121,7 +121,7 @@ bool PROGRESS_REPORTER_BASE::KeepRefreshing( bool aWait )
                 return false;
             }
 
-            wxMilliSleep( 20 );
+            wxMilliSleep( 33 /* 30 FPS refresh rate */ );
         }
 
         return true;

common/widgets/unit_binder.cpp

@@ -250,7 +250,7 @@ bool UNIT_BINDER::Validate( double aMin, double aMax, EDA_UNITS aUnits )
 }
 
 
-void UNIT_BINDER::SetValue( int aValue )
+void UNIT_BINDER::SetValue( long long int aValue )
 {
     double value = aValue;
     double displayValue = m_originTransforms.ToDisplay( value, m_coordType );

common/widgets/wx_grid.cpp

@@ -40,6 +40,11 @@ WX_GRID::WX_GRID( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxS
 
     // Make sure the GUI font scales properly on GTK
     SetDefaultCellFont( KIUI::GetControlFont( this ) );
+
+#if wxCHECK_VERSION( 3, 1, 0 )
+    Connect( wxEVT_DPI_CHANGED, wxDPIChangedEventHandler( WX_GRID::onDPIChanged ), nullptr, this );
+#endif
+
 }
 
 
@@ -47,9 +52,25 @@ WX_GRID::~WX_GRID()
 {
     if( m_weOwnTable )
         DestroyTable( GetTable() );
+
+#if wxCHECK_VERSION( 3, 1, 0 )
+    Disconnect( wxEVT_DPI_CHANGED, wxDPIChangedEventHandler( WX_GRID::onDPIChanged ), nullptr, this );
+#endif
+
 }
 
 
+#if wxCHECK_VERSION( 3, 1, 0 )
+void WX_GRID::onDPIChanged(wxDPIChangedEvent& aEvt)
+{
+    /// This terrible hack is a way to avoid the incredibly disruptive resizing of grids that happens on Macs
+    /// when moving a window between monitors of different DPIs.
+#ifndef __WXMAC__
+    aEvt.Skip();
+#endif
+}
+#endif
+
 void WX_GRID::SetColLabelSize( int aHeight )
 {
     if( aHeight == 0 )

cvpcb/auto_associate.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2022 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
@@ -94,7 +94,10 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
     {
         fn =  wxExpandEnvVars( equfile );
 
-        tmp = search.FindValidPath( fn.GetFullPath() );
+        if( fn.IsAbsolute() || fn.FileExists() )
+            tmp = fn.GetFullPath();
+        else
+            tmp = search.FindValidPath( fn.GetFullPath() );
 
         if( !tmp )
         {
@@ -102,8 +105,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList,
 
             if( aErrorMessages )
             {
-                error_msg.Printf( _( "Equivalence file '%s' could not be found in the "
-                                     "default search paths." ),
+                error_msg.Printf( _( "Equivalence file '%s' could not be found." ),
                                   fn.GetFullName() );
 
                 if( ! aErrorMessages->IsEmpty() )

cvpcb/cvpcb_mainframe.cpp

@@ -276,9 +276,10 @@ void CVPCB_MAINFRAME::setupUIConditions()
 #define ENABLE( x ) ACTION_CONDITIONS().Enable( x )
 #define CHECK( x )  ACTION_CONDITIONS().Check( x )
 
-    mgr->SetConditions( CVPCB_ACTIONS::saveAssociations, ENABLE( cond.ContentModified() ) );
-    mgr->SetConditions( ACTIONS::undo,                   ENABLE( cond.UndoAvailable() ) );
-    mgr->SetConditions( ACTIONS::redo,                   ENABLE( cond.RedoAvailable() ) );
+    mgr->SetConditions( CVPCB_ACTIONS::saveAssociationsToSchematic, ENABLE( cond.ContentModified() ) );
+    mgr->SetConditions( CVPCB_ACTIONS::saveAssociationsToFile,      ENABLE( cond.ContentModified() ) );
+    mgr->SetConditions( ACTIONS::undo,                              ENABLE( cond.UndoAvailable() ) );
+    mgr->SetConditions( ACTIONS::redo,                              ENABLE( cond.RedoAvailable() ) );
 
     auto compFilter =
             [this] ( const SELECTION& )
@@ -327,7 +328,7 @@ void CVPCB_MAINFRAME::setupEventHandlers()
             [this]( wxCommandEvent& )
             {
                 // saveAssociations must be run immediately
-                GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true );
+                GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociationsToFile, true );
             } );
 
     // Connect the handlers for the ok/cancel buttons
@@ -335,7 +336,7 @@ void CVPCB_MAINFRAME::setupEventHandlers()
             [this]( wxCommandEvent& )
             {
                 // saveAssociations must be run immediately, before running Close( true )
-                GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociations, true );
+                GetToolManager()->RunAction( CVPCB_ACTIONS::saveAssociationsToSchematic, true );
                 Close( true );
             }, wxID_OK );
     Bind( wxEVT_BUTTON,

cvpcb/menubar.cpp

@@ -46,7 +46,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
     //
     ACTION_MENU*   fileMenu = new ACTION_MENU( false, tool );
 
-    fileMenu->Add( CVPCB_ACTIONS::saveAssociations );
+    fileMenu->Add( CVPCB_ACTIONS::saveAssociationsToSchematic );
     fileMenu->AppendSeparator();
     fileMenu->AddClose( _( "Assign Footprints" ) );
 

cvpcb/toolbars_cvpcb.cpp

@@ -46,7 +46,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
         m_mainToolBar->SetAuiManager( &m_auimgr );
     }
 
-    m_mainToolBar->Add( CVPCB_ACTIONS::saveAssociations );
+    m_mainToolBar->Add( CVPCB_ACTIONS::saveAssociationsToSchematic );
 
     m_mainToolBar->AddScaledSeparator( this );
     m_mainToolBar->Add( ACTIONS::showFootprintLibTable );

cvpcb/tools/cvpcb_actions.cpp

@@ -61,13 +61,20 @@ TOOL_ACTION CVPCB_ACTIONS::showEquFileTable( "cvpcb.Control.ShowEquFileTable",
         _( "Configure footprint association file (.equ) list.  These files are "
            "used to automatically assign footprint names from symbol values." ) );
 
-TOOL_ACTION CVPCB_ACTIONS::saveAssociations( "cvpcb.Control.SaveAssociations",
+TOOL_ACTION CVPCB_ACTIONS::saveAssociationsToSchematic( "cvpcb.Control.SaveAssociationsToSchematic",
         AS_GLOBAL,
         MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ),
         _( "Save to Schematic" ),
         _( "Save footprint associations in schematic symbol footprint fields" ),
         BITMAPS::save );
 
+TOOL_ACTION CVPCB_ACTIONS::saveAssociationsToFile( "cvpcb.Control.SaveAssociationsToFile",
+        AS_GLOBAL,
+        MD_CTRL + 'S', LEGACY_HK_NAME( "Save" ),
+        _( "Save to Schematic and File" ),
+        _( "Save footprint associations in schematic symbol footprint fields and schematic files" ),
+        BITMAPS::save );
+
 // Actions to navigate the display
 TOOL_ACTION CVPCB_ACTIONS::changeFocusRight( "cvpcb.Control.changeFocusRight",
         AS_GLOBAL,

cvpcb/tools/cvpcb_actions.h

@@ -53,7 +53,8 @@ public:
     static TOOL_ACTION gotoNextNA;
 
     /// Management actions
-    static TOOL_ACTION saveAssociations;
+    static TOOL_ACTION saveAssociationsToSchematic;
+    static TOOL_ACTION saveAssociationsToFile;
     static TOOL_ACTION showEquFileTable;
 
     /// Footprint Association actions

cvpcb/tools/cvpcb_control.cpp

@@ -167,6 +167,9 @@ int CVPCB_CONTROL::ShowFootprintViewer( const TOOL_EVENT& aEvent )
     }
     else
     {
+        if( wxWindow* blocking_win = fpframe->Kiway().GetBlockingDialog() )
+            blocking_win->Close( true );
+
         if( fpframe->IsIconized() )
             fpframe->Iconize( false );
 
@@ -210,13 +213,20 @@ int CVPCB_CONTROL::ShowEquFileTable( const TOOL_EVENT& aEvent )
 }
 
 
-int CVPCB_CONTROL::SaveAssociations( const TOOL_EVENT& aEvent )
+int CVPCB_CONTROL::SaveAssociationsToFile( const TOOL_EVENT& aEvent )
 {
     m_frame->SaveFootprintAssociation( true );
     return 0;
 }
 
 
+int CVPCB_CONTROL::SaveAssociationsToSchematic( const TOOL_EVENT& aEvent )
+{
+    m_frame->SaveFootprintAssociation( false );
+    return 0;
+}
+
+
 int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
 {
     int tmp = aEvent.Parameter<intptr_t>();
@@ -231,8 +241,9 @@ int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
         return 0;
 
     // Extract the current selection
-    unsigned int curSel = -1;
-    unsigned int newSel = -1;
+    bool changeSel = false;
+    unsigned int newSel = UINT_MAX;
+
     switch( dir )
     {
     case CVPCB_MAINFRAME::ITEM_NEXT:
@@ -240,11 +251,12 @@ int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
             newSel = tempSel.front();
 
         // Find the next index in the component list
-        for( unsigned int i : naComp )
+        for( unsigned int idx : naComp )
         {
-            if( i > newSel )
+            if( idx > newSel )
             {
-                newSel = i;
+                changeSel = true;
+                newSel = idx;
                 break;
             }
         }
@@ -255,7 +267,19 @@ int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
         if( !tempSel.empty() )
         {
             newSel = tempSel.front();
-            curSel = newSel - 1;        // Break one before the current selection
+
+            // Find the previous index in the component list
+            for( int jj = naComp.size()-1; jj >= 0; jj-- )
+            {
+                unsigned idx = naComp[jj];
+
+                if( idx < newSel )
+                {
+                    changeSel = true;
+                    newSel = idx;
+                    break;
+                }
+            }
         }
 
         break;
@@ -264,18 +288,9 @@ int CVPCB_CONTROL::ToNA( const TOOL_EVENT& aEvent )
         wxASSERT_MSG( false, wxT( "Invalid direction" ) );
     }
 
-    // Find the next index in the component list
-    for( unsigned int i : naComp )
-    {
-        if( i >= curSel )
-        {
-            newSel = i;
-            break;
-        }
-    }
-
-    // Set the component selection
-    m_frame->SetSelectedComponent( newSel );
+    // Set the new component selection
+    if( changeSel )
+        m_frame->SetSelectedComponent( newSel );
 
     return 0;
 }
@@ -310,7 +325,8 @@ void CVPCB_CONTROL::setTransitions()
 
     // Management actions
     Go( &CVPCB_CONTROL::ShowEquFileTable,      CVPCB_ACTIONS::showEquFileTable.MakeEvent() );
-    Go( &CVPCB_CONTROL::SaveAssociations,      CVPCB_ACTIONS::saveAssociations.MakeEvent() );
+    Go( &CVPCB_CONTROL::SaveAssociationsToSchematic, CVPCB_ACTIONS::saveAssociationsToSchematic.MakeEvent() );
+    Go( &CVPCB_CONTROL::SaveAssociationsToFile,CVPCB_ACTIONS::saveAssociationsToFile.MakeEvent() );
 
     // Navigation actions
     Go( &CVPCB_CONTROL::ToNA,                  CVPCB_ACTIONS::gotoNextNA.MakeEvent() );

cvpcb/tools/cvpcb_control.h

@@ -75,7 +75,14 @@ public:
      *
      * @param aEvent is the event generated by the tool framework
      */
-    int SaveAssociations( const TOOL_EVENT& aEvent );
+    int SaveAssociationsToSchematic( const TOOL_EVENT& aEvent );
+
+    /**
+     * Save the associations to the schematic and save schematic to file.
+     *
+     * @param aEvent is the event generated by the tool framework
+     */
+    int SaveAssociationsToFile( const TOOL_EVENT& aEvent );
 
     /**
      * Create or Update the frame showing the current highlighted footprint

eeschema/CMakeLists.txt

@@ -175,7 +175,7 @@ set( EESCHEMA_SRCS
     fields_grid_table.cpp
     files-io.cpp
     generate_alias_info.cpp
-    getpart.cpp
+    picksymbol.cpp
     hierarch.cpp
     lib_shape.cpp
     lib_item.cpp

eeschema/annotate.cpp

@@ -49,10 +49,7 @@ void SCH_EDIT_FRAME::mapExistingAnnotation( std::map<wxString, wxString>& aMap )
 
         curr_full_uuid.push_back( symbol->m_Uuid );
 
-        wxString ref = symbol->GetRef( curr_sheetpath );
-
-        if( symbol->GetUnitCount() > 1 )
-            ref << LIB_SYMBOL::SubReference( symbol->GetUnitSelection( curr_sheetpath ) );
+        wxString ref = symbol->GetRef( curr_sheetpath, true );
 
         if( symbol->IsAnnotated( curr_sheetpath ) )
             aMap[ curr_full_uuid.AsString() ] = ref;

eeschema/autoplace_fields.cpp

@@ -144,14 +144,14 @@ public:
      */
     void DoAutoplace( bool aManual )
     {
-        bool            force_wire_spacing = false;
+        bool            forceWireSpacing = false;
         SIDE_AND_NPINS  sideandpins = chooseSideForFields( aManual );
         SIDE            field_side = sideandpins.side;
         wxPoint         fbox_pos = fieldBoxPlacement( sideandpins );
         EDA_RECT        field_box( fbox_pos, m_fbox_size );
 
         if( aManual )
-            force_wire_spacing = fitFieldsBetweenWires( &field_box, field_side );
+            forceWireSpacing = fitFieldsBetweenWires( &field_box, field_side );
 
         // Move the fields
         int last_y_coord = field_box.GetTop();
@@ -160,6 +160,9 @@ public:
         {
             SCH_FIELD* field = m_fields[field_idx];
 
+            if( !field->IsVisible() )
+                continue;
+
             if( m_allow_rejustify )
             {
                 if( sideandpins.pins > 0 )
@@ -175,8 +178,8 @@ public:
                 }
             }
 
-            wxPoint pos( fieldHorizPlacement( field, field_box ),
-                         fieldVertPlacement( field, field_box, &last_y_coord, !force_wire_spacing ) );
+            wxPoint pos( fieldHPlacement( field, field_box ),
+                         fieldVPlacement( field, field_box, &last_y_coord, !forceWireSpacing ) );
 
             if( m_align_to_grid )
             {
@@ -201,7 +204,15 @@ protected:
         int max_field_width = 0;
         int total_height = 0;
 
+        std::vector<SCH_FIELD*> visibleFields;
+
         for( SCH_FIELD* field : m_fields )
+        {
+            if( field->IsVisible() )
+                visibleFields.push_back( field );
+        }
+
+        for( SCH_FIELD* field : visibleFields )
         {
             if( m_symbol->GetTransform().y1 )
                 field->SetTextAngle( TEXT_ANGLE_VERT );
@@ -215,7 +226,7 @@ protected:
             max_field_width = std::max( max_field_width, field_width );
 
             // Remove interline spacing from field_height for last line.
-            if( field == m_fields[ m_fields.size() - 1 ] )
+            if( field == visibleFields.back() )
                 field_height *= 0.62;
 
             if( !aDynamic )
@@ -322,6 +333,7 @@ protected:
             if( item_box.Intersects( aRect ) )
                 filtered.push_back( item );
         }
+
         return filtered;
     }
 
@@ -642,7 +654,7 @@ protected:
      *
      * @return Correct field horizontal position
      */
-    int fieldHorizPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox )
+    int fieldHPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox )
     {
         int field_hjust;
         int field_xcoord;
@@ -677,13 +689,13 @@ protected:
      *
      * @param aField - the field to place.
      * @param aFieldBox - box in which fields will be placed.
-     * @param aPosAccum - pointer to a position accumulator
+     * @param aAccumulatedPosition - pointer to a position accumulator
      * @param aDynamic - use dynamic spacing
      *
      * @return Correct field vertical position
      */
-    int fieldVertPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox, int *aPosAccum,
-                            bool aDynamic )
+    int fieldVPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox, int *aAccumulatedPosition,
+                         bool aDynamic )
     {
         int field_height;
         int padding;
@@ -704,9 +716,9 @@ protected:
             padding = FIELD_PADDING;
         }
 
-        int placement = *aPosAccum + padding / 2 + field_height / 2;
+        int placement = *aAccumulatedPosition + padding / 2 + field_height / 2;
 
-        *aPosAccum += padding + field_height;
+        *aAccumulatedPosition += padding + field_height;
 
         return placement;
     }

eeschema/connection_graph.cpp

@@ -366,6 +366,9 @@ void CONNECTION_SUBGRAPH::UpdateItemConnections()
     {
         SCH_CONNECTION* item_conn = item->GetOrInitConnection( m_sheet, m_graph );
 
+        if( !item_conn )
+            continue;
+
         if( ( m_driver_connection->IsBus() && item_conn->IsNet() ) ||
             ( m_driver_connection->IsNet() && item_conn->IsBus() ) )
         {
@@ -585,142 +588,147 @@ void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
         // Pre-scan to see if we have a bus at this location
         SCH_LINE* busLine = aSheet.LastScreen()->GetBus( it.first );
 
-        for( auto primary_it = connection_vec.begin(); primary_it != connection_vec.end(); primary_it++ )
+        // We don't want to spin up a new thread for fewer than 4 items (overhead costs)
+        size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
+                ( connection_vec.size() + 3 ) / 4 );
+
+        std::atomic<size_t> nextItem( 0 );
+        std::mutex update_mutex;
+        std::vector<std::future<size_t>> returns( parallelThreadCount );
+
+        auto update_lambda = [&]() -> size_t
         {
-            SCH_ITEM* connected_item = *primary_it;
-
-            // Bus entries are special: they can have connection points in the
-            // middle of a wire segment, because the junction algo doesn't split
-            // the segment in two where you place a bus entry.  This means that
-            // bus entries that don't land on the end of a line segment need to
-            // have "virtual" connection points to the segments they graphically
-            // touch.
-            if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
+            for( size_t ii = nextItem++; ii < connection_vec.size(); ii = nextItem++ )
             {
-                // If this location only has the connection point of the bus
-                // entry itself, this means that either the bus entry is not
-                // connected to anything graphically, or that it is connected to
-                // a segment at some point other than at one of the endpoints.
-                if( connection_vec.size() == 1 )
-                {
-                    if( busLine )
-                    {
-                        auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
-                        bus_entry->m_connected_bus_item = busLine;
-                    }
-                }
-            }
-
-            // Bus-to-bus entries are treated just like bus wires
-            else if( connected_item->Type() == SCH_BUS_BUS_ENTRY_T )
-            {
-                if( connection_vec.size() < 2 )
-                {
-                    if( busLine )
-                    {
-                        auto bus_entry = static_cast<SCH_BUS_BUS_ENTRY*>( connected_item );
-
-                        if( it.first == bus_entry->GetPosition() )
-                            bus_entry->m_connected_bus_items[0] = busLine;
-                        else
-                            bus_entry->m_connected_bus_items[1] = busLine;
-
-                        bus_entry->ConnectedItems( aSheet ).insert( busLine );
-                        busLine->ConnectedItems( aSheet ).insert( bus_entry );
-                    }
-                }
-            }
-
-            // Change junctions to be on bus junction layer if they are touching a bus
-            else if( connected_item->Type() == SCH_JUNCTION_T )
-            {
-                connected_item->SetLayer( busLine ? LAYER_BUS_JUNCTION : LAYER_JUNCTION );
-            }
-
-            for( auto test_it = primary_it + 1; test_it != connection_vec.end(); test_it++ )
-            {
-                bool      bus_connection_ok = true;
-                SCH_ITEM* test_item         = *test_it;
-
-                wxASSERT( test_item != connected_item );
-
-                // Set up the link between the bus entry net and the bus
+                SCH_ITEM* connected_item = connection_vec[ii];
+                // Bus entries are special: they can have connection points in the
+                // middle of a wire segment, because the junction algo doesn't split
+                // the segment in two where you place a bus entry.  This means that
+                // bus entries that don't land on the end of a line segment need to
+                // have "virtual" connection points to the segments they graphically
+                // touch.
                 if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
                 {
-                    if( test_item->GetLayer() == LAYER_BUS )
+                    // If this location only has the connection point of the bus
+                    // entry itself, this means that either the bus entry is not
+                    // connected to anything graphically, or that it is connected to
+                    // a segment at some point other than at one of the endpoints.
+                    if( connection_vec.size() == 1 )
                     {
-                        auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
-                        bus_entry->m_connected_bus_item = test_item;
+                        if( busLine )
+                        {
+                            auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
+                            bus_entry->m_connected_bus_item = busLine;
+                        }
                     }
                 }
 
-                // Bus entries only connect to bus lines on the end that is touching a bus line.
-                // If the user has overlapped another net line with the endpoint of the bus entry
-                // where the entry connects to a bus, we don't want to short-circuit it.
+                // Bus-to-bus entries are treated just like bus wires
+                else if( connected_item->Type() == SCH_BUS_BUS_ENTRY_T )
+                {
+                    if( connection_vec.size() < 2 )
+                    {
+                        if( busLine )
+                        {
+                            auto bus_entry = static_cast<SCH_BUS_BUS_ENTRY*>( connected_item );
+
+                            if( it.first == bus_entry->GetPosition() )
+                                bus_entry->m_connected_bus_items[0] = busLine;
+                            else
+                                bus_entry->m_connected_bus_items[1] = busLine;
+
+                            std::lock_guard<std::mutex> lock( update_mutex );
+                            bus_entry->AddConnectionTo( aSheet, busLine );
+                            busLine->AddConnectionTo( aSheet, bus_entry );
+                        }
+                    }
+                }
+
+                // Change junctions to be on bus junction layer if they are touching a bus
+                else if( connected_item->Type() == SCH_JUNCTION_T )
+                {
+                    connected_item->SetLayer( busLine ? LAYER_BUS_JUNCTION : LAYER_JUNCTION );
+                }
+
+                SCH_ITEM_SET& connected_set = connected_item->ConnectedItems( aSheet );
+                connected_set.reserve( connection_vec.size() );
+
+                for( SCH_ITEM* test_item : connection_vec )
+                {
+                    bool      bus_connection_ok = true;
+
+                    if( test_item == connected_item )
+                        continue;
+
+                    // Set up the link between the bus entry net and the bus
+                    if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
+                    {
+                        if( test_item->GetLayer() == LAYER_BUS )
+                        {
+                            auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
+                            bus_entry->m_connected_bus_item = test_item;
+                        }
+                    }
+
+                    // Bus entries only connect to bus lines on the end that is touching a bus line.
+                    // If the user has overlapped another net line with the endpoint of the bus entry
+                    // where the entry connects to a bus, we don't want to short-circuit it.
+                    if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
+                    {
+                        bus_connection_ok = !busLine || test_item->GetLayer() == LAYER_BUS;
+                    }
+                    else if( test_item->Type() == SCH_BUS_WIRE_ENTRY_T )
+                    {
+                        bus_connection_ok = !busLine || connected_item->GetLayer() == LAYER_BUS;
+                    }
+
+                    if( connected_item->ConnectionPropagatesTo( test_item ) &&
+                        test_item->ConnectionPropagatesTo( connected_item ) &&
+                        bus_connection_ok )
+                    {
+                        connected_set.push_back( test_item );
+                    }
+                }
+
+                // If we got this far and did not find a connected bus item for a bus entry,
+                // we should do a manual scan in case there is a bus item on this connection
+                // point but we didn't pick it up earlier because there is *also* a net item here.
                 if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
                 {
-                    bus_connection_ok = !busLine || test_item->GetLayer() == LAYER_BUS;
-                }
-                else if( test_item->Type() == SCH_BUS_WIRE_ENTRY_T )
-                {
-                    bus_connection_ok = !busLine || connected_item->GetLayer() == LAYER_BUS;
-                }
+                    auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
 
-                if( connected_item->ConnectionPropagatesTo( test_item ) &&
-                    test_item->ConnectionPropagatesTo( connected_item ) &&
-                    bus_connection_ok )
-                {
-                    connected_item->ConnectedItems( aSheet ).insert( test_item );
-                    test_item->ConnectedItems( aSheet ).insert( connected_item );
+                    if( !bus_entry->m_connected_bus_item )
+                    {
+                        SCH_SCREEN* screen = aSheet.LastScreen();
+                        SCH_LINE*   bus = screen->GetBus( it.first );
+
+                        if( bus )
+                            bus_entry->m_connected_bus_item = bus;
+                    }
                 }
             }
 
-            // If we got this far and did not find a connected bus item for a bus entry,
-            // we should do a manual scan in case there is a bus item on this connection
-            // point but we didn't pick it up earlier because there is *also* a net item here.
-            if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
-            {
-                auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
+            return 1;
+        };
 
-                if( !bus_entry->m_connected_bus_item )
-                {
-                    SCH_SCREEN* screen = aSheet.LastScreen();
-                    SCH_LINE*   bus = screen->GetBus( it.first );
 
-                    if( bus )
-                        bus_entry->m_connected_bus_item = bus;
-                }
-            }
+        if( parallelThreadCount == 1 )
+            update_lambda();
+        else
+        {
+            for( size_t ii = 0; ii < parallelThreadCount; ++ii )
+                returns[ii] = std::async( std::launch::async, update_lambda );
+
+            // Finalize the threads
+            for( size_t ii = 0; ii < parallelThreadCount; ++ii )
+                returns[ii].wait();
         }
     }
 }
 
 
-// TODO(JE) This won't give the same subgraph IDs (and eventually net/graph codes)
-// to the same subgraph necessarily if it runs over and over again on the same
-// sheet.  We need:
-//
-//  a) a cache of net/bus codes, like used before
-//  b) to persist the CONNECTION_GRAPH globally so the cache is persistent,
-//  c) some way of trying to avoid changing net names.  so we should keep track
-//     of the previous driver of a net, and if it comes down to choosing between
-//     equally-prioritized drivers, choose the one that already exists as a driver
-//     on some portion of the items.
-
-
-void CONNECTION_GRAPH::buildConnectionGraph()
+void CONNECTION_GRAPH::buildItemSubGraphs()
 {
-    // Recache all bus aliases for later use
-    wxCHECK_RET( m_schematic, wxT( "Connection graph cannot be built without schematic pointer" ) );
-
-    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
-
-    for( unsigned i = 0; i < all_sheets.size(); i++ )
-    {
-        for( const auto& alias : all_sheets[i].LastScreen()->GetBusAliases() )
-            m_bus_alias_cache[ alias->GetName() ] = alias;
-    }
-
     // Build subgraphs from items (on a per-sheet basis)
 
     for( SCH_ITEM* item : m_items )
@@ -742,21 +750,25 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                 connection->SetSubgraphCode( subgraph->m_code );
                 m_item_to_subgraph_map[item] = subgraph;
 
-                std::list<SCH_ITEM*> members;
+                std::list<SCH_ITEM*> memberlist;
 
                 auto get_items =
                         [&]( SCH_ITEM* aItem ) -> bool
                         {
                             SCH_CONNECTION* conn = aItem->GetOrInitConnection( sheet, this );
+                            bool unique = !( aItem->GetFlags() & CANDIDATE );
 
-                            return ( conn->SubgraphCode() == 0 );
+                            if( conn && !conn->SubgraphCode() )
+                                aItem->SetFlags( CANDIDATE );
+
+                            return ( unique && conn && ( conn->SubgraphCode() == 0 ) );
                         };
 
                 std::copy_if( item->ConnectedItems( sheet ).begin(),
                               item->ConnectedItems( sheet ).end(),
-                              std::back_inserter( members ), get_items );
+                              std::back_inserter( memberlist ), get_items );
 
-                for( SCH_ITEM* connected_item : members )
+                for( SCH_ITEM* connected_item : memberlist )
                 {
                     if( connected_item->Type() == SCH_NO_CONNECT_T )
                         subgraph->m_no_connect = connected_item;
@@ -770,24 +782,32 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                         connected_conn->SetSubgraphCode( subgraph->m_code );
                         m_item_to_subgraph_map[connected_item] = subgraph;
                         subgraph->AddItem( connected_item );
+                        SCH_ITEM_SET& citemset = connected_item->ConnectedItems( sheet );
 
-                        std::copy_if( connected_item->ConnectedItems( sheet ).begin(),
-                                      connected_item->ConnectedItems( sheet ).end(),
-                                      std::back_inserter( members ), get_items );
+                        for( SCH_ITEM* citem : citemset )
+                        {
+                            if( citem->HasFlag( CANDIDATE ) )
+                                continue;
+
+                            if( get_items( citem ) )
+                                memberlist.push_back( citem );
+                        }
                     }
                 }
 
+                for( SCH_ITEM* connected_item : memberlist )
+                    connected_item->ClearFlags( CANDIDATE );
+
                 subgraph->m_dirty = true;
                 m_subgraphs.push_back( subgraph );
             }
         }
     }
 
-    /**
-     * TODO(JE): Net codes are non-deterministic.  Fortunately, they are also not really used for
-     * anything. We should consider removing them entirely and just using net names everywhere.
-     */
+}
 
+void CONNECTION_GRAPH::resolveAllDrivers()
+{
     // Resolve drivers for subgraphs and propagate connectivity info
 
     // We don't want to spin up a new thread for fewer than 8 nets (overhead costs)
@@ -867,7 +887,11 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                   {
                       return candidate->m_driver;
                   } );
+}
 
+
+void CONNECTION_GRAPH::collectAllDriverValues()
+{
     // Check for subgraphs with the same net name but only weak drivers.
     // For example, two wires that are both connected to hierarchical
     // sheet pins that happen to have the same name, but are not the same.
@@ -922,7 +946,11 @@ void CONNECTION_GRAPH::buildConnectionGraph()
             }
         }
     }
+}
 
+
+void CONNECTION_GRAPH::generateInvisiblePinSubGraphs()
+{
     // Generate subgraphs for invisible power pins.  These will be merged with other subgraphs
     // on the same sheet in the next loop.
 
@@ -942,7 +970,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
         SCH_CONNECTION* connection = pin->GetOrInitConnection( sheet, this );
 
         // If this pin already has a subgraph, don't need to process
-        if( connection->SubgraphCode() > 0 )
+        if( !connection || connection->SubgraphCode() > 0 )
             continue;
 
         connection->SetName( pin->GetShownName() );
@@ -979,7 +1007,11 @@ void CONNECTION_GRAPH::buildConnectionGraph()
 
         connection->SetSubgraphCode( subgraph->m_code );
     }
+}
 
+
+void CONNECTION_GRAPH::processSubGraphs()
+{
     // Here we do all the local (sheet) processing of each subgraph, including assigning net
     // codes, merging subgraphs together that use label connections, etc.
 
@@ -1306,6 +1338,58 @@ void CONNECTION_GRAPH::buildConnectionGraph()
                     subgraph->m_driver_connection->Name() );
     }
 
+}
+
+
+// TODO(JE) This won't give the same subgraph IDs (and eventually net/graph codes)
+// to the same subgraph necessarily if it runs over and over again on the same
+// sheet.  We need:
+//
+//  a) a cache of net/bus codes, like used before
+//  b) to persist the CONNECTION_GRAPH globally so the cache is persistent,
+//  c) some way of trying to avoid changing net names.  so we should keep track
+//     of the previous driver of a net, and if it comes down to choosing between
+//     equally-prioritized drivers, choose the one that already exists as a driver
+//     on some portion of the items.
+
+
+void CONNECTION_GRAPH::buildConnectionGraph()
+{
+    // Recache all bus aliases for later use
+    wxCHECK_RET( m_schematic, wxT( "Connection graph cannot be built without schematic pointer" ) );
+
+    SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
+
+    for( unsigned i = 0; i < all_sheets.size(); i++ )
+    {
+        for( const auto& alias : all_sheets[i].LastScreen()->GetBusAliases() )
+            m_bus_alias_cache[ alias->GetName() ] = alias;
+    }
+
+    PROF_TIMER sub_graph( "buildItemSubGraphs" );
+    buildItemSubGraphs();
+
+    if( wxLog::IsAllowedTraceMask( ConnProfileMask ) )
+        sub_graph.Show();
+
+
+    /**
+     * TODO(JE): Net codes are non-deterministic.  Fortunately, they are also not really used for
+     * anything. We should consider removing them entirely and just using net names everywhere.
+     */
+
+    resolveAllDrivers();
+
+    collectAllDriverValues();
+
+    generateInvisiblePinSubGraphs();
+
+    PROF_TIMER proc_sub_graph( "ProcessSubGraphs" );
+    processSubGraphs();
+
+    if( wxLog::IsAllowedTraceMask( ConnProfileMask ) )
+        proc_sub_graph.Show();
+
     // Absorbed subgraphs should no longer be considered
     alg::delete_if( m_driver_subgraphs, [&]( const CONNECTION_SUBGRAPH* candidate ) -> bool
                                         {
@@ -1328,7 +1412,13 @@ void CONNECTION_GRAPH::buildConnectionGraph()
         m_sheet_to_subgraphs_map[ subgraph->m_sheet ].emplace_back( subgraph );
 
     // Update item connections at this point so that neighbor propagation works
-    nextSubgraph.store( 0 );
+    std::atomic<size_t> nextSubgraph( 0 );
+
+    // We don't want to spin up a new thread for fewer than 8 nets (overhead costs)
+    size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
+            ( m_subgraphs.size() + 3 ) / 4 );
+
+    std::vector<std::future<size_t>> returns( parallelThreadCount );
 
     auto preliminaryUpdateTask =
             [&]() -> size_t
@@ -1901,7 +1991,7 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
     // member to have the correct connection info
     if( conn->IsBus() && !stale_bus_members.empty() )
     {
-        for( auto stale_member : stale_bus_members )
+        for( SCH_CONNECTION* stale_member : stale_bus_members )
         {
             for( CONNECTION_SUBGRAPH* subgraph : visited )
             {
@@ -1933,13 +2023,13 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
 std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM* aItem,
         CONNECTION_SUBGRAPH* aSubgraph )
 {
-    auto c = std::shared_ptr<SCH_CONNECTION>( nullptr );
+    std::shared_ptr<SCH_CONNECTION> c = std::shared_ptr<SCH_CONNECTION>( nullptr );
 
     switch( aItem->Type() )
     {
     case SCH_PIN_T:
     {
-        auto pin = static_cast<SCH_PIN*>( aItem );
+        SCH_PIN* pin = static_cast<SCH_PIN*>( aItem );
 
         if( pin->IsPowerConnection() )
             c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet );
@@ -1981,7 +2071,7 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection
         // Vector bus: compare against index, because we allow the name
         // to be different
 
-        for( const auto& bus_member : aBusConnection->Members() )
+        for( const std::shared_ptr<SCH_CONNECTION>& bus_member : aBusConnection->Members() )
         {
             if( bus_member->VectorIndex() == aSearch->VectorIndex() )
             {
@@ -1993,14 +2083,14 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection
     else
     {
         // Group bus
-        for( const auto& c : aBusConnection->Members() )
+        for( const std::shared_ptr<SCH_CONNECTION>& c : aBusConnection->Members() )
         {
             // Vector inside group: compare names, because for bus groups
             // we expect the naming to be consistent across all usages
             // TODO(JE) explain this in the docs
             if( c->Type() == CONNECTION_TYPE::BUS )
             {
-                for( const auto& bus_member : c->Members() )
+                for( const std::shared_ptr<SCH_CONNECTION>& bus_member : c->Members() )
                 {
                     if( bus_member->LocalName() == aSearch->LocalName() )
                     {
@@ -2051,7 +2141,7 @@ std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigrati
 {
     std::vector<const CONNECTION_SUBGRAPH*> ret;
 
-    for( auto&& subgraph : m_subgraphs )
+    for( CONNECTION_SUBGRAPH* subgraph : m_subgraphs )
     {
         // Graph is supposed to be up-to-date before calling this
         wxASSERT( !subgraph->m_dirty );
@@ -2313,8 +2403,8 @@ bool CONNECTION_GRAPH::ercCheckMultipleDrivers( const CONNECTION_SUBGRAPH* aSubg
 
 bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
 {
-    auto sheet = aSubgraph->m_sheet;
-    auto screen = sheet.LastScreen();
+    const SCH_SHEET_PATH& sheet = aSubgraph->m_sheet;
+    SCH_SCREEN* screen = sheet.LastScreen();
 
     SCH_ITEM* net_item = nullptr;
     SCH_ITEM* bus_item = nullptr;
@@ -2371,8 +2461,8 @@ bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSu
 bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
 {
     wxString msg;
-    auto sheet = aSubgraph->m_sheet;
-    auto screen = sheet.LastScreen();
+    const SCH_SHEET_PATH& sheet = aSubgraph->m_sheet;
+    SCH_SCREEN* screen = sheet.LastScreen();
 
     SCH_ITEM* label = nullptr;
     SCH_ITEM* port = nullptr;
@@ -2440,8 +2530,8 @@ bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSu
 bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
 {
     bool conflict = false;
-    auto sheet = aSubgraph->m_sheet;
-    auto screen = sheet.LastScreen();
+    const SCH_SHEET_PATH& sheet = aSubgraph->m_sheet;
+    SCH_SCREEN* screen = sheet.LastScreen();
 
     SCH_BUS_WIRE_ENTRY* bus_entry = nullptr;
     SCH_ITEM* bus_wire = nullptr;
@@ -2453,7 +2543,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
         return true;
     }
 
-    for( auto item : aSubgraph->m_items )
+    for( SCH_ITEM* item : aSubgraph->m_items )
     {
         switch( item->Type() )
         {
@@ -2509,7 +2599,9 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
     // or global label
     if( conflict && CONNECTION_SUBGRAPH::GetDriverPriority( aSubgraph->m_driver )
                        >= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN )
+    {
         conflict = false;
+    }
 
     if( conflict )
     {
@@ -2622,8 +2714,21 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph
             {
             case SCH_PIN_T:
             {
-                if( !pins.empty() )
-                    has_other_connections = true;
+                // Stacked pins do not count as other connections but non-stacked pins do
+                if( !has_other_connections && !pins.empty() )
+                {
+                    SCH_PIN* pin = static_cast<SCH_PIN*>( item );
+
+                    for( SCH_PIN* other_pin  : pins )
+                    {
+                        if( other_pin->GetParent() != pin->GetParent()
+                                || other_pin->GetPosition() != pin->GetPosition() )
+                        {
+                            has_other_connections = true;
+                            break;
+                        }
+                    }
+                }
 
                 pins.emplace_back( static_cast<SCH_PIN*>( item ) );
 
@@ -2653,8 +2758,8 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph
             wxString name = pin->Connection( &sheet )->Name();
             wxString local_name = pin->Connection( &sheet )->Name( true );
 
-            if( m_global_label_cache.count( name )  ||
-                ( m_local_label_cache.count( std::make_pair( sheet, local_name ) ) ) )
+            if( m_global_label_cache.count( name )
+                    || m_local_label_cache.count( std::make_pair( sheet, local_name ) ) )
             {
                 has_other_connections = true;
             }
@@ -2787,7 +2892,7 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
                 return false;
             };
 
-    for( auto item : aSubgraph->m_items )
+    for( SCH_ITEM* item : aSubgraph->m_items )
     {
         switch( item->Type() )
         {
@@ -2837,9 +2942,9 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
 
     if( isGlobal )
     {
-        // This will be set to true if the global is connected to a pin above, but we
-        // want to reset this to false so that globals get flagged if they only have a
-        // single instance connected to a single pin
+        // This will be set to true if the global is connected to a pin above, but we want to
+        // reset this to false so that globals get flagged if they only have a single instance
+        // connected to a single pin
         hasOtherConnections = ( pinCount > 1 );
 
         auto it = m_net_name_to_subgraphs_map.find( name );
@@ -2853,9 +2958,9 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
     else if( text->Type() == SCH_HIER_LABEL_T )
     {
         // For a hier label, check if the parent pin is connected
-        if( aSubgraph->m_hier_parent &&
-            ( aSubgraph->m_hier_parent->m_strong_driver ||
-                aSubgraph->m_hier_parent->m_drivers.size() > 1) )
+        if( aSubgraph->m_hier_parent
+                && ( aSubgraph->m_hier_parent->m_strong_driver
+                        || aSubgraph->m_hier_parent->m_drivers.size() > 1) )
         {
             // For now, a simple check: if there is more than one driver, the parent is probably
             // connected elsewhere (because at least one driver will be the hier pin itself)

eeschema/connection_graph.h

@@ -370,6 +370,33 @@ private:
      */
     void buildConnectionGraph();
 
+    /**
+     * Generates individual item subgraphs on a per-sheet basis
+     */
+    void buildItemSubGraphs();
+
+    /**
+     * Finds all subgraphs in the connection graph and calls ResolveDrivers() in
+     * parallel
+     */
+    void resolveAllDrivers();
+
+    /**
+     * Maps the driver values for each subgraph
+     */
+    void collectAllDriverValues();
+
+    /**
+     * Iterate through the invisible power pins to collect the global labels
+     * as drivers
+     */
+    void generateInvisiblePinSubGraphs();
+
+    /**
+     * Process all subgraphs to assign netcodes and merge subgraphs based on labels
+     */
+    void processSubGraphs();
+
     /**
      * Helper to assign a new net code to a connection
      *

eeschema/cross-probing.cpp

@@ -379,7 +379,8 @@ void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
 }
 
 
-std::string FormatProbeItem( EDA_ITEM* aItem, SCH_SYMBOL* aSymbol )
+std::string FormatProbeItem( const SCH_SHEET_PATH& aCurrentSheet, EDA_ITEM* aItem,
+                             SCH_SYMBOL* aSymbol )
 {
     // This is a keyword followed by a quoted string.
 
@@ -403,20 +404,8 @@ std::string FormatProbeItem( EDA_ITEM* aItem, SCH_SYMBOL* aSymbol )
         {
             // For cross probing, we need the full path of the sheet, because
             // in complex hierarchies the sheet uuid of not unique
-            SCH_SHEET* sheet = (SCH_SHEET*)aItem;
-            wxString full_path;
 
-            SCH_SHEET* parent = sheet;
-            while( (parent = dynamic_cast<SCH_SHEET*>( parent->GetParent() ) ) )
-            {
-                if( parent->GetParent() )   // The root sheet has no parent and path is just "/"
-                {
-                    full_path.Prepend( parent->m_Uuid.AsString() );
-                    full_path.Prepend( "/" );
-                }
-            }
-
-            full_path += "/" + sheet->m_Uuid.AsString();
+            wxString full_path = aCurrentSheet.PathAsString() + aItem->m_Uuid.AsString();
 
             return StrPrintf( "$SHEET: \"%s\"", TO_UTF8( full_path ) );
         }
@@ -454,7 +443,7 @@ void SCH_EDIT_FRAME::SendMessageToPCBNEW( EDA_ITEM* aObjectToSync, SCH_SYMBOL* a
     if( !aObjectToSync )
         return;
 
-    std::string packet = FormatProbeItem( aObjectToSync, aLibItem );
+    std::string packet = FormatProbeItem( GetCurrentSheet(), aObjectToSync, aLibItem );
 
     if( !packet.empty() )
     {

eeschema/dialogs/dialog_erc.cpp

@@ -396,7 +396,7 @@ void DIALOG_ERC::testErc()
             || settings.IsTestEnabled( ERCE_POWERPIN_NOT_DRIVEN )
             || settings.IsTestEnabled( ERCE_PIN_NOT_DRIVEN ) )
     {
-        tester.TestPinToPin();
+         tester.TestPinToPin();
     }
 
     // Test similar labels (i;e. labels which are identical when

eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp

@@ -30,6 +30,7 @@
 #include <sch_line.h>
 #include <sch_junction.h>
 #include <sch_sheet.h>
+#include <sch_sheet_pin.h>
 #include <schematic.h>
 #include <advanced_config.h>
 #include <tool/tool_manager.h>
@@ -412,6 +413,12 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::visitItem( const SCH_SHEET_PATH& aShe
             if( m_setBgColor->GetValue() )
                 sheet->SetBackgroundColor( m_bgColorSwatch->GetSwatchColor() );
         }
+
+        if( m_sheetPins->GetValue() )
+        {
+            for( SCH_SHEET_PIN* pin : sheet->GetPins() )
+                processItem( aSheetPath, pin );
+        }
     }
     else if( aItem->Type() == SCH_JUNCTION_T )
     {
@@ -439,8 +446,6 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::visitItem( const SCH_SHEET_PATH& aShe
         processItem( aSheetPath, aItem );
     else if( m_hierLabels->GetValue() && aItem->Type() == SCH_HIER_LABEL_T )
         processItem( aSheetPath, aItem );
-    else if( m_sheetPins->GetValue() && aItem->Type() == SCH_SHEET_PIN_T )
-        processItem( aSheetPath, aItem );
     else if( m_schTextAndGraphics->GetValue() && aItem->IsType( schTextAndGraphics ) )
         processItem( aSheetPath, aItem );
 }

eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp

@@ -283,7 +283,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
 	fgSizer1->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 7 );
 
 	m_staticline4 = new wxStaticLine( m_specifiedValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer1->Add( m_staticline4, 0, wxEXPAND|wxBOTTOM, 7 );
+	fgSizer1->Add( m_staticline4, 0, wxEXPAND|wxTOP|wxBOTTOM, 7 );
 
 	m_staticline5 = new wxStaticLine( m_specifiedValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	fgSizer1->Add( m_staticline5, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 7 );

eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp

@@ -2956,7 +2956,7 @@
                                             </object>
                                             <object class="sizeritem" expanded="1">
                                                 <property name="border">7</property>
-                                                <property name="flag">wxEXPAND|wxBOTTOM</property>
+                                                <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
                                                 <property name="proportion">0</property>
                                                 <object class="wxStaticLine" expanded="1">
                                                     <property name="BottomDockable">1</property>

eeschema/dialogs/dialog_lib_edit_pin_table.cpp

@@ -621,6 +621,7 @@ void DIALOG_LIB_EDIT_PIN_TABLE::OnAddRow( wxCommandEvent& event )
         newPin->SetOrientation( last->GetOrientation() );
         newPin->SetType( last->GetType() );
         newPin->SetShape( last->GetShape() );
+        newPin->SetParent( last->GetParent() );
 
         wxPoint pos = last->GetPosition();
 

eeschema/dialogs/dialog_lib_shape_properties.cpp

@@ -75,10 +75,10 @@ bool DIALOG_LIB_SHAPE_PROPERTIES::TransferDataToWindow()
 
     bool enblConvOptStyle = symbol && symbol->HasConversion();
 
-    // if a symbol contains no graphic items, symbol->HasConversion() returns false.
-    // but when creating a new symbol, with DeMorgan option set, the ApplyToAllConversions
-    // must be enabled even if symbol->HasConversion() returns false in order to be able
-    // to create graphic items shared by all body styles
+    // If a symbol contains no conversion-specific pins or graphic items, symbol->HasConversion()
+    // will return false.
+    // But when creating a new symbol, with DeMorgan option set, the ApplyToAllConversions
+    // must be enabled in order to be able to create graphic items shared by all body styles.
     if( m_frame->GetShowDeMorgan() )
         enblConvOptStyle = true;
 

eeschema/dialogs/dialog_lib_symbol_properties.cpp

@@ -72,7 +72,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
     m_grid->ShowHideColumns( cfg->m_EditSymbolVisibleColumns );
 
     wxGridCellAttr* attr = new wxGridCellAttr;
-    attr->SetEditor( new GRID_CELL_URL_EDITOR( this ) );
+    attr->SetEditor( new GRID_CELL_URL_EDITOR( this, Prj().SchSearchS() ) );
     m_grid->SetAttr( DATASHEET_FIELD, FDC_VALUE, attr );
 
     m_SymbolNameCtrl->SetValidator( SCH_FIELD_VALIDATOR( true, VALUE_FIELD ) );
@@ -174,7 +174,13 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataToWindow()
     m_SelNumberOfUnits->SetValue( m_libEntry->GetUnitCount() );
     m_OptionPartsInterchangeable->SetValue( !m_libEntry->UnitsLocked() ||
                                             m_libEntry->GetUnitCount() == 1 );
-    m_AsConvertButt->SetValue( m_libEntry->HasConversion() );
+
+    // If a symbol contains no conversion-specific pins or graphic items, symbol->HasConversion()
+    // will return false.  But when editing a symbol with DeMorgan option set, we don't want to
+    // keep turning it off just because there aren't any conversion-specific items yet, so we force
+    // it to on if the parent frame has it enabled.
+    m_AsConvertButt->SetValue( m_Parent->GetShowDeMorgan() );
+
     m_OptionPower->SetValue( m_libEntry->IsPower() );
     m_excludeFromBomCheckBox->SetValue( !m_libEntry->GetIncludeInBom() );
     m_excludeFromBoardCheckBox->SetValue( !m_libEntry->GetIncludeOnBoard() );
@@ -302,7 +308,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataFromWindow()
         return false;
 
     // We need to keep the name and the value the same at the moment!
-    wxString   newName = m_fields->at( VALUE_FIELD ).GetText();
+    wxString   newName = EscapeString( m_fields->at( VALUE_FIELD ).GetText(), CTX_LIBID );
     wxString   oldName = m_libEntry->GetName();
 
     if( oldName != newName )
@@ -367,6 +373,7 @@ bool DIALOG_LIB_SYMBOL_PROPERTIES::TransferDataFromWindow()
     m_libEntry->LockUnits( m_libEntry->GetUnitCount() > 1 &&
                            !m_OptionPartsInterchangeable->GetValue() );
     m_libEntry->SetConversion( m_AsConvertButt->GetValue() );
+    m_Parent->SetShowDeMorgan( m_AsConvertButt->GetValue() );
 
     if( m_OptionPower->GetValue() )
         m_libEntry->SetPower();
@@ -448,17 +455,26 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnGridCellChanging( wxGridEvent& event )
 
 void DIALOG_LIB_SYMBOL_PROPERTIES::OnSymbolNameText( wxCommandEvent& event )
 {
-    if( !m_Parent->IsSymbolFromSchematic() )
+    if( !m_Parent->IsSymbolFromSchematic() || m_OptionPower->IsChecked() )
         m_grid->SetCellValue( VALUE_FIELD, FDC_VALUE, m_SymbolNameCtrl->GetValue() );
 }
 
 
 void DIALOG_LIB_SYMBOL_PROPERTIES::OnSymbolNameKillFocus( wxFocusEvent& event )
 {
-    if( !m_delayedFocusCtrl && !m_SymbolNameCtrl->GetValidator()->Validate( m_SymbolNameCtrl ) )
+    if( !m_delayedFocusCtrl )
     {
+        // If the validation fails and we throw up a dialog then GTK will give us another
+        // KillFocus event and we end up in infinite recursion.  So we use m_delayedFocusCtrl
+        // as a re-entrancy block and then clear it again if validation passes.
         m_delayedFocusCtrl = m_SymbolNameCtrl;
         m_delayedFocusPage = 0;
+
+        if( m_SymbolNameCtrl->GetValidator()->Validate( m_SymbolNameCtrl ) )
+        {
+            m_delayedFocusCtrl = nullptr;
+            m_delayedFocusPage = -1;
+        }
     }
 
     event.Skip();
@@ -593,7 +609,7 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnEditSpiceModel( wxCommandEvent& event )
 {
 #ifdef KICAD_SPICE
     int diff = m_fields->size();
-    auto symbol = SCH_SYMBOL( *m_libEntry, m_libEntry->GetLibId(), nullptr );
+    auto symbol = SCH_SYMBOL( *m_libEntry, m_libEntry->GetLibId(), nullptr, 0 );
 
     DIALOG_SPICE_MODEL dialog( this, symbol, m_fields );
 

eeschema/dialogs/dialog_netlist.cpp

@@ -168,7 +168,6 @@ private:
 
 public:
     SCH_EDIT_FRAME*      m_Parent;
-    wxString             m_DefaultNetFmtName;
     NETLIST_PAGE_DIALOG* m_PanelNetType[4 + CUSTOMPANEL_COUNTMAX];
 };
 
@@ -217,11 +216,7 @@ NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent, const wxString& ti
     m_TitleStringCtrl     = nullptr;
     m_AdjustPassiveValues = nullptr;
 
-    wxString netfmtName = static_cast<NETLIST_DIALOG*>( parent->GetParent() )->m_DefaultNetFmtName;
-
-    bool selected = m_pageNetFmtName == netfmtName;
-
-    parent->AddPage( this, title, selected );
+    parent->AddPage( this, title, false );
 
     wxBoxSizer* MainBoxSizer = new wxBoxSizer( wxVERTICAL );
     SetSizer( MainBoxSizer );
@@ -246,8 +241,6 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
 
     SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
 
-    m_DefaultNetFmtName = settings.m_NetFormatName;
-
     for( NETLIST_PAGE_DIALOG*& page : m_PanelNetType)
         page = nullptr;
 
@@ -271,6 +264,15 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
 
     m_sdbSizer2OK->SetDefault();
 
+    for( int ii = 0; m_PanelNetType[ii] && ii < 4 + CUSTOMPANEL_COUNTMAX; ++ii )
+    {
+        if( m_PanelNetType[ii]->GetPageNetFmtName() == settings.m_NetFormatName )
+        {
+            m_NoteBook->ChangeSelection( ii );
+            break;
+        }
+    }
+
     // Now all widgets have the size fixed, call FinishDialogSettings
     finishDialogSettings();
 }
@@ -416,8 +418,6 @@ void NETLIST_DIALOG::OnNetlistTypeSelection( wxNotebookEvent& event )
     if( currPage == nullptr )
         return;
 
-    m_DefaultNetFmtName = currPage->GetPageNetFmtName();
-
     m_buttonDelGenerator->Enable( currPage->m_IdNetType >= NET_TYPE_CUSTOM1 );
 }
 
@@ -431,8 +431,7 @@ void NETLIST_DIALOG::NetlistUpdateOpt()
 
     settings.m_SpiceAdjustPassiveValues = adjust;
     settings.m_SpiceCommandString       = spice_cmd_string;
-    settings.m_NetFormatName            = wxEmptyString;
-    settings.m_NetFormatName            = m_DefaultNetFmtName;
+    settings.m_NetFormatName            = m_PanelNetType[m_NoteBook->GetSelection()]->GetPageNetFmtName();
 }
 
 
@@ -591,7 +590,6 @@ void NETLIST_DIALOG::OnDelGenerator( wxCommandEvent& event )
 
     currPage->m_CommandStringCtrl->SetValue( wxEmptyString );
     currPage->m_TitleStringCtrl->SetValue( wxEmptyString );
-    m_DefaultNetFmtName = m_PanelNetType[PANELPCBNEW]->GetPageNetFmtName();
 
     WriteCurrentNetlistSetup();
 
@@ -718,17 +716,8 @@ int InvokeDialogNetList( SCH_EDIT_FRAME* aCaller )
 {
     NETLIST_DIALOG dlg( aCaller );
 
-    SCHEMATIC_SETTINGS& settings = aCaller->Schematic().Settings();
-
-    wxString curr_default_netformat = settings.m_NetFormatName;
-
     int ret = dlg.ShowModal();
-
-    // Update the default netlist and store it in prj config if it was explicitly changed.
-    settings.m_NetFormatName = dlg.m_DefaultNetFmtName; // can have temporary changed
-
-    if( curr_default_netformat != dlg.m_DefaultNetFmtName )
-        aCaller->SaveProjectSettings();
+    aCaller->SaveProjectSettings();
 
     return ret;
 }

eeschema/dialogs/dialog_plot_schematic.cpp

@@ -802,7 +802,7 @@ void DIALOG_PLOT_SCHEMATIC::createPDFFile( bool aPlotAll, bool aPlotDrawingSheet
     plotter->SetRenderSettings( aRenderSettings );
     plotter->SetColorMode( getModeColor() );
     plotter->SetCreator( wxT( "Eeschema-PDF" ) );
-    plotter->SetTitle( m_parent->GetTitleBlock().GetTitle() );
+    plotter->SetTitle( ExpandTextVars( m_parent->GetTitleBlock().GetTitle(), &m_parent->Prj() ) );
 
     wxString   msg;
     wxFileName plotFileName;
@@ -1250,7 +1250,15 @@ wxString DIALOG_PLOT_SCHEMATIC::getOutputPath()
                    wxStandardPaths::Get().GetDocumentsDir() );
 
     // Build the absolute path of current output directory to preselect it in the file browser.
-    wxString path = ExpandEnvVarSubstitutions( m_outputDirectoryName->GetValue(), &Prj() );
+    std::function<bool( wxString* )> textResolver =
+    [&]( wxString* token ) -> bool
+    {
+        return m_parent->Schematic().ResolveTextVar( token, 0 );
+    };
+
+    wxString path = m_outputDirectoryName->GetValue();
+    path = ExpandTextVars( path, &textResolver, nullptr, &Prj() );
+    path = ExpandEnvVarSubstitutions( path, &Prj() );
 
     fn.SetPath( path );
 

eeschema/dialogs/dialog_print_using_printer.cpp

@@ -171,6 +171,12 @@ bool DIALOG_PRINT_USING_PRINTER::TransferDataToWindow()
 {
     EESCHEMA_SETTINGS* cfg = m_parent->eeconfig();
 
+    if( cfg->m_Printing.monochrome )
+    {
+        m_checkBackgroundColor->SetValue( false );
+        m_checkBackgroundColor->Enable( false );
+    }
+
     m_checkReference->SetValue( cfg->m_Printing.title_block );
     m_checkMonochrome->SetValue( cfg->m_Printing.monochrome );
     m_checkBackgroundColor->SetValue( cfg->m_Printing.background );
@@ -246,7 +252,10 @@ void DIALOG_PRINT_USING_PRINTER::SavePrintOptions()
 
     cfg->m_Printing.monochrome  = m_checkMonochrome->IsChecked();
     cfg->m_Printing.title_block = m_checkReference->IsChecked();
-    cfg->m_Printing.background  = m_checkBackgroundColor->IsChecked();
+
+    if( m_checkBackgroundColor->IsEnabled() )
+        cfg->m_Printing.background  = m_checkBackgroundColor->IsChecked();
+
     cfg->m_Printing.use_theme   = m_checkUseColorTheme->IsChecked();
 
     COLOR_SETTINGS* theme = static_cast<COLOR_SETTINGS*>(

eeschema/dialogs/dialog_schematic_find.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2010-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2010-2022 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
@@ -196,6 +196,14 @@ void DIALOG_SCH_FIND::OnReplaceWithEnter( wxCommandEvent& aEvent )
 
 void DIALOG_SCH_FIND::OnOptions( wxCommandEvent& aEvent )
 {
+    updateFlags();
+    m_findDirty = true;
+}
+
+
+void DIALOG_SCH_FIND::updateFlags()
+{
+    // Rebuild the search flags in m_findReplaceData from dialog settings
     int flags = 0;
 
     if( m_radioForward->GetValue() )
@@ -223,12 +231,13 @@ void DIALOG_SCH_FIND::OnOptions( wxCommandEvent& aEvent )
         flags |= FR_REPLACE_REFERENCES;
 
     m_findReplaceData->SetFlags( flags );
-    m_findDirty = true;
 }
 
 
 void DIALOG_SCH_FIND::OnFind( wxCommandEvent& aEvent )
 {
+    updateFlags();      // Ensure search flags are up to date
+
     int index = m_comboFind->FindString( m_comboFind->GetValue(), true );
 
     if( index == wxNOT_FOUND )
@@ -250,6 +259,8 @@ void DIALOG_SCH_FIND::OnFind( wxCommandEvent& aEvent )
 
 void DIALOG_SCH_FIND::OnReplace( wxCommandEvent& aEvent )
 {
+    updateFlags();      // Ensure search flags are up to date
+
     int index = m_comboReplace->FindString( m_comboReplace->GetValue(), true );
 
     if( index == wxNOT_FOUND )

eeschema/dialogs/dialog_schematic_find.h

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2010 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2010-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2010-2022 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
@@ -75,6 +75,9 @@ protected:
     void OnFind( wxCommandEvent& aEvent ) override;
     void OnReplace( wxCommandEvent& aEvent ) override;
 
+    // Rebuild the search flags from dialog settings
+    void updateFlags();
+
     SCH_EDIT_FRAME*     m_frame;
     SCH_EDITOR_CONTROL* m_editorControl;
     wxFindReplaceData*  m_findReplaceData;