Merge branch 'Simulation_AbstractPlotWindowFromPlotTab' into 'master'

Simulation: Added simple multiplot support

See merge request kicad/code/kicad!2267

.gitlab/Windows-CI.yml

@@ -8,8 +8,6 @@ win64_build:
   interruptible: false
   image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/ltsc2022-msvc:latest
   variables:
-    VCPKG_BINARY_SOURCES: 'nuget,gitlab,readwrite'
-    VCPKG_DISABLE_COMPILER_TRACKING: '1'
     # Switch the compressor to fastzip and reduce the compression level
     FF_USE_FASTZIP: "true"
     CACHE_COMPRESSION_LEVEL: "fast"
@@ -25,7 +23,6 @@ win64_build:
   script:
     - C:\builder\build.ps1 -Env -Arch x64
     - $vcpkgCache=Join-Path -Path (Get-Location) -ChildPath ".vcpkgCache";$env:VCPKG_DEFAULT_BINARY_CACHE=$vcpkgCache;New-Item -ItemType Directory -Force -Path $vcpkgCache
-    - nuget.exe sources add -Name gitlab -Source "https://gitlab.com/api/v4/projects/27426693/packages/nuget/index.json"  -UserName gitlab-ci-token -Password $env:CI_JOB_TOKEN
     - mkdir -p build/windows -Force
     - cd build/windows
     - cmake `
@@ -40,6 +37,8 @@ win64_build:
       ../../
     - cmake --build . 2>&1 | tee compilation_log.txt
     - cd ../../
+  after_script:
+    - Get-Content -Path C:\builder\vcpkg\buildtrees\wxpython-33\python3-tool-post-install-err.log
   artifacts:
     # Only save the artifacts that are needed for running the tests in the next stage
     # and the compilation log. The entire build directory is too large to save as an

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -35,22 +35,14 @@
 #include <advanced_config.h>
 #include <build_version.h>
 #include <board.h>
-#include <pad.h>
-#include <pcb_field.h>
 #include <reporter.h>
 #include <gal/opengl/gl_context_mgr.h>
 #include <core/profile.h>        // To use GetRunningMicroSecs or another profiling utility
 #include <bitmaps.h>
-#include <kiway_holder.h>
-#include <kiway.h>
 #include <macros.h>
 #include <pgm_base.h>
 #include <settings/settings_manager.h>
 #include <tool/tool_dispatcher.h>
-#include <string_utils.h>
-#include <mail_type.h>
-#include <kiway_express.h>
-#include <fmt/format.h>
 
 #include <widgets/wx_busy_indicator.h>
 
@@ -100,12 +92,28 @@ END_EVENT_TABLE()
 EDA_3D_CANVAS::EDA_3D_CANVAS( wxWindow* aParent, const wxGLAttributes& aGLAttribs,
                               BOARD_ADAPTER& aBoardAdapter, CAMERA& aCamera,
                               S3D_CACHE* a3DCachePointer ) :
-    HIDPI_GL_3D_CANVAS( EDA_DRAW_PANEL_GAL::GetVcSettings(), aCamera, aParent, aGLAttribs,
-                EDA_3D_CANVAS_ID, wxDefaultPosition,
-                wxDefaultSize, wxFULL_REPAINT_ON_RESIZE ),
-    m_editing_timeout_timer( this, wxID_HIGHEST + 1 ),
-    m_redraw_trigger_timer( this, wxID_HIGHEST + 2 ),
-    m_boardAdapter( aBoardAdapter )
+        HIDPI_GL_3D_CANVAS( EDA_DRAW_PANEL_GAL::GetVcSettings(), aCamera, aParent, aGLAttribs,
+                            EDA_3D_CANVAS_ID, wxDefaultPosition,
+                            wxDefaultSize, wxFULL_REPAINT_ON_RESIZE ),
+        m_eventDispatcher( nullptr ),
+        m_parentStatusBar( nullptr ),
+        m_parentInfoBar( nullptr ),
+        m_glRC( nullptr ),
+        m_is_opengl_initialized( false ),
+        m_is_opengl_version_supported( true ),
+        m_editing_timeout_timer( this, wxID_HIGHEST + 1 ),
+        m_redraw_trigger_timer( this, wxID_HIGHEST + 2 ),
+        m_render_pivot( false ),
+        m_camera_moving_speed( 1.0f ),
+        m_strtime_camera_movement( 0 ),
+        m_animation_enabled( true ),
+        m_moving_speed_multiplier( 3 ),
+        m_boardAdapter( aBoardAdapter ),
+        m_3d_render( nullptr ),
+        m_opengl_supports_raytracing( true ),
+        m_render_raytracing_was_requested( false ),
+        m_accelerator3DShapes( nullptr ),
+        m_currentRollOverItem( nullptr )
 {
     wxLogTrace( m_logTrace, wxT( "EDA_3D_CANVAS::EDA_3D_CANVAS" ) );
 
@@ -473,10 +481,8 @@ void EDA_3D_CANVAS::DoRePaint()
 
     if( m_camera_is_moving )
     {
-    const int64_t curtime_delta = GetRunningMicroSecs() - m_strtime_camera_movement;
-    // Convert microseconds to seconds as float and apply speed multiplier
-    curtime_delta_s = static_cast<float>( static_cast<double>( curtime_delta ) / 1e6 )
-              * m_camera_moving_speed;
+        const int64_t curtime_delta = GetRunningMicroSecs() - m_strtime_camera_movement;
+        curtime_delta_s = ( curtime_delta / 1e6 ) * m_camera_moving_speed;
         m_camera.Interpolate( curtime_delta_s );
 
         if( curtime_delta_s > 1.0f )
@@ -745,8 +751,7 @@ void EDA_3D_CANVAS::RenderToFrameBuffer( unsigned char* buffer, int width, int h
     if( m_camera_is_moving )
     {
         const int64_t curtime_delta = GetRunningMicroSecs() - m_strtime_camera_movement;
-        curtime_delta_s = static_cast<float>( static_cast<double>( curtime_delta ) / 1e6 )
-                          * m_camera_moving_speed;
+        curtime_delta_s = ( curtime_delta / 1e6 ) * m_camera_moving_speed;
         m_camera.Interpolate( curtime_delta_s );
 
         if( curtime_delta_s > 1.0f )
@@ -882,7 +887,7 @@ void EDA_3D_CANVAS::OnZoomGesture( wxZoomGestureEvent& aEvent )
     m_camera.Pan( aEvent.GetPosition() );
     m_camera.SetCurMousePosition( aEvent.GetPosition() );
 
-    m_camera.Zoom( static_cast<float>( aEvent.GetZoomFactor() / m_gestureLastZoomFactor ) );
+    m_camera.Zoom( aEvent.GetZoomFactor() / m_gestureLastZoomFactor );
 
     m_gestureLastZoomFactor = aEvent.GetZoomFactor();
 
@@ -925,7 +930,7 @@ void EDA_3D_CANVAS::OnRotateGesture( wxRotateGestureEvent& aEvent )
     if( m_camera_is_moving )
         return;
 
-    m_camera.RotateScreen( static_cast<float>( m_gestureLastAngle - aEvent.GetRotationAngle() ) );
+    m_camera.RotateScreen( m_gestureLastAngle - aEvent.GetRotationAngle() );
     m_gestureLastAngle = aEvent.GetRotationAngle();
 
     DisplayStatus();
@@ -1061,45 +1066,9 @@ void EDA_3D_CANVAS::OnLeftDown( wxMouseEvent& event )
     {
         RAY mouseRay = getRayAtCurrentMousePosition();
 
-        BOARD_ITEM* intersectedBoardItem = m_3d_render_raytracing->IntersectBoardItem( mouseRay );
+        BOARD_ITEM *intersectedBoardItem = m_3d_render_raytracing->IntersectBoardItem( mouseRay );
 
-        if( intersectedBoardItem )
-        {
-            FOOTPRINT* footprint = nullptr;
-
-            switch( intersectedBoardItem->Type() )
-            {
-            case PCB_FOOTPRINT_T:
-                footprint = static_cast<FOOTPRINT*>( intersectedBoardItem );
-                break;
-
-            case PCB_PAD_T:
-                footprint = static_cast<PAD*>( intersectedBoardItem )->GetParentFootprint();
-                break;
-
-            case PCB_FIELD_T:
-                footprint = static_cast<PCB_FIELD*>( intersectedBoardItem )->GetParentFootprint();
-                break;
-
-            default:
-                break;
-            }
-
-            if( footprint )
-            {
-                std::string command =
-                        fmt::format( "$SELECT: 0,F{}",
-                                   EscapeString( footprint->GetReference(), CTX_IPC ).ToStdString() );
-
-                EDA_3D_VIEWER_FRAME* frame = static_cast<EDA_3D_VIEWER_FRAME*>( GetParent() );
-
-                if( frame )
-                {
-                    frame->Kiway().ExpressMail( FRAME_PCB_EDITOR, MAIL_SELECTION, command, frame );
-                    frame->Kiway().ExpressMail( FRAME_SCH, MAIL_SELECTION, command, frame );
-                }
-            }
-        }
+        // !TODO: send a selection item to pcbnew, eg: via kiway?
     }
 }
 
@@ -1119,14 +1088,14 @@ void EDA_3D_CANVAS::OnLeftUp( wxMouseEvent& event )
     int    logicalW = logicalSize.GetWidth();
     int    logicalH = logicalSize.GetHeight();
 
-    int gizmo_x = 0, gizmo_y = 0, gizmo_width = 0, gizmo_height = 0;
+    int gizmo_x, gizmo_y, gizmo_width, gizmo_height;
     std::tie( gizmo_x, gizmo_y, gizmo_width, gizmo_height ) = m_3d_render_opengl->getGizmoViewport();
 
-    float scaleX = static_cast<float>( static_cast<double>( gizmo_width ) / static_cast<double>( logicalW ) );
-    float scaleY = static_cast<float>( static_cast<double>( gizmo_height ) / static_cast<double>( logicalH ) );
+    float scaleX = static_cast<float>( gizmo_width ) / logicalW;
+    float scaleY = static_cast<float>( gizmo_height ) / logicalH;
 
-    int scaledMouseX = static_cast<int>( static_cast<float>( event.GetX() ) * scaleX );
-    int scaledMouseY = static_cast<int>( static_cast<float>( logicalH - event.GetY() ) * scaleY );
+    int scaledMouseX = static_cast<int>( event.GetX() * scaleX );
+    int scaledMouseY = static_cast<int>( ( logicalH - event.GetY() ) * scaleY );
 
     m_3d_render_opengl->handleGizmoMouseInput( scaledMouseX, scaledMouseY );
     Refresh();
@@ -1260,7 +1229,7 @@ void EDA_3D_CANVAS::request_start_moving_camera( float aMovingSpeed, bool aRende
 
     // Map speed multiplier option to actual multiplier value
     // [1,2,3,4,5] -> [0.25, 0.5, 1, 2, 4]
-    aMovingSpeed *= static_cast<float>( ( 1 << m_moving_speed_multiplier ) ) / 8.0f;
+    aMovingSpeed *= ( 1 << m_moving_speed_multiplier ) / 8.0f;
 
     m_render_pivot = aRenderPivot;
     m_camera_moving_speed = aMovingSpeed;
@@ -1280,7 +1249,7 @@ void EDA_3D_CANVAS::move_pivot_based_on_cur_mouse_position()
 {
     RAY mouseRay = getRayAtCurrentMousePosition();
 
-    float hit_t = 0.0f;
+    float hit_t;
 
     // Test it with the board bounding box
     if( m_boardAdapter.GetBBox().Intersect( mouseRay, &hit_t ) )

3d-viewer/3d_canvas/eda_3d_canvas.h

@@ -42,7 +42,7 @@ class RENDER_3D_RAYTRACE_GL;
 class RENDER_3D_OPENGL;
 
 
-#define EDA_3D_CANVAS_ID (wxID_HIGHEST + 1321)
+#define EDA_3D_CANVAS_ID wxID_HIGHEST + 1321
 
 /**
  *  Implement a canvas based on a wxGLCanvas
@@ -61,7 +61,7 @@ public:
     EDA_3D_CANVAS( wxWindow* aParent, const wxGLAttributes& aGLAttribs, BOARD_ADAPTER& aSettings,
                    CAMERA& aCamera, S3D_CACHE* a3DCachePointer );
 
-    ~EDA_3D_CANVAS() override;
+    ~EDA_3D_CANVAS();
 
     /**
      * Set a dispatcher that processes events and forwards them to tools.
@@ -302,36 +302,36 @@ private:
     RAY getRayAtCurrentMousePosition();
 
 private:
-    TOOL_DISPATCHER*       m_eventDispatcher = nullptr;
-    wxStatusBar*           m_parentStatusBar = nullptr;         // Parent statusbar to report progress
-    WX_INFOBAR*            m_parentInfoBar = nullptr;
+    TOOL_DISPATCHER*       m_eventDispatcher;
+    wxStatusBar*           m_parentStatusBar;         // Parent statusbar to report progress
+    WX_INFOBAR*            m_parentInfoBar;
 
-    wxGLContext*           m_glRC = nullptr;                    // Current OpenGL context
-    bool                   m_is_opengl_initialized = false;
-    bool                   m_is_opengl_version_supported = true;
+    wxGLContext*           m_glRC;                    // Current OpenGL context
+    bool                   m_is_opengl_initialized;
+    bool                   m_is_opengl_version_supported;
 
     wxTimer                m_editing_timeout_timer;   // Expires after some time signaling that
                                                       // the mouse / keyboard movements are over
     wxTimer                m_redraw_trigger_timer;    // Used to schedule a redraw event
-    std::atomic_flag       m_is_currently_painting = ATOMIC_FLAG_INIT;   // Avoid drawing twice at the same time
+    std::atomic_flag       m_is_currently_painting;   // Avoid drawing twice at the same time
 
-    bool                   m_render_pivot = false;            // Render the pivot while camera moving
-    float                  m_camera_moving_speed = 1.0f;     // 1.0f will be 1:1
-    int64_t                m_strtime_camera_movement = 0; // Ticktime of camera movement start
-    bool                   m_animation_enabled = true;       // Camera animation enabled
-    int                    m_moving_speed_multiplier = 3; // Camera animation speed multiplier option
+    bool                   m_render_pivot;            // Render the pivot while camera moving
+    float                  m_camera_moving_speed;     // 1.0f will be 1:1
+    int64_t                m_strtime_camera_movement; // Ticktime of camera movement start
+    bool                   m_animation_enabled;       // Camera animation enabled
+    int                    m_moving_speed_multiplier; // Camera animation speed multiplier option
 
     BOARD_ADAPTER&         m_boardAdapter;            // Pre-computed 3D info and settings
-    RENDER_3D_BASE*        m_3d_render = nullptr;
+    RENDER_3D_BASE*        m_3d_render;
     RENDER_3D_RAYTRACE_GL* m_3d_render_raytracing;
     RENDER_3D_OPENGL*      m_3d_render_opengl;
 
-    bool                   m_opengl_supports_raytracing = true;
-    bool                   m_render_raytracing_was_requested = false;
+    bool                   m_opengl_supports_raytracing;
+    bool                   m_render_raytracing_was_requested;
 
-    ACCELERATOR_3D*        m_accelerator3DShapes = nullptr;    // used for mouse over searching
+    ACCELERATOR_3D*        m_accelerator3DShapes;    // used for mouse over searching
 
-    BOARD_ITEM*            m_currentRollOverItem = nullptr;
+    BOARD_ITEM*            m_currentRollOverItem;
 
     bool    m_render3dmousePivot = false; // Render the 3dmouse pivot
     SFVEC3F m_3dmousePivotPos;            // The position of the 3dmouse pivot

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

@@ -26,7 +26,6 @@
 #include "render_3d_opengl.h"
 #include <board.h>
 #include <footprint.h>
-#include <pcb_track.h>
 #include "../../3d_math.h"
 #include "convert_basic_shapes_to_polygon.h"
 #include <lset.h>
@@ -727,54 +726,6 @@ void RENDER_3D_OPENGL::generateCylinder( const SFVEC2F& aCenter, float aInnerRad
 }
 
 
-void RENDER_3D_OPENGL::generateDisk( const SFVEC2F& aCenter, float aRadius, float aZ,
-                                     unsigned int aNr_sides_per_circle, TRIANGLE_DISPLAY_LIST* aDstLayer,
-                                     bool aTop )
-{
-    const float delta = 2.0f * glm::pi<float>() / (float) aNr_sides_per_circle;
-
-    for( unsigned int i = 0; i < aNr_sides_per_circle; ++i )
-    {
-        float a0 = delta * i;
-        float a1 = delta * ( i + 1 );
-        const SFVEC3F p0( aCenter.x + cosf( a0 ) * aRadius,
-                          aCenter.y + sinf( a0 ) * aRadius, aZ );
-        const SFVEC3F p1( aCenter.x + cosf( a1 ) * aRadius,
-                          aCenter.y + sinf( a1 ) * aRadius, aZ );
-        const SFVEC3F c( aCenter.x, aCenter.y, aZ );
-
-        if( aTop )
-            aDstLayer->m_layer_top_triangles->AddTriangle( p1, p0, c );
-        else
-            aDstLayer->m_layer_bot_triangles->AddTriangle( p0, p1, c );
-    }
-}
-
-
-void RENDER_3D_OPENGL::generateDimple( const SFVEC2F& aCenter, float aRadius, float aZ,
-                                       float aDepth, unsigned int aNr_sides_per_circle,
-                                       TRIANGLE_DISPLAY_LIST* aDstLayer, bool aTop )
-{
-    const float delta = 2.0f * glm::pi<float>() / (float) aNr_sides_per_circle;
-    const SFVEC3F c( aCenter.x, aCenter.y, aTop ? aZ - aDepth : aZ + aDepth );
-
-    for( unsigned int i = 0; i < aNr_sides_per_circle; ++i )
-    {
-        float a0 = delta * i;
-        float a1 = delta * ( i + 1 );
-        const SFVEC3F p0( aCenter.x + cosf( a0 ) * aRadius,
-                          aCenter.y + sinf( a0 ) * aRadius, aZ );
-        const SFVEC3F p1( aCenter.x + cosf( a1 ) * aRadius,
-                          aCenter.y + sinf( a1 ) * aRadius, aZ );
-
-        if( aTop )
-            aDstLayer->m_layer_top_triangles->AddTriangle( p0, p1, c );
-        else
-            aDstLayer->m_layer_bot_triangles->AddTriangle( p1, p0, c );
-    }
-}
-
-
 void RENDER_3D_OPENGL::generateViasAndPads()
 {
     if( !m_boardAdapter.GetBoard() )
@@ -931,63 +882,6 @@ void RENDER_3D_OPENGL::generateViasAndPads()
             delete layerTriangles;
         }
     }
-
-    TRIANGLE_DISPLAY_LIST* frontCover = new TRIANGLE_DISPLAY_LIST( m_boardAdapter.GetViaCount() );
-    TRIANGLE_DISPLAY_LIST* backCover = new TRIANGLE_DISPLAY_LIST( m_boardAdapter.GetViaCount() );
-
-    for( const PCB_TRACK* track : m_boardAdapter.GetBoard()->Tracks() )
-    {
-        if( track->Type() != PCB_VIA_T )
-            continue;
-
-        const PCB_VIA* via = static_cast<const PCB_VIA*>( track );
-
-        const float holediameter = via->GetDrillValue() * m_boardAdapter.BiuTo3dUnits();
-        const float hole_radius = holediameter / 2.0f + 2.0 * platingThickness3d;
-        const SFVEC2F center( via->GetStart().x * m_boardAdapter.BiuTo3dUnits(),
-                              -via->GetStart().y * m_boardAdapter.BiuTo3dUnits() );
-        unsigned int seg = m_boardAdapter.GetCircleSegmentCount( via->GetDrillValue() );
-
-        PCB_LAYER_ID top_layer, bottom_layer;
-        via->LayerPair( &top_layer, &bottom_layer );
-        float ztop, zbot, dummy;
-        getLayerZPos( top_layer, ztop, dummy );
-        getLayerZPos( bottom_layer, dummy, zbot );
-
-        bool frontCovering = via->GetFrontCoveringMode() == COVERING_MODE::COVERED || via->IsTented( F_Mask );
-        bool backCovering = via->GetBackCoveringMode() == COVERING_MODE::COVERED || via->IsTented( B_Mask );
-        bool frontPlugged = via->GetFrontPluggingMode() == PLUGGING_MODE::PLUGGED;
-        bool backPlugged  = via->GetBackPluggingMode() == PLUGGING_MODE::PLUGGED;
-        bool filled = via->GetFillingMode() == FILLING_MODE::FILLED
-                      || via->GetCappingMode() == CAPPING_MODE::CAPPED;
-
-        const float depth = hole_radius * 0.3f;
-
-        if( frontCovering )
-        {
-            if( filled || !frontPlugged )
-                generateDisk( center, hole_radius, ztop, seg, frontCover, true );
-            else
-                generateDimple( center, hole_radius, ztop, depth, seg, frontCover, true );
-        }
-
-        if( backCovering )
-        {
-            if( filled || !backPlugged )
-                generateDisk( center, hole_radius, zbot, seg, backCover, false );
-            else
-                generateDimple( center, hole_radius, zbot, depth, seg, backCover, false );
-        }
-    }
-
-    if( frontCover->m_layer_top_triangles->GetVertexSize() > 0 )
-        m_viaFrontCover = new OPENGL_RENDER_LIST( *frontCover, 0, 0.0f, 0.0f );
-
-    if( backCover->m_layer_bot_triangles->GetVertexSize() > 0 )
-        m_viaBackCover = new OPENGL_RENDER_LIST( *backCover, 0, 0.0f, 0.0f );
-
-    delete frontCover;
-    delete backCover;
 }
 
 

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

@@ -72,8 +72,6 @@ RENDER_3D_OPENGL::RENDER_3D_OPENGL( EDA_3D_CANVAS* aCanvas, BOARD_ADAPTER& aAdap
     m_outerViaThroughHoles = nullptr;
     m_microviaHoles = nullptr;
     m_padHoles = nullptr;
-    m_viaFrontCover = nullptr;
-    m_viaBackCover = nullptr;
 
     m_circleTexture = 0;
     m_grid = 0;
@@ -949,8 +947,6 @@ void RENDER_3D_OPENGL::freeAllLists()
 
     DELETE_AND_FREE( m_microviaHoles )
     DELETE_AND_FREE( m_padHoles )
-    DELETE_AND_FREE( m_viaFrontCover )
-    DELETE_AND_FREE( m_viaBackCover )
 }
 
 
@@ -972,17 +968,6 @@ void RENDER_3D_OPENGL::renderSolderMaskLayer( PCB_LAYER_ID aLayerID, float aZPos
         setLayerMaterial( aLayerID );
         m_board->SetItIsTransparent( true );
         m_board->DrawCulled( aShowThickness, solder_mask, via_holes );
-
-        if( aLayerID == F_Mask && m_viaFrontCover )
-        {
-            m_viaFrontCover->ApplyScalePosition( aZPos, 4 * m_boardAdapter.GetNonCopperLayerThickness() );
-            m_viaFrontCover->DrawTop();
-        }
-        else if( aLayerID == B_Mask && m_viaBackCover )
-        {
-            m_viaBackCover->ApplyScalePosition( aZPos, 4 * m_boardAdapter.GetNonCopperLayerThickness() );
-            m_viaBackCover->DrawBot();
-        }
     }
 }
 

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

@@ -123,14 +123,6 @@ private:
                            float aZtop, float aZbot, unsigned int aNr_sides_per_circle,
                            TRIANGLE_DISPLAY_LIST* aDstLayer );
 
-    void generateDisk( const SFVEC2F& aCenter, float aRadius, float aZ,
-                       unsigned int aNr_sides_per_circle, TRIANGLE_DISPLAY_LIST* aDstLayer,
-                       bool aTop );
-
-    void generateDimple( const SFVEC2F& aCenter, float aRadius, float aZ, float aDepth,
-                         unsigned int aNr_sides_per_circle, TRIANGLE_DISPLAY_LIST* aDstLayer,
-                         bool aTop );
-
     void generateViasAndPads();
 
     /**
@@ -244,8 +236,6 @@ private:
 
     OPENGL_RENDER_LIST* m_microviaHoles;
     OPENGL_RENDER_LIST* m_padHoles;
-    OPENGL_RENDER_LIST* m_viaFrontCover;
-    OPENGL_RENDER_LIST* m_viaBackCover;
 
     // Caches
     std::map<wxString, MODEL_3D*>           m_3dModelMap;

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

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

common/CMakeLists.txt

@@ -633,8 +633,7 @@ set( COMMON_GIT_SRCS
     git/project_git_utils.cpp
     git/kicad_git_common.cpp
     git/kicad_git_errors.cpp
-    git/git_backend.cpp
-    git/libgit_backend.cpp
+    git/project_git_utils.cpp
     )
 
 set( COMMON_SRCS

common/design_block_info_impl.cpp

@@ -190,7 +190,7 @@ void DESIGN_BLOCK_LIST_IMPL::loadDesignBlocks()
             };
 
     for( size_t ii = 0; ii < num_elements; ++ii )
-        returns[ii] = tp.submit_task( db_thread );
+        returns[ii] = tp.submit( db_thread );
 
     for( const std::future<size_t>& ret : returns )
     {

common/dialogs/panel_embedded_files.cpp

@@ -167,7 +167,9 @@ void PANEL_EMBEDDED_FILES::resizeGrid()
 bool PANEL_EMBEDDED_FILES::TransferDataToWindow()
 {
     m_files_grid->ClearGrid();
-    m_files_grid->ClearRows();
+
+    if( m_files_grid->GetNumberRows() > 0 )
+        m_files_grid->DeleteRows( 0, m_files_grid->GetNumberRows() );
 
     int ii = 0;
 

common/draw_panel_gal.cpp

@@ -87,10 +87,6 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
         m_stealsFocus( true ),
         m_statusPopup( nullptr )
 {
-#ifdef _WIN32
-    // need to fix broken cairo rendering on Windows with wx 3.3
-    SetDoubleBuffered( false );
-#endif
     m_PaintEventCounter = std::make_unique<PROF_COUNTER>( "Draw panel paint events" );
 
     if( Pgm().GetCommonSettings()->m_Appearance.show_scrollbars )

common/eda_draw_frame.cpp

@@ -1059,35 +1059,32 @@ std::vector<wxWindow*> EDA_DRAW_FRAME::findDialogs()
 }
 
 
-void EDA_DRAW_FRAME::FocusOnLocation( const VECTOR2I& aPos, bool aAllowScroll )
+void EDA_DRAW_FRAME::FocusOnLocation( const VECTOR2I& aPos )
 {
-    bool               centerView = false;
+    bool  centerView = false;
+    BOX2D r = GetCanvas()->GetView()->GetViewport();
+
+    // Center if we're off the current view, or within 10% of its edge
+    r.Inflate( - r.GetWidth() / 10.0 );
+
+    if( !r.Contains( aPos ) )
+        centerView = true;
+
     std::vector<BOX2D> dialogScreenRects;
 
-    if( aAllowScroll )
+    for( wxWindow* dialog : findDialogs() )
     {
-        BOX2D r = GetCanvas()->GetView()->GetViewport();
+        dialogScreenRects.emplace_back( ToVECTOR2D( GetCanvas()->ScreenToClient( dialog->GetScreenPosition() ) ),
+                                        ToVECTOR2D( dialog->GetSize() ) );
+    }
 
-        // Center if we're off the current view, or within 10% of its edge
-        r.Inflate( - r.GetWidth() / 10.0 );
+    // Center if we're behind an obscuring dialog, or within 10% of its edge
+    for( BOX2D rect : dialogScreenRects )
+    {
+        rect.Inflate( rect.GetWidth() / 10 );
 
-        if( !r.Contains( aPos ) )
+        if( rect.Contains( GetCanvas()->GetView()->ToScreen( aPos ) ) )
             centerView = true;
-
-        for( wxWindow* dialog : findDialogs() )
-        {
-            dialogScreenRects.emplace_back( ToVECTOR2D( GetCanvas()->ScreenToClient( dialog->GetScreenPosition() ) ),
-                                            ToVECTOR2D( dialog->GetSize() ) );
-        }
-
-        // Center if we're behind an obscuring dialog, or within 10% of its edge
-        for( BOX2D rect : dialogScreenRects )
-        {
-            rect.Inflate( rect.GetWidth() / 10 );
-
-            if( rect.Contains( GetCanvas()->GetView()->ToScreen( aPos ) ) )
-                centerView = true;
-        }
     }
 
     if( centerView )

common/eda_shape.cpp

@@ -1382,15 +1382,6 @@ bool EDA_SHAPE::hitTest( const VECTOR2I& aPosition, int aAccuracy ) const
 
             return poly.Collide( aPosition, maxdist );
         }
-        else if( m_cornerRadius > 0 )
-        {
-            ROUNDRECT rr( SHAPE_RECT( GetStart(), GetRectangleWidth(), GetRectangleHeight() ), m_cornerRadius );
-            SHAPE_POLY_SET poly;
-            rr.TransformToPolygon( poly );
-
-            if( poly.CollideEdge( aPosition, nullptr, maxdist ) )
-                return true;
-        }
         else
         {
             std::vector<VECTOR2I> pts = GetRectCorners();
@@ -1402,13 +1393,13 @@ bool EDA_SHAPE::hitTest( const VECTOR2I& aPosition, int aAccuracy ) const
             {
                 return true;
             }
+
+            if( IsHatchedFill() && GetHatching().Collide( aPosition, maxdist ) )
+                return true;
+
+            return false;
         }
 
-        if( IsHatchedFill() && GetHatching().Collide( aPosition, maxdist ) )
-            return true;
-
-        return false;
-
     case SHAPE_T::POLY:
         if( IsFilledForHitTesting() )
         {
@@ -1450,40 +1441,6 @@ bool EDA_SHAPE::hitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) co
 
     BOX2I bbox = getBoundingBox();
 
-    auto checkOutline =
-            [&]( const SHAPE_LINE_CHAIN& outline )
-            {
-                int count = (int) outline.GetPointCount();
-
-                for( int ii = 0; ii < count; ii++ )
-                {
-                    VECTOR2I vertex = outline.GetPoint( ii );
-
-                    // Test if the point is within aRect
-                    if( arect.Contains( vertex ) )
-                        return true;
-
-                    if( ii + 1 < count )
-                    {
-                        VECTOR2I vertexNext = outline.GetPoint( ii + 1 );
-
-                        // Test if this edge intersects aRect
-                        if( arect.Intersects( vertex, vertexNext ) )
-                            return true;
-                    }
-                    else if( outline.IsClosed() )
-                    {
-                        VECTOR2I vertexNext = outline.GetPoint( 0 );
-
-                        // Test if this edge intersects aRect
-                        if( arect.Intersects( vertex, vertexNext ) )
-                            return true;
-                    }
-                }
-
-                return false;
-            };
-
     switch( m_shape )
     {
     case SHAPE_T::CIRCLE:
@@ -1530,17 +1487,6 @@ bool EDA_SHAPE::hitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) co
         {
             return arect.Contains( bbox );
         }
-        else if( m_cornerRadius > 0 )
-        {
-            ROUNDRECT rr( SHAPE_RECT( GetStart(), GetRectangleWidth(), GetRectangleHeight() ), m_cornerRadius );
-            SHAPE_POLY_SET poly;
-            rr.TransformToPolygon( poly );
-
-            // Account for the width of the line
-            arect.Inflate( GetWidth() / 2 );
-
-            return checkOutline( poly.Outline( 0 ) );
-        }
         else
         {
             std::vector<VECTOR2I> pts = GetRectCorners();
@@ -1582,8 +1528,34 @@ bool EDA_SHAPE::hitTest( const BOX2I& aRect, bool aContained, int aAccuracy ) co
 
             for( int ii = 0; ii < m_poly.OutlineCount(); ++ii )
             {
-                if( checkOutline( m_poly.Outline( ii ) ) )
-                    return true;
+                const SHAPE_LINE_CHAIN& poly = m_poly.Outline( ii );
+                int                     count = (int) poly.GetPointCount();
+
+                for( int jj = 0; jj < count; jj++ )
+                {
+                    VECTOR2I vertex = poly.GetPoint( jj );
+
+                    // Test if the point is within aRect
+                    if( arect.Contains( vertex ) )
+                        return true;
+
+                    if( jj + 1 < count )
+                    {
+                        VECTOR2I vertexNext = poly.GetPoint( jj + 1 );
+
+                        // Test if this edge intersects aRect
+                        if( arect.Intersects( vertex, vertexNext ) )
+                            return true;
+                    }
+                    else if( poly.IsClosed() )
+                    {
+                        VECTOR2I vertexNext = poly.GetPoint( 0 );
+
+                        // Test if this edge intersects aRect
+                        if( arect.Intersects( vertex, vertexNext ) )
+                            return true;
+                    }
+                }
             }
 
             return false;

common/gal/cairo/cairo_gal.cpp

@@ -1364,11 +1364,6 @@ CAIRO_GAL::CAIRO_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     m_currentTarget = TARGET_NONCACHED;
     SetTarget( TARGET_NONCACHED );
 
-#ifdef _WIN32
-    // need to fix broken cairo rendering on Windows with wx 3.3
-    SetDoubleBuffered( false );
-#endif
-
     m_bitmapBuffer = nullptr;
     m_wxOutput = nullptr;
 

common/git/git_add_to_index_handler.cpp

@@ -22,13 +22,16 @@
  */
 
 #include "git_add_to_index_handler.h"
-#include "git_backend.h"
+#include <git/kicad_git_memory.h>
 
+#include <iterator>
+
+#include <wx/string.h>
 #include <wx/log.h>
 
-GIT_ADD_TO_INDEX_HANDLER::GIT_ADD_TO_INDEX_HANDLER( git_repository* aRepository ) :
-    KIGIT_COMMON( aRepository )
+GIT_ADD_TO_INDEX_HANDLER::GIT_ADD_TO_INDEX_HANDLER( git_repository* aRepository )
 {
+    m_repository = aRepository;
     m_filesToAdd.clear();
 }
 
@@ -40,11 +43,66 @@ GIT_ADD_TO_INDEX_HANDLER::~GIT_ADD_TO_INDEX_HANDLER()
 
 bool GIT_ADD_TO_INDEX_HANDLER::AddToIndex( const wxString& aFilePath )
 {
-    return GetGitBackend()->AddToIndex( this, aFilePath );
+    // Test if file is currently in the index
+
+    git_index* index = nullptr;
+    size_t at_pos = 0;
+
+    if( git_repository_index( &index, m_repository ) != 0 )
+    {
+        wxLogError( "Failed to get repository index" );
+        return false;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    if( git_index_find( &at_pos, index, aFilePath.ToUTF8().data() ) == GIT_OK )
+    {
+        wxLogError( "%s already in index", aFilePath );
+        return false;
+    }
+
+    // Add file to index if not already there
+    m_filesToAdd.push_back( aFilePath );
+
+    return true;
 }
 
 
 bool GIT_ADD_TO_INDEX_HANDLER::PerformAddToIndex()
 {
-    return GetGitBackend()->PerformAddToIndex( this );
+    git_index* index = nullptr;
+
+    m_filesFailedToAdd.clear();
+
+    if( git_repository_index( &index, m_repository ) != 0 )
+    {
+        wxLogError( "Failed to get repository index" );
+        std::copy( m_filesToAdd.begin(), m_filesToAdd.end(), std::back_inserter( m_filesFailedToAdd ) );
+        return false;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    for( auto& file : m_filesToAdd )
+    {
+        if( git_index_add_bypath( index, file.ToUTF8().data() ) != 0 )
+        {
+            wxLogError( "Failed to add %s to index", file );
+            m_filesFailedToAdd.push_back( file );
+            continue;
+        }
+    }
+
+
+    if( git_index_write( index ) != 0 )
+    {
+        wxLogError( "Failed to write index" );
+        m_filesFailedToAdd.clear();
+        std::copy( m_filesToAdd.begin(), m_filesToAdd.end(),
+                   std::back_inserter( m_filesFailedToAdd ) );
+        return false;
+    }
+
+    return true;
 }

common/git/git_add_to_index_handler.h

@@ -24,13 +24,12 @@
 #ifndef GIT_ADD_TO_INDEX_HANDLER_H_
 #define GIT_ADD_TO_INDEX_HANDLER_H_
 
-#include <git/kicad_git_common.h>
+#include <git2.h>
 #include <vector>
-#include <wx/string.h>
 
-class LIBGIT_BACKEND;
+class wxString;
 
-class GIT_ADD_TO_INDEX_HANDLER : public KIGIT_COMMON
+class GIT_ADD_TO_INDEX_HANDLER
 {
 public:
     GIT_ADD_TO_INDEX_HANDLER( git_repository* aRepository );
@@ -41,7 +40,8 @@ public:
     bool PerformAddToIndex();
 
 private:
-    friend class LIBGIT_BACKEND;
+    git_repository* m_repository;
+
     std::vector<wxString> m_filesToAdd;
     std::vector<wxString> m_filesFailedToAdd;
 };

common/git/git_backend.cpp

@@ -1,36 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright The KiCad Developers, see AUTHORS.TXT for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/gpl-3.0.html
- * or you may search the http://www.gnu.org website for the version 3 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include "git_backend.h"
-
-static GIT_BACKEND* s_backend = nullptr;
-
-GIT_BACKEND* GetGitBackend()
-{
-    return s_backend;
-}
-
-void SetGitBackend( GIT_BACKEND* aBackend )
-{
-    s_backend = aBackend;
-}

common/git/git_backend.h

@@ -1,127 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright The KiCad Developers, see AUTHORS.TXT for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/gpl-3.0.html
- * or you may search the http://www.gnu.org website for the version 3 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#ifndef GIT_BACKEND_H_
-#define GIT_BACKEND_H_
-
-#include <map>
-#include <set>
-#include <vector>
-#include <wx/string.h>
-
-class GIT_CLONE_HANDLER;
-class GIT_COMMIT_HANDLER;
-class GIT_PUSH_HANDLER;
-class GIT_STATUS_HANDLER;
-class GIT_ADD_TO_INDEX_HANDLER;
-class GIT_REMOVE_FROM_INDEX_HANDLER;
-class GIT_CONFIG_HANDLER;
-class GIT_INIT_HANDLER;
-class GIT_BRANCH_HANDLER;
-class GIT_PULL_HANDLER;
-class GIT_REVERT_HANDLER;
-struct RemoteConfig;
-struct git_repository;
-enum class InitResult;
-enum class BranchResult;
-enum class PullResult;
-struct FileStatus;
-enum class PushResult;
-
-// Commit result shared across backend and handlers
-enum class CommitResult
-{
-    Success,
-    Error,
-    Cancelled
-};
-
-class GIT_BACKEND
-{
-public:
-    virtual ~GIT_BACKEND() = default;
-
-    virtual void Init() = 0;
-    virtual void Shutdown() = 0;
-
-    // Whether the libgit2 library is available/initialized enough for use
-    virtual bool IsLibraryAvailable() = 0;
-
-    virtual bool Clone( GIT_CLONE_HANDLER* aHandler ) = 0;
-
-    virtual CommitResult Commit( GIT_COMMIT_HANDLER* aHandler,
-                                 const std::vector<wxString>& aFiles,
-                                 const wxString& aMessage,
-                                 const wxString& aAuthorName,
-                                 const wxString& aAuthorEmail ) = 0;
-
-    virtual PushResult Push( GIT_PUSH_HANDLER* aHandler ) = 0;
-
-    virtual bool HasChangedFiles( GIT_STATUS_HANDLER* aHandler ) = 0;
-
-    virtual std::map<wxString, FileStatus> GetFileStatus( GIT_STATUS_HANDLER* aHandler,
-                                                          const wxString& aPathspec ) = 0;
-
-    virtual wxString GetCurrentBranchName( GIT_STATUS_HANDLER* aHandler ) = 0;
-
-    virtual void UpdateRemoteStatus( GIT_STATUS_HANDLER* aHandler,
-                                     const std::set<wxString>& aLocalChanges,
-                                     const std::set<wxString>& aRemoteChanges,
-                                     std::map<wxString, FileStatus>& aFileStatus ) = 0;
-
-    virtual wxString GetWorkingDirectory( GIT_STATUS_HANDLER* aHandler ) = 0;
-
-    virtual wxString GetWorkingDirectory( GIT_CONFIG_HANDLER* aHandler ) = 0;
-    virtual bool GetConfigString( GIT_CONFIG_HANDLER* aHandler, const wxString& aKey,
-                                  wxString& aValue ) = 0;
-
-    virtual bool IsRepository( GIT_INIT_HANDLER* aHandler, const wxString& aPath ) = 0;
-    virtual InitResult InitializeRepository( GIT_INIT_HANDLER* aHandler, const wxString& aPath ) = 0;
-    virtual bool SetupRemote( GIT_INIT_HANDLER* aHandler, const RemoteConfig& aConfig ) = 0;
-
-    virtual BranchResult SwitchToBranch( GIT_BRANCH_HANDLER* aHandler, const wxString& aBranchName ) = 0;
-    virtual bool BranchExists( GIT_BRANCH_HANDLER* aHandler, const wxString& aBranchName ) = 0;
-
-    virtual bool PerformFetch( GIT_PULL_HANDLER* aHandler, bool aSkipLock ) = 0;
-    virtual PullResult PerformPull( GIT_PULL_HANDLER* aHandler ) = 0;
-
-    virtual void PerformRevert( GIT_REVERT_HANDLER* aHandler ) = 0;
-
-    virtual git_repository* GetRepositoryForFile( const char* aFilename ) = 0;
-    virtual int CreateBranch( git_repository* aRepo, const wxString& aBranchName ) = 0;
-    virtual bool RemoveVCS( git_repository*& aRepo, const wxString& aProjectPath,
-                            bool aRemoveGitDir, wxString* aErrors ) = 0;
-
-    virtual bool AddToIndex( GIT_ADD_TO_INDEX_HANDLER* aHandler, const wxString& aFilePath ) = 0;
-
-    virtual bool PerformAddToIndex( GIT_ADD_TO_INDEX_HANDLER* aHandler ) = 0;
-
-    virtual bool RemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler, const wxString& aFilePath ) = 0;
-
-    virtual void PerformRemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler ) = 0;
-};
-
-GIT_BACKEND* GetGitBackend();
-void SetGitBackend( GIT_BACKEND* aBackend );
-
-#endif

common/git/git_branch_handler.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "git_branch_handler.h"
-#include "git_backend.h"
 #include <git/kicad_git_common.h>
 #include <git/kicad_git_memory.h>
 #include <trace_helpers.h>
@@ -36,12 +35,89 @@ GIT_BRANCH_HANDLER::~GIT_BRANCH_HANDLER()
 
 bool GIT_BRANCH_HANDLER::BranchExists( const wxString& aBranchName )
 {
-    return GetGitBackend()->BranchExists( this, aBranchName );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return false;
+
+    git_reference* branchRef = nullptr;
+    bool exists = LookupBranchReference( aBranchName, &branchRef );
+
+    if( branchRef )
+        git_reference_free( branchRef );
+
+    return exists;
+}
+
+bool GIT_BRANCH_HANDLER::LookupBranchReference( const wxString& aBranchName, git_reference** aReference )
+{
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return false;
+
+    // Try direct lookup first
+    if( git_reference_lookup( aReference, repo, aBranchName.mb_str() ) == GIT_OK )
+        return true;
+
+    // Try dwim (Do What I Mean) lookup for short branch names
+    if( git_reference_dwim( aReference, repo, aBranchName.mb_str() ) == GIT_OK )
+        return true;
+
+    return false;
 }
 
 BranchResult GIT_BRANCH_HANDLER::SwitchToBranch( const wxString& aBranchName )
 {
-    return GetGitBackend()->SwitchToBranch( this, aBranchName );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+    {
+        AddErrorString( _( "No repository available" ) );
+        return BranchResult::Error;
+    }
+
+    // Look up the branch reference
+    git_reference* branchRef = nullptr;
+
+    if( !LookupBranchReference( aBranchName, &branchRef ) )
+    {
+        AddErrorString( wxString::Format( _( "Failed to lookup branch '%s': %s" ),
+                                          aBranchName, KIGIT_COMMON::GetLastGitError() ) );
+        return BranchResult::BranchNotFound;
+    }
+
+    KIGIT::GitReferencePtr branchRefPtr( branchRef );
+    const char* branchRefName = git_reference_name( branchRef );
+    git_object* branchObj = nullptr;
+
+    if( git_revparse_single( &branchObj, repo, aBranchName.mb_str() ) != GIT_OK )
+    {
+        AddErrorString( wxString::Format( _( "Failed to find branch head for '%s': %s" ),
+                                          aBranchName, KIGIT_COMMON::GetLastGitError() ) );
+        return BranchResult::Error;
+    }
+
+    KIGIT::GitObjectPtr branchObjPtr( branchObj );
+
+    // Switch to the branch
+    if( git_checkout_tree( repo, branchObj, nullptr ) != GIT_OK )
+    {
+        AddErrorString( wxString::Format( _( "Failed to switch to branch '%s': %s" ),
+                                          aBranchName, KIGIT_COMMON::GetLastGitError() ) );
+        return BranchResult::CheckoutFailed;
+    }
+
+    // Update the HEAD reference
+    if( git_repository_set_head( repo, branchRefName ) != GIT_OK )
+    {
+        AddErrorString( wxString::Format( _( "Failed to update HEAD reference for branch '%s': %s" ),
+                                          aBranchName, KIGIT_COMMON::GetLastGitError() ) );
+        return BranchResult::Error;
+    }
+
+    wxLogTrace( traceGit, "Successfully switched to branch '%s'", aBranchName );
+    return BranchResult::Success;
 }
 
 void GIT_BRANCH_HANDLER::UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage )

common/git/git_branch_handler.h

@@ -57,6 +57,15 @@ public:
     bool BranchExists( const wxString& aBranchName );
 
     void UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage ) override;
+
+private:
+    /**
+     * Look up a branch reference by name
+     * @param aBranchName Name of the branch
+     * @param aReference Output parameter for the reference
+     * @return True if successful, false otherwise
+     */
+    bool LookupBranchReference( const wxString& aBranchName, git_reference** aReference );
 };
 
 #endif // GIT_BRANCH_HANDLER_H

common/git/git_clone_handler.cpp

@@ -23,8 +23,13 @@
 
 #include "git_clone_handler.h"
 
+#include <git/kicad_git_common.h>
+#include <git/kicad_git_memory.h>
 #include <trace_helpers.h>
-#include "git_backend.h"
+
+#include <git2.h>
+#include <wx/filename.h>
+#include <wx/log.h>
 
 GIT_CLONE_HANDLER::GIT_CLONE_HANDLER( KIGIT_COMMON* aCommon ) :  KIGIT_REPO_MIXIN( aCommon )
 {}
@@ -36,7 +41,55 @@ GIT_CLONE_HANDLER::~GIT_CLONE_HANDLER()
 
 bool GIT_CLONE_HANDLER::PerformClone()
 {
-    return GetGitBackend()->Clone( this );
+    std::unique_lock<std::mutex> lock( GetCommon()->m_gitActionMutex, std::try_to_lock );
+
+    if( !lock.owns_lock() )
+    {
+        wxLogTrace( traceGit, "GIT_CLONE_HANDLER::PerformClone() could not lock" );
+        return false;
+    }
+
+    wxFileName clonePath( m_clonePath );
+
+    if( !clonePath.DirExists() )
+    {
+        if( !clonePath.Mkdir( wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL ) )
+        {
+            AddErrorString( wxString::Format( _( "Could not create directory '%s'" ),
+                                              m_clonePath ) );
+            return false;
+        }
+    }
+
+    git_clone_options cloneOptions;
+    git_clone_init_options( &cloneOptions, GIT_CLONE_OPTIONS_VERSION );
+    cloneOptions.checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
+    cloneOptions.checkout_opts.progress_cb = clone_progress_cb;
+    cloneOptions.checkout_opts.progress_payload = this;
+    cloneOptions.fetch_opts.callbacks.transfer_progress = transfer_progress_cb;
+    cloneOptions.fetch_opts.callbacks.credentials = credentials_cb;
+    cloneOptions.fetch_opts.callbacks.payload = this;
+
+    TestedTypes() = 0;
+    ResetNextKey();
+    git_repository* newRepo = nullptr;
+    wxString        remote = GetCommon()->m_remote;
+
+    if( git_clone( &newRepo, remote.mbc_str(), m_clonePath.mbc_str(),
+                   &cloneOptions ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Could not clone repository '%s'" ), remote ) );
+        return false;
+    }
+
+    GetCommon()->SetRepo( newRepo );
+
+    if( m_progressReporter )
+        m_progressReporter->Hide();
+
+    m_previousProgress = 0;
+
+    return true;
 }
 
 

common/git/git_commit_handler.cpp

@@ -22,7 +22,8 @@
  */
 
 #include "git_commit_handler.h"
-#include "git_backend.h"
+#include <git/kicad_git_memory.h>
+#include <wx/log.h>
 
 GIT_COMMIT_HANDLER::GIT_COMMIT_HANDLER( git_repository* aRepo ) :
     KIGIT_COMMON( aRepo )
@@ -33,13 +34,121 @@ GIT_COMMIT_HANDLER::~GIT_COMMIT_HANDLER()
 {}
 
 
-CommitResult
+GIT_COMMIT_HANDLER::CommitResult
 GIT_COMMIT_HANDLER::PerformCommit( const std::vector<wxString>& aFiles,
                                    const wxString&               aMessage,
                                    const wxString&               aAuthorName,
                                    const wxString&               aAuthorEmail )
 {
-    return GetGitBackend()->Commit( this, aFiles, aMessage, aAuthorName, aAuthorEmail );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return CommitResult::Error;
+
+    git_index* index = nullptr;
+
+    if( git_repository_index( &index, repo ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to get repository index: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    for( const wxString& file : aFiles )
+    {
+        if( git_index_add_bypath( index, file.mb_str() ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to add file to index: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+    }
+
+    if( git_index_write( index ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to write index: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    git_oid tree_id;
+
+    if( git_index_write_tree( &tree_id, index ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to write tree: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    git_tree* tree = nullptr;
+
+    if( git_tree_lookup( &tree, repo, &tree_id ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to lookup tree: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitTreePtr treePtr( tree );
+    git_commit* parent = nullptr;
+
+    if( git_repository_head_unborn( repo ) == 0 )
+    {
+        git_reference* headRef = nullptr;
+
+        if( git_repository_head( &headRef, repo ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to get HEAD reference: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+
+        KIGIT::GitReferencePtr headRefPtr( headRef );
+
+        if( git_reference_peel( (git_object**) &parent, headRef, GIT_OBJECT_COMMIT ) != 0 )
+        {
+            AddErrorString( wxString::Format( _( "Failed to get commit: %s" ),
+                                              KIGIT_COMMON::GetLastGitError() ) );
+            return CommitResult::Error;
+        }
+    }
+
+    KIGIT::GitCommitPtr parentPtr( parent );
+
+    git_signature* author = nullptr;
+
+    if( git_signature_now( &author, aAuthorName.mb_str(), aAuthorEmail.mb_str() ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to create author signature: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    KIGIT::GitSignaturePtr authorPtr( author );
+    git_oid                oid;
+    size_t                 parentsCount = parent ? 1 : 0;
+#if( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR == 8 \
+    && ( LIBGIT2_VER_REVISION < 2 || LIBGIT2_VER_REVISION == 3 ) )
+    git_commit* const parents[1] = { parent };
+    git_commit** const parentsPtr = parent ? parents : nullptr;
+#else
+    const git_commit* parents[1] = { parent };
+    const git_commit** parentsPtr = parent ? parents : nullptr;
+#endif
+
+
+
+    if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr,
+                           aMessage.mb_str(), tree, parentsCount, parentsPtr ) != 0 )
+    {
+        AddErrorString( wxString::Format( _( "Failed to create commit: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return CommitResult::Error;
+    }
+
+    return CommitResult::Success;
 }
 
 

common/git/git_commit_handler.h

@@ -27,20 +27,25 @@
 // Define a class to handle git commit operations
 
 #include <git/kicad_git_common.h>
-#include "git_backend.h"
+#include <git2.h>
 
 #include <string>
 #include <vector>
 #include <wx/string.h>
 
-class LIBGIT_BACKEND;
-
 class GIT_COMMIT_HANDLER : public KIGIT_COMMON
 {
 public:
     GIT_COMMIT_HANDLER( git_repository* aRepo );
     virtual ~GIT_COMMIT_HANDLER();
 
+    enum class CommitResult
+    {
+        Success,
+        Error,
+        Cancelled
+    };
+
     CommitResult PerformCommit( const std::vector<wxString>& aFiles,
                                const wxString&               aMessage,
                                const wxString&               aAuthorName,
@@ -49,7 +54,6 @@ public:
     wxString GetErrorString() const;
 
 private:
-    friend class LIBGIT_BACKEND;
     void AddErrorString( const wxString& aErrorString );
 
     wxString m_errorString;

common/git/git_config_handler.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "git_config_handler.h"
-#include "git_backend.h"
 #include <git/kicad_git_common.h>
 #include <git/kicad_git_memory.h>
 #include <pgm_base.h>
@@ -60,12 +59,48 @@ GitUserConfig GIT_CONFIG_HANDLER::GetUserConfig()
 
 wxString GIT_CONFIG_HANDLER::GetWorkingDirectory()
 {
-    return GetGitBackend()->GetWorkingDirectory( this );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return wxEmptyString;
+
+    const char* workdir = git_repository_workdir( repo );
+
+    if( !workdir )
+        return wxEmptyString;
+
+    return wxString( workdir );
 }
 
 bool GIT_CONFIG_HANDLER::GetConfigString( const wxString& aKey, wxString& aValue )
 {
-    return GetGitBackend()->GetConfigString( this, aKey, aValue );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return false;
+
+    git_config* config = nullptr;
+
+    if( git_repository_config( &config, repo ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to get repository config: %s", KIGIT_COMMON::GetLastGitError() );
+        return false;
+    }
+
+    KIGIT::GitConfigPtr configPtr( config );
+
+    git_config_entry* entry = nullptr;
+    int result = git_config_get_entry( &entry, config, aKey.mb_str() );
+    KIGIT::GitConfigEntryPtr entryPtr( entry );
+
+    if( result != GIT_OK || entry == nullptr )
+    {
+        wxLogTrace( traceGit, "Config key '%s' not found", aKey );
+        return false;
+    }
+
+    aValue = wxString( entry->value );
+    return true;
 }
 
 void GIT_CONFIG_HANDLER::UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage )

common/git/git_init_handler.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "git_init_handler.h"
-#include "git_backend.h"
 #include <git/kicad_git_common.h>
 #include <git/kicad_git_memory.h>
 #include <trace_helpers.h>
@@ -36,17 +35,118 @@ GIT_INIT_HANDLER::~GIT_INIT_HANDLER()
 
 bool GIT_INIT_HANDLER::IsRepository( const wxString& aPath )
 {
-    return GetGitBackend()->IsRepository( this, aPath );
+    git_repository* repo = nullptr;
+    int error = git_repository_open( &repo, aPath.mb_str() );
+
+    if( error == 0 )
+    {
+        git_repository_free( repo );
+        return true;
+    }
+
+    return false;
 }
 
 InitResult GIT_INIT_HANDLER::InitializeRepository( const wxString& aPath )
 {
-    return GetGitBackend()->InitializeRepository( this, aPath );
+    // Check if directory is already a git repository
+    if( IsRepository( aPath ) )
+    {
+        return InitResult::AlreadyExists;
+    }
+
+    git_repository* repo = nullptr;
+
+    if( git_repository_init( &repo, aPath.mb_str(), 0 ) != GIT_OK )
+    {
+        if( repo )
+            git_repository_free( repo );
+
+        AddErrorString( wxString::Format( _( "Failed to initialize Git repository: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return InitResult::Error;
+    }
+
+    // Update the common repository pointer
+    GetCommon()->SetRepo( repo );
+
+    wxLogTrace( traceGit, "Successfully initialized Git repository at %s", aPath );
+    return InitResult::Success;
 }
 
 bool GIT_INIT_HANDLER::SetupRemote( const RemoteConfig& aConfig )
 {
-    return GetGitBackend()->SetupRemote( this, aConfig );
+    // This is an optional step
+    if( aConfig.url.IsEmpty() )
+        return true;
+
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+    {
+        AddErrorString( _( "No repository available to set up remote" ) );
+        return false;
+    }
+
+    // Update connection settings in common
+    GetCommon()->SetUsername( aConfig.username );
+    GetCommon()->SetPassword( aConfig.password );
+    GetCommon()->SetSSHKey( aConfig.sshKey );
+
+    git_remote* remote = nullptr;
+    wxString fullURL;
+
+    // Build the full URL based on connection type
+    if( aConfig.connType == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_SSH )
+    {
+        fullURL = aConfig.username + "@" + aConfig.url;
+    }
+    else if( aConfig.connType == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_HTTPS )
+    {
+        fullURL = aConfig.url.StartsWith( "https" ) ? "https://" : "http://";
+
+        if( !aConfig.username.empty() )
+        {
+            fullURL.append( aConfig.username );
+
+            if( !aConfig.password.empty() )
+            {
+                fullURL.append( wxS( ":" ) );
+                fullURL.append( aConfig.password );
+            }
+
+            fullURL.append( wxS( "@" ) );
+        }
+
+        // Extract the bare URL (without protocol prefix)
+        wxString bareURL = aConfig.url;
+        if( bareURL.StartsWith( "https://" ) )
+            bareURL = bareURL.Mid( 8 );
+        else if( bareURL.StartsWith( "http://" ) )
+            bareURL = bareURL.Mid( 7 );
+
+        fullURL.append( bareURL );
+    }
+    else
+    {
+        fullURL = aConfig.url;
+    }
+
+    int error = git_remote_create_with_fetchspec( &remote, repo, "origin",
+                                                  fullURL.ToStdString().c_str(),
+                                                  "+refs/heads/*:refs/remotes/origin/*" );
+
+    KIGIT::GitRemotePtr remotePtr( remote );
+
+    if( error != GIT_OK )
+    {
+        AddErrorString( wxString::Format( _( "Failed to create remote: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return false;
+    }
+
+    wxLogTrace( traceGit, "Successfully set up remote origin" );
+    return true;
 }
 
 void GIT_INIT_HANDLER::UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage )

common/git/git_pull_handler.cpp

@@ -22,22 +22,188 @@
  */
 
 #include "git_pull_handler.h"
-#include "git_backend.h"
+#include <git/kicad_git_common.h>
+#include <git/kicad_git_memory.h>
+#include <trace_helpers.h>
+
+#include <wx/log.h>
+
+#include <iostream>
+#include <time.h>
+#include <memory>
 
 GIT_PULL_HANDLER::GIT_PULL_HANDLER( KIGIT_COMMON* aCommon ) : KIGIT_REPO_MIXIN( aCommon )
-{}
+{
+}
+
 
 GIT_PULL_HANDLER::~GIT_PULL_HANDLER()
-{}
+{
+}
+
 
 bool GIT_PULL_HANDLER::PerformFetch( bool aSkipLock )
 {
-    return GetGitBackend()->PerformFetch( this, aSkipLock );
+    if( !GetRepo() )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - No repository found" );
+        return false;
+    }
+
+    std::unique_lock<std::mutex> lock( GetCommon()->m_gitActionMutex, std::try_to_lock );
+
+    if( !aSkipLock && !lock.owns_lock() )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - Could not lock mutex" );
+        return false;
+    }
+
+    // Fetch updates from remote repository
+    git_remote* remote = nullptr;
+
+    if( git_remote_lookup( &remote, GetRepo(), "origin" ) != 0 )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - Failed to lookup remote 'origin'" );
+        AddErrorString( wxString::Format( _( "Could not lookup remote '%s'" ), "origin" ) );
+        return false;
+    }
+
+    KIGIT::GitRemotePtr remotePtr( remote );
+
+    git_remote_callbacks remoteCallbacks;
+    git_remote_init_callbacks( &remoteCallbacks, GIT_REMOTE_CALLBACKS_VERSION );
+    remoteCallbacks.sideband_progress = progress_cb;
+    remoteCallbacks.transfer_progress = transfer_progress_cb;
+    remoteCallbacks.credentials = credentials_cb;
+    remoteCallbacks.payload = this;
+    GetCommon()->SetCancelled( false );
+
+    TestedTypes() = 0;
+    ResetNextKey();
+
+    if( git_remote_connect( remote, GIT_DIRECTION_FETCH, &remoteCallbacks, nullptr, nullptr ) )
+    {
+        wxString errorMsg = KIGIT_COMMON::GetLastGitError();
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - Failed to connect to remote: %s", errorMsg );
+        AddErrorString( wxString::Format( _( "Could not connect to remote '%s': %s" ), "origin", errorMsg ) );
+        return false;
+    }
+
+    git_fetch_options fetchOptions;
+    git_fetch_init_options( &fetchOptions, GIT_FETCH_OPTIONS_VERSION );
+    fetchOptions.callbacks = remoteCallbacks;
+
+    if( git_remote_fetch( remote, nullptr, &fetchOptions, nullptr ) )
+    {
+        wxString errorMsg = KIGIT_COMMON::GetLastGitError();
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - Failed to fetch from remote: %s", errorMsg );
+        AddErrorString( wxString::Format( _( "Could not fetch data from remote '%s': %s" ), "origin", errorMsg ) );
+        return false;
+    }
+
+    wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformFetch() - Fetch completed successfully" );
+    return true;
 }
 
+
 PullResult GIT_PULL_HANDLER::PerformPull()
 {
-    return GetGitBackend()->PerformPull( this );
+    PullResult                   result = PullResult::Success;
+    std::unique_lock<std::mutex> lock( GetCommon()->m_gitActionMutex, std::try_to_lock );
+
+    if( !lock.owns_lock() )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Could not lock mutex" );
+        return PullResult::Error;
+    }
+
+    if( !PerformFetch( true ) )
+        return PullResult::Error;
+
+    git_oid pull_merge_oid = {};
+
+    if( git_repository_fetchhead_foreach( GetRepo(), fetchhead_foreach_cb,
+                                          &pull_merge_oid ) )
+    {
+        AddErrorString( _( "Could not read 'FETCH_HEAD'" ) );
+        return PullResult::Error;
+    }
+
+    git_annotated_commit* fetchhead_commit;
+
+    if( git_annotated_commit_lookup( &fetchhead_commit, GetRepo(), &pull_merge_oid ) )
+    {
+        AddErrorString( _( "Could not lookup commit" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitAnnotatedCommitPtr fetchheadCommitPtr( fetchhead_commit );
+    const git_annotated_commit*  merge_commits[] = { fetchhead_commit };
+    git_merge_analysis_t         merge_analysis;
+    git_merge_preference_t       merge_preference = GIT_MERGE_PREFERENCE_NONE;
+
+    if( git_merge_analysis( &merge_analysis, &merge_preference, GetRepo(), merge_commits, 1 ) )
+    {
+        AddErrorString( _( "Could not analyze merge" ) );
+        return PullResult::Error;
+    }
+
+    if( merge_analysis & GIT_MERGE_ANALYSIS_UNBORN )
+    {
+        AddErrorString( _( "Invalid HEAD.  Cannot merge." ) );
+        return PullResult::MergeFailed;
+    }
+
+    // Nothing to do if the repository is up to date
+    if( merge_analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Repository is up to date" );
+        git_repository_state_cleanup( GetRepo() );
+        return PullResult::UpToDate;
+    }
+
+    // Fast-forward is easy, just update the local reference
+    if( merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Fast-forward merge" );
+        return handleFastForward();
+    }
+
+    if( merge_analysis & GIT_MERGE_ANALYSIS_NORMAL )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Normal merge" );
+
+        // Check git config to determine if we should rebase or merge
+        git_config* config = nullptr;
+
+        if( git_repository_config( &config, GetRepo() ) != GIT_OK )
+        {
+            wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Failed to get repository config" );
+            AddErrorString( _( "Could not access repository configuration" ) );
+            return PullResult::Error;
+        }
+
+        KIGIT::GitConfigPtr configPtr( config );
+
+        // Check for pull.rebase config
+        int rebase_value = 0;
+        int ret = git_config_get_bool( &rebase_value, config, "pull.rebase" );
+
+        // If pull.rebase is set to true, use rebase; otherwise use merge
+        if( ret == GIT_OK && rebase_value )
+        {
+            wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Using rebase based on config" );
+            return handleRebase( merge_commits, 1 );
+        }
+
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Using merge based on config" );
+        return handleMerge( merge_commits, 1 );
+    }
+
+    wxLogTrace( traceGit, "GIT_PULL_HANDLER::PerformPull() - Merge needs resolution" );
+    //TODO: handle merges when they need to be resolved
+
+    return result;
 }
 
 const std::vector<std::pair<std::string, std::vector<CommitDetails>>>&
@@ -46,7 +212,384 @@ GIT_PULL_HANDLER::GetFetchResults() const
     return m_fetchResults;
 }
 
+
+std::string GIT_PULL_HANDLER::getFirstLineFromCommitMessage( const std::string& aMessage )
+{
+    if( aMessage.empty() )
+        return aMessage;
+
+    size_t firstLineEnd = aMessage.find_first_of( '\n' );
+
+    if( firstLineEnd != std::string::npos )
+        return aMessage.substr( 0, firstLineEnd );
+
+    return aMessage;
+}
+
+
+std::string GIT_PULL_HANDLER::getFormattedCommitDate( const git_time& aTime )
+{
+    char   dateBuffer[64];
+    time_t time = static_cast<time_t>( aTime.time );
+    struct tm timeInfo;
+    #ifdef _WIN32
+        localtime_s( &timeInfo, &time );
+    #else
+        gmtime_r( &time, &timeInfo );
+    #endif
+    strftime( dateBuffer, sizeof( dateBuffer ), "%Y-%b-%d %H:%M:%S", &timeInfo );
+    return dateBuffer;
+}
+
+
+PullResult GIT_PULL_HANDLER::handleFastForward()
+{
+    git_reference* rawRef = nullptr;
+
+    // Get the current HEAD reference
+    if( git_repository_head( &rawRef, GetRepo() ) )
+    {
+        AddErrorString( _( "Could not get repository head" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitReferencePtr headRef( rawRef );
+
+    git_oid     updatedRefOid;
+    const char* currentBranchName = git_reference_name( rawRef );
+    const char* branch_shorthand = git_reference_shorthand( rawRef );
+    wxString remote_name = GetRemotename();
+    wxString    remoteBranchName = wxString::Format( "refs/remotes/%s/%s",
+                                    remote_name, branch_shorthand );
+
+    // Get the OID of the updated reference (remote-tracking branch)
+    if( git_reference_name_to_id( &updatedRefOid, GetRepo(), remoteBranchName.c_str() ) != GIT_OK )
+    {
+        AddErrorString( wxString::Format( _( "Could not get reference OID for reference '%s'" ),
+                                            remoteBranchName ) );
+        return PullResult::Error;
+    }
+
+    // Get the target commit object
+    git_commit* targetCommit = nullptr;
+
+    if( git_commit_lookup( &targetCommit, GetRepo(), &updatedRefOid ) != GIT_OK )
+    {
+        AddErrorString( _( "Could not look up target commit" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitCommitPtr targetCommitPtr( targetCommit );
+
+    // Get the tree from the target commit
+    git_tree* targetTree = nullptr;
+
+    if( git_commit_tree( &targetTree, targetCommit ) != GIT_OK )
+    {
+        git_commit_free( targetCommit );
+        AddErrorString( _( "Could not get tree from target commit" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitTreePtr targetTreePtr( targetTree );
+
+    // Perform a checkout to update the working directory
+    git_checkout_options checkoutOptions;
+    git_checkout_init_options( &checkoutOptions, GIT_CHECKOUT_OPTIONS_VERSION );
+    auto notify_cb = []( git_checkout_notify_t why, const char* path, const git_diff_file* baseline,
+                         const git_diff_file* target, const git_diff_file* workdir, void* payload ) -> int
+    {
+        switch( why )
+        {
+        case GIT_CHECKOUT_NOTIFY_CONFLICT:
+            wxLogTrace( traceGit, "Checkout conflict: %s", path ? path : "unknown" );
+            break;
+        case GIT_CHECKOUT_NOTIFY_DIRTY:
+            wxLogTrace( traceGit, "Checkout dirty: %s", path ? path : "unknown" );
+            break;
+        case GIT_CHECKOUT_NOTIFY_UPDATED:
+            wxLogTrace( traceGit, "Checkout updated: %s", path ? path : "unknown" );
+            break;
+        case GIT_CHECKOUT_NOTIFY_UNTRACKED:
+            wxLogTrace( traceGit, "Checkout untracked: %s", path ? path : "unknown" );
+            break;
+        case GIT_CHECKOUT_NOTIFY_IGNORED:
+            wxLogTrace( traceGit, "Checkout ignored: %s", path ? path : "unknown" );
+            break;
+        default:
+            break;
+        }
+
+        return 0;
+    };
+
+    checkoutOptions.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS;
+    checkoutOptions.notify_flags = GIT_CHECKOUT_NOTIFY_ALL;
+    checkoutOptions.notify_cb = notify_cb;
+
+    if( git_checkout_tree( GetRepo(), reinterpret_cast<git_object*>( targetTree ), &checkoutOptions ) != GIT_OK )
+    {
+        AddErrorString( _( "Failed to perform checkout operation." ) );
+        return PullResult::Error;
+    }
+
+    git_reference* updatedRef = nullptr;
+
+    // Update the current branch to point to the new commit
+    if (git_reference_set_target(&updatedRef, rawRef, &updatedRefOid, nullptr) != GIT_OK)
+    {
+        AddErrorString( wxString::Format( _( "Failed to update reference '%s' to point to '%s'" ), currentBranchName,
+                                          git_oid_tostr_s( &updatedRefOid ) ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitReferencePtr updatedRefPtr( updatedRef );
+
+    // Clean up the repository state
+    if( git_repository_state_cleanup( GetRepo() ) != GIT_OK )
+    {
+        AddErrorString( _( "Failed to clean up repository state after fast-forward." ) );
+        return PullResult::Error;
+    }
+
+    git_revwalk* revWalker = nullptr;
+
+    // Collect commit details for updated references
+    if( git_revwalk_new( &revWalker, GetRepo() ) != GIT_OK )
+    {
+        AddErrorString( _( "Failed to initialize revision walker." ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitRevWalkPtr revWalkerPtr( revWalker );
+    git_revwalk_sorting( revWalker, GIT_SORT_TIME );
+
+    if( git_revwalk_push_glob( revWalker, currentBranchName ) != GIT_OK )
+    {
+        AddErrorString( _( "Failed to push reference to revision walker." ) );
+        return PullResult::Error;
+    }
+
+    std::pair<std::string, std::vector<CommitDetails>>& branchCommits = m_fetchResults.emplace_back();
+    branchCommits.first = currentBranchName;
+
+    git_oid commitOid;
+
+    while( git_revwalk_next( &commitOid, revWalker ) == GIT_OK )
+    {
+        git_commit* commit = nullptr;
+
+        if( git_commit_lookup( &commit, GetRepo(), &commitOid ) )
+        {
+            AddErrorString( wxString::Format( _( "Could not lookup commit '%s'" ),
+                                              git_oid_tostr_s( &commitOid ) ) );
+            return PullResult::Error;
+        }
+
+        KIGIT::GitCommitPtr commitPtr( commit );
+
+        CommitDetails details;
+        details.m_sha = git_oid_tostr_s( &commitOid );
+        details.m_firstLine = getFirstLineFromCommitMessage( git_commit_message( commit ) );
+        details.m_author = git_commit_author( commit )->name;
+        details.m_date = getFormattedCommitDate( git_commit_author( commit )->when );
+
+        branchCommits.second.push_back( details );
+    }
+
+    return PullResult::FastForward;
+}
+
+
+PullResult GIT_PULL_HANDLER::handleMerge( const git_annotated_commit** aMergeHeads,
+                                          size_t                       aMergeHeadsCount )
+{
+    git_merge_options merge_opts;
+    git_merge_options_init( &merge_opts, GIT_MERGE_OPTIONS_VERSION );
+
+    git_checkout_options checkout_opts;
+    git_checkout_init_options( &checkout_opts, GIT_CHECKOUT_OPTIONS_VERSION );
+
+    checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
+
+    if( git_merge( GetRepo(), aMergeHeads, aMergeHeadsCount, &merge_opts, &checkout_opts ) )
+    {
+        AddErrorString( _( "Could not merge commits" ) );
+        return PullResult::Error;
+    }
+
+    // Get the repository index
+    git_index* index = nullptr;
+
+    if( git_repository_index( &index, GetRepo() ) )
+    {
+        AddErrorString( _( "Could not get repository index" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    // Check for conflicts
+    git_index_conflict_iterator* conflicts = nullptr;
+
+    if( git_index_conflict_iterator_new( &conflicts, index ) )
+    {
+        AddErrorString( _( "Could not get conflict iterator" ) );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitIndexConflictIteratorPtr conflictsPtr( conflicts );
+
+    const git_index_entry*    ancestor = nullptr;
+    const git_index_entry*    our = nullptr;
+    const git_index_entry*    their = nullptr;
+    std::vector<ConflictData> conflict_data;
+
+    while( git_index_conflict_next( &ancestor, &our, &their, conflicts ) == 0 )
+    {
+        // Case 3: Both files have changed
+        if( ancestor && our && their )
+        {
+            ConflictData conflict_datum;
+            conflict_datum.filename = our->path;
+            conflict_datum.our_oid = our->id;
+            conflict_datum.their_oid = their->id;
+            conflict_datum.our_commit_time = our->mtime.seconds;
+            conflict_datum.their_commit_time = their->mtime.seconds;
+            conflict_datum.our_status = _( "Changed" );
+            conflict_datum.their_status = _( "Changed" );
+            conflict_datum.use_ours = true;
+
+            conflict_data.push_back( conflict_datum );
+        }
+        // Case 4: File added in both ours and theirs
+        else if( !ancestor && our && their )
+        {
+            ConflictData conflict_datum;
+            conflict_datum.filename = our->path;
+            conflict_datum.our_oid = our->id;
+            conflict_datum.their_oid = their->id;
+            conflict_datum.our_commit_time = our->mtime.seconds;
+            conflict_datum.their_commit_time = their->mtime.seconds;
+            conflict_datum.our_status = _( "Added" );
+            conflict_datum.their_status = _( "Added" );
+            conflict_datum.use_ours = true;
+
+            conflict_data.push_back( conflict_datum );
+        }
+        // Case 1: Remote file has changed or been added, local file has not
+        else if( their && !our )
+        {
+            // Accept their changes
+            git_index_add( index, their );
+        }
+        // Case 2: Local file has changed or been added, remote file has not
+        else if( our && !their )
+        {
+            // Accept our changes
+            git_index_add( index, our );
+        }
+        else
+        {
+            wxLogError( wxS( "Unexpected conflict state" ) );
+        }
+    }
+
+    if( conflict_data.empty() )
+    {
+        git_index_conflict_cleanup( index );
+        git_index_write( index );
+    }
+
+    return conflict_data.empty() ? PullResult::Success : PullResult::MergeFailed;
+}
+
+
+PullResult GIT_PULL_HANDLER::handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount )
+{
+    // Get the current branch reference
+    git_reference* head_ref = nullptr;
+
+    if( git_repository_head( &head_ref, GetRepo() ) )
+    {
+        wxString errorMsg = KIGIT_COMMON::GetLastGitError();
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to get HEAD: %s", errorMsg );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitReferencePtr headRefPtr(head_ref);
+
+    // Initialize rebase operation
+    git_rebase* rebase = nullptr;
+    git_rebase_options rebase_opts = GIT_REBASE_OPTIONS_INIT;
+    rebase_opts.checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
+
+    if( git_rebase_init( &rebase, GetRepo(), nullptr, nullptr, aMergeHeads[0], &rebase_opts ) )
+    {
+        wxString errorMsg = KIGIT_COMMON::GetLastGitError();
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to initialize rebase: %s", errorMsg );
+        return PullResult::Error;
+    }
+
+    KIGIT::GitRebasePtr   rebasePtr( rebase );
+    git_rebase_operation* operation = nullptr;
+
+    while( git_rebase_next( &operation, rebase ) != GIT_ITEROVER )
+    {
+        // Check for conflicts
+        git_index* index = nullptr;
+        if( git_repository_index( &index, GetRepo() ) )
+        {
+            wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to get index: %s",
+                        KIGIT_COMMON::GetLastGitError() );
+            return PullResult::Error;
+        }
+        KIGIT::GitIndexPtr indexPtr( index );
+
+        if( git_index_has_conflicts( index ) )
+        {
+            // Abort the rebase if there are conflicts because we need to merge manually
+            git_rebase_abort( rebase );
+            AddErrorString( _( "Conflicts detected during rebase" ) );
+            return PullResult::MergeFailed;
+        }
+
+        git_oid commit_id;
+        git_signature* committer = nullptr;
+
+        if( git_signature_default( &committer, GetRepo() ) )
+        {
+            wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to create signature: %s",
+                KIGIT_COMMON::GetLastGitError() );
+            return PullResult::Error;
+        }
+
+        KIGIT::GitSignaturePtr committerPtr( committer );
+
+        if( git_rebase_commit( &commit_id, rebase, nullptr, committer, nullptr, nullptr ) != GIT_OK )
+        {
+            wxString errorMsg = KIGIT_COMMON::GetLastGitError();
+            wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to commit operation: %s", errorMsg );
+            git_rebase_abort( rebase );
+            return PullResult::Error;
+        }
+    }
+
+    // Finish the rebase
+    if( git_rebase_finish( rebase, nullptr ) )
+    {
+        wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Failed to finish rebase: %s",
+                    KIGIT_COMMON::GetLastGitError() );
+        return PullResult::Error;
+    }
+
+    wxLogTrace( traceGit, "GIT_PULL_HANDLER::handleRebase() - Rebase completed successfully" );
+    git_repository_state_cleanup( GetRepo() );
+    return PullResult::Success;
+}
+
+
 void GIT_PULL_HANDLER::UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage )
 {
-    ReportProgress( aCurrent, aTotal, aMessage );
+
 }

common/git/git_pull_handler.h

@@ -29,6 +29,7 @@
 #include <vector>
 #include <string>
 #include <wx/string.h>
+#include <git2.h>
 
 // Structure to store commit details
 struct CommitDetails
@@ -49,12 +50,22 @@ enum class PullResult : int
     FastForward
 };
 
-class LIBGIT_BACKEND;
+struct ConflictData
+{
+    std::string filename;
+    std::string our_status;
+    std::string their_status;
+    git_oid our_oid;
+    git_oid their_oid;
+    git_time_t our_commit_time;
+    git_time_t their_commit_time;
+    bool use_ours; // Flag indicating user's choice (true = ours, false = theirs)
+};
+
 
 class GIT_PULL_HANDLER : public KIGIT_REPO_MIXIN
 {
 public:
-    friend class LIBGIT_BACKEND;
     GIT_PULL_HANDLER( KIGIT_COMMON* aCommon );
     ~GIT_PULL_HANDLER();
 
@@ -66,8 +77,15 @@ public:
     // Implementation for progress updates
     void UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage ) override;
 
+
 private:
     std::vector<std::pair<std::string, std::vector<CommitDetails>>> m_fetchResults;
+
+    std::string getFirstLineFromCommitMessage( const std::string& aMessage );
+    std::string getFormattedCommitDate( const git_time& aTime );
+    PullResult  handleFastForward();
+    PullResult  handleMerge( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
+    PullResult  handleRebase( const git_annotated_commit** aMergeHeads, size_t aMergeHeadsCount );
 };
 
 #endif // _GIT_PULL_HANDLER_H_

common/git/git_push_handler.cpp

@@ -22,8 +22,13 @@
  */
 
 #include "git_push_handler.h"
+#include <git/kicad_git_common.h>
+#include <git/kicad_git_memory.h>
 #include <trace_helpers.h>
-#include "git_backend.h"
+
+#include <iostream>
+
+#include <wx/log.h>
 
 GIT_PUSH_HANDLER::GIT_PUSH_HANDLER( KIGIT_COMMON* aRepo ) : KIGIT_REPO_MIXIN( aRepo )
 {}
@@ -33,7 +38,79 @@ GIT_PUSH_HANDLER::~GIT_PUSH_HANDLER()
 
 PushResult GIT_PUSH_HANDLER::PerformPush()
 {
-    return GetGitBackend()->Push( this );
+    std::unique_lock<std::mutex> lock( GetCommon()->m_gitActionMutex, std::try_to_lock );
+
+    if(!lock.owns_lock())
+    {
+        wxLogTrace(traceGit, "GIT_PUSH_HANDLER::PerformPush: Could not lock mutex");
+        return PushResult::Error;
+    }
+
+    PushResult result = PushResult::Success;
+
+    // Fetch updates from remote repository
+    git_remote* remote = nullptr;
+
+    if(git_remote_lookup(&remote, GetRepo(), "origin") != 0)
+    {
+        AddErrorString(_("Could not lookup remote"));
+        return PushResult::Error;
+    }
+
+    KIGIT::GitRemotePtr remotePtr(remote);
+
+    git_remote_callbacks remoteCallbacks;
+    git_remote_init_callbacks(&remoteCallbacks, GIT_REMOTE_CALLBACKS_VERSION);
+    remoteCallbacks.sideband_progress = progress_cb;
+    remoteCallbacks.transfer_progress = transfer_progress_cb;
+    remoteCallbacks.update_tips = update_cb;
+    remoteCallbacks.push_transfer_progress = push_transfer_progress_cb;
+    remoteCallbacks.credentials = credentials_cb;
+    remoteCallbacks.payload = this;
+    GetCommon()->SetCancelled( false );
+
+    TestedTypes() = 0;
+    ResetNextKey();
+
+    if( git_remote_connect( remote, GIT_DIRECTION_PUSH, &remoteCallbacks, nullptr, nullptr ) )
+    {
+        AddErrorString( wxString::Format( _( "Could not connect to remote: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        return PushResult::Error;
+    }
+
+    git_push_options pushOptions;
+    git_push_init_options( &pushOptions, GIT_PUSH_OPTIONS_VERSION );
+    pushOptions.callbacks = remoteCallbacks;
+
+    // Get the current HEAD reference
+    git_reference* head = nullptr;
+
+    if( git_repository_head( &head, GetRepo() ) != 0 )
+    {
+        git_remote_disconnect( remote );
+        AddErrorString( _( "Could not get repository head" ) );
+        return PushResult::Error;
+    }
+
+    KIGIT::GitReferencePtr headPtr( head );
+
+    // Create refspec for current branch
+    const char* refs[1];
+    refs[0] = git_reference_name( head );
+    const git_strarray refspecs = { (char**) refs, 1 };
+
+    if( git_remote_push( remote, &refspecs, &pushOptions ) )
+    {
+        AddErrorString( wxString::Format( _( "Could not push to remote: %s" ),
+                                          KIGIT_COMMON::GetLastGitError() ) );
+        git_remote_disconnect( remote );
+        return PushResult::Error;
+    }
+
+    git_remote_disconnect( remote );
+
+    return result;
 }
 
 

common/git/git_remove_from_index_handler.cpp

@@ -21,14 +21,15 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "git_remove_from_index_handler.h"
-#include "git_backend.h"
-
+#include <wx/string.h>
 #include <wx/log.h>
 
-GIT_REMOVE_FROM_INDEX_HANDLER::GIT_REMOVE_FROM_INDEX_HANDLER( git_repository* aRepository ) :
-    KIGIT_COMMON( aRepository )
+#include <git/kicad_git_memory.h>
+#include "git_remove_from_index_handler.h"
+
+GIT_REMOVE_FROM_INDEX_HANDLER::GIT_REMOVE_FROM_INDEX_HANDLER( git_repository* aRepository )
 {
+    m_repository = aRepository;
     m_filesToRemove.clear();
 }
 
@@ -40,11 +41,61 @@ GIT_REMOVE_FROM_INDEX_HANDLER::~GIT_REMOVE_FROM_INDEX_HANDLER()
 
 bool GIT_REMOVE_FROM_INDEX_HANDLER::RemoveFromIndex( const wxString& aFilePath )
 {
-    return GetGitBackend()->RemoveFromIndex( this, aFilePath );
+    // Test if file is currently in the index
+
+    git_index* index = nullptr;
+    size_t at_pos = 0;
+
+    if( git_repository_index( &index, m_repository ) != 0 )
+    {
+        wxLogError( "Failed to get repository index" );
+        return false;
+    }
+
+    KIGIT::GitIndexPtr indexPtr( index );
+
+    if( git_index_find( &at_pos, index, aFilePath.ToUTF8().data() ) != 0 )
+    {
+        wxLogError( "Failed to find index entry for %s", aFilePath );
+        return false;
+    }
+
+    m_filesToRemove.push_back( aFilePath );
+    return true;
 }
 
 
 void GIT_REMOVE_FROM_INDEX_HANDLER::PerformRemoveFromIndex()
 {
-    GetGitBackend()->PerformRemoveFromIndex( this );
+    for( auto& file : m_filesToRemove )
+    {
+        git_index* index = nullptr;
+        git_oid oid;
+
+        if( git_repository_index( &index, m_repository ) != 0 )
+        {
+            wxLogError( "Failed to get repository index" );
+            return;
+        }
+
+        KIGIT::GitIndexPtr indexPtr( index );
+
+        if( git_index_remove_bypath( index, file.ToUTF8().data() ) != 0 )
+        {
+            wxLogError( "Failed to remove index entry for %s", file );
+            return;
+        }
+
+        if( git_index_write( index ) != 0 )
+        {
+            wxLogError( "Failed to write index" );
+            return;
+        }
+
+        if( git_index_write_tree( &oid, index ) != 0 )
+        {
+            wxLogError( "Failed to write index tree" );
+            return;
+        }
+    }
 }

common/git/git_remove_from_index_handler.h

@@ -24,13 +24,12 @@
 #ifndef GIT_REMOVE_FROM_INDEX_HANDLER_H_
 #define GIT_REMOVE_FROM_INDEX_HANDLER_H_
 
-#include <git/kicad_git_common.h>
+#include <git2.h>
 #include <vector>
-#include <wx/string.h>
 
-class LIBGIT_BACKEND;
+class wxString;
 
-class GIT_REMOVE_FROM_INDEX_HANDLER : public KIGIT_COMMON
+class GIT_REMOVE_FROM_INDEX_HANDLER
 {
 public:
     GIT_REMOVE_FROM_INDEX_HANDLER( git_repository* aRepository );
@@ -42,7 +41,7 @@ public:
 
 private:
 
-    friend class LIBGIT_BACKEND;
+    git_repository* m_repository;
 
     std::vector<wxString> m_filesToRemove;
 };

common/git/git_revert_handler.cpp

@@ -22,7 +22,11 @@
  */
 
 #include "git_revert_handler.h"
-#include "git_backend.h"
+
+#include <wx/log.h>
+#include <wx/string.h>
+
+#include <trace_helpers.h>
 
 
 GIT_REVERT_HANDLER::GIT_REVERT_HANDLER( git_repository* aRepository )
@@ -42,8 +46,74 @@ bool GIT_REVERT_HANDLER::Revert( const wxString& aFilePath )
     return true;
 }
 
-void GIT_REVERT_HANDLER::PerformRevert()
+
+static void checkout_progress_cb( const char *path, size_t cur, size_t tot, void *payload )
 {
-    GetGitBackend()->PerformRevert( this );
+    wxLogTrace( traceGit, wxS( "checkout_progress_cb: %s %zu/%zu" ), path, cur, tot );
+}
+
+
+static int checkout_notify_cb( git_checkout_notify_t why, const char *path,
+                               const git_diff_file *baseline,
+                               const git_diff_file *target,
+                               const git_diff_file *workdir, void *payload )
+{
+    GIT_REVERT_HANDLER* handler = static_cast<GIT_REVERT_HANDLER*>(payload);
+
+    if( why & ( GIT_CHECKOUT_NOTIFY_CONFLICT | GIT_CHECKOUT_NOTIFY_IGNORED
+              | GIT_CHECKOUT_NOTIFY_UPDATED ) )
+        handler->PushFailedFile( path );
+
+    return 0;
+}
+
+
+void GIT_REVERT_HANDLER::PerformRevert()
+{
+    git_object* head_commit = NULL;
+    git_checkout_options opts;
+    git_checkout_init_options( &opts, GIT_CHECKOUT_OPTIONS_VERSION );
+
+    // Get the HEAD commit
+    if( git_revparse_single( &head_commit, m_repository, "HEAD" ) != 0 )
+    {
+        // Handle error. If we cannot get the HEAD, then there's no point proceeding.
+        return;
+    }
+
+    opts.checkout_strategy = GIT_CHECKOUT_FORCE;
+    char** paths =  new char*[m_filesToRevert.size()];
+
+    for( size_t ii = 0; ii < m_filesToRevert.size(); ii++ )
+    {
+        // Set paths to the specific file
+        paths[ii] = wxStrdup( m_filesToRevert[ii].ToUTF8() );
+    }
+
+    git_strarray arr = { paths, m_filesToRevert.size() };
+
+    opts.paths = arr;
+    opts.progress_cb = checkout_progress_cb;
+    opts.notify_cb = checkout_notify_cb;
+    opts.notify_payload = static_cast<void*>( this );
+
+    // Attempt to checkout the file(s)
+    if( git_checkout_tree(m_repository, head_commit, &opts ) != 0 )
+    {
+        const git_error *e = git_error_last();
+
+        if( e )
+        {
+            wxLogTrace( traceGit, wxS( "Checkout failed: %d: %s" ), e->klass, e->message );
+        }
+    }
+
+    // Free the HEAD commit
+    for( size_t ii = 0; ii < m_filesToRevert.size(); ii++ )
+        delete( paths[ii] );
+
+    delete[] paths;
+
+    git_object_free( head_commit );
 }
 

common/git/git_revert_handler.h

@@ -27,10 +27,6 @@
 #include <git2.h>
 #include <vector>
 #include <wx/string.h>
-// TEMPORARY HACKFIX INCLUDE FOR STD::VECTOR EXPORT OUT OF KICOMMON ON WINDOWS
-#include <settings/parameters.h>
-
-class LIBGIT_BACKEND;
 
 class GIT_REVERT_HANDLER
 {
@@ -48,7 +44,6 @@ public:
     }
 
 private:
-    friend class LIBGIT_BACKEND;
     git_repository* m_repository;
 
     std::vector<wxString> m_filesToRevert;

common/git/git_status_handler.cpp

@@ -22,8 +22,10 @@
  */
 
 #include "git_status_handler.h"
+#include <git/kicad_git_common.h>
+#include <git/kicad_git_memory.h>
 #include <trace_helpers.h>
-#include "git_backend.h"
+#include <wx/log.h>
 
 GIT_STATUS_HANDLER::GIT_STATUS_HANDLER( KIGIT_COMMON* aCommon ) : KIGIT_REPO_MIXIN( aCommon )
 {}
@@ -33,29 +35,171 @@ GIT_STATUS_HANDLER::~GIT_STATUS_HANDLER()
 
 bool GIT_STATUS_HANDLER::HasChangedFiles()
 {
-    return GetGitBackend()->HasChangedFiles( this );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return false;
+
+    git_status_options opts;
+    git_status_init_options( &opts, GIT_STATUS_OPTIONS_VERSION );
+
+    opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
+    opts.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX
+                 | GIT_STATUS_OPT_SORT_CASE_SENSITIVELY;
+
+    git_status_list* status_list = nullptr;
+
+    if( git_status_list_new( &status_list, repo, &opts ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to get status list: %s", KIGIT_COMMON::GetLastGitError() );
+        return false;
+    }
+
+    KIGIT::GitStatusListPtr status_list_ptr( status_list );
+    bool hasChanges = ( git_status_list_entrycount( status_list ) > 0 );
+
+    return hasChanges;
 }
 
 std::map<wxString, FileStatus> GIT_STATUS_HANDLER::GetFileStatus( const wxString& aPathspec )
 {
-    return GetGitBackend()->GetFileStatus( this, aPathspec );
+    std::map<wxString, FileStatus> fileStatusMap;
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return fileStatusMap;
+
+    git_status_options status_options;
+    git_status_init_options( &status_options, GIT_STATUS_OPTIONS_VERSION );
+    status_options.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
+    status_options.flags = GIT_STATUS_OPT_INCLUDE_UNTRACKED | GIT_STATUS_OPT_INCLUDE_UNMODIFIED;
+
+    // Set up pathspec if provided
+    std::string pathspec_str;
+    std::vector<const char*> pathspec_ptrs;
+
+    if( !aPathspec.IsEmpty() )
+    {
+        pathspec_str = aPathspec.ToStdString();
+        pathspec_ptrs.push_back( pathspec_str.c_str() );
+
+        status_options.pathspec.strings = const_cast<char**>( pathspec_ptrs.data() );
+        status_options.pathspec.count = pathspec_ptrs.size();
+    }
+
+    git_status_list* status_list = nullptr;
+
+    if( git_status_list_new( &status_list, repo, &status_options ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to get git status list: %s", KIGIT_COMMON::GetLastGitError() );
+        return fileStatusMap;
+    }
+
+    KIGIT::GitStatusListPtr statusListPtr( status_list );
+
+    size_t count = git_status_list_entrycount( status_list );
+    wxString repoWorkDir( git_repository_workdir( repo ) );
+
+    for( size_t ii = 0; ii < count; ++ii )
+    {
+        const git_status_entry* entry = git_status_byindex( status_list, ii );
+        std::string path( entry->head_to_index ? entry->head_to_index->old_file.path
+                        : entry->index_to_workdir->old_file.path );
+
+        wxString absPath = repoWorkDir + path;
+
+        FileStatus fileStatus;
+        fileStatus.filePath = absPath;
+        fileStatus.gitStatus = entry->status;
+        fileStatus.status = ConvertStatus( entry->status );
+
+        fileStatusMap[absPath] = fileStatus;
+    }
+
+    return fileStatusMap;
 }
 
 wxString GIT_STATUS_HANDLER::GetCurrentBranchName()
 {
-    return GetGitBackend()->GetCurrentBranchName( this );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return wxEmptyString;
+
+    git_reference* currentBranchReference = nullptr;
+    int rc = git_repository_head( &currentBranchReference, repo );
+    KIGIT::GitReferencePtr currentBranchReferencePtr( currentBranchReference );
+
+    if( currentBranchReference )
+    {
+        return git_reference_shorthand( currentBranchReference );
+    }
+    else if( rc == GIT_EUNBORNBRANCH )
+    {
+        // Unborn branch - could return empty or a default name
+        return wxEmptyString;
+    }
+    else
+    {
+        wxLogTrace( traceGit, "Failed to lookup current branch: %s", KIGIT_COMMON::GetLastGitError() );
+        return wxEmptyString;
+    }
 }
 
 void GIT_STATUS_HANDLER::UpdateRemoteStatus( const std::set<wxString>& aLocalChanges,
-                                             const std::set<wxString>& aRemoteChanges,
-                                             std::map<wxString, FileStatus>& aFileStatus )
+                                              const std::set<wxString>& aRemoteChanges,
+                                              std::map<wxString, FileStatus>& aFileStatus )
 {
-    GetGitBackend()->UpdateRemoteStatus( this, aLocalChanges, aRemoteChanges, aFileStatus );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return;
+
+    wxString repoWorkDir( git_repository_workdir( repo ) );
+
+    // Update status based on local/remote changes
+    for( auto& [absPath, fileStatus] : aFileStatus )
+    {
+        // Convert absolute path to relative path for comparison
+        wxString relativePath = absPath;
+        if( relativePath.StartsWith( repoWorkDir ) )
+        {
+            relativePath = relativePath.Mid( repoWorkDir.length() );
+#ifdef _WIN32
+            relativePath.Replace( wxS( "\\" ), wxS( "/" ) );
+#endif
+        }
+
+        std::string relativePathStd = relativePath.ToStdString();
+
+        // Only update if the file is not already modified/added/deleted
+        if( fileStatus.status == KIGIT_COMMON::GIT_STATUS::GIT_STATUS_CURRENT )
+        {
+            if( aLocalChanges.count( relativePathStd ) )
+            {
+                fileStatus.status = KIGIT_COMMON::GIT_STATUS::GIT_STATUS_AHEAD;
+            }
+            else if( aRemoteChanges.count( relativePathStd ) )
+            {
+                fileStatus.status = KIGIT_COMMON::GIT_STATUS::GIT_STATUS_BEHIND;
+            }
+        }
+    }
 }
 
 wxString GIT_STATUS_HANDLER::GetWorkingDirectory()
 {
-    return GetGitBackend()->GetWorkingDirectory( this );
+    git_repository* repo = GetRepo();
+
+    if( !repo )
+        return wxEmptyString;
+
+    const char* workdir = git_repository_workdir( repo );
+
+    if( !workdir )
+        return wxEmptyString;
+
+    return wxString( workdir );
 }
 
 KIGIT_COMMON::GIT_STATUS GIT_STATUS_HANDLER::ConvertStatus( unsigned int aGitStatus )

common/git/git_status_handler.h

@@ -29,8 +29,6 @@
 #include <map>
 #include <set>
 
-class LIBGIT_BACKEND;
-
 struct FileStatus
 {
     wxString filePath;
@@ -82,7 +80,6 @@ public:
     void UpdateProgress( int aCurrent, int aTotal, const wxString& aMessage ) override;
 
 private:
-    friend class LIBGIT_BACKEND;
     /**
      * Convert git status flags to KIGIT_COMMON::GIT_STATUS
      * @param aGitStatus Raw git status flags

common/git/kicad_git_common.h

@@ -33,8 +33,6 @@
 
 #include <wx/string.h>
 
-class LIBGIT_BACKEND;
-
 class KIGIT_COMMON
 {
 
@@ -176,7 +174,6 @@ protected:
     friend class GIT_PUSH_HANDLER;
     friend class GIT_PULL_HANDLER;
     friend class GIT_CLONE_HANDLER;
-    friend class LIBGIT_BACKEND;
     friend class PROJECT_TREE_PANE;
 
 private:

common/git/libgit_backend.h

@@ -1,100 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright The KiCad Developers, see AUTHORS.TXT for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/gpl-3.0.html
- * or you may search the http://www.gnu.org website for the version 3 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#ifndef LIBGIT_BACKEND_H_
-#define LIBGIT_BACKEND_H_
-
-#include "git_backend.h"
-
-// Forward declarations to avoid exposing libgit2 headers
-struct git_annotated_commit;
-
-class LIBGIT_BACKEND : public GIT_BACKEND
-{
-public:
-    void Init() override;
-    void Shutdown() override;
-    bool IsLibraryAvailable() override;
-
-    bool Clone( GIT_CLONE_HANDLER* aHandler ) override;
-
-    CommitResult Commit( GIT_COMMIT_HANDLER* aHandler,
-                         const std::vector<wxString>& aFiles,
-                         const wxString& aMessage,
-                         const wxString& aAuthorName,
-                         const wxString& aAuthorEmail ) override;
-
-    PushResult Push( GIT_PUSH_HANDLER* aHandler ) override;
-
-    bool HasChangedFiles( GIT_STATUS_HANDLER* aHandler ) override;
-
-    std::map<wxString, FileStatus> GetFileStatus( GIT_STATUS_HANDLER* aHandler,
-                                                  const wxString& aPathspec ) override;
-
-    wxString GetCurrentBranchName( GIT_STATUS_HANDLER* aHandler ) override;
-
-    void UpdateRemoteStatus( GIT_STATUS_HANDLER* aHandler,
-                             const std::set<wxString>& aLocalChanges,
-                             const std::set<wxString>& aRemoteChanges,
-                             std::map<wxString, FileStatus>& aFileStatus ) override;
-
-    wxString GetWorkingDirectory( GIT_STATUS_HANDLER* aHandler ) override;
-
-    wxString GetWorkingDirectory( GIT_CONFIG_HANDLER* aHandler ) override;
-    bool GetConfigString( GIT_CONFIG_HANDLER* aHandler, const wxString& aKey,
-                          wxString& aValue ) override;
-
-    bool IsRepository( GIT_INIT_HANDLER* aHandler, const wxString& aPath ) override;
-    InitResult InitializeRepository( GIT_INIT_HANDLER* aHandler, const wxString& aPath ) override;
-    bool SetupRemote( GIT_INIT_HANDLER* aHandler, const RemoteConfig& aConfig ) override;
-
-    BranchResult SwitchToBranch( GIT_BRANCH_HANDLER* aHandler, const wxString& aBranchName ) override;
-    bool BranchExists( GIT_BRANCH_HANDLER* aHandler, const wxString& aBranchName ) override;
-
-    bool PerformFetch( GIT_PULL_HANDLER* aHandler, bool aSkipLock ) override;
-    PullResult PerformPull( GIT_PULL_HANDLER* aHandler ) override;
-
-    void PerformRevert( GIT_REVERT_HANDLER* aHandler ) override;
-
-    git_repository* GetRepositoryForFile( const char* aFilename ) override;
-    int CreateBranch( git_repository* aRepo, const wxString& aBranchName ) override;
-    bool RemoveVCS( git_repository*& aRepo, const wxString& aProjectPath,
-                    bool aRemoveGitDir, wxString* aErrors ) override;
-
-    bool AddToIndex( GIT_ADD_TO_INDEX_HANDLER* aHandler, const wxString& aFilePath ) override;
-
-    bool PerformAddToIndex( GIT_ADD_TO_INDEX_HANDLER* aHandler ) override;
-
-    bool RemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler, const wxString& aFilePath ) override;
-
-    void PerformRemoveFromIndex( GIT_REMOVE_FROM_INDEX_HANDLER* aHandler ) override;
-
-private:
-    PullResult handleFastForward( GIT_PULL_HANDLER* aHandler );
-    PullResult handleMerge( GIT_PULL_HANDLER* aHandler, const git_annotated_commit** aMergeHeads,
-                            size_t aMergeHeadsCount );
-    PullResult handleRebase( GIT_PULL_HANDLER* aHandler, const git_annotated_commit** aMergeHeads,
-                             size_t aMergeHeadsCount );
-};
-
-#endif

common/git/project_git_utils.cpp

@@ -22,25 +22,105 @@
  */
 
 #include "project_git_utils.h"
-#include "git_backend.h"
+#include "kicad_git_common.h"
+#include "kicad_git_memory.h"
+#include <git/kicad_git_compat.h>
+#include <trace_helpers.h>
+#include <wx/log.h>
+#include <wx/filename.h>
+#include <gestfich.h>
 
 namespace KIGIT
 {
 
 git_repository* PROJECT_GIT_UTILS::GetRepositoryForFile( const char* aFilename )
 {
-    return GetGitBackend()->GetRepositoryForFile( aFilename );
+    git_repository* repo = nullptr;
+    git_buf repo_path = GIT_BUF_INIT;
+
+    if( git_repository_discover( &repo_path, aFilename, 0, nullptr ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Can't repo discover %s: %s", aFilename,
+                    KIGIT_COMMON::GetLastGitError() );
+        return nullptr;
+    }
+
+    KIGIT::GitBufPtr repo_path_ptr( &repo_path );
+
+    if( git_repository_open( &repo, repo_path.ptr ) != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Can't open repo for %s: %s", repo_path.ptr,
+                    KIGIT_COMMON::GetLastGitError() );
+        return nullptr;
+    }
+
+    return repo;
 }
 
 int PROJECT_GIT_UTILS::CreateBranch( git_repository* aRepo, const wxString& aBranchName )
 {
-    return GetGitBackend()->CreateBranch( aRepo, aBranchName );
+    git_oid head_oid;
+
+    if( int error = git_reference_name_to_id( &head_oid, aRepo, "HEAD" ); error != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to lookup HEAD reference: %s",
+                    KIGIT_COMMON::GetLastGitError() );
+        return error;
+    }
+
+    git_commit* commit = nullptr;
+
+    if( int error = git_commit_lookup( &commit, aRepo, &head_oid ); error != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to lookup commit: %s",
+                    KIGIT_COMMON::GetLastGitError() );
+        return error;
+    }
+
+    KIGIT::GitCommitPtr commitPtr( commit );
+    git_reference* branchRef = nullptr;
+
+    if( int error = git_branch_create( &branchRef, aRepo, aBranchName.mb_str(), commit, 0 ); error != GIT_OK )
+    {
+        wxLogTrace( traceGit, "Failed to create branch: %s",
+                    KIGIT_COMMON::GetLastGitError() );
+        return error;
+    }
+
+    git_reference_free( branchRef );
+    return 0;
 }
 
 bool PROJECT_GIT_UTILS::RemoveVCS( git_repository*& aRepo, const wxString& aProjectPath,
                                   bool aRemoveGitDir, wxString* aErrors )
 {
-    return GetGitBackend()->RemoveVCS( aRepo, aProjectPath, aRemoveGitDir, aErrors );
+    if( aRepo )
+    {
+        git_repository_free( aRepo );
+        aRepo = nullptr;
+    }
+
+    if( aRemoveGitDir )
+    {
+        wxFileName gitDir( aProjectPath, wxEmptyString );
+        gitDir.AppendDir( ".git" );
+
+        if( gitDir.DirExists() )
+        {
+            wxString errors;
+            if( !RmDirRecursive( gitDir.GetPath(), &errors ) )
+            {
+                if( aErrors )
+                    *aErrors = errors;
+
+                wxLogTrace( traceGit, "Failed to remove .git directory: %s", errors );
+                return false;
+            }
+        }
+    }
+
+    wxLogTrace( traceGit, "Successfully removed VCS from project" );
+    return true;
 }
 
-} // namespace KIGIT
+} // namespace KIGIT

common/hotkeys_basic.cpp

@@ -40,7 +40,6 @@
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 #include <tool/tool_action.h>
-#include <tool/tool_event.h>
 
 
 /*
@@ -160,10 +159,6 @@ static struct hotkey_name_descr hotkeyNameList[] =
 #define MODIFIER_CMD_MAC    wxT( "Cmd+" )
 #define MODIFIER_CTRL_BASE  wxT( "Ctrl+" )
 #define MODIFIER_SHIFT      wxT( "Shift+" )
-#define MODIFIER_META       wxT( "Meta+" )
-#define MODIFIER_WIN        wxT( "Win+" )
-#define MODIFIER_SUPER      wxT( "Super+" )
-#define MODIFIER_ALTGR      wxT( "AltGr+" )
 
 
 wxString KeyNameFromKeyCode( int aKeycode, bool* aIsFound )
@@ -180,14 +175,6 @@ wxString KeyNameFromKeyCode( int aKeycode, bool* aIsFound )
         return wxString( MODIFIER_SHIFT ).BeforeFirst( '+' );
     else if( aKeycode == WXK_ALT )
         return wxString( MODIFIER_ALT ).BeforeFirst( '+' );
-#ifdef WXK_WINDOWS_LEFT
-    else if( aKeycode == WXK_WINDOWS_LEFT || aKeycode == WXK_WINDOWS_RIGHT )
-        return wxString( MODIFIER_WIN ).BeforeFirst( '+' );
-#endif
-#ifdef WXK_META
-    else if( aKeycode == WXK_META )
-        return wxString( MODIFIER_META ).BeforeFirst( '+' );
-#endif
 
     // Assume keycode of 0 is "unassigned"
     if( (aKeycode & MD_CTRL) != 0 )
@@ -199,16 +186,7 @@ wxString KeyNameFromKeyCode( int aKeycode, bool* aIsFound )
     if( (aKeycode & MD_SHIFT) != 0 )
         modifier << MODIFIER_SHIFT;
 
-    if( (aKeycode & MD_META) != 0 )
-        modifier << MODIFIER_META;
-
-    if( (aKeycode & MD_SUPER) != 0 )
-        modifier << MODIFIER_WIN;
-
-    if( (aKeycode & MD_ALTGR) != 0 )
-        modifier << MODIFIER_ALTGR;
-
-    aKeycode &= ~MD_MODIFIER_MASK;
+    aKeycode &= ~( MD_CTRL | MD_ALT | MD_SHIFT );
 
     if( (aKeycode > ' ') && (aKeycode < 0x7F ) )
     {
@@ -284,7 +262,7 @@ int KeyCodeFromKeyName( const wxString& keyname )
 {
     int ii, keycode = KEY_NON_FOUND;
 
-    // Search for modifiers: Ctrl+ Alt+ Shift+ and others
+    // Search for modifiers: Ctrl+ Alt+ and Shift+
     // Note: on Mac OSX, the Cmd key is equiv here to Ctrl
     wxString key = keyname;
     wxString prefix;
@@ -314,26 +292,6 @@ int KeyCodeFromKeyName( const wxString& keyname )
             modifier |= MD_SHIFT;
             prefix = MODIFIER_SHIFT;
         }
-        else if( key.StartsWith( MODIFIER_META ) )
-        {
-            modifier |= MD_META;
-            prefix = MODIFIER_META;
-        }
-        else if( key.StartsWith( MODIFIER_WIN ) )
-        {
-            modifier |= MD_SUPER;
-            prefix = MODIFIER_WIN;
-        }
-        else if( key.StartsWith( MODIFIER_SUPER ) )
-        {
-            modifier |= MD_SUPER;
-            prefix = MODIFIER_SUPER;
-        }
-        else if( key.StartsWith( MODIFIER_ALTGR ) )
-        {
-            modifier |= MD_ALTGR;
-            prefix = MODIFIER_ALTGR;
-        }
         else
         {
             break;

common/jobs/job_export_sch_bom.cpp

@@ -40,7 +40,8 @@ JOB_EXPORT_SCH_BOM::JOB_EXPORT_SCH_BOM() :
     m_sortField(),
     m_sortAsc( true ),
     m_filterString(),
-    m_excludeDNP( false )
+    m_excludeDNP( false ),
+    m_includeExcludedFromBOM( false )
 {
     m_params.emplace_back( new JOB_PARAM<wxString>( "field_delimiter",
                                                     &m_fieldDelimiter,
@@ -69,8 +70,13 @@ JOB_EXPORT_SCH_BOM::JOB_EXPORT_SCH_BOM() :
                                                                  m_fieldsGroupBy ) );
     m_params.emplace_back( new JOB_PARAM<wxString>( "sort_field", &m_sortField, m_sortField ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "sort_asc", &m_sortAsc, m_sortAsc ) );
-    m_params.emplace_back( new JOB_PARAM<wxString>( "filter_string", &m_filterString, m_filterString ) );
+    m_params.emplace_back( new JOB_PARAM<wxString>( "filter_string",
+                                                    &m_filterString,
+                                                    m_filterString ) );
     m_params.emplace_back( new JOB_PARAM<bool>( "exclude_dnp", &m_excludeDNP, m_excludeDNP ) );
+    m_params.emplace_back( new JOB_PARAM<bool>( "include_excluded_from_bom",
+                                                &m_includeExcludedFromBOM,
+                                                m_includeExcludedFromBOM ) );
 
     m_params.emplace_back( new JOB_PARAM<wxString>( "bom_preset_name",
                                                     &m_bomPresetName,

common/jobs/job_export_sch_bom.h

@@ -55,6 +55,7 @@ public:
     bool                  m_sortAsc;
     wxString              m_filterString;
     bool                  m_excludeDNP;
+    bool                  m_includeExcludedFromBOM;
 };
 
 #endif

common/lib_table_grid_tricks.cpp

@@ -19,23 +19,11 @@
 
 #include "lib_table_grid_tricks.h"
 #include "lib_table_grid.h"
-#include <wx/clipbrd.h>
-#include <wx/log.h>
 
 
 LIB_TABLE_GRID_TRICKS::LIB_TABLE_GRID_TRICKS( WX_GRID* aGrid ) :
         GRID_TRICKS( aGrid )
 {
-    m_grid->Disconnect( wxEVT_CHAR_HOOK );
-    m_grid->Connect( wxEVT_CHAR_HOOK, wxCharEventHandler( LIB_TABLE_GRID_TRICKS::onCharHook ), nullptr, this );
-}
-
-LIB_TABLE_GRID_TRICKS::LIB_TABLE_GRID_TRICKS( WX_GRID* aGrid,
-        std::function<void( wxCommandEvent& )> aAddHandler ) :
-        GRID_TRICKS( aGrid, aAddHandler )
-{
-    m_grid->Disconnect( wxEVT_CHAR_HOOK );
-    m_grid->Connect( wxEVT_CHAR_HOOK, wxCharEventHandler( LIB_TABLE_GRID_TRICKS::onCharHook ), nullptr, this );
 }
 
 
@@ -146,61 +134,6 @@ void LIB_TABLE_GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
         GRID_TRICKS::doPopupSelection( event );
     }
 }
-void LIB_TABLE_GRID_TRICKS::onCharHook( wxKeyEvent& ev )
-{
-    if( ev.GetModifiers() == wxMOD_CONTROL && ev.GetKeyCode() == 'V' && m_grid->IsCellEditControlShown() )
-    {
-        wxLogNull doNotLog;
-
-        if( wxTheClipboard->Open() )
-        {
-            if( wxTheClipboard->IsSupported( wxDF_TEXT ) || wxTheClipboard->IsSupported( wxDF_UNICODETEXT ) )
-            {
-                wxTextDataObject data;
-                wxTheClipboard->GetData( data );
-
-                wxString text = data.GetText();
-
-                if( !text.Contains( '\t' ) && text.Contains( ',' ) )
-                    text.Replace( ',', '\t' );
-
-                if( text.Contains( '\t' ) || text.Contains( '\n' ) || text.Contains( '\r' ) )
-                {
-                    m_grid->CancelPendingChanges();
-                    int row = m_grid->GetGridCursorRow();
-
-                    // Check if the current row already has data (has a nickname)
-                    wxGridTableBase* table = m_grid->GetTable();
-                    if( table && row >= 0 && row < table->GetNumberRows() )
-                    {
-                        // Check if the row has a nickname (indicating it has existing data)
-                        wxString nickname = table->GetValue( row, COL_NICKNAME );
-                        if( !nickname.IsEmpty() )
-                        {
-                            // Row already has data, don't allow pasting over it
-                            wxTheClipboard->Close();
-                            wxBell(); // Provide audio feedback
-                            return;
-                        }
-                    }
-
-                    m_grid->ClearSelection();
-                    m_grid->SelectRow( row );
-                    m_grid->SetGridCursor( row, 0 );
-                    getSelectedArea();
-                    paste_text( text );
-                    wxTheClipboard->Close();
-                    m_grid->ForceRefresh();
-                    return;
-                }
-            }
-
-            wxTheClipboard->Close();
-        }
-    }
-
-    GRID_TRICKS::onCharHook( ev );
-}
 
 
 bool LIB_TABLE_GRID_TRICKS::handleDoubleClick( wxGridEvent& aEvent )

common/libeval_compiler/libeval_compiler.cpp

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

common/properties/pg_editors.cpp

@@ -24,16 +24,6 @@
 #include <properties/pg_properties.h>
 #include <widgets/color_swatch.h>
 #include <widgets/unit_binder.h>
-#include <bitmaps.h>
-#include <frame_type.h>
-#include <kiway_player.h>
-#include <kiway.h>
-#include <wx/filedlg.h>
-#include <wx/intl.h>
-#include <eda_doc.h>
-
-#include <wx/button.h>
-#include <wx/bmpbuttn.h>
 
 #include <wx/log.h>
 
@@ -41,8 +31,6 @@ const wxString PG_UNIT_EDITOR::EDITOR_NAME = wxS( "KiCadUnitEditor" );
 const wxString PG_CHECKBOX_EDITOR::EDITOR_NAME = wxS( "KiCadCheckboxEditor" );
 const wxString PG_COLOR_EDITOR::EDITOR_NAME = wxS( "KiCadColorEditor" );
 const wxString PG_RATIO_EDITOR::EDITOR_NAME = wxS( "KiCadRatioEditor" );
-const wxString PG_FPID_EDITOR::EDITOR_NAME = wxS( "KiCadFpidEditor" );
-const wxString PG_URL_EDITOR::EDITOR_NAME = wxS( "KiCadUrlEditor" );
 
 
 PG_UNIT_EDITOR::PG_UNIT_EDITOR( EDA_DRAW_FRAME* aFrame ) :
@@ -63,9 +51,6 @@ PG_UNIT_EDITOR::~PG_UNIT_EDITOR()
 
 wxString PG_UNIT_EDITOR::BuildEditorName( EDA_DRAW_FRAME* aFrame )
 {
-    if( !aFrame )
-        return EDITOR_NAME + "NoFrame";
-
     return EDITOR_NAME + aFrame->GetName();
 }
 
@@ -473,164 +458,3 @@ void PG_RATIO_EDITOR::UpdateControl( wxPGProperty* aProperty, wxWindow* aCtrl )
                          "properties!" ) );
     }
 }
-
-
-PG_FPID_EDITOR::PG_FPID_EDITOR( EDA_DRAW_FRAME* aFrame ) : m_frame( aFrame )
-{
-    m_editorName = BuildEditorName( aFrame );
-}
-
-
-void PG_FPID_EDITOR::UpdateFrame( EDA_DRAW_FRAME* aFrame )
-{
-    m_frame = aFrame;
-    m_editorName = BuildEditorName( aFrame );
-}
-
-
-wxString PG_FPID_EDITOR::BuildEditorName( EDA_DRAW_FRAME* aFrame )
-{
-    if( !aFrame )
-        return EDITOR_NAME + "NoFrame";
-
-    return EDITOR_NAME + aFrame->GetName();
-}
-
-
-wxPGWindowList PG_FPID_EDITOR::CreateControls( wxPropertyGrid* aGrid, wxPGProperty* aProperty,
-                                               const wxPoint& aPos, const wxSize& aSize ) const
-{
-    wxPGMultiButton* buttons = new wxPGMultiButton( aGrid, aSize );
-    buttons->Add( KiBitmap( BITMAPS::small_library ) );
-    buttons->Finalize( aGrid, aPos );
-    wxSize textSize = buttons->GetPrimarySize();
-    wxWindow* textCtrl = aGrid->GenerateEditorTextCtrl( aPos, textSize,
-                                                       aProperty->GetValueAsString(), nullptr, 0,
-                                                       aProperty->GetMaxLength() );
-    wxPGWindowList ret( textCtrl, buttons );
-    return ret;
-}
-
-
-bool PG_FPID_EDITOR::OnEvent( wxPropertyGrid* aGrid, wxPGProperty* aProperty, wxWindow* aCtrl,
-                              wxEvent& aEvent ) const
-{
-    if( aEvent.GetEventType() == wxEVT_BUTTON )
-    {
-        wxString fpid = aProperty->GetValue().GetString();
-
-        if( KIWAY_PLAYER* frame = m_frame->Kiway().Player( FRAME_FOOTPRINT_CHOOSER, true, m_frame ) )
-        {
-            if( frame->ShowModal( &fpid, m_frame ) )
-                aGrid->ChangePropertyValue( aProperty, fpid );
-
-            frame->Destroy();
-        }
-
-        return true;
-    }
-
-    return wxPGTextCtrlEditor::OnEvent( aGrid, aProperty, aCtrl, aEvent );
-}
-
-
-PG_URL_EDITOR::PG_URL_EDITOR( EDA_DRAW_FRAME* aFrame ) : m_frame( aFrame )
-{
-    m_editorName = BuildEditorName( aFrame );
-}
-
-
-void PG_URL_EDITOR::UpdateFrame( EDA_DRAW_FRAME* aFrame )
-{
-    m_frame = aFrame;
-    m_editorName = BuildEditorName( aFrame );
-}
-
-
-wxString PG_URL_EDITOR::BuildEditorName( EDA_DRAW_FRAME* aFrame )
-{
-    if( !aFrame )
-        return EDITOR_NAME + "NoFrame";
-
-    return EDITOR_NAME + aFrame->GetName();
-}
-
-
-wxPGWindowList PG_URL_EDITOR::CreateControls( wxPropertyGrid* aGrid, wxPGProperty* aProperty,
-                                              const wxPoint& aPos, const wxSize& aSize ) const
-{
-    wxPGMultiButton* buttons = new wxPGMultiButton( aGrid, aSize );
-    // Use a folder icon when no datasheet is set; otherwise use a globe icon.
-    wxString urlValue = aProperty->GetValueAsString();
-    bool     hasUrl   = !( urlValue.IsEmpty() || urlValue == wxS( "~" ) );
-    buttons->Add( KiBitmap( hasUrl ? BITMAPS::www : BITMAPS::small_folder ) );
-    buttons->Finalize( aGrid, aPos );
-    wxSize textSize = buttons->GetPrimarySize();
-    wxWindow* textCtrl = aGrid->GenerateEditorTextCtrl( aPos, textSize,
-                                                       aProperty->GetValueAsString(), nullptr, 0,
-                                                       aProperty->GetMaxLength() );
-    wxPGWindowList ret( textCtrl, buttons );
-    return ret;
-}
-
-
-bool PG_URL_EDITOR::OnEvent( wxPropertyGrid* aGrid, wxPGProperty* aProperty, wxWindow* aCtrl,
-                             wxEvent& aEvent ) const
-{
-    if( aEvent.GetEventType() == wxEVT_BUTTON )
-    {
-        wxString filename = aProperty->GetValue().GetString();
-
-        if( filename.IsEmpty() || filename == wxS( "~" ) )
-        {
-            wxFileDialog openFileDialog( m_frame, _( "Open file" ), wxS( "" ), wxS( "" ),
-                                         _( "All Files" ) + wxS( " (*.*)|*.*" ),
-                                         wxFD_OPEN | wxFD_FILE_MUST_EXIST );
-
-            if( openFileDialog.ShowModal() == wxID_OK )
-            {
-                filename = openFileDialog.GetPath();
-                aGrid->ChangePropertyValue( aProperty, wxString::Format( wxS( "file://%s" ),
-                                                                         filename ) );
-            }
-        }
-        else
-        {
-            GetAssociatedDocument( m_frame, filename, &m_frame->Prj() );
-        }
-
-        // Update the button icon to reflect presence/absence of URL
-        if( wxObject* src = aEvent.GetEventObject() )
-        {
-            wxString newUrl = aProperty->GetValueAsString();
-            bool     hasUrl = !( newUrl.IsEmpty() || newUrl == wxS( "~" ) );
-            auto     bmp    = KiBitmap( hasUrl ? BITMAPS::www : BITMAPS::small_folder );
-
-            if( wxWindow* win = wxDynamicCast( src, wxWindow ) )
-            {
-                if( wxBitmapButton* bb = wxDynamicCast( win, wxBitmapButton ) )
-                {
-                    bb->SetBitmap( bmp );
-                }
-                else if( wxButton* b = wxDynamicCast( win, wxButton ) )
-                {
-                    b->SetBitmap( bmp );
-                }
-                else if( wxWindow* parent = win->GetParent() )
-                {
-                    if( wxPGMultiButton* buttons = wxDynamicCast( parent, wxPGMultiButton ) )
-                    {
-                        wxWindow* btn0 = buttons->GetButton( 0 );
-                        if( wxBitmapButton* bb0 = wxDynamicCast( btn0, wxBitmapButton ) )
-                            bb0->SetBitmap( bmp );
-                        else if( wxButton* b0 = wxDynamicCast( btn0, wxButton ) )
-                            b0->SetBitmap( bmp );
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    return wxPGTextCtrlEditor::OnEvent( aGrid, aProperty, aCtrl, aEvent );
-}

common/properties/pg_properties.cpp

@@ -696,9 +696,7 @@ PGPROPERTY_COLOR4D::PGPROPERTY_COLOR4D( const wxString& aLabel, const wxString&
         m_backgroundColor( aBackgroundColor )
 {
     SetEditor( PG_COLOR_EDITOR::EDITOR_NAME );
-#if wxCHECK_VERSION( 3, 3, 1 )
-    SetFlag( wxPGFlags::NoEditor );
-#elif wxCHECK_VERSION( 3, 3, 0 )
+#if wxCHECK_VERSION( 3, 3, 0 )
     SetFlag( wxPGPropertyFlags::NoEditor );
 #else
     SetFlag( wxPG_PROP_NOEDITOR );

common/settings/app_settings.cpp

@@ -280,9 +280,6 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV
 
     m_params.emplace_back( new PARAM<bool>( "cross_probing.auto_highlight",
             &m_CrossProbing.auto_highlight, true ) );
-
-    m_params.emplace_back( new PARAM<bool>( "cross_probing.flash_selection",
-            &m_CrossProbing.flash_selection, false ) );
 }
 
 

common/string_utils.cpp

@@ -38,7 +38,6 @@
 #include <fmt/chrono.h>
 #include <wx/log.h>
 #include <wx/regex.h>
-#include <wx/tokenzr.h>
 #include "locale_io.h"
 
 
@@ -1504,124 +1503,3 @@ wxString NormalizeFileUri( const wxString& aFileUri )
 
     return retv;
 }
-
-
-namespace
-{
-    // Extract (prefix, numericValue) where numericValue = -1 if no numeric suffix
-    std::pair<wxString, long> ParseAlphaNumericPin( const wxString& pinNum )
-    {
-        wxString prefix;
-        long     numValue = -1;
-
-        size_t numStart = pinNum.length();
-        for( int i = static_cast<int>( pinNum.length() ) - 1; i >= 0; --i )
-        {
-            if( !wxIsdigit( pinNum[i] ) )
-            {
-                numStart = i + 1;
-                break;
-            }
-            if( i == 0 )
-                numStart = 0; // all digits
-        }
-
-        if( numStart < pinNum.length() )
-        {
-            prefix = pinNum.Left( numStart );
-            wxString numericPart = pinNum.Mid( numStart );
-            numericPart.ToLong( &numValue );
-        }
-
-        return { prefix, numValue };
-    }
-}
-
-std::vector<wxString> ExpandStackedPinNotation( const wxString& aPinName, bool* aValid )
-{
-    if( aValid )
-        *aValid = true;
-
-    std::vector<wxString> expanded;
-
-    const bool hasOpenBracket  = aPinName.Contains( wxT( "[" ) );
-    const bool hasCloseBracket = aPinName.Contains( wxT( "]" ) );
-
-    if( hasOpenBracket || hasCloseBracket )
-    {
-        if( !aPinName.StartsWith( wxT( "[" ) ) || !aPinName.EndsWith( wxT( "]" ) ) )
-        {
-            if( aValid )
-                *aValid = false;
-            expanded.push_back( aPinName );
-            return expanded;
-        }
-    }
-
-    if( !aPinName.StartsWith( wxT( "[" ) ) || !aPinName.EndsWith( wxT( "]" ) ) )
-    {
-        expanded.push_back( aPinName );
-        return expanded;
-    }
-
-    const wxString inner = aPinName.Mid( 1, aPinName.Length() - 2 );
-
-    size_t start = 0;
-    while( start < inner.length() )
-    {
-        size_t comma = inner.find( ',', start );
-        wxString part = ( comma == wxString::npos ) ? inner.Mid( start ) : inner.Mid( start, comma - start );
-        part.Trim( true ).Trim( false );
-        if( part.empty() )
-        {
-            start = ( comma == wxString::npos ) ? inner.length() : comma + 1;
-            continue;
-        }
-
-        int dashPos = part.Find( '-' );
-        if( dashPos != wxNOT_FOUND )
-        {
-            wxString startTxt = part.Left( dashPos );
-            wxString endTxt   = part.Mid( dashPos + 1 );
-            startTxt.Trim( true ).Trim( false );
-            endTxt.Trim( true ).Trim( false );
-
-            auto [startPrefix, startVal] = ParseAlphaNumericPin( startTxt );
-            auto [endPrefix, endVal]     = ParseAlphaNumericPin( endTxt );
-
-            if( startPrefix != endPrefix || startVal == -1 || endVal == -1 || startVal > endVal )
-            {
-                if( aValid )
-                    *aValid = false;
-                expanded.clear();
-                expanded.push_back( aPinName );
-                return expanded;
-            }
-
-            for( long ii = startVal; ii <= endVal; ++ii )
-            {
-                if( startPrefix.IsEmpty() )
-                    expanded.emplace_back( wxString::Format( wxT( "%ld" ), ii ) );
-                else
-                    expanded.emplace_back( wxString::Format( wxT( "%s%ld" ), startPrefix, ii ) );
-            }
-        }
-        else
-        {
-            expanded.push_back( part );
-        }
-
-        if( comma == wxString::npos )
-            break;
-        start = comma + 1;
-    }
-
-    if( expanded.empty() )
-    {
-        expanded.push_back( aPinName );
-        if( aValid )
-            *aValid = false;
-    }
-
-    return expanded;
-}

common/text_eval/text_eval_wrapper.cpp

@@ -1368,7 +1368,8 @@ std::vector<wxString> EXPRESSION_EVALUATOR::ExtractExpressions( const wxString&
 
         if( end != wxString::npos )
         {
-            expressions.push_back( aInput.substr( start, end - start ) );
+            wxString expression = aInput.substr( start, end - start );
+            expressions.push_back( expression );
             pos = end + 1;
         }
         else

common/tool/actions.cpp

@@ -953,17 +953,17 @@ TOOL_ACTION ACTIONS::unpinLibrary( TOOL_ACTION_ARGS()
         .FriendlyName( _( "Unpin Library" ) )
         .Tooltip( _( "No longer keep the library at the top of the list" ) ) );
 
-TOOL_ACTION ACTIONS::showLibraryFieldsTable( TOOL_ACTION_ARGS()
-        .Name( "common.Control.showLibraryFieldsTable" )
+TOOL_ACTION ACTIONS::showLibraryTable( TOOL_ACTION_ARGS()
+        .Name( "common.Control.showLibraryTable" )
         .Scope( AS_GLOBAL )
-        .FriendlyName( _( "Library Fields Table" ) )
+        .FriendlyName( _( "Library Table" ) )
         .Icon( BITMAPS::table ) );
 
-TOOL_ACTION ACTIONS::showRelatedLibraryFieldsTable( TOOL_ACTION_ARGS()
-        .Name( "common.Control.showRelatedLibraryFieldsTable" )
+TOOL_ACTION ACTIONS::showRelatedLibraryTable( TOOL_ACTION_ARGS()
+        .Name( "common.Control.showRelatedLibraryTable" )
         .Scope( AS_GLOBAL )
-        .FriendlyName( _( "Library Fields Table of Related Symbols" ) )
-        .Tooltip( _( "Edit a table of fields of all symbols related to the selected symbol" ) )
+        .FriendlyName( _( "Edit Related Symbols as Table" ) )
+        .Tooltip( _( "Edit all symbols related to the selected symbol in a table" ) )
         .Icon( BITMAPS::table ) );
 
 TOOL_ACTION ACTIONS::showLibraryTree( TOOL_ACTION_ARGS()

common/tool/edit_points.cpp

@@ -61,8 +61,11 @@ EDIT_POINT* EDIT_POINTS::FindPoint( const VECTOR2I& aLocation, KIGFX::VIEW *aVie
 
     if( m_allowPoints )
     {
-        for( EDIT_POINT& point : m_points )
+        // Check from the end so that we get the topmost point
+        for( auto r_it = m_points.rbegin(); r_it != m_points.rend(); ++r_it )
         {
+            EDIT_POINT& point = *r_it;
+
             if( point.WithinPoint( aLocation, size ) )
                 return &point;
         }

common/tool/tool_dispatcher.cpp

@@ -158,43 +158,6 @@ TOOL_DISPATCHER::~TOOL_DISPATCHER()
         delete st;
 }
 
-int TOOL_DISPATCHER::decodeModifiers( const wxKeyboardState* aState )
-{
-    int mods = 0;
-    int wxmods = aState->GetModifiers();
-
-    // Returns the state of key modifiers (Alt, Ctrl and so on). Be carefull:
-    // the flag wxMOD_ALTGR is defined in wxWidgets as wxMOD_CONTROL|wxMOD_ALT
-    // So AltGr key cannot used as modifier key because it is the same as Alt key + Ctrl key.
-#if CAN_USE_ALTGR_KEY
-    if( wxmods & wxMOD_ALTGR )
-        mods |= MD_ALTGR;
-    else
-#endif
-    {
-        if( wxmods & wxMOD_CONTROL )
-            mods |= MD_CTRL;
-
-        if( wxmods & wxMOD_ALT )
-            mods |= MD_ALT;
-    }
-
-    if( wxmods & wxMOD_SHIFT )
-        mods |= MD_SHIFT;
-
-#ifdef wxMOD_META
-    if( wxmods & wxMOD_META )
-        mods |= MD_META;
-#endif
-
-#ifdef wxMOD_WIN
-    if( wxmods & wxMOD_WIN )
-        mods |= MD_SUPER;
-#endif
-
-    return mods;
-}
-
 
 void TOOL_DISPATCHER::ResetState()
 {
@@ -334,19 +297,7 @@ static bool isKeyModifierOnly( int aKeyCode )
 {
     static std::vector<enum wxKeyCode> special_keys =
     {
-        WXK_CONTROL, WXK_RAW_CONTROL, WXK_SHIFT, WXK_ALT,
-#ifdef WXK_WINDOWS_LEFT
-        WXK_WINDOWS_LEFT, WXK_WINDOWS_RIGHT,
-#endif
-#ifdef WXK_MENU
-        WXK_MENU,
-#endif
-#ifdef WXK_COMMAND
-        WXK_COMMAND,
-#endif
-#ifdef WXK_META
-        WXK_META,
-#endif
+        WXK_CONTROL, WXK_RAW_CONTROL, WXK_SHIFT, WXK_ALT
     };
 
     return alg::contains( special_keys, aKeyCode );
@@ -564,7 +515,7 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
         if( !evt && me->GetWheelRotation() != 0 )
         {
             const unsigned modBits =
-                    static_cast<unsigned>( mods ) & MD_MODIFIER_MASK;
+                    static_cast<unsigned>( mods ) & ( MD_CTRL | MD_ALT | MD_SHIFT );
             const bool shouldHandle = std::popcount( modBits ) > 1;
 
             if( shouldHandle )

common/tool/tool_event.cpp

@@ -149,9 +149,6 @@ const std::string TOOL_EVENT::Format() const
         { MD_SHIFT, "shift" },
         { MD_CTRL,  "ctrl"  },
         { MD_ALT,   "alt"   },
-        { MD_SUPER, "super" },
-        { MD_META,  "meta"  },
-        { MD_ALTGR, "altgr" },
         { 0,        ""      }
     };
 

common/widgets/lib_tree.cpp

@@ -640,36 +640,15 @@ void LIB_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
 {
     int hotkey = aKeyStroke.GetKeyCode();
 
-    int mods = aKeyStroke.GetModifiers();
+    if( aKeyStroke.GetModifiers() & wxMOD_CONTROL )
+        hotkey += MD_CTRL;
 
-    // the flag wxMOD_ALTGR is defined in wxWidgets as wxMOD_CONTROL|wxMOD_ALT
-    // So AltGr key cannot used as modifier key because it is the same as Alt key + Ctrl key.
-#if CAN_USE_ALTGR_KEY
-    if( wxmods & wxMOD_ALTGR )
-        mods |= MD_ALTGR;
-    else
-#endif
-    {
-        if( mods & wxMOD_CONTROL )
-            hotkey += MD_CTRL;
+    if( aKeyStroke.GetModifiers() & wxMOD_ALT )
+        hotkey += MD_ALT;
 
-        if( mods & wxMOD_ALT )
-            hotkey += MD_ALT;
-    }
-
-    if( mods & wxMOD_SHIFT )
+    if( aKeyStroke.GetModifiers() & wxMOD_SHIFT )
         hotkey += MD_SHIFT;
 
-#ifdef wxMOD_META
-    if( mods & wxMOD_META )
-        hotkey += MD_META;
-#endif
-
-#ifdef wxMOD_WIN
-    if( mods & wxMOD_WIN )
-        hotkey += MD_SUPER;
-#endif
-
     if( hotkey == ACTIONS::expandAll.GetHotKey()
         || hotkey == ACTIONS::expandAll.GetHotKeyAlt() )
     {
@@ -881,31 +860,14 @@ void LIB_TREE::onTreeCharHook( wxKeyEvent& aKeyStroke )
         {
             int hotkey = aKeyStroke.GetKeyCode();
 
-            int mods = aKeyStroke.GetModifiers();
-
-            if( mods & wxMOD_ALTGR )
-                hotkey |= MD_ALTGR;
-            else
-            {
-                if( mods & wxMOD_ALT )
-                    hotkey |= MD_ALT;
-
-                if( mods & wxMOD_CONTROL )
-                    hotkey |= MD_CTRL;
-            }
-
-            if( mods & wxMOD_SHIFT )
+            if( aKeyStroke.ShiftDown() )
                 hotkey |= MD_SHIFT;
 
-#ifdef wxMOD_META
-            if( mods & wxMOD_META )
-                hotkey |= MD_META;
-#endif
+            if( aKeyStroke.AltDown() )
+                hotkey |= MD_ALT;
 
-#ifdef wxMOD_WIN
-            if( mods & wxMOD_WIN )
-                hotkey |= MD_SUPER;
-#endif
+            if( aKeyStroke.ControlDown() )
+                hotkey |= MD_CTRL;
 
             if( tool->GetManager()->GetActionManager()->RunHotKey( hotkey ) )
                 aKeyStroke.Skip( false );

common/widgets/unit_binder.cpp

@@ -235,11 +235,7 @@ void UNIT_BINDER::onComboBox( wxCommandEvent& aEvent )
     const wxString      value = combo->GetStringSelection();
     const long long int conv = ValueFromString( *m_iuScale, m_units, value, m_dataType );
 
-    CallAfter(
-            [this, conv]
-            {
-                SetValue( conv );
-            } );
+    SetValue( conv );
 
     aEvent.Skip();
 }

common/widgets/widget_hotkey_list.cpp

@@ -670,7 +670,7 @@ long WIDGET_HOTKEY_LIST::MapKeypressToKeycode( const wxKeyEvent& aEvent )
 {
     long key = aEvent.GetKeyCode();
     bool is_tab = aEvent.IsKeyInCategory( WXK_CATEGORY_TAB );
-printf("key %lX mod %X\n", key, aEvent.GetModifiers());
+
     if( key == WXK_ESCAPE )
     {
         return 0;
@@ -693,35 +693,14 @@ printf("key %lX mod %X\n", key, aEvent.GetModifiers());
          */
         bool keyIsLetter = key >= 'A' && key <= 'Z';
 
-        int mods = aEvent.GetModifiers();
-
-        if( ( mods & wxMOD_SHIFT ) && ( keyIsLetter || key > 256 || key == 9 || key == 32 ) )
+        if( aEvent.ShiftDown() && ( keyIsLetter || key > 256 || key == 9 || key == 32 ) )
             key |= MD_SHIFT;
 
-        // the flag wxMOD_ALTGR is defined in wxWidgets as wxMOD_CONTROL|wxMOD_ALT
-        // So AltGr key cannot used as modifier key because it is the same as Alt key + Ctrl key.
-    #if CAN_USE_ALTGR_KEY
-        if( wxmods & wxMOD_ALTGR )
-            mods |= MD_ALTGR;
-        else
-    #endif
-        {
-            if( mods & wxMOD_CONTROL )
-                key |= MD_CTRL;
+        if( aEvent.ControlDown() )
+            key |= MD_CTRL;
 
-            if( mods & wxMOD_ALT )
-                key |= MD_ALT;
-        }
-
-#ifdef wxMOD_META
-        if( mods & wxMOD_META )
-            key |= MD_META;
-#endif
-
-#ifdef wxMOD_WIN
-        if( mods & wxMOD_WIN )
-            key |= MD_SUPER;
-#endif
+        if( aEvent.AltDown() )
+            key |= MD_ALT;
 
         return key;
     }

cvpcb/cvpcb_mainframe.cpp

@@ -62,7 +62,6 @@
 #include <wx/stattext.h>
 #include <wx/button.h>
 #include <wx/msgdlg.h>
-#include <wx/ffile.h>
 
 
 CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
@@ -797,12 +796,7 @@ void CVPCB_MAINFRAME::DisplayStatus()
         msg.Empty();
 
         if( symbol )
-        {
-            int pc = symbol->GetPinCount();
-            wxLogTrace( "CVPCB_PINCOUNT", wxT( "DisplayStatus: selected '%s' pinCount=%d" ),
-                        symbol->GetReference(), pc );
-            msg = wxString::Format( wxT( "%i" ), pc );
-        }
+            msg = wxString::Format( wxT( "%i" ), symbol->GetPinCount() );
 
         if( !filters.IsEmpty() )
             filters += wxT( ", " );
@@ -963,12 +957,6 @@ int CVPCB_MAINFRAME::readSchematicNetlist( const std::string& aNetlist )
 
     m_netlist.Clear();
 
-    // Trace basic payload characteristics to verify libparts are present and visible here
-    wxLogTrace( "CVPCB_PINCOUNT",
-                wxT( "readSchematicNetlist: payload size=%zu has_libparts=%d has_libpart=%d" ),
-                aNetlist.size(), aNetlist.find( "(libparts" ) != std::string::npos,
-                aNetlist.find( "(libpart" ) != std::string::npos );
-
     try
     {
         netlistReader.LoadNetlist();

cvpcb/footprints_listbox.cpp

@@ -132,13 +132,7 @@ void FOOTPRINTS_LISTBOX::SetFootprints( FOOTPRINT_LIST& aList, const wxString& a
         filter.FilterByFootprintFilters( aComponent->GetFootprintFilters() );
 
     if( aFilterType & FILTERING_BY_PIN_COUNT && aComponent )
-    {
-        int pc = aComponent->GetPinCount();
-        wxLogTrace( "CVPCB_PINCOUNT",
-                    wxT( "FOOTPRINTS_LISTBOX::SetFootprints: ref='%s' pinCount filter=%d" ),
-                    aComponent->GetReference(), pc );
-        filter.FilterByPinCount( pc );
-    }
+        filter.FilterByPinCount( aComponent->GetPinCount() );
 
     if( aFilterType & FILTERING_BY_LIBRARY )
         filter.FilterByLibrary( aLibName );

eeschema/CMakeLists.txt

@@ -122,8 +122,8 @@ set( EESCHEMA_DLGS
     dialogs/dialog_label_properties_base.cpp
     dialogs/dialog_lib_edit_pin_table.cpp
     dialogs/dialog_lib_edit_pin_table_base.cpp
-    dialogs/dialog_lib_fields_table_base.cpp
-    dialogs/dialog_lib_fields_table.cpp
+    dialogs/dialog_lib_fields_base.cpp
+    dialogs/dialog_lib_fields.cpp
     dialogs/dialog_lib_new_symbol.cpp
     dialogs/dialog_lib_new_symbol_base.cpp
     dialogs/dialog_lib_symbol_properties.cpp

eeschema/connection_graph.cpp

@@ -1614,10 +1614,11 @@ void CONNECTION_GRAPH::resolveAllDrivers()
 
     thread_pool& tp = GetKiCadThreadPool();
 
-    auto results = tp.submit_loop( 0, dirty_graphs.size(),
-                        [&]( const int ii )
+    auto results = tp.parallelize_loop( dirty_graphs.size(),
+                        [&]( const int a, const int b)
                         {
-                            update_lambda( dirty_graphs[ii] );
+                            for( int ii = a; ii < b; ++ii )
+                                update_lambda( dirty_graphs[ii] );
                         });
     results.wait();
 
@@ -2256,10 +2257,11 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
 
     thread_pool& tp = GetKiCadThreadPool();
 
-    auto results = tp.submit_loop( 0, m_driver_subgraphs.size(),
-                            [&]( const int ii )
+    auto results = tp.parallelize_loop( m_driver_subgraphs.size(),
+                            [&]( const int a, const int b)
                             {
-                                m_driver_subgraphs[ii]->UpdateItemConnections();
+                                for( int ii = a; ii < b; ++ii )
+                                    m_driver_subgraphs[ii]->UpdateItemConnections();
                             });
 
     results.wait();
@@ -2462,11 +2464,12 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
                 return 1;
             };
 
-    auto results2 = tp.submit_loop( 0, m_driver_subgraphs.size(),
-                            [&]( const int ii )
+    auto results2 = tp.parallelize_loop( m_driver_subgraphs.size(),
+                            [&]( const int a, const int b)
                             {
-                                updateItemConnectionsTask( m_driver_subgraphs[ii] );
-                            } );
+                                for( int ii = a; ii < b; ++ii )
+                                    updateItemConnectionsTask( m_driver_subgraphs[ii] );
+                            });
     results2.wait();
 
     m_net_code_to_subgraphs_map.clear();

eeschema/cross-probing.cpp

@@ -931,26 +931,6 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
                                                                             items );
 
             m_syncingPcbToSchSelection = false;
-
-            if( eeconfig()->m_CrossProbing.flash_selection )
-            {
-                wxLogTrace( "CROSS_PROBE_FLASH", "MAIL_SELECTION(_FORCE): flash enabled, items=%zu", items.size() );
-                if( items.empty() )
-                {
-                    wxLogTrace( "CROSS_PROBE_FLASH", "MAIL_SELECTION(_FORCE): nothing to flash" );
-                }
-                else
-                {
-                    std::vector<SCH_ITEM*> itemPtrs;
-                    std::copy( items.begin(), items.end(), std::back_inserter( itemPtrs ) );
-
-                    StartCrossProbeFlash( itemPtrs );
-                }
-            }
-            else
-            {
-                wxLogTrace( "CROSS_PROBE_FLASH", "MAIL_SELECTION(_FORCE): flash disabled" );
-            }
         }
 
         break;

eeschema/dialogs/dialog_erc.cpp

@@ -42,7 +42,6 @@
 #include <id.h>
 #include <confirm.h>
 #include <widgets/wx_html_report_box.h>
-#include <widgets/std_bitmap_button.h>
 #include <dialogs/dialog_text_entry.h>
 #include <string_utils.h>
 #include <kiplatform/ui.h>
@@ -77,15 +76,15 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
         m_running( false ),
         m_ercRun( false ),
         m_centerMarkerOnIdle( nullptr ),
-        m_crossprobe( true ),
-        m_scroll_on_crossprobe( true )
+        m_severities( 0 )
 {
     m_currentSchematic = &parent->Schematic();
 
     SetName( DIALOG_ERC_WINDOW_NAME ); // Set a window name to be able to find it
     KIPLATFORM::UI::SetFloatLevel( this );
 
-    m_bMenu->SetBitmap( KiBitmapBundle( BITMAPS::config ) );
+    if( EESCHEMA_SETTINGS* cfg = GetAppSettings<EESCHEMA_SETTINGS>( "eeschema" ) )
+        m_severities = cfg->m_Appearance.erc_severities;
 
     m_messages->SetImmediateMode();
 
@@ -93,7 +92,7 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
 
     m_markerTreeModel = new ERC_TREE_MODEL( parent, m_markerDataView );
     m_markerDataView->AssociateModel( m_markerTreeModel );
-    m_markerTreeModel->Update( m_markerProvider, getSeverities() );
+    m_markerTreeModel->Update( m_markerProvider, m_severities );
 
     m_ignoredList->InsertColumn( 0, wxEmptyString, wxLIST_FORMAT_LEFT, DEFAULT_SINGLE_COL_WIDTH );
 
@@ -130,11 +129,8 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
 
     SetFocus();
 
-    if( EESCHEMA_SETTINGS* cfg = GetAppSettings<EESCHEMA_SETTINGS>( "eeschema" ) )
-    {
-        m_crossprobe = cfg->m_ERCDialog.crossprobe;
-        m_scroll_on_crossprobe = cfg->m_ERCDialog.scroll_on_crossprobe;
-    }
+    syncCheckboxes();
+    updateDisplayedCounts();
 
     // Now all widgets have the size fixed, call FinishDialogSettings
     finishDialogSettings();
@@ -152,10 +148,7 @@ DIALOG_ERC::~DIALOG_ERC()
         g_lastERCIgnored.push_back( { m_ignoredList->GetItemText( ii ), m_ignoredList->GetItemData( ii ) } );
 
     if( EESCHEMA_SETTINGS* cfg = GetAppSettings<EESCHEMA_SETTINGS>( "eeschema" ) )
-    {
-        cfg->m_ERCDialog.crossprobe = m_crossprobe;
-        cfg->m_ERCDialog.scroll_on_crossprobe = m_scroll_on_crossprobe;
-    }
+        cfg->m_Appearance.erc_severities = m_severities;
 
     m_markerTreeModel->DecRef();
 }
@@ -196,59 +189,6 @@ void DIALOG_ERC::UpdateAnnotationWarning()
 }
 
 
-int DIALOG_ERC::getSeverities()
-{
-    int severities = 0;
-
-    if( m_showErrors->GetValue() )
-        severities |= RPT_SEVERITY_ERROR;
-
-    if( m_showWarnings->GetValue() )
-        severities |= RPT_SEVERITY_WARNING;
-
-    if( m_showExclusions->GetValue() )
-        severities |= RPT_SEVERITY_EXCLUSION;
-
-    return severities;
-}
-
-
-void DIALOG_ERC::OnMenu( wxCommandEvent& event )
-{
-    // Build a pop menu:
-    wxMenu menu;
-
-    menu.Append( 4206, _( "Cross-probe Selected Items" ),
-                 _( "Highlight corresponding items on canvas when selected in the ERC list" ),
-                 wxITEM_CHECK );
-    menu.Check( 4206, m_crossprobe );
-
-    menu.Append( 4207, _( "Center on Cross-probe" ),
-                 _( "When cross-probing, scroll the canvas so that the item is visible" ),
-                 wxITEM_CHECK );
-    menu.Check( 4207, m_scroll_on_crossprobe );
-
-    // menu_id is the selected submenu id from the popup menu or wxID_NONE
-    int menu_id = m_bMenu->GetPopupMenuSelectionFromUser( menu );
-
-    if( menu_id == 0 || menu_id == 4206 )
-    {
-        m_crossprobe = !m_crossprobe;
-    }
-    else if( menu_id == 1 || menu_id == 4207 )
-    {
-        m_scroll_on_crossprobe = !m_scroll_on_crossprobe;
-    }
-}
-
-
-bool DIALOG_ERC::TransferDataToWindow()
-{
-    UpdateData();
-    return true;
-}
-
-
 bool DIALOG_ERC::updateUI()
 {
     // If ERC checks ever get slow enough we'll want a progress indicator...
@@ -277,13 +217,6 @@ void DIALOG_ERC::Report( const wxString& aMessage )
 }
 
 
-void DIALOG_ERC::UpdateData()
-{
-    m_markerTreeModel->Update( m_markerProvider, getSeverities() );
-    updateDisplayedCounts();
-}
-
-
 void DIALOG_ERC::updateDisplayedCounts()
 {
     int numErrors = 0;
@@ -415,14 +348,30 @@ void DIALOG_ERC::OnCloseErcDialog( wxCloseEvent& aEvent )
     // Dialog is mode-less so let the parent know that it needs to be destroyed.
     if( !IsModal() && !IsQuasiModal() )
     {
-        if( wxWindow* parent = GetParent() )
-            wxQueueEvent( parent, new wxCommandEvent( EDA_EVT_CLOSE_ERC_DIALOG, wxID_ANY ) );
+        wxCommandEvent* evt = new wxCommandEvent( EDA_EVT_CLOSE_ERC_DIALOG, wxID_ANY );
+
+        wxWindow* parent = GetParent();
+
+        if( parent )
+            wxQueueEvent( parent, evt );
     }
 
     aEvent.Skip();
 }
 
 
+static int RPT_SEVERITY_ALL = RPT_SEVERITY_WARNING | RPT_SEVERITY_ERROR | RPT_SEVERITY_EXCLUSION;
+
+
+void DIALOG_ERC::syncCheckboxes()
+{
+    m_showAll->SetValue( m_severities == RPT_SEVERITY_ALL );
+    m_showErrors->SetValue( m_severities & RPT_SEVERITY_ERROR );
+    m_showWarnings->SetValue( m_severities & RPT_SEVERITY_WARNING );
+    m_showExclusions->SetValue( m_severities & RPT_SEVERITY_EXCLUSION );
+}
+
+
 void DIALOG_ERC::OnLinkClicked( wxHtmlLinkEvent& event )
 {
     m_parent->OnAnnotate();
@@ -497,7 +446,8 @@ void DIALOG_ERC::OnRunERCClick( wxCommandEvent& event )
     }
 
     if( m_cancelled )
-        m_messages->Report( _( "-------- ERC cancelled by user.<br><br>" ), RPT_SEVERITY_INFO );
+        // @spellingerror
+        m_messages->Report( _( "-------- ERC canceled by user.<br><br>" ), RPT_SEVERITY_INFO );
     else
         m_messages->Report( _( "Done.<br><br>" ), RPT_SEVERITY_INFO );
 
@@ -558,7 +508,7 @@ void DIALOG_ERC::testErc()
     }
 
     // Update marker list:
-    m_markerTreeModel->Update( m_markerProvider, getSeverities() );
+    m_markerTreeModel->Update( m_markerProvider, m_severities );
 
     // Display new markers from the current screen:
     for( SCH_ITEM* marker : m_parent->GetScreen()->Items().OfType( SCH_MARKER_T ) )
@@ -573,12 +523,6 @@ void DIALOG_ERC::testErc()
 
 void DIALOG_ERC::OnERCItemSelected( wxDataViewEvent& aEvent )
 {
-    if( !m_crossprobe )
-    {
-        aEvent.Skip();
-        return;
-    }
-
     const KIID&     itemID = RC_TREE_MODEL::ToUUID( aEvent.GetItem() );
     SCH_SHEET_PATH  sheet;
     SCH_ITEM*       item = m_parent->Schematic().ResolveItem( itemID, &sheet, true );
@@ -624,7 +568,7 @@ void DIALOG_ERC::OnERCItemSelected( wxDataViewEvent& aEvent )
             m_parent->RedrawScreen( m_parent->GetScreen()->m_ScrollCenter, false );
         }
 
-        m_parent->FocusOnItem( item, m_scroll_on_crossprobe );
+        m_parent->FocusOnItem( item );
         redrawDrawPanel();
     }
 
@@ -818,7 +762,7 @@ void DIALOG_ERC::OnERCItemRClick( wxDataViewEvent& aEvent )
             m_parent->GetCanvas()->GetView()->Update( marker );
 
             // Update view
-            if( getSeverities() & RPT_SEVERITY_EXCLUSION )
+            if( m_severities & RPT_SEVERITY_EXCLUSION )
                 static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->ValueChanged( node );
             else
                 static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->DeleteCurrentItem( false );
@@ -844,7 +788,7 @@ void DIALOG_ERC::OnERCItemRClick( wxDataViewEvent& aEvent )
         }
 
         // Rebuild model and view
-        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, getSeverities() );
+        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, m_severities );
         modified = true;
         break;
 
@@ -860,7 +804,7 @@ void DIALOG_ERC::OnERCItemRClick( wxDataViewEvent& aEvent )
         }
 
         // Rebuild model and view
-        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, getSeverities() );
+        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, m_severities );
         modified = true;
         break;
 
@@ -886,7 +830,7 @@ void DIALOG_ERC::OnERCItemRClick( wxDataViewEvent& aEvent )
         ScreenList.DeleteMarkers( MARKER_BASE::MARKER_ERC, rcItem->GetErrorCode() );
 
         // Rebuild model and view
-        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, getSeverities() );
+        static_cast<RC_TREE_MODEL*>( aEvent.GetModel() )->Update( m_markerProvider, m_severities );
         modified = true;
     }
         break;
@@ -1012,7 +956,7 @@ void DIALOG_ERC::ExcludeMarker( SCH_MARKER* aMarker )
         m_parent->GetCanvas()->GetView()->Update( marker );
 
         // Update view
-        if( getSeverities() & RPT_SEVERITY_EXCLUSION )
+        if( m_severities & RPT_SEVERITY_EXCLUSION )
             m_markerTreeModel->ValueChanged( node );
         else
             m_markerTreeModel->DeleteCurrentItem( false );
@@ -1032,14 +976,28 @@ void DIALOG_ERC::OnEditViolationSeverities( wxHyperlinkEvent& aEvent )
 
 void DIALOG_ERC::OnSeverity( wxCommandEvent& aEvent )
 {
-    if( aEvent.GetEventObject() == m_showAll )
-    {
-        m_showErrors->SetValue( true );
-        m_showWarnings->SetValue( aEvent.IsChecked() );
-        m_showExclusions->SetValue( aEvent.IsChecked() );
-    }
+    int flag = 0;
 
-    UpdateData();
+    if( aEvent.GetEventObject() == m_showAll )
+        flag = RPT_SEVERITY_ALL;
+    else if( aEvent.GetEventObject() == m_showErrors )
+        flag = RPT_SEVERITY_ERROR;
+    else if( aEvent.GetEventObject() == m_showWarnings )
+        flag = RPT_SEVERITY_WARNING;
+    else if( aEvent.GetEventObject() == m_showExclusions )
+        flag = RPT_SEVERITY_EXCLUSION;
+
+    if( aEvent.IsChecked() )
+        m_severities |= flag;
+    else if( aEvent.GetEventObject() == m_showAll )
+        m_severities = RPT_SEVERITY_ERROR;
+    else
+        m_severities &= ~flag;
+
+    syncCheckboxes();
+
+    m_markerTreeModel->Update( m_markerProvider, m_severities );
+    updateDisplayedCounts();
 }
 
 

eeschema/dialogs/dialog_erc.h

@@ -49,8 +49,6 @@ public:
     DIALOG_ERC( SCH_EDIT_FRAME* parent );
     ~DIALOG_ERC();
 
-    bool TransferDataToWindow() override;
-
     // PROGRESS_REPORTER_BASE calls
     bool updateUI() override;
     void AdvancePhase( const wxString& aMessage ) override;
@@ -68,14 +66,10 @@ public:
      */
     void ExcludeMarker( SCH_MARKER* aMarker = nullptr );
 
-    void UpdateData();
     void UpdateAnnotationWarning();
 
 private:
-    int getSeverities();
-
     // from DIALOG_ERC_BASE:
-    void OnMenu( wxCommandEvent& aEvent ) override;
     void OnCloseErcDialog( wxCloseEvent& event ) override;
     void OnRunERCClick( wxCommandEvent& event ) override;
     void OnDeleteOneClick( wxCommandEvent& event ) override;
@@ -98,6 +92,8 @@ private:
 
     void testErc();
 
+    bool writeReport( const wxString& aFullFileName );
+
     void deleteAllMarkers( bool aIncludeExclusions );
 
     void syncCheckboxes();
@@ -118,8 +114,7 @@ private:
 
     const SCH_MARKER*  m_centerMarkerOnIdle;
 
-    bool               m_crossprobe;
-    bool               m_scroll_on_crossprobe;
+    int                m_severities;
 };
 
 

eeschema/dialogs/dialog_erc_base.cpp

@@ -5,7 +5,6 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/std_bitmap_button.h"
 #include "widgets/wx_html_report_box.h"
 #include "widgets/wx_infobar.h"
 
@@ -30,24 +29,6 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	wxBoxSizer* bMainSizer;
 	bMainSizer = new wxBoxSizer( wxVERTICAL );
 
-	wxGridBagSizer* gbSizerOptions;
-	gbSizerOptions = new wxGridBagSizer( 0, 0 );
-	gbSizerOptions->SetFlexibleDirection( wxBOTH );
-	gbSizerOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-	m_bMenu = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_bMenu->SetMinSize( wxSize( 30,30 ) );
-
-	gbSizerOptions->Add( m_bMenu, wxGBPosition( 0, 2 ), wxGBSpan( 2, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
-
-
-	gbSizerOptions->AddGrowableCol( 0 );
-	gbSizerOptions->AddGrowableCol( 1 );
-	gbSizerOptions->AddGrowableRow( 0 );
-	gbSizerOptions->AddGrowableRow( 1 );
-
-	bMainSizer->Add( gbSizerOptions, 0, wxEXPAND|wxLEFT, 5 );
-
 	m_runningResultsBook = new wxSimplebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	running = new wxPanel( m_runningResultsBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer14;
@@ -214,7 +195,6 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 
 	// Connect Events
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) );
-	m_bMenu->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnMenu ), NULL, this );
 	m_messages->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLinkClicked ), NULL, this );
 	m_markerDataView->Connect( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEventHandler( DIALOG_ERC_BASE::OnERCItemDClick ), NULL, this );
 	m_markerDataView->Connect( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEventHandler( DIALOG_ERC_BASE::OnERCItemRClick ), NULL, this );
@@ -236,7 +216,6 @@ DIALOG_ERC_BASE::~DIALOG_ERC_BASE()
 {
 	// Disconnect Events
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) );
-	m_bMenu->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnMenu ), NULL, this );
 	m_messages->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_ERC_BASE::OnLinkClicked ), NULL, this );
 	m_markerDataView->Disconnect( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, wxDataViewEventHandler( DIALOG_ERC_BASE::OnERCItemDClick ), NULL, this );
 	m_markerDataView->Disconnect( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEventHandler( DIALOG_ERC_BASE::OnERCItemRClick ), NULL, this );

eeschema/dialogs/dialog_erc_base.fbp

@@ -14,7 +14,7 @@
     <property name="embedded_files_path">res</property>
     <property name="encoding">UTF-8</property>
     <property name="file">dialog_erc_base</property>
-    <property name="first_id">7100</property>
+    <property name="first_id">1000</property>
     <property name="internationalize">1</property>
     <property name="lua_skip_events">1</property>
     <property name="lua_ui_table">UI</property>
@@ -135,101 +135,6 @@
             <property name="name">bMainSizer</property>
             <property name="orient">wxVERTICAL</property>
             <property name="permission">none</property>
-            <object class="sizeritem" expanded="true">
-              <property name="border">5</property>
-              <property name="flag">wxEXPAND|wxLEFT</property>
-              <property name="proportion">0</property>
-              <object class="wxGridBagSizer" expanded="true">
-                <property name="empty_cell_size"></property>
-                <property name="flexible_direction">wxBOTH</property>
-                <property name="growablecols">0,1</property>
-                <property name="growablerows">0,1</property>
-                <property name="hgap">0</property>
-                <property name="minimum_size"></property>
-                <property name="name">gbSizerOptions</property>
-                <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                <property name="permission">none</property>
-                <property name="vgap">0</property>
-                <object class="gbsizeritem" expanded="true">
-                  <property name="border">5</property>
-                  <property name="colspan">1</property>
-                  <property name="column">2</property>
-                  <property name="flag">wxALIGN_CENTER_VERTICAL</property>
-                  <property name="row">0</property>
-                  <property name="rowspan">2</property>
-                  <object class="wxBitmapButton" expanded="true">
-                    <property name="BottomDockable">1</property>
-                    <property name="LeftDockable">1</property>
-                    <property name="RightDockable">1</property>
-                    <property name="TopDockable">1</property>
-                    <property name="aui_layer">0</property>
-                    <property name="aui_name"></property>
-                    <property name="aui_position">0</property>
-                    <property name="aui_row">0</property>
-                    <property name="auth_needed">0</property>
-                    <property name="best_size"></property>
-                    <property name="bg"></property>
-                    <property name="bitmap"></property>
-                    <property name="caption"></property>
-                    <property name="caption_visible">1</property>
-                    <property name="center_pane">0</property>
-                    <property name="close_button">1</property>
-                    <property name="context_help"></property>
-                    <property name="context_menu">1</property>
-                    <property name="current"></property>
-                    <property name="default">0</property>
-                    <property name="default_pane">0</property>
-                    <property name="disabled"></property>
-                    <property name="dock">Dock</property>
-                    <property name="dock_fixed">0</property>
-                    <property name="docking">Left</property>
-                    <property name="drag_accept_files">0</property>
-                    <property name="enabled">1</property>
-                    <property name="fg"></property>
-                    <property name="floatable">1</property>
-                    <property name="focus"></property>
-                    <property name="font"></property>
-                    <property name="gripper">0</property>
-                    <property name="hidden">0</property>
-                    <property name="id">wxID_ANY</property>
-                    <property name="label">Refresh Grouping</property>
-                    <property name="margins"></property>
-                    <property name="markup">0</property>
-                    <property name="max_size"></property>
-                    <property name="maximize_button">0</property>
-                    <property name="maximum_size"></property>
-                    <property name="min_size"></property>
-                    <property name="minimize_button">0</property>
-                    <property name="minimum_size">30,30</property>
-                    <property name="moveable">1</property>
-                    <property name="name">m_bMenu</property>
-                    <property name="pane_border">1</property>
-                    <property name="pane_position"></property>
-                    <property name="pane_size"></property>
-                    <property name="permission">protected</property>
-                    <property name="pin_button">1</property>
-                    <property name="pos"></property>
-                    <property name="position"></property>
-                    <property name="pressed"></property>
-                    <property name="resize">Resizable</property>
-                    <property name="show">1</property>
-                    <property name="size"></property>
-                    <property name="style"></property>
-                    <property name="subclass">STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare</property>
-                    <property name="toolbar_pane">0</property>
-                    <property name="tooltip"></property>
-                    <property name="validator_data_type"></property>
-                    <property name="validator_style">wxFILTER_NONE</property>
-                    <property name="validator_type">wxDefaultValidator</property>
-                    <property name="validator_variable"></property>
-                    <property name="window_extra_style"></property>
-                    <property name="window_name"></property>
-                    <property name="window_style"></property>
-                    <event name="OnButtonClick">OnMenu</event>
-                  </object>
-                </object>
-              </object>
-            </object>
             <object class="sizeritem" expanded="true">
               <property name="border">5</property>
               <property name="flag">wxEXPAND|wxTOP|wxRIGHT</property>

eeschema/dialogs/dialog_erc_base.h

@@ -10,7 +10,6 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-class STD_BITMAP_BUTTON;
 class WX_HTML_REPORT_BOX;
 class WX_INFOBAR;
 
@@ -21,16 +20,13 @@ class WX_INFOBAR;
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/bmpbuttn.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/button.h>
-#include <wx/gbsizer.h>
 #include <wx/html/htmlwin.h>
 #include <wx/gauge.h>
 #include <wx/sizer.h>
 #include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
 #include <wx/notebook.h>
 #include <wx/dataview.h>
 #include <wx/listctrl.h>
@@ -39,11 +35,12 @@ class WX_INFOBAR;
 #include <wx/stattext.h>
 #include <wx/checkbox.h>
 #include <widgets/number_badge.h>
+#include <wx/button.h>
 #include <wx/dialog.h>
 
 ///////////////////////////////////////////////////////////////////////////
 
-#define ID_ERASE_DRC_MARKERS 7100
+#define ID_ERASE_DRC_MARKERS 1000
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DIALOG_ERC_BASE
@@ -54,7 +51,6 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
 
 	protected:
 		WX_INFOBAR* m_infoBar;
-		STD_BITMAP_BUTTON* m_bMenu;
 		wxSimplebook* m_runningResultsBook;
 		wxPanel* running;
 		wxNotebook* m_runningNotebook;
@@ -86,7 +82,6 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
 
 		// Virtual event handlers, override them in your derived class
 		virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnMenu( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnLinkClicked( wxHtmlLinkEvent& event ) { event.Skip(); }
 		virtual void OnERCItemDClick( wxDataViewEvent& event ) { event.Skip(); }
 		virtual void OnERCItemRClick( wxDataViewEvent& event ) { event.Skip(); }

eeschema/dialogs/dialog_field_properties.cpp

@@ -175,28 +175,11 @@ DIALOG_FIELD_PROPERTIES::DIALOG_FIELD_PROPERTIES( SCH_BASE_FRAME* aParent, const
         wxString      netlist;
         wxArrayString pins;
 
-        for( SCH_PIN* pin : symbol->GetGraphicalPins( 0 /* all units */, 1 /* single bodyStyle */ ) )
-        {
-            bool valid = false;
-            auto expanded = pin->GetStackedPinNumbers( &valid );
-
-            if( valid && !expanded.empty() )
-            {
-                for( const wxString& num : expanded )
-                    pins.push_back( num + ' ' + pin->GetShownName() );
-            }
-            else
-            {
-                pins.push_back( pin->GetNumber() + ' ' + pin->GetShownName() );
-            }
-        }
+        for( SCH_PIN* pin : symbol->GetPins( 0 /* all units */, 1 /* single bodyStyle */ ) )
+            pins.push_back( pin->GetNumber() + ' ' + pin->GetShownName() );
 
         if( !pins.IsEmpty() )
-        {
-            wxString dbg = wxJoin( pins, '\t' );
-            wxLogTrace( "FOOTPRINT_CHOOSER", wxS( "Chooser payload pins (LIB_SYMBOL): %s" ), dbg );
-            netlist << EscapeString( dbg, CTX_LINE );
-        }
+            netlist << EscapeString( wxJoin( pins, '\t' ), CTX_LINE );
 
         netlist << wxS( "\r" );
 
@@ -230,28 +213,12 @@ DIALOG_FIELD_PROPERTIES::DIALOG_FIELD_PROPERTIES( SCH_BASE_FRAME* aParent, const
 
         if( lib_symbol )
         {
-            for( SCH_PIN* pin : lib_symbol->GetGraphicalPins( 0 /* all units */, 1 /* single bodyStyle */ ) )
-            {
-                bool valid = false;
-                auto expanded = pin->GetStackedPinNumbers( &valid );
-                if( valid && !expanded.empty() )
-                {
-                    for( const wxString& num : expanded )
-                        pins.push_back( num + ' ' + pin->GetShownName() );
-                }
-                else
-                {
-                    pins.push_back( pin->GetNumber() + ' ' + pin->GetShownName() );
-                }
-            }
+            for( SCH_PIN* pin : lib_symbol->GetPins( 0 /* all units */, 1 /* single bodyStyle */ ) )
+                pins.push_back( pin->GetNumber() + ' ' + pin->GetShownName() );
         }
 
         if( !pins.IsEmpty() )
-        {
-            wxString dbg = wxJoin( pins, '\t' );
-            wxLogTrace( "FOOTPRINT_CHOOSER", wxS( "Chooser payload pins (SCH_SYMBOL): %s" ), dbg );
-            netlist << EscapeString( dbg, CTX_LINE );
-        }
+            netlist << EscapeString( wxJoin( pins, '\t' ), CTX_LINE );
 
         netlist << wxS( "\r" );
 

eeschema/dialogs/dialog_lib_fields.h

@@ -17,77 +17,71 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#pragma once
+#ifndef DIALOG_LIB_FIELDS_H
+#define DIALOG_LIB_FIELDS_H
 
-#include <dialog_lib_fields_table_base.h>
+#include <dialog_lib_fields_base.h>
 #include <sch_reference_list.h>
-#include <lib_fields_data_model.h>
+#include <widgets/grid_text_button_helpers.h>
 
 class SYMBOL_EDIT_FRAME;
+class LIB_FIELDS_EDITOR_GRID_DATA_MODEL;
 class LIB_SYMBOL;
 
-
-class DIALOG_LIB_FIELDS_TABLE : public DIALOG_LIB_FIELDS_TABLE_BASE
+class DIALOG_LIB_FIELDS : public DIALOG_LIB_FIELDS_BASE
 {
 public:
-    enum SCOPE : int
-    {
-        SCOPE_LIBRARY = 0,
-        SCOPE_RELATED_SYMBOLS
-    };
+    DIALOG_LIB_FIELDS( SYMBOL_EDIT_FRAME* parent, wxString libId, const wxArrayString& aSymbolNames );
+    ~DIALOG_LIB_FIELDS() override;
 
-    DIALOG_LIB_FIELDS_TABLE( SYMBOL_EDIT_FRAME* parent, DIALOG_LIB_FIELDS_TABLE::SCOPE aScope );
-    ~DIALOG_LIB_FIELDS_TABLE() override;
+    void OnInit();
 
-    bool TransferDataToWindow() override;
+protected:
+    void OnClose( wxCloseEvent& event ) override;
+    void OnColumnItemToggled( wxDataViewEvent& event ) override;
+    void OnFieldsCtrlSelectionChanged( wxDataViewEvent& event ) override;
+    void OnSizeFieldList( wxSizeEvent& event ) override;
+    void OnAddField( wxCommandEvent& event ) override;
+    void OnRenameField( wxCommandEvent& event ) override;
+    void OnRemoveField( wxCommandEvent& event ) override;
+    void OnFilterMouseMoved( wxMouseEvent& event ) override;
+    void OnFilterText( wxCommandEvent& event ) override;
+    void OnRegroupSymbols( wxCommandEvent& event ) override;
+    void OnTableValueChanged( wxGridEvent& event ) override;
+    void OnTableCellClick( wxGridEvent& event ) override;
+    void OnTableItemContextMenu( wxGridEvent& event ) override;
+    void OnTableColSize( wxGridSizeEvent& event ) override;
+    void OnCancel( wxCommandEvent& event ) override;
+    void OnOk( wxCommandEvent& event ) override;
+    void OnApply( wxCommandEvent& event ) override;
     bool TransferDataFromWindow() override;
 
-    void ShowHideColumn( int aCol, bool aShow );
-
 private:
     void UpdateFieldList();
-    void AddField( const wxString& aFieldName, const wxString& aLabelValue, bool show, bool groupBy,
-                   bool addedByUser = false, bool aIsCheckbox = false );
+    void AddField( const wxString& aFieldName, const wxString& aLabelValue, bool show, bool groupBy, bool addedByUser = false, bool aIsCheckbox = false );
     void RemoveField( const wxString& fieldName );
     void RenameField( const wxString& oldName, const wxString& newName );
     void RegroupSymbols();
 
     void OnColSort( wxGridEvent& aEvent );
     void OnColMove( wxGridEvent& aEvent );
+    void OnColLabelChange( wxDataViewEvent& aEvent );
     void SetupColumnProperties( int aCol );
     void SetupAllColumnProperties();
-    void setScope( SCOPE aScope );
 
     void loadSymbols( const wxArrayString& aSymbolNames );
 
-    void OnViewControlsCellChanged( wxGridEvent& aEvent ) override;
-    void OnSizeViewControlsGrid( wxSizeEvent& event ) override;
-    void OnAddField( wxCommandEvent& event ) override;
-    void OnRenameField( wxCommandEvent& event ) override;
-    void OnRemoveField( wxCommandEvent& event ) override;
-
-    void OnFilterMouseMoved( wxMouseEvent& event ) override;
-    void OnFilterText( wxCommandEvent& event ) override;
-    void OnScope( wxCommandEvent& event ) override;
-    void OnRegroupSymbols( wxCommandEvent& event ) override;
-
-    void OnTableValueChanged( wxGridEvent& event ) override;
-    void OnTableCellClick( wxGridEvent& event ) override;
-    void OnTableItemContextMenu( wxGridEvent& event ) override;
-    void OnTableColSize( wxGridSizeEvent& event ) override;
-
-    void OnSidebarToggle( wxCommandEvent& event ) override;
-    void OnCancel( wxCommandEvent& event ) override;
-    void OnOk( wxCommandEvent& event ) override;
-    void OnApply( wxCommandEvent& event ) override;
-    void OnClose( wxCloseEvent& event ) override;
-
-private:
+    wxString                           m_libId;
     SYMBOL_EDIT_FRAME*                 m_parent;
-    SCOPE                              m_scope;
 
-    VIEW_CONTROLS_GRID_DATA_MODEL*     m_viewControlsDataModel;
+    int                                m_fieldNameColWidth;
+    int                                m_labelColWidth;
+    int                                m_showColWidth;
+    int                                m_groupByColWidth;
 
     LIB_FIELDS_EDITOR_GRID_DATA_MODEL* m_dataModel;
     std::vector<LIB_SYMBOL*>           m_symbolsList;
 };
+
+
+#endif // DIALOG_LIB_FIELDS_H

eeschema/dialogs/dialog_lib_fields_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -8,11 +8,11 @@
 #include "widgets/std_bitmap_button.h"
 #include "widgets/wx_grid.h"
 
-#include "dialog_lib_fields_table_base.h"
+#include "dialog_lib_fields_base.h"
 
 ///////////////////////////////////////////////////////////////////////////
 
-DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+DIALOG_LIB_FIELDS_BASE::DIALOG_LIB_FIELDS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
 
@@ -29,41 +29,10 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx
 	wxBoxSizer* bLeftSizer;
 	bLeftSizer = new wxBoxSizer( wxVERTICAL );
 
-	m_viewControlsGrid = new WX_GRID( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_fieldsCtrl = new wxDataViewListCtrl( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_fieldsCtrl->SetMinSize( wxSize( -1,250 ) );
 
-	// Grid
-	m_viewControlsGrid->CreateGrid( 1, 4 );
-	m_viewControlsGrid->EnableEditing( true );
-	m_viewControlsGrid->EnableGridLines( false );
-	m_viewControlsGrid->EnableDragGridSize( false );
-	m_viewControlsGrid->SetMargins( 0, 0 );
-
-	// Columns
-	m_viewControlsGrid->SetColSize( 0, 60 );
-	m_viewControlsGrid->SetColSize( 1, 60 );
-	m_viewControlsGrid->SetColSize( 2, 46 );
-	m_viewControlsGrid->SetColSize( 3, 56 );
-	m_viewControlsGrid->EnableDragColMove( false );
-	m_viewControlsGrid->EnableDragColSize( false );
-	m_viewControlsGrid->SetColLabelValue( 0, _("Field") );
-	m_viewControlsGrid->SetColLabelValue( 1, _("BOM Name") );
-	m_viewControlsGrid->SetColLabelValue( 2, _("Include") );
-	m_viewControlsGrid->SetColLabelValue( 3, _("Group By") );
-	m_viewControlsGrid->SetColLabelSize( 24 );
-	m_viewControlsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
-
-	// Rows
-	m_viewControlsGrid->EnableDragRowSize( false );
-	m_viewControlsGrid->SetRowLabelSize( 0 );
-	m_viewControlsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
-
-	// Label Appearance
-
-	// Cell Defaults
-	m_viewControlsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	m_viewControlsGrid->SetMinSize( wxSize( -1,250 ) );
-
-	bLeftSizer->Add( m_viewControlsGrid, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	bLeftSizer->Add( m_fieldsCtrl, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
 
 	wxBoxSizer* bFieldsButtons;
 	bFieldsButtons = new wxBoxSizer( wxHORIZONTAL );
@@ -81,7 +50,7 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx
 	bFieldsButtons->Add( m_removeFieldButton, 0, wxBOTTOM|wxLEFT, 5 );
 
 
-	bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 );
+	bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND, 5 );
 
 
 	m_leftPanel->SetSizer( bLeftSizer );
@@ -107,15 +76,6 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx
 	m_staticline31 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bControls->Add( m_staticline31, 0, wxEXPAND | wxALL, 3 );
 
-	wxString m_choiceScopeChoices[] = { _("Whole Library"), _("Related Symbols Only") };
-	int m_choiceScopeNChoices = sizeof( m_choiceScopeChoices ) / sizeof( wxString );
-	m_choiceScope = new wxChoice( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceScopeNChoices, m_choiceScopeChoices, 0 );
-	m_choiceScope->SetSelection( 0 );
-	bControls->Add( m_choiceScope, 0, wxALL, 5 );
-
-	m_staticline311 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bControls->Add( m_staticline311, 0, wxEXPAND | wxALL, 5 );
-
 	m_bRefresh = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bRefresh->SetMinSize( wxSize( 30,30 ) );
 
@@ -152,38 +112,35 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx
 
 	bRightSizer->Add( m_grid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
 
+
+	m_rightPanel->SetSizer( bRightSizer );
+	m_rightPanel->Layout();
+	bRightSizer->Fit( m_rightPanel );
+	m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 );
+	bEditSizer->Add( m_splitterMainWindow, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+
+	bMainSizer->Add( bEditSizer, 1, wxEXPAND, 5 );
+
 	wxBoxSizer* bButtonsSizer;
 	bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_sidebarButton = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	bButtonsSizer->Add( m_sidebarButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
 
 	bButtonsSizer->Add( 0, 0, 9, wxEXPAND, 5 );
 
 	m_sdbSizer = new wxStdDialogButtonSizer();
-	m_sdbSizerOK = new wxButton( m_rightPanel, wxID_OK );
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
-	m_sdbSizerApply = new wxButton( m_rightPanel, wxID_APPLY );
+	m_sdbSizerApply = new wxButton( this, wxID_APPLY );
 	m_sdbSizer->AddButton( m_sdbSizerApply );
-	m_sdbSizerCancel = new wxButton( m_rightPanel, wxID_CANCEL );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 
 	bButtonsSizer->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-	bRightSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 );
-
-
-	m_rightPanel->SetSizer( bRightSizer );
-	m_rightPanel->Layout();
-	bRightSizer->Fit( m_rightPanel );
-	m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 );
-	bEditSizer->Add( m_splitterMainWindow, 1, wxEXPAND|wxALL, 5 );
-
-
-	bMainSizer->Add( bEditSizer, 1, wxEXPAND, 5 );
+	bMainSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 );
 
 
 	this->SetSizer( bMainSizer );
@@ -193,56 +150,54 @@ DIALOG_LIB_FIELDS_TABLE_BASE::DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wx
 	this->Centre( wxBOTH );
 
 	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnClose ) );
-	m_viewControlsGrid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this );
-	m_viewControlsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this );
-	m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnAddField ), NULL, this );
-	m_renameFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRenameField ), NULL, this );
-	m_removeFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this );
-	m_filter->Connect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this );
-	m_filter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnFilterText ), NULL, this );
-	m_choiceScope->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnScope ), NULL, this );
-	m_bRefresh->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRegroupSymbols ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableValueChanged ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableItemContextMenu ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCmdCellClick ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCmdCellClick ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnEditorShown ), NULL, this );
-	m_grid->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableSelectCell ), NULL, this );
-	m_sidebarButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this );
-	m_sdbSizerApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnApply ), NULL, this );
-	m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnCancel ), NULL, this );
-	m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnOk ), NULL, this );
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_FIELDS_BASE::OnClose ) );
+	m_fieldsCtrl->Connect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_LIB_FIELDS_BASE::OnColumnItemToggled ), NULL, this );
+	m_fieldsCtrl->Connect( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler( DIALOG_LIB_FIELDS_BASE::OnFieldsCtrlSelectionChanged ), NULL, this );
+	m_fieldsCtrl->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_LIB_FIELDS_BASE::OnSizeFieldList ), NULL, this );
+	m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnAddField ), NULL, this );
+	m_renameFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRenameField ), NULL, this );
+	m_removeFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRemoveField ), NULL, this );
+	m_filter->Connect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_LIB_FIELDS_BASE::OnFilterMouseMoved ), NULL, this );
+	m_filter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnFilterText ), NULL, this );
+	m_bRefresh->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRegroupSymbols ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableValueChanged ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCellClick ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCellClick ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableItemContextMenu ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCmdCellClick ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCmdCellClick ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableColSize ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnEditorShown ), NULL, this );
+	m_grid->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableSelectCell ), NULL, this );
+	m_sdbSizerApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnApply ), NULL, this );
+	m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnCancel ), NULL, this );
+	m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnOk ), NULL, this );
 }
 
-DIALOG_LIB_FIELDS_TABLE_BASE::~DIALOG_LIB_FIELDS_TABLE_BASE()
+DIALOG_LIB_FIELDS_BASE::~DIALOG_LIB_FIELDS_BASE()
 {
 	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnClose ) );
-	m_viewControlsGrid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this );
-	m_viewControlsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this );
-	m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnAddField ), NULL, this );
-	m_renameFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRenameField ), NULL, this );
-	m_removeFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this );
-	m_filter->Disconnect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this );
-	m_filter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnFilterText ), NULL, this );
-	m_choiceScope->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnScope ), NULL, this );
-	m_bRefresh->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnRegroupSymbols ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableValueChanged ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCellClick ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableItemContextMenu ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCmdCellClick ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableCmdCellClick ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableColSize ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnEditorShown ), NULL, this );
-	m_grid->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnTableSelectCell ), NULL, this );
-	m_sidebarButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this );
-	m_sdbSizerApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnApply ), NULL, this );
-	m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnCancel ), NULL, this );
-	m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_TABLE_BASE::OnOk ), NULL, this );
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_LIB_FIELDS_BASE::OnClose ) );
+	m_fieldsCtrl->Disconnect( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEventHandler( DIALOG_LIB_FIELDS_BASE::OnColumnItemToggled ), NULL, this );
+	m_fieldsCtrl->Disconnect( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, wxDataViewEventHandler( DIALOG_LIB_FIELDS_BASE::OnFieldsCtrlSelectionChanged ), NULL, this );
+	m_fieldsCtrl->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_LIB_FIELDS_BASE::OnSizeFieldList ), NULL, this );
+	m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnAddField ), NULL, this );
+	m_renameFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRenameField ), NULL, this );
+	m_removeFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRemoveField ), NULL, this );
+	m_filter->Disconnect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_LIB_FIELDS_BASE::OnFilterMouseMoved ), NULL, this );
+	m_filter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnFilterText ), NULL, this );
+	m_bRefresh->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnRegroupSymbols ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableValueChanged ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCellClick ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCellClick ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableItemContextMenu ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCmdCellClick ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableCmdCellClick ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_COL_SIZE, wxGridSizeEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableColSize ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnEditorShown ), NULL, this );
+	m_grid->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( DIALOG_LIB_FIELDS_BASE::OnTableSelectCell ), NULL, this );
+	m_sdbSizerApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnApply ), NULL, this );
+	m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnCancel ), NULL, this );
+	m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LIB_FIELDS_BASE::OnOk ), NULL, this );
 
 }

eeschema/dialogs/dialog_lib_fields_base.fbp

@@ -13,12 +13,12 @@
     <property name="cpp_use_enum">0</property>
     <property name="embedded_files_path">res</property>
     <property name="encoding">UTF-8</property>
-    <property name="file">dialog_lib_fields_table_base</property>
+    <property name="file">dialog_lib_fields_base</property>
     <property name="first_id">1000</property>
     <property name="internationalize">1</property>
     <property name="lua_skip_events">1</property>
     <property name="lua_ui_table">UI</property>
-    <property name="name">dialog_lib_fields_table_base</property>
+    <property name="name">dialog_lib_fields_base</property>
     <property name="path">.</property>
     <property name="php_disconnect_events">0</property>
     <property name="php_disconnect_mode">source_name</property>
@@ -48,12 +48,12 @@
       <property name="id">wxID_ANY</property>
       <property name="maximum_size"></property>
       <property name="minimum_size">-1,-1</property>
-      <property name="name">DIALOG_LIB_FIELDS_TABLE_BASE</property>
+      <property name="name">DIALOG_LIB_FIELDS_BASE</property>
       <property name="pos"></property>
       <property name="size">-1,-1</property>
       <property name="style">wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER</property>
       <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
-      <property name="title">Library Fields Table (%s)</property>
+      <property name="title">Library Fields Editor</property>
       <property name="tooltip"></property>
       <property name="two_step_creation">0</property>
       <property name="window_extra_style"></property>
@@ -76,7 +76,7 @@
             <property name="permission">none</property>
             <object class="sizeritem" expanded="true">
               <property name="border">5</property>
-              <property name="flag">wxEXPAND|wxALL</property>
+              <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
               <property name="proportion">1</property>
               <object class="wxSplitterWindow" expanded="true">
                 <property name="BottomDockable">1</property>
@@ -194,100 +194,40 @@
                       <property name="name">bLeftSizer</property>
                       <property name="orient">wxVERTICAL</property>
                       <property name="permission">none</property>
-                      <object class="sizeritem" expanded="true">
+                      <object class="sizeritem" expanded="false">
                         <property name="border">5</property>
-                        <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
+                        <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP</property>
                         <property name="proportion">1</property>
-                        <object class="wxGrid" expanded="true">
-                          <property name="BottomDockable">1</property>
-                          <property name="LeftDockable">1</property>
-                          <property name="RightDockable">1</property>
-                          <property name="TopDockable">1</property>
-                          <property name="aui_layer">0</property>
-                          <property name="aui_name"></property>
-                          <property name="aui_position">0</property>
-                          <property name="aui_row">0</property>
-                          <property name="autosize_cols">0</property>
-                          <property name="autosize_rows">0</property>
-                          <property name="best_size"></property>
+                        <object class="wxDataViewListCtrl" expanded="false">
                           <property name="bg"></property>
-                          <property name="caption"></property>
-                          <property name="caption_visible">1</property>
-                          <property name="cell_bg"></property>
-                          <property name="cell_font"></property>
-                          <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
-                          <property name="cell_text"></property>
-                          <property name="cell_vert_alignment">wxALIGN_TOP</property>
-                          <property name="center_pane">0</property>
-                          <property name="close_button">1</property>
-                          <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
-                          <property name="col_label_size">24</property>
-                          <property name="col_label_values">&quot;Field&quot; &quot;BOM Name&quot; &quot;Include&quot; &quot;Group By&quot;</property>
-                          <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
-                          <property name="cols">4</property>
-                          <property name="column_sizes">60,60,46,56</property>
                           <property name="context_help"></property>
                           <property name="context_menu">1</property>
-                          <property name="default_pane">0</property>
-                          <property name="dock">Dock</property>
-                          <property name="dock_fixed">0</property>
-                          <property name="docking">Left</property>
                           <property name="drag_accept_files">0</property>
-                          <property name="drag_col_move">0</property>
-                          <property name="drag_col_size">0</property>
-                          <property name="drag_grid_size">0</property>
-                          <property name="drag_row_size">0</property>
-                          <property name="editing">1</property>
                           <property name="enabled">1</property>
                           <property name="fg"></property>
-                          <property name="floatable">1</property>
                           <property name="font"></property>
-                          <property name="grid_line_color"></property>
-                          <property name="grid_lines">0</property>
-                          <property name="gripper">0</property>
                           <property name="hidden">0</property>
                           <property name="id">wxID_ANY</property>
-                          <property name="label_bg"></property>
-                          <property name="label_font"></property>
-                          <property name="label_text"></property>
-                          <property name="margin_height">0</property>
-                          <property name="margin_width">0</property>
-                          <property name="max_size"></property>
-                          <property name="maximize_button">0</property>
                           <property name="maximum_size"></property>
-                          <property name="min_size"></property>
-                          <property name="minimize_button">0</property>
                           <property name="minimum_size">-1,250</property>
-                          <property name="moveable">1</property>
-                          <property name="name">m_viewControlsGrid</property>
-                          <property name="pane_border">1</property>
-                          <property name="pane_position"></property>
-                          <property name="pane_size"></property>
+                          <property name="name">m_fieldsCtrl</property>
                           <property name="permission">protected</property>
-                          <property name="pin_button">1</property>
                           <property name="pos"></property>
-                          <property name="resize">Resizable</property>
-                          <property name="row_label_horiz_alignment">wxALIGN_CENTER</property>
-                          <property name="row_label_size">0</property>
-                          <property name="row_label_values"></property>
-                          <property name="row_label_vert_alignment">wxALIGN_CENTER</property>
-                          <property name="row_sizes"></property>
-                          <property name="rows">1</property>
-                          <property name="show">1</property>
                           <property name="size"></property>
-                          <property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>
-                          <property name="toolbar_pane">0</property>
+                          <property name="style"></property>
+                          <property name="subclass"></property>
                           <property name="tooltip"></property>
                           <property name="window_extra_style"></property>
                           <property name="window_name"></property>
                           <property name="window_style"></property>
-                          <event name="OnGridCellChange">OnViewControlsCellChanged</event>
-                          <event name="OnSize">OnSizeViewControlsGrid</event>
+                          <event name="OnDataViewListCtrlItemValueChanged">OnColumnItemToggled</event>
+                          <event name="OnDataViewListCtrlSelectionChanged">OnFieldsCtrlSelectionChanged</event>
+                          <event name="OnSize">OnSizeFieldList</event>
                         </object>
                       </object>
                       <object class="sizeritem" expanded="true">
-                        <property name="border">2</property>
-                        <property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
+                        <property name="border">5</property>
+                        <property name="flag">wxEXPAND</property>
                         <property name="proportion">0</property>
                         <object class="wxBoxSizer" expanded="true">
                           <property name="minimum_size"></property>
@@ -728,131 +668,6 @@
                               <property name="window_style"></property>
                             </object>
                           </object>
-                          <object class="sizeritem" expanded="true">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxChoice" expanded="true">
-                              <property name="BottomDockable">1</property>
-                              <property name="LeftDockable">1</property>
-                              <property name="RightDockable">1</property>
-                              <property name="TopDockable">1</property>
-                              <property name="aui_layer">0</property>
-                              <property name="aui_name"></property>
-                              <property name="aui_position">0</property>
-                              <property name="aui_row">0</property>
-                              <property name="best_size"></property>
-                              <property name="bg"></property>
-                              <property name="caption"></property>
-                              <property name="caption_visible">1</property>
-                              <property name="center_pane">0</property>
-                              <property name="choices">&quot;Whole Library&quot; &quot;Related Symbols Only&quot;</property>
-                              <property name="close_button">1</property>
-                              <property name="context_help"></property>
-                              <property name="context_menu">1</property>
-                              <property name="default_pane">0</property>
-                              <property name="dock">Dock</property>
-                              <property name="dock_fixed">0</property>
-                              <property name="docking">Left</property>
-                              <property name="drag_accept_files">0</property>
-                              <property name="enabled">1</property>
-                              <property name="fg"></property>
-                              <property name="floatable">1</property>
-                              <property name="font"></property>
-                              <property name="gripper">0</property>
-                              <property name="hidden">0</property>
-                              <property name="id">wxID_ANY</property>
-                              <property name="max_size"></property>
-                              <property name="maximize_button">0</property>
-                              <property name="maximum_size"></property>
-                              <property name="min_size"></property>
-                              <property name="minimize_button">0</property>
-                              <property name="minimum_size"></property>
-                              <property name="moveable">1</property>
-                              <property name="name">m_choiceScope</property>
-                              <property name="pane_border">1</property>
-                              <property name="pane_position"></property>
-                              <property name="pane_size"></property>
-                              <property name="permission">protected</property>
-                              <property name="pin_button">1</property>
-                              <property name="pos"></property>
-                              <property name="resize">Resizable</property>
-                              <property name="selection">0</property>
-                              <property name="show">1</property>
-                              <property name="size"></property>
-                              <property name="style"></property>
-                              <property name="subclass">; ; forward_declare</property>
-                              <property name="toolbar_pane">0</property>
-                              <property name="tooltip"></property>
-                              <property name="validator_data_type"></property>
-                              <property name="validator_style">wxFILTER_NONE</property>
-                              <property name="validator_type">wxDefaultValidator</property>
-                              <property name="validator_variable"></property>
-                              <property name="window_extra_style"></property>
-                              <property name="window_name"></property>
-                              <property name="window_style"></property>
-                              <event name="OnChoice">OnScope</event>
-                            </object>
-                          </object>
-                          <object class="sizeritem" expanded="true">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND | wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticLine" expanded="true">
-                              <property name="BottomDockable">1</property>
-                              <property name="LeftDockable">1</property>
-                              <property name="RightDockable">1</property>
-                              <property name="TopDockable">1</property>
-                              <property name="aui_layer">0</property>
-                              <property name="aui_name"></property>
-                              <property name="aui_position">0</property>
-                              <property name="aui_row">0</property>
-                              <property name="best_size"></property>
-                              <property name="bg"></property>
-                              <property name="caption"></property>
-                              <property name="caption_visible">1</property>
-                              <property name="center_pane">0</property>
-                              <property name="close_button">1</property>
-                              <property name="context_help"></property>
-                              <property name="context_menu">1</property>
-                              <property name="default_pane">0</property>
-                              <property name="dock">Dock</property>
-                              <property name="dock_fixed">0</property>
-                              <property name="docking">Left</property>
-                              <property name="drag_accept_files">0</property>
-                              <property name="enabled">1</property>
-                              <property name="fg"></property>
-                              <property name="floatable">1</property>
-                              <property name="font"></property>
-                              <property name="gripper">0</property>
-                              <property name="hidden">0</property>
-                              <property name="id">wxID_ANY</property>
-                              <property name="max_size"></property>
-                              <property name="maximize_button">0</property>
-                              <property name="maximum_size"></property>
-                              <property name="min_size"></property>
-                              <property name="minimize_button">0</property>
-                              <property name="minimum_size"></property>
-                              <property name="moveable">1</property>
-                              <property name="name">m_staticline311</property>
-                              <property name="pane_border">1</property>
-                              <property name="pane_position"></property>
-                              <property name="pane_size"></property>
-                              <property name="permission">protected</property>
-                              <property name="pin_button">1</property>
-                              <property name="pos"></property>
-                              <property name="resize">Resizable</property>
-                              <property name="show">1</property>
-                              <property name="size"></property>
-                              <property name="style">wxLI_VERTICAL</property>
-                              <property name="subclass">; ; forward_declare</property>
-                              <property name="toolbar_pane">0</property>
-                              <property name="tooltip"></property>
-                              <property name="window_extra_style"></property>
-                              <property name="window_name"></property>
-                              <property name="window_style"></property>
-                            </object>
-                          </object>
                           <object class="sizeritem" expanded="false">
                             <property name="border">5</property>
                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>
@@ -1028,123 +843,6 @@
                           <event name="OnGridSelectCell">OnTableSelectCell</event>
                         </object>
                       </object>
-                      <object class="sizeritem" expanded="true">
-                        <property name="border">5</property>
-                        <property name="flag">wxEXPAND</property>
-                        <property name="proportion">0</property>
-                        <object class="wxBoxSizer" expanded="true">
-                          <property name="minimum_size"></property>
-                          <property name="name">bButtonsSizer</property>
-                          <property name="orient">wxHORIZONTAL</property>
-                          <property name="permission">none</property>
-                          <object class="sizeritem" expanded="true">
-                            <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
-                            <property name="proportion">0</property>
-                            <object class="wxBitmapButton" expanded="true">
-                              <property name="BottomDockable">1</property>
-                              <property name="LeftDockable">1</property>
-                              <property name="RightDockable">1</property>
-                              <property name="TopDockable">1</property>
-                              <property name="aui_layer">0</property>
-                              <property name="aui_name"></property>
-                              <property name="aui_position">0</property>
-                              <property name="aui_row">0</property>
-                              <property name="auth_needed">0</property>
-                              <property name="best_size"></property>
-                              <property name="bg"></property>
-                              <property name="bitmap"></property>
-                              <property name="caption"></property>
-                              <property name="caption_visible">1</property>
-                              <property name="center_pane">0</property>
-                              <property name="close_button">1</property>
-                              <property name="context_help"></property>
-                              <property name="context_menu">1</property>
-                              <property name="current"></property>
-                              <property name="default">0</property>
-                              <property name="default_pane">0</property>
-                              <property name="disabled"></property>
-                              <property name="dock">Dock</property>
-                              <property name="dock_fixed">0</property>
-                              <property name="docking">Left</property>
-                              <property name="drag_accept_files">0</property>
-                              <property name="enabled">1</property>
-                              <property name="fg"></property>
-                              <property name="floatable">1</property>
-                              <property name="focus"></property>
-                              <property name="font"></property>
-                              <property name="gripper">0</property>
-                              <property name="hidden">0</property>
-                              <property name="id">wxID_ANY</property>
-                              <property name="label">Remove Field...</property>
-                              <property name="margins"></property>
-                              <property name="markup">0</property>
-                              <property name="max_size"></property>
-                              <property name="maximize_button">0</property>
-                              <property name="maximum_size"></property>
-                              <property name="min_size"></property>
-                              <property name="minimize_button">0</property>
-                              <property name="minimum_size"></property>
-                              <property name="moveable">1</property>
-                              <property name="name">m_sidebarButton</property>
-                              <property name="pane_border">1</property>
-                              <property name="pane_position"></property>
-                              <property name="pane_size"></property>
-                              <property name="permission">protected</property>
-                              <property name="pin_button">1</property>
-                              <property name="pos"></property>
-                              <property name="position"></property>
-                              <property name="pressed"></property>
-                              <property name="resize">Resizable</property>
-                              <property name="show">1</property>
-                              <property name="size"></property>
-                              <property name="style"></property>
-                              <property name="subclass">STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare</property>
-                              <property name="toolbar_pane">0</property>
-                              <property name="tooltip"></property>
-                              <property name="validator_data_type"></property>
-                              <property name="validator_style">wxFILTER_NONE</property>
-                              <property name="validator_type">wxDefaultValidator</property>
-                              <property name="validator_variable"></property>
-                              <property name="window_extra_style"></property>
-                              <property name="window_name"></property>
-                              <property name="window_style"></property>
-                              <event name="OnButtonClick">OnSidebarToggle</event>
-                            </object>
-                          </object>
-                          <object class="sizeritem" expanded="false">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">9</property>
-                            <object class="spacer" expanded="false">
-                              <property name="height">0</property>
-                              <property name="permission">protected</property>
-                              <property name="width">0</property>
-                            </object>
-                          </object>
-                          <object class="sizeritem" expanded="false">
-                            <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStdDialogButtonSizer" expanded="false">
-                              <property name="Apply">1</property>
-                              <property name="Cancel">1</property>
-                              <property name="ContextHelp">0</property>
-                              <property name="Help">0</property>
-                              <property name="No">0</property>
-                              <property name="OK">1</property>
-                              <property name="Save">0</property>
-                              <property name="Yes">0</property>
-                              <property name="minimum_size"></property>
-                              <property name="name">m_sdbSizer</property>
-                              <property name="permission">protected</property>
-                              <event name="OnApplyButtonClick">OnApply</event>
-                              <event name="OnCancelButtonClick">OnCancel</event>
-                              <event name="OnOKButtonClick">OnOk</event>
-                            </object>
-                          </object>
-                        </object>
-                      </object>
                     </object>
                   </object>
                 </object>
@@ -1152,6 +850,48 @@
             </object>
           </object>
         </object>
+        <object class="sizeritem" expanded="true">
+          <property name="border">5</property>
+          <property name="flag">wxEXPAND</property>
+          <property name="proportion">0</property>
+          <object class="wxBoxSizer" expanded="true">
+            <property name="minimum_size"></property>
+            <property name="name">bButtonsSizer</property>
+            <property name="orient">wxHORIZONTAL</property>
+            <property name="permission">none</property>
+            <object class="sizeritem" expanded="false">
+              <property name="border">5</property>
+              <property name="flag">wxEXPAND</property>
+              <property name="proportion">9</property>
+              <object class="spacer" expanded="false">
+                <property name="height">0</property>
+                <property name="permission">protected</property>
+                <property name="width">0</property>
+              </object>
+            </object>
+            <object class="sizeritem" expanded="false">
+              <property name="border">5</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+              <property name="proportion">0</property>
+              <object class="wxStdDialogButtonSizer" expanded="false">
+                <property name="Apply">1</property>
+                <property name="Cancel">1</property>
+                <property name="ContextHelp">0</property>
+                <property name="Help">0</property>
+                <property name="No">0</property>
+                <property name="OK">1</property>
+                <property name="Save">0</property>
+                <property name="Yes">0</property>
+                <property name="minimum_size"></property>
+                <property name="name">m_sdbSizer</property>
+                <property name="permission">protected</property>
+                <event name="OnApplyButtonClick">OnApply</event>
+                <event name="OnCancelButtonClick">OnCancel</event>
+                <event name="OnOKButtonClick">OnOk</event>
+              </object>
+            </object>
+          </object>
+        </object>
       </object>
     </object>
   </object>

eeschema/dialogs/dialog_lib_fields_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -14,12 +14,12 @@ class STD_BITMAP_BUTTON;
 class WX_GRID;
 
 #include "dialog_shim.h"
+#include <wx/dataview.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
-#include <wx/gdicmn.h>
 #include <wx/bmpbuttn.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
@@ -29,34 +29,31 @@ class WX_GRID;
 #include <wx/panel.h>
 #include <wx/srchctrl.h>
 #include <wx/statline.h>
-#include <wx/choice.h>
+#include <wx/grid.h>
 #include <wx/splitter.h>
 #include <wx/dialog.h>
 
 ///////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_LIB_FIELDS_TABLE_BASE
+/// Class DIALOG_LIB_FIELDS_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM
+class DIALOG_LIB_FIELDS_BASE : public DIALOG_SHIM
 {
 	private:
 
 	protected:
 		wxSplitterWindow* m_splitterMainWindow;
 		wxPanel* m_leftPanel;
-		WX_GRID* m_viewControlsGrid;
+		wxDataViewListCtrl* m_fieldsCtrl;
 		STD_BITMAP_BUTTON* m_addFieldButton;
 		STD_BITMAP_BUTTON* m_renameFieldButton;
 		STD_BITMAP_BUTTON* m_removeFieldButton;
 		wxPanel* m_rightPanel;
 		wxSearchCtrl* m_filter;
 		wxStaticLine* m_staticline31;
-		wxChoice* m_choiceScope;
-		wxStaticLine* m_staticline311;
 		STD_BITMAP_BUTTON* m_bRefresh;
 		WX_GRID* m_grid;
-		STD_BITMAP_BUTTON* m_sidebarButton;
 		wxStdDialogButtonSizer* m_sdbSizer;
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerApply;
@@ -64,14 +61,14 @@ class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM
 
 		// Virtual event handlers, override them in your derived class
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnViewControlsCellChanged( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSizeViewControlsGrid( wxSizeEvent& event ) { event.Skip(); }
+		virtual void OnColumnItemToggled( wxDataViewEvent& event ) { event.Skip(); }
+		virtual void OnFieldsCtrlSelectionChanged( wxDataViewEvent& event ) { event.Skip(); }
+		virtual void OnSizeFieldList( wxSizeEvent& event ) { event.Skip(); }
 		virtual void OnAddField( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRenameField( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRemoveField( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnFilterMouseMoved( wxMouseEvent& event ) { event.Skip(); }
 		virtual void OnFilterText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnScope( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRegroupSymbols( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnTableValueChanged( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnTableCellClick( wxGridEvent& event ) { event.Skip(); }
@@ -80,7 +77,6 @@ class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM
 		virtual void OnTableColSize( wxGridSizeEvent& event ) { event.Skip(); }
 		virtual void OnEditorShown( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnTableSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSidebarToggle( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOk( wxCommandEvent& event ) { event.Skip(); }
@@ -88,9 +84,9 @@ class DIALOG_LIB_FIELDS_TABLE_BASE : public DIALOG_SHIM
 
 	public:
 
-		DIALOG_LIB_FIELDS_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Fields Table (%s)"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
+		DIALOG_LIB_FIELDS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Library Fields Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
 
-		~DIALOG_LIB_FIELDS_TABLE_BASE();
+		~DIALOG_LIB_FIELDS_BASE();
 
 };
 

eeschema/dialogs/dialog_sch_find.cpp

@@ -133,16 +133,21 @@ void DIALOG_SCH_FIND::onShowSearchPanel( wxHyperlinkEvent& event )
 {
     wxCHECK2( m_frame->GetFrameType() == FRAME_SCH, /* void */ );
 
-    m_frame->GetToolManager()->RunAction( ACTIONS::showSearch );
+    if( static_cast<SCH_EDIT_FRAME*>( m_frame )->IsSearchPaneShown() )
+    {
+        EndModal( wxID_CANCEL );
 
-    EndModal( wxID_CANCEL );
-
-    CallAfter(
-            []()
-            {
-                if( wxWindow* frame = wxWindow::FindWindowByName( SCH_EDIT_FRAME_NAME ) )
-                    static_cast<SCH_EDIT_FRAME*>( frame )->FocusSearch();
-            } );
+        CallAfter(
+                []()
+                {
+                    if( wxWindow* frame = wxWindow::FindWindowByName( SCH_EDIT_FRAME_NAME ) )
+                        static_cast<SCH_EDIT_FRAME*>( frame )->FocusSearch();
+                } );
+    }
+    else
+    {
+        m_frame->GetToolManager()->RunAction( ACTIONS::showSearch );
+    }
 }
 
 

eeschema/dialogs/dialog_sch_find_base.cpp

@@ -149,7 +149,7 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con
 	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bSizer6->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 
-	m_searchPanelLink = new wxHyperlinkCtrl( this, wxID_ANY, _("Show search panel"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_searchPanelLink = new wxHyperlinkCtrl( this, wxID_ANY, _("Show search panel"), wxT("http://www.wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
 	bSizer6->Add( m_searchPanelLink, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 );
 
 

eeschema/dialogs/dialog_sch_find_base.fbp

@@ -1648,7 +1648,7 @@
                 <property name="subclass">; ; forward_declare</property>
                 <property name="toolbar_pane">0</property>
                 <property name="tooltip"></property>
-                <property name="url"></property>
+                <property name="url">http://www.wxformbuilder.org</property>
                 <property name="visited_color"></property>
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>

eeschema/dialogs/dialog_symbol_chooser.h

@@ -77,8 +77,8 @@ public:
      */
     std::vector<std::pair<FIELD_T, wxString>> GetFields() const;
 
-    bool GetKeepSymbol() { return m_keepSymbol->GetValue(); }
-    bool GetPlaceAllUnits() { return m_useUnits->GetValue(); }
+    bool GetKeepSymbol() { return m_keepSymbol; }
+    bool GetPlaceAllUnits() { return m_useUnits; }
 
 public:
     static std::mutex         g_Mutex;

eeschema/dialogs/dialog_symbol_fields_table.cpp

@@ -208,9 +208,7 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
     m_removeFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_trash ) );
     m_renameFieldButton->SetBitmap( KiBitmapBundle( BITMAPS::small_edit ) );
 
-    m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) );
-
-    m_viewControlsDataModel = new VIEW_CONTROLS_GRID_DATA_MODEL( true );
+    m_viewControlsDataModel = new VIEW_CONTROLS_GRID_DATA_MODEL();
 
     m_viewControlsGrid->UseNativeColHeader( true );
     m_viewControlsGrid->SetTable( m_viewControlsDataModel, true );
@@ -269,6 +267,7 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
 
         preset.name = m_job->m_bomPresetName;
         preset.excludeDNP = m_job->m_excludeDNP;
+        preset.includeExcludedFromBOM = m_job->m_includeExcludedFromBOM;
         preset.filterString = m_job->m_filterString;
         preset.sortAsc = m_job->m_sortAsc;
         preset.sortField = m_job->m_sortField;
@@ -329,34 +328,19 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
 
     finishDialogSettings();
 
-    SetSize( wxSize( horizPixelsFromDU( 600 ), vertPixelsFromDU( 300 ) ) );
+    EESCHEMA_SETTINGS::PANEL_FIELD_EDITOR& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
 
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
+    wxSize dlgSize( cfg.width > 0 ? cfg.width : horizPixelsFromDU( 600 ),
+                    cfg.height > 0 ? cfg.height : vertPixelsFromDU( 300 ) );
+    SetSize( dlgSize );
 
     m_nbPages->SetSelection( cfg.page );
 
     m_viewControlsGrid->ShowHideColumns( cfg.view_controls_visible_columns );
-    // Ensure at least one column is visible otherwise we cannot add columns
-    // because there is no area to right click to get the menu managing the show/hide columns
-    wxString visible_column = m_viewControlsGrid->GetShownColumnsAsString();;
-
-    if( visible_column.IsEmpty() )
-    {
-        visible_column = wxT( "0" );
-        m_viewControlsGrid->ShowHideColumns( visible_column );
-    }
 
     CallAfter( [this, cfg]()
                {
-                   if( cfg.sidebar_collapsed )
-                   {
-                       m_splitterMainWindow->Unsplit( m_leftPanel );
-                       m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) );
-                   }
-                   else
-                   {
-                       m_splitterMainWindow->SetSashPosition( cfg.sash_pos );
-                   }
+                   m_splitterMainWindow->SetSashPosition( cfg.sash_pos );
                } );
 
     if( m_job )
@@ -367,8 +351,8 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
     Center();
 
     // Connect Events
-    m_grid->Bind( wxEVT_GRID_COL_SORT, &DIALOG_SYMBOL_FIELDS_TABLE::OnColSort, this );
-    m_grid->Bind( wxEVT_GRID_COL_MOVE, &DIALOG_SYMBOL_FIELDS_TABLE::OnColMove, this );
+    m_grid->Connect( wxEVT_GRID_COL_SORT, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE::OnColSort ), nullptr, this );
+    m_grid->Connect( wxEVT_GRID_COL_MOVE, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE::OnColMove ), nullptr, this );
     m_cbBomPresets->Bind( wxEVT_CHOICE, &DIALOG_SYMBOL_FIELDS_TABLE::onBomPresetChanged, this );
     m_cbBomFmtPresets->Bind( wxEVT_CHOICE, &DIALOG_SYMBOL_FIELDS_TABLE::onBomFmtPresetChanged, this );
     m_viewControlsGrid->Bind( wxEVT_GRID_CELL_CHANGED, &DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged, this );
@@ -384,49 +368,12 @@ DIALOG_SYMBOL_FIELDS_TABLE::DIALOG_SYMBOL_FIELDS_TABLE( SCH_EDIT_FRAME* parent,
         m_grid->EnableEditing( false );
         m_buttonApply->Hide();
         m_buttonExport->Hide();
+
+        SetupStandardButtons();
     }
 }
 
 
-DIALOG_SYMBOL_FIELDS_TABLE::~DIALOG_SYMBOL_FIELDS_TABLE()
-{
-    savePresetsToSchematic();
-    m_schSettings.m_BomExportFileName = m_outputFileName->GetValue();
-
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
-
-    cfg.page = m_nbPages->GetSelection();
-    cfg.view_controls_visible_columns = m_viewControlsGrid->GetShownColumnsAsString();
-
-    cfg.sidebar_collapsed = ( m_splitterMainWindow->GetSashPosition() == 0 );
-
-    if( !cfg.sidebar_collapsed )
-        cfg.sash_pos = m_splitterMainWindow->GetSashPosition();
-
-    for( int i = 0; i < m_grid->GetNumberCols(); i++ )
-    {
-        if( m_grid->IsColShown( i ) )
-        {
-            std::string fieldName( m_dataModel->GetColFieldName( i ).ToUTF8() );
-            cfg.field_widths[fieldName] = m_grid->GetColSize( i );
-        }
-    }
-
-    // Disconnect Events
-    m_grid->Unbind( wxEVT_GRID_COL_SORT, &DIALOG_SYMBOL_FIELDS_TABLE::OnColSort, this );
-    m_grid->Unbind( wxEVT_GRID_COL_SORT, &DIALOG_SYMBOL_FIELDS_TABLE::OnColMove, this );
-    m_cbBomPresets->Unbind( wxEVT_CHOICE, &DIALOG_SYMBOL_FIELDS_TABLE::onBomPresetChanged, this );
-    m_cbBomFmtPresets->Unbind( wxEVT_CHOICE, &DIALOG_SYMBOL_FIELDS_TABLE::onBomFmtPresetChanged, this );
-    m_viewControlsGrid->Unbind( wxEVT_GRID_CELL_CHANGED, &DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged, this );
-
-    // Delete the GRID_TRICKS.
-    m_viewControlsGrid->PopEventHandler( true );
-    m_grid->PopEventHandler( true );
-
-    // we gave ownership of m_viewControlsDataModel & m_dataModel to the wxGrids...
-}
-
-
 void DIALOG_SYMBOL_FIELDS_TABLE::SetupColumnProperties( int aCol )
 {
     wxGridCellAttr* attr = new wxGridCellAttr;
@@ -539,6 +486,28 @@ void DIALOG_SYMBOL_FIELDS_TABLE::SetupAllColumnProperties()
 }
 
 
+DIALOG_SYMBOL_FIELDS_TABLE::~DIALOG_SYMBOL_FIELDS_TABLE()
+{
+    if( EESCHEMA_SETTINGS* cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ) )
+    {
+        cfg->m_FieldEditorPanel.view_controls_visible_columns = m_viewControlsGrid->GetShownColumnsAsString();
+        cfg->m_FieldEditorPanel.sash_pos = m_splitterMainWindow->GetSashPosition();
+    }
+
+    // Disconnect Events
+    m_grid->Disconnect( wxEVT_GRID_COL_SORT, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE::OnColSort ),
+                        nullptr, this );
+    m_grid->Disconnect( wxEVT_GRID_COL_SORT, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE::OnColMove ),
+                        nullptr, this );
+
+    // Delete the GRID_TRICKS.
+    m_viewControlsGrid->PopEventHandler( true );
+    m_grid->PopEventHandler( true );
+
+    // we gave ownership of m_viewControlsDataModel & m_dataModel to the wxGrids...
+}
+
+
 bool DIALOG_SYMBOL_FIELDS_TABLE::TransferDataToWindow()
 {
     if( !wxDialog::TransferDataFromWindow() )
@@ -549,7 +518,7 @@ bool DIALOG_SYMBOL_FIELDS_TABLE::TransferDataToWindow()
     SCH_SELECTION&      selection = selectionTool->GetSelection();
     SCH_SYMBOL*         symbol = nullptr;
 
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
+    EESCHEMA_SETTINGS::PANEL_FIELD_EDITOR& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
 
     switch( cfg.scope )
     {
@@ -881,29 +850,6 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnFilterMouseMoved( wxMouseEvent& aEvent )
 }
 
 
-void DIALOG_SYMBOL_FIELDS_TABLE::setScope( SCOPE aScope )
-{
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
-
-    cfg.scope = aScope;
-
-    m_dataModel->SetPath( m_parent->GetCurrentSheet() );
-    m_dataModel->SetScope( aScope );
-    m_dataModel->RebuildRows();
-}
-
-
-void DIALOG_SYMBOL_FIELDS_TABLE::OnScope( wxCommandEvent& aEvent )
-{
-    switch( aEvent.GetSelection() )
-    {
-    case 0: setScope( SCOPE::SCOPE_ALL );             break;
-    case 1: setScope( SCOPE::SCOPE_SHEET );           break;
-    case 2: setScope( SCOPE::SCOPE_SHEET_RECURSIVE ); break;
-    }
-}
-
-
 void DIALOG_SYMBOL_FIELDS_TABLE::OnGroupSymbolsToggled( wxCommandEvent& event )
 {
     m_dataModel->SetGroupingEnabled( m_groupSymbolsBox->GetValue() );
@@ -916,33 +862,21 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnGroupSymbolsToggled( wxCommandEvent& event )
 
 void DIALOG_SYMBOL_FIELDS_TABLE::OnMenu( wxCommandEvent& event )
 {
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
+    EESCHEMA_SETTINGS::PANEL_FIELD_EDITOR& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
 
     // Build a pop menu:
     wxMenu menu;
 
-    menu.Append( 4204, _( "Include 'DNP' Symbols" ),
-                 _( "Show symbols marked 'DNP' in the table.  This setting also controls whether or not 'DNP' "
-                    "symbols are included on export." ),
-                 wxITEM_CHECK );
-    menu.Check( 4204, !m_dataModel->GetExcludeDNP() );
+    menu.Append( 4204, _( "Include 'DNP' Symbols" ), wxEmptyString, wxITEM_CHECK );
+    menu.Append( 4205, _( "Include 'Exclude from BOM' Symbols" ), wxEmptyString, wxITEM_CHECK );
+    menu.AppendSeparator();
+    menu.Append( 4206, _( "Highlight on Cross Probe" ), wxEmptyString, wxITEM_CHECK );
+    menu.Append( 4207, _( "Select on Cross Probe" ), wxEmptyString, wxITEM_CHECK );
 
-    menu.Append( 4205, _( "Include 'Exclude from BOM' Symbols" ),
-                 _( "Show symbols marked 'Exclude from BOM' in the table.  Symbols marked 'Exclude from BOM' "
-                    "are never included on export." ),
-                 wxITEM_CHECK );
+    menu.Check( 4204, !m_dataModel->GetExcludeDNP() );
     menu.Check( 4205, m_dataModel->GetIncludeExcludedFromBOM() );
 
-    menu.AppendSeparator();
-
-    menu.Append( 4206, _( "Highlight on Cross-probe" ),
-                 _( "Highlight corresponding item on canvas when it is selected in the table" ),
-                 wxITEM_CHECK );
     menu.Check( 4206, cfg.selection_mode == 0 );
-
-    menu.Append( 4207, _( "Select on Cross-probe" ),
-                 _( "Select corresponding item on canvas when it is selected in the table" ),
-                 wxITEM_CHECK );
     menu.Check( 4207, cfg.selection_mode == 1 );
 
     // menu_id is the selected submenu id from the popup menu or wxID_NONE
@@ -958,7 +892,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnMenu( wxCommandEvent& event )
     }
     else if( menu_id == 1 || menu_id == 4205 )
     {
-        m_dataModel->SetIncludeExcludedFromBOM( !m_dataModel->GetIncludeExcludedFromBOM() );
+        m_dataModel->SetExcludeDNP( m_dataModel->GetIncludeExcludedFromBOM() );
         m_dataModel->RebuildRows();
         m_grid->ForceRefresh();
 
@@ -1066,12 +1000,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::ShowHideColumn( int aCol, bool aShow )
     m_dataModel->SetShowColumn( aCol, aShow );
 
     syncBomPresetSelection();
-
-    if( m_nbPages->GetSelection() == 1 )
-        PreviewRefresh();
-    else
-        m_grid->ForceRefresh();
-
+    m_grid->ForceRefresh();
     OnModify();
 }
 
@@ -1095,12 +1024,8 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged( wxGridEvent& aEvent
             m_dataModel->SetColLabelValue( dataCol, label );
             m_grid->SetColLabelValue( dataCol, label );
 
-            if( m_nbPages->GetSelection() == 1 )
-                PreviewRefresh();
-            else
-                m_grid->ForceRefresh();
-
             syncBomPresetSelection();
+            m_grid->ForceRefresh();
             OnModify();
         }
 
@@ -1146,12 +1071,8 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnViewControlsCellChanged( wxGridEvent& aEvent
         m_dataModel->SetGroupColumn( dataCol, value );
         m_dataModel->RebuildRows();
 
-        if( m_nbPages->GetSelection() == 1 )
-            PreviewRefresh();
-        else
-            m_grid->ForceRefresh();
-
         syncBomPresetSelection();
+        m_grid->ForceRefresh();
         OnModify();
         break;
     }
@@ -1184,6 +1105,29 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnRegroupSymbols( wxCommandEvent& aEvent )
 }
 
 
+void DIALOG_SYMBOL_FIELDS_TABLE::setScope( SCOPE aScope )
+{
+    EESCHEMA_SETTINGS::PANEL_FIELD_EDITOR& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
+
+    cfg.scope = aScope;
+
+    m_dataModel->SetPath( m_parent->GetCurrentSheet() );
+    m_dataModel->SetScope( aScope );
+    m_dataModel->RebuildRows();
+}
+
+
+void DIALOG_SYMBOL_FIELDS_TABLE::OnScope( wxCommandEvent& aEvent )
+{
+    switch( aEvent.GetSelection() )
+    {
+    case 0: setScope( SCOPE::SCOPE_ALL );             break;
+    case 1: setScope( SCOPE::SCOPE_SHEET );           break;
+    case 2: setScope( SCOPE::SCOPE_SHEET_RECURSIVE ); break;
+    }
+}
+
+
 void DIALOG_SYMBOL_FIELDS_TABLE::OnTableCellClick( wxGridEvent& event )
 {
     if( m_dataModel->ColIsReference( event.GetCol() ) )
@@ -1202,7 +1146,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnTableCellClick( wxGridEvent& event )
 
 void DIALOG_SYMBOL_FIELDS_TABLE::OnTableRangeSelected( wxGridRangeSelectEvent& aEvent )
 {
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
+    EESCHEMA_SETTINGS::PANEL_FIELD_EDITOR& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
 
     // Cross-probing should only work in Edit page
     if( m_nbPages->GetSelection() != 0 )
@@ -1270,16 +1214,16 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnSizeViewControlsGrid( wxSizeEvent& event )
 
     if( m_viewControlsGrid->IsColShown( DISPLAY_NAME_COLUMN ) && m_viewControlsGrid->IsColShown( LABEL_COLUMN ) )
     {
-        m_viewControlsGrid->SetColSize( DISPLAY_NAME_COLUMN, std::max( remainingWidth / 2, 60 ) );
-        m_viewControlsGrid->SetColSize( LABEL_COLUMN, std::max( remainingWidth - ( remainingWidth / 2 ), 60 ) );
+        m_viewControlsGrid->SetColSize( DISPLAY_NAME_COLUMN, remainingWidth / 2 );
+        m_viewControlsGrid->SetColSize( LABEL_COLUMN, remainingWidth - ( remainingWidth / 2 ) );
     }
     else if( m_viewControlsGrid->IsColShown( DISPLAY_NAME_COLUMN ) )
     {
-        m_viewControlsGrid->SetColSize( DISPLAY_NAME_COLUMN, std::max( remainingWidth, 60 ) );
+        m_viewControlsGrid->SetColSize( DISPLAY_NAME_COLUMN, remainingWidth );
     }
     else if( m_viewControlsGrid->IsColShown( LABEL_COLUMN ) )
     {
-        m_viewControlsGrid->SetColSize( LABEL_COLUMN, std::max( remainingWidth, 60 ) );
+        m_viewControlsGrid->SetColSize( LABEL_COLUMN, remainingWidth );
     }
 
     event.Skip();
@@ -1311,18 +1255,8 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnPreviewRefresh( wxCommandEvent& event )
 
 void DIALOG_SYMBOL_FIELDS_TABLE::PreviewRefresh()
 {
-    bool saveIncludeExcudedFromBOM = m_dataModel->GetIncludeExcludedFromBOM();
-
-    m_dataModel->SetIncludeExcludedFromBOM( false );
     m_dataModel->RebuildRows();
-
     m_textOutput->SetValue( m_dataModel->Export( GetCurrentBomFmtSettings() ) );
-
-    if( saveIncludeExcudedFromBOM )
-    {
-        m_dataModel->SetIncludeExcludedFromBOM( true );
-        m_dataModel->RebuildRows();
-    }
 }
 
 
@@ -1388,27 +1322,6 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnOutputFileBrowseClicked( wxCommandEvent& even
 }
 
 
-void DIALOG_SYMBOL_FIELDS_TABLE::OnSidebarToggle( wxCommandEvent& event )
-{
-    EESCHEMA_SETTINGS::PANEL_SYMBOL_FIELDS_TABLE& cfg = m_parent->eeconfig()->m_FieldEditorPanel;
-
-    if( cfg.sidebar_collapsed )
-    {
-        cfg.sidebar_collapsed = false;
-        m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, cfg.sash_pos );
-        m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::left ) );
-    }
-    else
-    {
-        cfg.sash_pos = m_splitterMainWindow->GetSashPosition();
-
-        cfg.sidebar_collapsed = true;
-        m_splitterMainWindow->Unsplit( m_leftPanel );
-        m_sidebarButton->SetBitmap( KiBitmapBundle( BITMAPS::right ) );
-    }
-}
-
-
 void DIALOG_SYMBOL_FIELDS_TABLE::OnExport( wxCommandEvent& aEvent )
 {
     if( m_dataModel->IsEdited() )
@@ -1520,6 +1433,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnOk( wxCommandEvent& aEvent )
         BOM_PRESET presetFields = m_dataModel->GetBomSettings();
         m_job->m_sortAsc = presetFields.sortAsc;
         m_job->m_excludeDNP = presetFields.excludeDNP;
+        m_job->m_includeExcludedFromBOM = presetFields.includeExcludedFromBOM;
         m_job->m_filterString = presetFields.filterString;
         m_job->m_sortField = presetFields.sortField;
 
@@ -1557,6 +1471,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnClose( wxCloseEvent& aEvent )
         return;
     }
 
+    // This is a cancel, so commit quietly as we're going to throw the results away anyway.
     m_grid->CommitPendingChanges( true );
 
     if( m_dataModel->IsEdited() && aEvent.CanVeto() )
@@ -1574,6 +1489,26 @@ void DIALOG_SYMBOL_FIELDS_TABLE::OnClose( wxCloseEvent& aEvent )
 
     // Stop listening to schematic events
     m_parent->Schematic().RemoveListener( this );
+
+    // Save all our settings since we're really closing
+    savePresetsToSchematic();
+    m_schSettings.m_BomExportFileName = m_outputFileName->GetValue();
+
+    EESCHEMA_SETTINGS* cfg = m_parent->eeconfig();
+
+    cfg->m_FieldEditorPanel.width = GetSize().x;
+    cfg->m_FieldEditorPanel.height = GetSize().y;
+    cfg->m_FieldEditorPanel.page = m_nbPages->GetSelection();
+
+    for( int i = 0; i < m_grid->GetNumberCols(); i++ )
+    {
+        if( m_grid->IsColShown( i ) )
+        {
+            std::string fieldName( m_dataModel->GetColFieldName( i ).ToUTF8() );
+            cfg->m_FieldEditorPanel.field_widths[fieldName] = m_grid->GetColSize( i );
+        }
+    }
+
     m_parent->ClearFocus();
 
     wxCommandEvent* evt = new wxCommandEvent( EDA_EVT_CLOSE_DIALOG_SYMBOL_FIELDS_TABLE, wxID_ANY );
@@ -2007,11 +1942,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::doApplyBomPreset( const BOM_PRESET& aPreset )
     // and labels are right, then we refresh the shown grid data to match
     m_dataModel->EnableRebuilds();
     m_dataModel->RebuildRows();
-
-    if( m_nbPages->GetSelection() == 1 )
-        PreviewRefresh();
-    else
-        m_grid->ForceRefresh();
+    m_grid->ForceRefresh();
 }
 
 
@@ -2096,11 +2027,12 @@ void DIALOG_SYMBOL_FIELDS_TABLE::rebuildBomFmtPresetsWidget()
     int idx = 0;
     int default_idx = 0;
 
-    for( const auto& [presetName, preset] : m_bomFmtPresets )
+    for( std::pair<const wxString, BOM_FMT_PRESET>& pair : m_bomFmtPresets )
     {
-        m_cbBomFmtPresets->Append( wxGetTranslation( presetName ), (void*) &preset );
+        m_cbBomFmtPresets->Append( wxGetTranslation( pair.first ),
+                                   static_cast<void*>( &pair.second ) );
 
-        if( presetName == BOM_FMT_PRESET::CSV().name )
+        if( pair.first == BOM_FMT_PRESET::CSV().name )
             default_idx = idx;
 
         idx++;

eeschema/dialogs/dialog_symbol_fields_table.h

@@ -22,7 +22,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#pragma once
+#ifndef DIALOG_SYMBOL_FIELDS_TABLE_H
+#define DIALOG_SYMBOL_FIELDS_TABLE_H
+
 
 #include <dialog_symbol_fields_table_base.h>
 #include <sch_reference_list.h>
@@ -64,35 +66,32 @@ private:
 
     void OnViewControlsCellChanged( wxGridEvent& aEvent ) override;
     void OnSizeViewControlsGrid( wxSizeEvent& event ) override;
-    void OnAddField( wxCommandEvent& event ) override;
-    void OnRemoveField( wxCommandEvent& event ) override;
-    void OnRenameField( wxCommandEvent& event ) override;
 
     void OnColSort( wxGridEvent& aEvent );
     void OnColMove( wxGridEvent& aEvent );
     void OnTableRangeSelected( wxGridRangeSelectEvent& aEvent );
 
-    void OnFilterText( wxCommandEvent& aEvent ) override;
-    void OnFilterMouseMoved( wxMouseEvent& event ) override;
-    void OnScope( wxCommandEvent& event ) override;
+	void OnScope( wxCommandEvent& event ) override;
     void OnGroupSymbolsToggled( wxCommandEvent& event ) override;
     void OnRegroupSymbols( wxCommandEvent& aEvent ) override;
-    void OnMenu( wxCommandEvent& event ) override;
-
     void OnTableValueChanged( wxGridEvent& event ) override;
     void OnTableCellClick( wxGridEvent& event ) override;
     void OnTableColSize( wxGridSizeEvent& event ) override;
-
-    void OnSidebarToggle( wxCommandEvent& event ) override;
+    void OnAddField( wxCommandEvent& event ) override;
+    void OnRemoveField( wxCommandEvent& event ) override;
+    void OnRenameField( wxCommandEvent& event ) override;
     void OnExport( wxCommandEvent& aEvent ) override;
     void OnSaveAndContinue( wxCommandEvent& aEvent ) override;
     void OnCancel( wxCommandEvent& aEvent ) override;
-    void OnOk( wxCommandEvent& aEvent ) override;
     void OnClose( wxCloseEvent& aEvent ) override;
+    void OnOk( wxCommandEvent& aEvent ) override;
+    void OnFilterText( wxCommandEvent& aEvent ) override;
+    void OnFilterMouseMoved( wxMouseEvent& event ) override;
 
     void OnOutputFileBrowseClicked( wxCommandEvent& event ) override;
     void OnPageChanged( wxNotebookEvent& event ) override;
     void OnPreviewRefresh( wxCommandEvent& event ) override;
+    void OnMenu( wxCommandEvent& event ) override;
     void PreviewRefresh();
 
     std::vector<BOM_PRESET> GetUserBomPresets() const;
@@ -162,3 +161,5 @@ private:
 
     JOB_EXPORT_SCH_BOM* m_job;
 };
+
+#endif /* DIALOG_SYMBOL_FIELDS_TABLE_H */

eeschema/dialogs/dialog_symbol_fields_table_base.cpp

@@ -19,16 +19,18 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	wxBoxSizer* bMainSizer;
 	bMainSizer = new wxBoxSizer( wxVERTICAL );
 
-	m_splitterMainWindow = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME );
+	m_nbPages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_panelEdit = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bEditSizer;
+	bEditSizer = new wxBoxSizer( wxVERTICAL );
+
+	m_splitterMainWindow = new wxSplitterWindow( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME );
 	m_splitterMainWindow->SetMinimumPaneSize( 120 );
 
 	m_leftPanel = new wxPanel( m_splitterMainWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bLeftSizer;
 	bLeftSizer = new wxBoxSizer( wxVERTICAL );
 
-	wxBoxSizer* bMargins;
-	bMargins = new wxBoxSizer( wxVERTICAL );
-
 	m_viewControlsGrid = new WX_GRID( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
 	// Grid
@@ -39,8 +41,8 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	m_viewControlsGrid->SetMargins( 0, 0 );
 
 	// Columns
-	m_viewControlsGrid->SetColSize( 0, 60 );
-	m_viewControlsGrid->SetColSize( 1, 60 );
+	m_viewControlsGrid->SetColSize( 0, 80 );
+	m_viewControlsGrid->SetColSize( 1, 80 );
 	m_viewControlsGrid->SetColSize( 2, 46 );
 	m_viewControlsGrid->SetColSize( 3, 56 );
 	m_viewControlsGrid->EnableDragColMove( false );
@@ -63,7 +65,7 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	m_viewControlsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_viewControlsGrid->SetMinSize( wxSize( -1,250 ) );
 
-	bMargins->Add( m_viewControlsGrid, 1, wxEXPAND|wxTOP|wxLEFT, 5 );
+	bLeftSizer->Add( m_viewControlsGrid, 1, wxALL|wxEXPAND, 5 );
 
 	wxBoxSizer* bFieldsButtons;
 	bFieldsButtons = new wxBoxSizer( wxHORIZONTAL );
@@ -87,17 +89,17 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	bFieldsButtons->Add( m_removeFieldButton, 0, wxBOTTOM|wxLEFT, 5 );
 
 
-	bMargins->Add( bFieldsButtons, 0, wxEXPAND|wxTOP, 5 );
+	bLeftSizer->Add( bFieldsButtons, 0, wxEXPAND, 5 );
 
 	wxBoxSizer* bPresets;
 	bPresets = new wxBoxSizer( wxVERTICAL );
 
-	m_staticline11 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bPresets->Add( m_staticline11, 0, wxEXPAND|wxBOTTOM, 5 );
+	m_staticline1 = new wxStaticLine( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bPresets->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	m_bomPresetsLabel = new wxStaticText( m_leftPanel, wxID_ANY, _("View presets:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_bomPresetsLabel->Wrap( -1 );
-	bPresets->Add( m_bomPresetsLabel, 0, 0, 5 );
+	bPresets->Add( m_bomPresetsLabel, 0, wxRIGHT|wxLEFT, 5 );
 
 
 	bPresets->Add( 0, 2, 0, 0, 5 );
@@ -106,13 +108,10 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	int m_cbBomPresetsNChoices = sizeof( m_cbBomPresetsChoices ) / sizeof( wxString );
 	m_cbBomPresets = new wxChoice( m_leftPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbBomPresetsNChoices, m_cbBomPresetsChoices, 0 );
 	m_cbBomPresets->SetSelection( 0 );
-	bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxBOTTOM, 2 );
+	bPresets->Add( m_cbBomPresets, 0, wxEXPAND|wxRIGHT|wxLEFT, 4 );
 
 
-	bMargins->Add( bPresets, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-	bLeftSizer->Add( bMargins, 1, wxEXPAND|wxALL, 5 );
+	bLeftSizer->Add( bPresets, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 
 
 	m_leftPanel->SetSizer( bLeftSizer );
@@ -122,15 +121,10 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	wxBoxSizer* bRightSizer;
 	bRightSizer = new wxBoxSizer( wxVERTICAL );
 
-	m_nbPages = new wxNotebook( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelEdit = new wxPanel( m_nbPages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bEditSizer;
-	bEditSizer = new wxBoxSizer( wxVERTICAL );
-
 	wxBoxSizer* bControls;
 	bControls = new wxBoxSizer( wxHORIZONTAL );
 
-	m_filter = new wxSearchCtrl( m_panelEdit, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_filter = new wxSearchCtrl( m_rightPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	#ifndef __WXMAC__
 	m_filter->ShowSearchButton( true );
 	#endif
@@ -140,41 +134,41 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 
 	bControls->Add( m_filter, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-	m_staticline31 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	m_staticline31 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bControls->Add( m_staticline31, 0, wxEXPAND | wxALL, 3 );
 
 	wxString m_scopeChoices[] = { _("Entire Project"), _("Current Sheet Only"), _("Current Sheet and Down") };
 	int m_scopeNChoices = sizeof( m_scopeChoices ) / sizeof( wxString );
-	m_scope = new wxChoice( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scopeNChoices, m_scopeChoices, 0 );
+	m_scope = new wxChoice( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scopeNChoices, m_scopeChoices, 0 );
 	m_scope->SetSelection( 0 );
 	bControls->Add( m_scope, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_staticline311 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	m_staticline311 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bControls->Add( m_staticline311, 0, wxEXPAND | wxALL, 5 );
 
-	m_groupSymbolsBox = new wxCheckBox( m_panelEdit, wxID_ANY, _("Group symbols"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_groupSymbolsBox = new wxCheckBox( m_rightPanel, wxID_ANY, _("Group symbols"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_groupSymbolsBox->SetValue(true);
 	m_groupSymbolsBox->SetToolTip( _("Group symbols together based on common properties") );
 
 	bControls->Add( m_groupSymbolsBox, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 8 );
 
-	m_staticline3 = new wxStaticLine( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	m_staticline3 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bControls->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 3 );
 
-	m_bRefresh = new STD_BITMAP_BUTTON( m_panelEdit, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bRefresh = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bRefresh->SetMinSize( wxSize( 30,30 ) );
 
 	bControls->Add( m_bRefresh, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
-	m_bMenu = new STD_BITMAP_BUTTON( m_panelEdit, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	m_bMenu = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bMenu->SetMinSize( wxSize( 30,30 ) );
 
-	bControls->Add( m_bMenu, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	bControls->Add( m_bMenu, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
 
-	bEditSizer->Add( bControls, 0, wxEXPAND|wxLEFT|wxTOP, 5 );
+	bRightSizer->Add( bControls, 0, wxEXPAND|wxLEFT|wxTOP, 5 );
 
-	m_grid = new WX_GRID( m_panelEdit, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_grid = new WX_GRID( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
 	// Grid
 	m_grid->CreateGrid( 5, 5 );
@@ -200,7 +194,17 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER );
 	m_grid->SetMinSize( wxSize( 400,200 ) );
 
-	bEditSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
+	bRightSizer->Add( m_grid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
+
+	m_staticline7 = new wxStaticLine( m_rightPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bRightSizer->Add( m_staticline7, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+
+	m_rightPanel->SetSizer( bRightSizer );
+	m_rightPanel->Layout();
+	bRightSizer->Fit( m_rightPanel );
+	m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 );
+	bEditSizer->Add( m_splitterMainWindow, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
 
 
 	m_panelEdit->SetSizer( bEditSizer );
@@ -327,43 +331,31 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	gbExport->Fit( m_panelExport );
 	m_nbPages->AddPage( m_panelExport, _("Export"), false );
 
-	bRightSizer->Add( m_nbPages, 1, wxEXPAND|wxALL, 5 );
+	bMainSizer->Add( m_nbPages, 1, wxEXPAND | wxALL, 5 );
 
 	wxBoxSizer* bButtonsSizer;
 	bButtonsSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_sidebarButton = new STD_BITMAP_BUTTON( m_rightPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_sidebarButton->SetToolTip( _("Add a new field") );
-
-	bButtonsSizer->Add( m_sidebarButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
 
 	bButtonsSizer->Add( 0, 0, 9, wxEXPAND, 5 );
 
-	m_buttonExport = new wxButton( m_rightPanel, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonExport = new wxButton( this, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
 	bButtonsSizer->Add( m_buttonExport, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
 
-	m_buttonApply = new wxButton( m_rightPanel, wxID_ANY, _("Apply, Save Schematic && Continue"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonApply = new wxButton( this, wxID_ANY, _("Apply, Save Schematic && Continue"), wxDefaultPosition, wxDefaultSize, 0 );
 	bButtonsSizer->Add( m_buttonApply, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 );
 
 	m_sdbSizer = new wxStdDialogButtonSizer();
-	m_sdbSizerOK = new wxButton( m_rightPanel, wxID_OK );
+	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
-	m_sdbSizerCancel = new wxButton( m_rightPanel, wxID_CANCEL );
+	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
 
 	bButtonsSizer->Add( m_sdbSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
-	bRightSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 );
-
-
-	m_rightPanel->SetSizer( bRightSizer );
-	m_rightPanel->Layout();
-	bRightSizer->Fit( m_rightPanel );
-	m_splitterMainWindow->SplitVertically( m_leftPanel, m_rightPanel, -1 );
-	bMainSizer->Add( m_splitterMainWindow, 1, wxEXPAND, 5 );
+	bMainSizer->Add( bButtonsSizer, 0, wxEXPAND, 5 );
 
 
 	this->SetSizer( bMainSizer );
@@ -374,12 +366,12 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 
 	// Connect Events
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnClose ) );
+	m_nbPages->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this );
 	m_viewControlsGrid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this );
 	m_viewControlsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this );
 	m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnAddField ), NULL, this );
 	m_renameFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRenameField ), NULL, this );
 	m_removeFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this );
-	m_nbPages->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this );
 	m_filter->Connect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this );
 	m_filter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterText ), NULL, this );
 	m_scope->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScope ), NULL, this );
@@ -398,7 +390,6 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::DIALOG_SYMBOL_FIELDS_TABLE_BASE( wxWindow* pare
 	m_checkKeepLineBreaks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this );
 	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnOutputFileBrowseClicked ), NULL, this );
 	m_bRefreshPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this );
-	m_sidebarButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this );
 	m_buttonExport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExport ), NULL, this );
 	m_buttonApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSaveAndContinue ), NULL, this );
 	m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnCancel ), NULL, this );
@@ -409,12 +400,12 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::~DIALOG_SYMBOL_FIELDS_TABLE_BASE()
 {
 	// Disconnect Events
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnClose ) );
+	m_nbPages->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this );
 	m_viewControlsGrid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnViewControlsCellChanged ), NULL, this );
 	m_viewControlsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSizeViewControlsGrid ), NULL, this );
 	m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnAddField ), NULL, this );
 	m_renameFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRenameField ), NULL, this );
 	m_removeFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnRemoveField ), NULL, this );
-	m_nbPages->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPageChanged ), NULL, this );
 	m_filter->Disconnect( wxEVT_MOTION, wxMouseEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterMouseMoved ), NULL, this );
 	m_filter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnFilterText ), NULL, this );
 	m_scope->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnScope ), NULL, this );
@@ -433,7 +424,6 @@ DIALOG_SYMBOL_FIELDS_TABLE_BASE::~DIALOG_SYMBOL_FIELDS_TABLE_BASE()
 	m_checkKeepLineBreaks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this );
 	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnOutputFileBrowseClicked ), NULL, this );
 	m_bRefreshPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnPreviewRefresh ), NULL, this );
-	m_sidebarButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSidebarToggle ), NULL, this );
 	m_buttonExport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnExport ), NULL, this );
 	m_buttonApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnSaveAndContinue ), NULL, this );
 	m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYMBOL_FIELDS_TABLE_BASE::OnCancel ), NULL, this );

eeschema/dialogs/dialog_symbol_fields_table_base.h

@@ -32,10 +32,10 @@ class WX_GRID;
 #include <wx/panel.h>
 #include <wx/srchctrl.h>
 #include <wx/checkbox.h>
+#include <wx/splitter.h>
 #include <wx/textctrl.h>
 #include <wx/gbsizer.h>
 #include <wx/notebook.h>
-#include <wx/splitter.h>
 #include <wx/dialog.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -48,18 +48,18 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM
 	private:
 
 	protected:
+		wxNotebook* m_nbPages;
+		wxPanel* m_panelEdit;
 		wxSplitterWindow* m_splitterMainWindow;
 		wxPanel* m_leftPanel;
 		WX_GRID* m_viewControlsGrid;
 		STD_BITMAP_BUTTON* m_addFieldButton;
 		STD_BITMAP_BUTTON* m_renameFieldButton;
 		STD_BITMAP_BUTTON* m_removeFieldButton;
-		wxStaticLine* m_staticline11;
+		wxStaticLine* m_staticline1;
 		wxStaticText* m_bomPresetsLabel;
 		wxChoice* m_cbBomPresets;
 		wxPanel* m_rightPanel;
-		wxNotebook* m_nbPages;
-		wxPanel* m_panelEdit;
 		wxSearchCtrl* m_filter;
 		wxStaticLine* m_staticline31;
 		wxChoice* m_scope;
@@ -69,6 +69,7 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM
 		STD_BITMAP_BUTTON* m_bRefresh;
 		STD_BITMAP_BUTTON* m_bMenu;
 		WX_GRID* m_grid;
+		wxStaticLine* m_staticline7;
 		wxPanel* m_panelExport;
 		wxStaticText* m_labelFieldDelimiter;
 		wxTextCtrl* m_textFieldDelimiter;
@@ -89,7 +90,6 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM
 		wxStaticText* m_labelPreview;
 		STD_BITMAP_BUTTON* m_bRefreshPreview;
 		wxTextCtrl* m_textOutput;
-		STD_BITMAP_BUTTON* m_sidebarButton;
 		wxButton* m_buttonExport;
 		wxButton* m_buttonApply;
 		wxStdDialogButtonSizer* m_sdbSizer;
@@ -98,12 +98,12 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM
 
 		// Virtual event handlers, override them in your derived class
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void OnViewControlsCellChanged( wxGridEvent& event ) { event.Skip(); }
 		virtual void OnSizeViewControlsGrid( wxSizeEvent& event ) { event.Skip(); }
 		virtual void OnAddField( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRenameField( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRemoveField( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void OnFilterMouseMoved( wxMouseEvent& event ) { event.Skip(); }
 		virtual void OnFilterText( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnScope( wxCommandEvent& event ) { event.Skip(); }
@@ -115,7 +115,6 @@ class DIALOG_SYMBOL_FIELDS_TABLE_BASE : public DIALOG_SHIM
 		virtual void OnTableColSize( wxGridSizeEvent& event ) { event.Skip(); }
 		virtual void OnPreviewRefresh( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOutputFileBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSidebarToggle( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnExport( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnSaveAndContinue( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }

eeschema/dialogs/panel_eeschema_display_options.cpp

@@ -75,7 +75,6 @@ void PANEL_EESCHEMA_DISPLAY_OPTIONS::loadEEschemaSettings( EESCHEMA_SETTINGS* cf
     m_checkCrossProbeCenter->SetValue( cfg->m_CrossProbing.center_on_items );
     m_checkCrossProbeZoom->SetValue( cfg->m_CrossProbing.zoom_to_fit );
     m_checkCrossProbeAutoHighlight->SetValue( cfg->m_CrossProbing.auto_highlight );
-    m_checkCrossProbeFlash->SetValue( cfg->m_CrossProbing.flash_selection );
 }
 
 
@@ -118,7 +117,6 @@ bool PANEL_EESCHEMA_DISPLAY_OPTIONS::TransferDataFromWindow()
         cfg->m_CrossProbing.center_on_items = m_checkCrossProbeCenter->GetValue();
         cfg->m_CrossProbing.zoom_to_fit = m_checkCrossProbeZoom->GetValue();
         cfg->m_CrossProbing.auto_highlight = m_checkCrossProbeAutoHighlight->GetValue();
-    cfg->m_CrossProbing.flash_selection = m_checkCrossProbeFlash->GetValue();
     }
 
     m_galOptsPanel->TransferDataFromWindow();

eeschema/dialogs/panel_eeschema_display_options_base.cpp

@@ -62,10 +62,6 @@ PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE::PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE( wxWind
 
 	bCrossProbingSizer->Add( m_checkCrossProbeAutoHighlight, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
-	m_checkCrossProbeFlash = new wxCheckBox( this, wxID_ANY, _("Flash cross-probed selection"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkCrossProbeFlash->SetToolTip( _("Temporarily flash the newly cross-probed selection 3 times") );
-	bCrossProbingSizer->Add( m_checkCrossProbeFlash, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
 
 	bSizer8->Add( bCrossProbingSizer, 0, wxEXPAND|wxTOP|wxLEFT, 5 );
 

eeschema/dialogs/panel_eeschema_display_options_base.fbp

@@ -293,71 +293,6 @@
                         <property name="window_name"></property>
                         <property name="window_style"></property>
                       </object>
-                      <object class="sizeritem" expanded="false">
-                        <property name="border">5</property>
-                        <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                        <property name="proportion">0</property>
-                        <object class="wxCheckBox" expanded="false">
-                          <property name="BottomDockable">1</property>
-                          <property name="LeftDockable">1</property>
-                          <property name="RightDockable">1</property>
-                          <property name="TopDockable">1</property>
-                          <property name="aui_layer">0</property>
-                          <property name="aui_name"></property>
-                          <property name="aui_position">0</property>
-                          <property name="aui_row">0</property>
-                          <property name="best_size"></property>
-                          <property name="bg"></property>
-                          <property name="caption"></property>
-                          <property name="caption_visible">1</property>
-                          <property name="center_pane">0</property>
-                          <property name="checked">1</property>
-                          <property name="close_button">1</property>
-                          <property name="context_help"></property>
-                          <property name="context_menu">1</property>
-                          <property name="default_pane">0</property>
-                          <property name="dock">Dock</property>
-                          <property name="dock_fixed">0</property>
-                          <property name="docking">Left</property>
-                          <property name="drag_accept_files">0</property>
-                          <property name="enabled">1</property>
-                          <property name="fg"></property>
-                          <property name="floatable">1</property>
-                          <property name="font"></property>
-                          <property name="gripper">0</property>
-                          <property name="hidden">0</property>
-                          <property name="id">wxID_ANY</property>
-                          <property name="label">Flash cross-probed selection</property>
-                          <property name="max_size"></property>
-                          <property name="maximize_button">0</property>
-                          <property name="maximum_size"></property>
-                          <property name="min_size"></property>
-                          <property name="minimize_button">0</property>
-                          <property name="minimum_size"></property>
-                          <property name="moveable">1</property>
-                          <property name="name">m_checkCrossProbeFlash</property>
-                          <property name="pane_border">1</property>
-                          <property name="pane_position"></property>
-                          <property name="pane_size"></property>
-                          <property name="permission">protected</property>
-                          <property name="pin_button">1</property>
-                          <property name="pos"></property>
-                          <property name="resize">Resizable</property>
-                          <property name="show">1</property>
-                          <property name="size"></property>
-                          <property name="style"></property>
-                          <property name="subclass">; ; forward_declare</property>
-                          <property name="toolbar_pane">0</property>
-                          <property name="tooltip">Temporarily flash the newly cross-probed selection 3 times</property>
-                          <property name="validator_data_type"></property>
-                          <property name="validator_style">wxFILTER_NONE</property>
-                          <property name="validator_type">wxDefaultValidator</property>
-                          <property name="validator_variable"></property>
-                          <property name="window_extra_style"></property>
-                          <property name="window_name"></property>
-                          <property name="window_style"></property>
-                        </object>
-                      </object>
                     </object>
                     <object class="sizeritem" expanded="false">
                       <property name="border">5</property>

eeschema/dialogs/panel_eeschema_display_options_base.h

@@ -44,7 +44,6 @@ class PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE : public RESETTABLE_PANEL
 		wxCheckBox* m_checkCrossProbeCenter;
 		wxCheckBox* m_checkCrossProbeZoom;
 		wxCheckBox* m_checkCrossProbeAutoHighlight;
-		wxCheckBox* m_checkCrossProbeFlash;
 		wxStaticText* m_appearanceLabel;
 		wxStaticLine* m_staticline1;
 		wxStaticText* m_defaultFontLabel;

eeschema/dialogs/panel_sym_lib_table.cpp

@@ -38,7 +38,6 @@
 #include <lib_table_grid.h>
 #include <wildcards_and_files_ext.h>
 #include <env_paths.h>
-#include <functional>
 #include <eeschema_id.h>
 #include <symbol_edit_frame.h>
 #include <symbol_viewer_frame.h>
@@ -154,13 +153,6 @@ public:
     {
     }
 
-    SYMBOL_GRID_TRICKS( DIALOG_EDIT_LIBRARY_TABLES* aParent, WX_GRID* aGrid,
-                        std::function<void( wxCommandEvent& )> aAddHandler ) :
-        LIB_TABLE_GRID_TRICKS( aGrid, aAddHandler ),
-        m_dialog( aParent )
-    {
-    }
-
 protected:
     DIALOG_EDIT_LIBRARY_TABLES* m_dialog;
 
@@ -232,21 +224,8 @@ protected:
         }
         else
         {
-            wxString text = cb_text;
-
-            if( !text.Contains( '\t' ) && text.Contains( ',' ) )
-                text.Replace( ',', '\t' );
-
-            if( text.Contains( '\t' ) )
-            {
-                int row = m_grid->GetGridCursorRow();
-                m_grid->ClearSelection();
-                m_grid->SelectRow( row );
-                m_grid->SetGridCursor( row, 0 );
-                getSelectedArea();
-            }
-
-            GRID_TRICKS::paste_text( text );
+            // paste spreadsheet formatted text.
+            GRID_TRICKS::paste_text( cb_text );
 
             m_grid->AutoSizeColumns( false );
         }
@@ -271,8 +250,7 @@ void PANEL_SYM_LIB_TABLE::setupGrid( WX_GRID* aGrid )
             };
 
     // add Cut, Copy, and Paste to wxGrids
-    aGrid->PushEventHandler( new SYMBOL_GRID_TRICKS( m_parent, aGrid,
-            [this]( wxCommandEvent& event ) { appendRowHandler( event ); } ) );
+    aGrid->PushEventHandler( new SYMBOL_GRID_TRICKS( m_parent, aGrid ) );
 
     aGrid->SetSelectionMode( wxGrid::wxGridSelectRows );
 

eeschema/dialogs/panel_sym_lib_table_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -157,7 +157,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	bButtonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 
 	m_resetGlobal = new wxButton( this, wxID_ANY, _("Reset Libraries"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonsSizer->Add( m_resetGlobal, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	bButtonsSizer->Add( m_resetGlobal, 0, wxALL, 5 );
 
 
 	bButtonsSizer->Add( 0, 0, 0, wxEXPAND, 5 );

eeschema/dialogs/panel_sym_lib_table_base.fbp

@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
-  <FileVersion major="1" minor="18"/>
+  <FileVersion major="1" minor="17"/>
   <object class="Project" expanded="true">
+    <property name="class_decoration"></property>
     <property name="code_generation">C++</property>
-    <property name="cpp_class_decoration"></property>
-    <property name="cpp_disconnect_events">1</property>
-    <property name="cpp_event_generation">connect</property>
-    <property name="cpp_help_provider">none</property>
-    <property name="cpp_namespace"></property>
-    <property name="cpp_precompiled_header"></property>
-    <property name="cpp_use_array_enum">0</property>
-    <property name="cpp_use_enum">0</property>
+    <property name="disconnect_events">1</property>
+    <property name="disconnect_mode">source_name</property>
+    <property name="disconnect_php_events">0</property>
+    <property name="disconnect_python_events">0</property>
     <property name="embedded_files_path">res</property>
     <property name="encoding">UTF-8</property>
+    <property name="event_generation">connect</property>
     <property name="file">panel_sym_lib_table_base</property>
     <property name="first_id">1000</property>
+    <property name="help_provider">none</property>
+    <property name="image_path_wrapper_function_name"></property>
+    <property name="indent_with_spaces"></property>
     <property name="internationalize">1</property>
-    <property name="lua_skip_events">1</property>
-    <property name="lua_ui_table">UI</property>
     <property name="name">sym_lib_table</property>
+    <property name="namespace"></property>
     <property name="path">.</property>
-    <property name="php_disconnect_events">0</property>
-    <property name="php_disconnect_mode">source_name</property>
-    <property name="php_skip_events">1</property>
-    <property name="python_disconnect_events">0</property>
-    <property name="python_disconnect_mode">source_name</property>
-    <property name="python_image_path_wrapper_function_name"></property>
-    <property name="python_indent_with_spaces"></property>
-    <property name="python_skip_events">1</property>
+    <property name="precompiled_header"></property>
     <property name="relative_path">1</property>
+    <property name="skip_lua_events">1</property>
+    <property name="skip_php_events">1</property>
+    <property name="skip_python_events">1</property>
+    <property name="ui_table">UI</property>
+    <property name="use_array_enum">0</property>
+    <property name="use_enum">0</property>
     <property name="use_microsoft_bom">0</property>
-    <property name="use_native_eol">0</property>
     <object class="Panel" expanded="true">
       <property name="aui_managed">0</property>
       <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -70,10 +68,10 @@
             <property name="LeftDockable">1</property>
             <property name="RightDockable">1</property>
             <property name="TopDockable">1</property>
-            <property name="aui_layer">0</property>
+            <property name="aui_layer"></property>
             <property name="aui_name"></property>
-            <property name="aui_position">0</property>
-            <property name="aui_row">0</property>
+            <property name="aui_position"></property>
+            <property name="aui_row"></property>
             <property name="best_size"></property>
             <property name="bg"></property>
             <property name="bitmapsize"></property>
@@ -129,10 +127,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -190,10 +188,10 @@
                       <property name="LeftDockable">1</property>
                       <property name="RightDockable">1</property>
                       <property name="TopDockable">1</property>
-                      <property name="aui_layer">0</property>
+                      <property name="aui_layer"></property>
                       <property name="aui_name"></property>
-                      <property name="aui_position">0</property>
-                      <property name="aui_row">0</property>
+                      <property name="aui_position"></property>
+                      <property name="aui_row"></property>
                       <property name="autosize_cols">0</property>
                       <property name="autosize_rows">1</property>
                       <property name="best_size"></property>
@@ -282,10 +280,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
                 <property name="caption"></property>
@@ -343,10 +341,10 @@
                       <property name="LeftDockable">1</property>
                       <property name="RightDockable">1</property>
                       <property name="TopDockable">1</property>
-                      <property name="aui_layer">0</property>
+                      <property name="aui_layer"></property>
                       <property name="aui_name"></property>
-                      <property name="aui_position">0</property>
-                      <property name="aui_row">0</property>
+                      <property name="aui_position"></property>
+                      <property name="aui_row"></property>
                       <property name="autosize_cols">0</property>
                       <property name="autosize_rows">0</property>
                       <property name="best_size"></property>
@@ -446,10 +444,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -521,10 +519,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -596,10 +594,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -671,10 +669,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -756,10 +754,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -834,17 +832,17 @@
             </object>
             <object class="sizeritem" expanded="true">
               <property name="border">5</property>
-              <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
+              <property name="flag">wxALL</property>
               <property name="proportion">0</property>
               <object class="wxButton" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -926,10 +924,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer">0</property>
+                <property name="aui_layer"></property>
                 <property name="aui_name"></property>
-                <property name="aui_position">0</property>
-                <property name="aui_row">0</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
                 <property name="auth_needed">0</property>
                 <property name="best_size"></property>
                 <property name="bg"></property>
@@ -1013,10 +1011,10 @@
             <property name="LeftDockable">1</property>
             <property name="RightDockable">1</property>
             <property name="TopDockable">1</property>
-            <property name="aui_layer">0</property>
+            <property name="aui_layer"></property>
             <property name="aui_name"></property>
-            <property name="aui_position">0</property>
-            <property name="aui_row">0</property>
+            <property name="aui_position"></property>
+            <property name="aui_row"></property>
             <property name="best_size"></property>
             <property name="bg"></property>
             <property name="caption"></property>
@@ -1085,10 +1083,10 @@
             <property name="LeftDockable">1</property>
             <property name="RightDockable">1</property>
             <property name="TopDockable">1</property>
-            <property name="aui_layer">0</property>
+            <property name="aui_layer"></property>
             <property name="aui_name"></property>
-            <property name="aui_position">0</property>
-            <property name="aui_row">0</property>
+            <property name="aui_position"></property>
+            <property name="aui_row"></property>
             <property name="autosize_cols">1</property>
             <property name="autosize_rows">0</property>
             <property name="best_size"></property>

eeschema/dialogs/panel_sym_lib_table_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
+// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -31,6 +31,7 @@ class WX_GRID;
 
 ///////////////////////////////////////////////////////////////////////////
 
+
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PANEL_SYM_LIB_TABLE_BASE
 ///////////////////////////////////////////////////////////////////////////////

eeschema/eeschema_id.h

@@ -92,10 +92,6 @@ enum id_eeschema_frm
     // to select one unit among MAX_UNIT_COUNT_PER_PACKAGE in popup menu
     ID_POPUP_SCH_SELECT_UNIT_END = ID_POPUP_SCH_SELECT_UNIT1 + MAX_UNIT_COUNT_PER_PACKAGE,
 
-    ID_POPUP_SCH_PLACE_UNIT,
-    ID_POPUP_SCH_PLACE_UNIT1,
-    ID_POPUP_SCH_PLACE_UNIT_END = ID_POPUP_SCH_PLACE_UNIT1 + MAX_UNIT_COUNT_PER_PACKAGE,
-
     ID_POPUP_SCH_SELECT_BODY_STYLE,
     ID_POPUP_SCH_SELECT_BODY_STYLE1,
     ID_POPUP_SCH_SELECT_BODY_STYLE_END = ID_POPUP_SCH_SELECT_BODY_STYLE1 + MAX_BODY_STYLE_PER_PACKAGE,

eeschema/eeschema_jobs_handler.cpp

@@ -668,6 +668,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
         preset.filterString = aBomJob->m_filterString;
         preset.groupSymbols = ( aBomJob->m_fieldsGroupBy.size() > 0 );
         preset.excludeDNP = aBomJob->m_excludeDNP;
+        preset.includeExcludedFromBOM = aBomJob->m_includeExcludedFromBOM;
     }
 
     dataModel.ApplyBomPreset( preset );

eeschema/eeschema_settings.cpp

@@ -189,6 +189,9 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
     m_params.emplace_back( new PARAM<int>( "appearance.edit_label_height",
             &m_Appearance.edit_label_height, -1 ) );
 
+    m_params.emplace_back( new PARAM<int>( "appearance.erc_severities",
+            &m_Appearance.erc_severities, RPT_SEVERITY_ERROR | RPT_SEVERITY_WARNING ) );
+
     m_params.emplace_back( new PARAM<bool>( "appearance.footprint_preview",
             &m_Appearance.footprint_preview, true ) );
 
@@ -508,6 +511,12 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
     m_params.emplace_back( new PARAM_MAP<int>( "field_editor.field_widths",
             &m_FieldEditorPanel.field_widths, {} ) );
 
+    m_params.emplace_back( new PARAM<int>( "field_editor.width",
+            &m_FieldEditorPanel.width, 0 ) );
+
+    m_params.emplace_back( new PARAM<int>( "field_editor.height",
+            &m_FieldEditorPanel.height, 0 ) );
+
     m_params.emplace_back( new PARAM<int>( "field_editor.page",
             &m_FieldEditorPanel.page, 0 ) );
 
@@ -526,9 +535,6 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
     m_params.emplace_back( new PARAM<int>( "field_editor.sash_pos",
             &m_FieldEditorPanel.sash_pos, 400 ) );
 
-    m_params.emplace_back( new PARAM<bool>( "field_editor.sidebar_collapsed",
-            &m_FieldEditorPanel.sidebar_collapsed, false ) );
-
     addParamsForWindow( &m_Simulator.window, "simulator.window", 500, 400 );
 
     m_params.emplace_back( new PARAM<int>( "simulator.plot_panel_width",
@@ -588,12 +594,6 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
     m_params.emplace_back( new PARAM<int>( "symbol_chooser.sort_mode",
             &m_SymChooserPanel.sort_mode, 0 ) );
 
-    m_params.emplace_back( new PARAM<bool>( "ERC.crossprobe",
-            &m_ERCDialog.crossprobe, true ) );
-
-    m_params.emplace_back( new PARAM<bool>( "ERC.scroll_on_crossprobe",
-            &m_ERCDialog.scroll_on_crossprobe, true ) );
-
     m_params.emplace_back( new PARAM<bool>( "import_graphics.interactive_placement",
             &m_ImportGraphics.interactive_placement, true ) );
 

eeschema/eeschema_settings.h

@@ -68,6 +68,7 @@ public:
         int edit_label_width;
         int edit_label_height;
         bool edit_label_multiple;
+        int  erc_severities;
         bool footprint_preview;
         bool print_sheet_reference;
         wxString default_font;
@@ -229,16 +230,17 @@ public:
         std::vector<BOM_PLUGIN_SETTINGS> plugins;
     };
 
-    struct PANEL_SYMBOL_FIELDS_TABLE
+    struct PANEL_FIELD_EDITOR
     {
         std::map<std::string, int> field_widths;
+        int                        width;
+        int                        height;
         int                        page;
         wxString                   export_filename;
         int                        selection_mode;
         int                        scope;
         wxString                   view_controls_visible_columns;
         int                        sash_pos;
-        bool                       sidebar_collapsed;
     };
 
     struct PANEL_LIB_VIEW
@@ -264,12 +266,6 @@ public:
         int  sort_mode;
     };
 
-    struct DIALOG_ERC
-    {
-        bool crossprobe;
-        bool scroll_on_crossprobe;
-    };
-
     struct DIALOG_IMPORT_GRAPHICS
     {
         bool     interactive_placement;
@@ -333,31 +329,40 @@ private:
     static std::vector<NETLIST_PLUGIN_SETTINGS> netlistSettingsFromJson( const nlohmann::json& aObj );
 
 public:
-    APPEARANCE                m_Appearance;
-    AUI_PANELS                m_AuiPanels;
+    APPEARANCE m_Appearance;
 
-    DRAWING                   m_Drawing;
-    INPUT                     m_Input;
-    AUTOPLACE_FIELDS          m_AutoplaceFields;
-    SELECTION                 m_Selection;
+    AUTOPLACE_FIELDS m_AutoplaceFields;
 
-    PAGE_SETTINGS             m_PageSettings;
-    PANEL_ANNOTATE            m_AnnotatePanel;
-    PANEL_BOM                 m_BomPanel;
+    AUI_PANELS m_AuiPanels;
 
-    PANEL_SYMBOL_FIELDS_TABLE m_FieldEditorPanel;
-    PANEL_LIB_VIEW            m_LibViewPanel;
-    PANEL_NETLIST             m_NetlistPanel;
-    PANEL_SYM_CHOOSER         m_SymChooserPanel;
+    DRAWING m_Drawing;
 
-    FIND_REPLACE_EXTRA        m_FindReplaceExtra;
-    DIALOG_ERC                m_ERCDialog;
-    DIALOG_IMPORT_GRAPHICS    m_ImportGraphics;
+    FIND_REPLACE_EXTRA m_FindReplaceExtra;
 
-    SIMULATOR                 m_Simulator;
+    INPUT m_Input;
 
-    bool                      m_RescueNeverShow;
+    PAGE_SETTINGS m_PageSettings;
 
-    wxString                  m_lastSymbolLibDir;
+    PANEL_ANNOTATE m_AnnotatePanel;
+
+    PANEL_BOM m_BomPanel;
+
+    PANEL_FIELD_EDITOR m_FieldEditorPanel;
+
+    PANEL_LIB_VIEW m_LibViewPanel;
+
+    PANEL_NETLIST m_NetlistPanel;
+
+    PANEL_SYM_CHOOSER m_SymChooserPanel;
+
+    DIALOG_IMPORT_GRAPHICS m_ImportGraphics;
+
+    SELECTION m_Selection;
+
+    SIMULATOR m_Simulator;
+
+    bool m_RescueNeverShow;
+
+    wxString m_lastSymbolLibDir;
 };
 

eeschema/erc/erc.cpp

@@ -631,7 +631,7 @@ int ERC_TESTER::TestMissingUnits()
                 }
             }
 
-            for( SCH_PIN* pin : libSymbol->GetGraphicalPins( missing_unit, bodyStyle ) )
+            for( SCH_PIN* pin : libSymbol->GetPins( missing_unit, bodyStyle ) )
             {
                 switch( pin->GetType() )
                 {
@@ -655,19 +655,22 @@ int ERC_TESTER::TestMissingUnits()
 
         if( !missing_power.empty() && m_settings.IsTestEnabled( ERCE_MISSING_POWER_INPUT_PIN ) )
         {
-            report( missing_power, _( "Symbol %s has input power pins in units %s that are not placed" ),
+            report( missing_power,
+                    _( "Symbol %s has input power pins in units %s that are not placed." ),
                     ERCE_MISSING_POWER_INPUT_PIN );
         }
 
         if( !missing_input.empty() && m_settings.IsTestEnabled( ERCE_MISSING_INPUT_PIN ) )
         {
-           report( missing_input, _( "Symbol %s has input pins in units %s that are not placed" ),
+           report( missing_input,
+                   _( "Symbol %s has input pins in units %s that are not placed." ),
                    ERCE_MISSING_INPUT_PIN );
         }
 
         if( !missing_bidi.empty() && m_settings.IsTestEnabled( ERCE_MISSING_BIDI_PIN ) )
         {
-            report( missing_bidi, _( "Symbol %s has bidirectional pins in units %s that are not placed" ),
+            report( missing_bidi,
+                    _( "Symbol %s has bidirectional pins in units %s that are not placed." ),
                     ERCE_MISSING_BIDI_PIN );
         }
     }
@@ -1295,44 +1298,6 @@ int ERC_TESTER::TestGroundPins()
 }
 
 
-int ERC_TESTER::TestStackedPinNotation()
-{
-    int warnings = 0;
-
-    for( const SCH_SHEET_PATH& sheet : m_sheetList )
-    {
-        SCH_SCREEN* screen = sheet.LastScreen();
-
-        for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
-        {
-            SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
-
-            for( SCH_PIN* pin : symbol->GetPins( &sheet ) )
-            {
-                bool valid;
-                pin->GetStackedPinNumbers( &valid );
-
-                if( !valid )
-                {
-                    std::shared_ptr<ERC_ITEM> ercItem =
-                            ERC_ITEM::Create( ERCE_STACKED_PIN_SYNTAX );
-                    ercItem->SetItems( pin );
-                    ercItem->SetSheetSpecificPath( sheet );
-                    ercItem->SetItemsSheetPaths( sheet );
-
-                    SCH_MARKER* marker =
-                            new SCH_MARKER( std::move( ercItem ), pin->GetPosition() );
-                    screen->Append( marker );
-                    warnings++;
-                }
-            }
-        }
-    }
-
-    return warnings;
-}
-
-
 int ERC_TESTER::TestSameLocalGlobalLabel()
 {
     int errCount = 0;
@@ -1562,7 +1527,7 @@ int ERC_TESTER::TestLibSymbolIssues()
                 {
                     std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_LIB_SYMBOL_ISSUES );
                     ercItem->SetItems( symbol );
-                    msg.Printf( _( "The symbol library '%s' was not found at '%s'" ),
+                    msg.Printf( _( "The symbol library '%s' was not found at '%s'." ),
                                 UnescapeString( libName ),
                                 libTableRow->GetFullURI( true ) );
                     ercItem->SetErrorMessage( msg );
@@ -1666,7 +1631,7 @@ int ERC_TESTER::TestFootprintLinkIssues( KIFACE* aCvPcb, PROJECT* aProject )
             if( fpID.Parse( footprint, true ) >= 0 )
             {
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_FOOTPRINT_LINK_ISSUES );
-                msg.Printf( _( "'%s' is not a valid footprint identifier" ), footprint );
+                msg.Printf( _( "'%s' is not a valid footprint identifier." ), footprint );
                 ercItem->SetErrorMessage( msg );
                 ercItem->SetItems( symbol );
                 markers.emplace_back( new SCH_MARKER( std::move( ercItem ), symbol->GetPosition() ) );
@@ -1680,7 +1645,7 @@ int ERC_TESTER::TestFootprintLinkIssues( KIFACE* aCvPcb, PROJECT* aProject )
             if( ret == KIFACE_TEST_FOOTPRINT_LINK_NO_LIBRARY )
             {
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_FOOTPRINT_LINK_ISSUES );
-                msg.Printf( _( "The current configuration does not include the footprint library '%s'" ),
+                msg.Printf( _( "The current configuration does not include the footprint library '%s'." ),
                             libName );
                 ercItem->SetErrorMessage( msg );
                 ercItem->SetItems( symbol );
@@ -1689,7 +1654,7 @@ int ERC_TESTER::TestFootprintLinkIssues( KIFACE* aCvPcb, PROJECT* aProject )
             else if( ret == KIFACE_TEST_FOOTPRINT_LINK_LIBRARY_NOT_ENABLED )
             {
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_FOOTPRINT_LINK_ISSUES );
-                msg.Printf( _( "The footprint library '%s' is not enabled in the current configuration" ),
+                msg.Printf( _( "The footprint library '%s' is not enabled in the current configuration." ),
                             libName );
                 ercItem->SetErrorMessage( msg );
                 ercItem->SetItems( symbol );
@@ -1698,7 +1663,7 @@ int ERC_TESTER::TestFootprintLinkIssues( KIFACE* aCvPcb, PROJECT* aProject )
             else if( ret == KIFACE_TEST_FOOTPRINT_LINK_NO_FOOTPRINT )
             {
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_FOOTPRINT_LINK_ISSUES );
-                msg.Printf( _( "Footprint '%s' not found in library '%s'" ),
+                msg.Printf( _( "Footprint '%s' not found in library '%s'." ),
                             fpName,
                             libName );
                 ercItem->SetErrorMessage( msg );
@@ -1768,7 +1733,7 @@ int ERC_TESTER::TestFootprintFilters()
             if( !found )
             {
                 std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_FOOTPRINT_LINK_ISSUES );
-                msg.Printf( _( "Assigned footprint (%s) doesn't match footprint filters (%s)" ),
+                msg.Printf( _( "Assigned footprint (%s) doesn't match footprint filters (%s)." ),
                             footprint.GetUniStringLibItemName(),
                             wxJoin( filters, ' ' ) );
                 ercItem->SetErrorMessage( msg );
@@ -1999,9 +1964,6 @@ void ERC_TESTER::RunTests( DS_PROXY_VIEW_ITEM* aDrawingSheet, SCH_EDIT_FRAME* aE
     if( m_settings.IsTestEnabled( ERCE_GROUND_PIN_NOT_GROUND ) )
         TestGroundPins();
 
-    if( m_settings.IsTestEnabled( ERCE_STACKED_PIN_SYNTAX ) )
-        TestStackedPinNotation();
-
     // Test similar labels (i;e. labels which are identical when
     // using case insensitive comparisons)
     if( m_settings.IsTestEnabled( ERCE_SIMILAR_LABELS )

eeschema/erc/erc.h

@@ -118,12 +118,6 @@ public:
      */
     int TestGroundPins();
 
-    /**
-     * Checks for pin numbers that resemble stacked pin notation but are invalid.
-     * @return warning count
-     */
-    int TestStackedPinNotation();
-
     /**
      * Checks for global and local labels with the same name
      * @return the error count

eeschema/erc/erc_item.cpp

@@ -161,10 +161,6 @@ ERC_ITEM ERC_ITEM::groundPinNotGround( ERCE_GROUND_PIN_NOT_GROUND,
         _HKI( "Ground pin not connected to ground net" ),
         wxT( "ground_pin_not_ground" ) );
 
-ERC_ITEM ERC_ITEM::stackedPinName( ERCE_STACKED_PIN_SYNTAX,
-        _HKI( "Pin name resembles stacked pin" ),
-        wxT( "stacked_pin_name" ) );
-
 ERC_ITEM ERC_ITEM::unresolvedVariable( ERCE_UNRESOLVED_VARIABLE,
         _HKI( "Unresolved text variable" ),
         wxT( "unresolved_variable" ) );
@@ -272,7 +268,6 @@ std::vector<std::reference_wrapper<RC_ITEM>> ERC_ITEM::allItemTypes(
             ERC_ITEM::groundPinNotGround,
 
             ERC_ITEM::heading_misc,
-            ERC_ITEM::stackedPinName,
             ERC_ITEM::unannotated,
             ERC_ITEM::unresolvedVariable,
             ERC_ITEM::undefinedNetclass,
@@ -356,7 +351,6 @@ std::shared_ptr<ERC_ITEM> ERC_ITEM::Create( int aErrorCode )
     case ERCE_MISSING_POWER_INPUT_PIN: return std::make_shared<ERC_ITEM>( missingPowerInputPin );
     case ERCE_MISSING_BIDI_PIN:        return std::make_shared<ERC_ITEM>( missingBidiPin );
     case ERCE_UNCONNECTED_WIRE_ENDPOINT: return std::make_shared<ERC_ITEM>( unconnectedWireEndpoint );
-    case ERCE_STACKED_PIN_SYNTAX:      return std::make_shared<ERC_ITEM>( stackedPinName );
     case ERCE_UNSPECIFIED:
     default:
         wxFAIL_MSG( wxS( "Unknown ERC error code" ) );

eeschema/erc/erc_item.h

@@ -227,7 +227,6 @@ private:
     static ERC_ITEM busToBusConflict;
     static ERC_ITEM busToNetConflict;
     static ERC_ITEM groundPinNotGround;
-    static ERC_ITEM stackedPinName;
     static ERC_ITEM unresolvedVariable;
     static ERC_ITEM undefinedNetclass;
     static ERC_ITEM simulationModelIssues;

eeschema/erc/erc_settings.cpp

@@ -120,7 +120,6 @@ ERC_SETTINGS::ERC_SETTINGS( JSON_SETTINGS* aParent, const std::string& aPath ) :
     m_ERCSeverities[ERCE_FOUR_WAY_JUNCTION]       = RPT_SEVERITY_IGNORE;
     m_ERCSeverities[ERCE_LABEL_MULTIPLE_WIRES]    = RPT_SEVERITY_WARNING;
     m_ERCSeverities[ERCE_UNCONNECTED_WIRE_ENDPOINT] = RPT_SEVERITY_WARNING;
-    m_ERCSeverities[ERCE_STACKED_PIN_SYNTAX]      = RPT_SEVERITY_WARNING;
 
     m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "rule_severities",
             [&]() -> nlohmann::json

eeschema/erc/erc_settings.h

@@ -87,9 +87,8 @@ enum ERCE_T
     ERCE_FOUR_WAY_JUNCTION,       ///< A four-way junction was found.
     ERCE_LABEL_MULTIPLE_WIRES,    ///< A label is connected to more than one wire.
     ERCE_UNCONNECTED_WIRE_ENDPOINT, ///< A label is connected to more than one wire.
-    ERCE_STACKED_PIN_SYNTAX,      ///< Pin name resembles stacked pin notation.
 
-    ERCE_LAST = ERCE_STACKED_PIN_SYNTAX,
+    ERCE_LAST = ERCE_UNCONNECTED_WIRE_ENDPOINT,
 
     ERCE_DUPLICATE_PIN_ERROR,
     ERCE_PIN_TO_PIN_WARNING,    // pin connected to an other pin: warning level

eeschema/fields_data_model.cpp

@@ -35,7 +35,7 @@ wxString VIEW_CONTROLS_GRID_DATA_MODEL::GetColLabelValue( int aCol )
     switch( aCol )
     {
     case DISPLAY_NAME_COLUMN: return _( "Field" );
-    case LABEL_COLUMN:        return m_forBOM ? _( "BOM Name" ) : _( "Label" );
+    case LABEL_COLUMN:        return _( "BOM Name" );
     case SHOW_FIELD_COLUMN:   return _( "Include" );
     case GROUP_BY_COLUMN:     return _( "Group By" );
     default:                  return wxT( "unknown column" );
@@ -131,7 +131,7 @@ void VIEW_CONTROLS_GRID_DATA_MODEL::SetValueAsBool( int aRow, int aCol, bool aVa
 
 
 void VIEW_CONTROLS_GRID_DATA_MODEL::AppendRow( const wxString& aFieldName, const wxString& aBOMName,
-                                               bool aShow, bool aGroupBy )
+                                                 bool aShow, bool aGroupBy )
 {
     m_fields.emplace_back( BOM_FIELD{ aFieldName, aBOMName, aShow, aGroupBy } );
 
@@ -326,7 +326,8 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::GetValue( int aRow, int aCol )
 }
 
 
-wxGridCellAttr* FIELDS_EDITOR_GRID_DATA_MODEL::GetAttr( int aRow, int aCol, wxGridCellAttr::wxAttrKind aKind )
+wxGridCellAttr* FIELDS_EDITOR_GRID_DATA_MODEL::GetAttr( int aRow, int aCol,
+                                                        wxGridCellAttr::wxAttrKind aKind )
 {
     if( GetColFieldName( aCol ) == GetCanonicalFieldName( FIELD_T::DATASHEET )
             || IsURL( GetValue( m_rows[aRow], aCol ) ) )
@@ -362,8 +363,11 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::GetValue( const DATA_MODEL_ROW& group, i
         {
             const KIID& symbolID = ref.GetSymbol()->m_Uuid;
 
-            if( !m_dataStore.contains( symbolID ) || !m_dataStore[symbolID].contains( m_cols[aCol].m_fieldName ) )
+            if( !m_dataStore.count( symbolID )
+                || !m_dataStore[symbolID].count( m_cols[aCol].m_fieldName ) )
+            {
                 return INDETERMINATE_STATE;
+            }
 
             wxString refFieldValue = m_dataStore[symbolID][m_cols[aCol].m_fieldName];
 
@@ -582,7 +586,8 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::Sort()
 }
 
 
-bool FIELDS_EDITOR_GRID_DATA_MODEL::unitMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef )
+bool FIELDS_EDITOR_GRID_DATA_MODEL::unitMatch( const SCH_REFERENCE& lhRef,
+                                               const SCH_REFERENCE& rhRef )
 {
     // If items are unannotated then we can't tell if they're units of the same symbol or not
     if( lhRef.GetRefNumber() == wxT( "?" ) )
@@ -592,7 +597,9 @@ bool FIELDS_EDITOR_GRID_DATA_MODEL::unitMatch( const SCH_REFERENCE& lhRef, const
 }
 
 
-bool FIELDS_EDITOR_GRID_DATA_MODEL::groupMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef )
+bool FIELDS_EDITOR_GRID_DATA_MODEL::groupMatch( const SCH_REFERENCE& lhRef,
+                                                const SCH_REFERENCE& rhRef )
+
 {
     int  refCol = GetFieldNameCol( GetCanonicalFieldName( FIELD_T::REFERENCE ) );
     bool matchFound = false;
@@ -703,7 +710,8 @@ bool FIELDS_EDITOR_GRID_DATA_MODEL::isAttribute( const wxString& aFieldName )
 }
 
 
-wxString FIELDS_EDITOR_GRID_DATA_MODEL::getAttributeValue( const SCH_SYMBOL& aSymbol, const wxString& aAttributeName )
+wxString FIELDS_EDITOR_GRID_DATA_MODEL::getAttributeValue( const SCH_SYMBOL& aSymbol,
+                                                           const wxString&   aAttributeName )
 {
     if( aAttributeName == wxS( "${DNP}" ) )
         return aSymbol.GetDNP() ? wxS( "1" ) : wxS( "0" );
@@ -720,36 +728,18 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::getAttributeValue( const SCH_SYMBOL& aSy
     return wxS( "0" );
 }
 
-
-bool FIELDS_EDITOR_GRID_DATA_MODEL::setAttributeValue( SCH_SYMBOL&     aSymbol,
+void FIELDS_EDITOR_GRID_DATA_MODEL::setAttributeValue( SCH_SYMBOL&     aSymbol,
                                                        const wxString& aAttributeName,
                                                        const wxString& aValue )
 {
-    bool attrChanged = false;
-    bool newValue = aValue == wxS( "1" );
-
     if( aAttributeName == wxS( "${DNP}" ) )
-    {
-        attrChanged = aSymbol.GetDNP() != newValue;
-        aSymbol.SetDNP( newValue );
-    }
+        aSymbol.SetDNP( aValue == wxS( "1" ) );
     else if( aAttributeName == wxS( "${EXCLUDE_FROM_BOARD}" ) )
-    {
-        attrChanged = aSymbol.GetExcludedFromBoard() != newValue;
-        aSymbol.SetExcludedFromBoard( newValue );
-    }
+        aSymbol.SetExcludedFromBoard( aValue == wxS( "1" ) );
     else if( aAttributeName == wxS( "${EXCLUDE_FROM_BOM}" ) )
-    {
-        attrChanged = aSymbol.GetExcludedFromBOM() != newValue;
-        aSymbol.SetExcludedFromBOM( newValue );
-    }
+        aSymbol.SetExcludedFromBOM( aValue == wxS( "1" ) );
     else if( aAttributeName == wxS( "${EXCLUDE_FROM_SIM}" ) )
-    {
-        attrChanged = aSymbol.GetExcludedFromSim() != newValue;
-        aSymbol.SetExcludedFromSim( newValue );
-    }
-
-    return attrChanged;
+        aSymbol.SetExcludedFromSim( aValue == wxS( "1" ) );
 }
 
 
@@ -954,28 +944,21 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ExpandAfterSort()
 
 void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit, TEMPLATES& aTemplateFieldnames )
 {
-    bool symbolModified = false;
-    std::unique_ptr<SCH_SYMBOL> symbolCopy;
 
-    for( size_t i = 0; i < m_symbolsList.GetCount(); i++ )
+    for( const SCH_REFERENCE& instance : m_symbolsList )
     {
-        SCH_SYMBOL* symbol = m_symbolsList[i].GetSymbol();
-        SCH_SYMBOL* nextSymbol = nullptr;
+        SCH_SYMBOL& symbol = *instance.GetSymbol();
 
-        if( ( i + 1 ) < m_symbolsList.GetCount() )
-            nextSymbol = m_symbolsList[i + 1].GetSymbol();
+        aCommit.Modify( &symbol, instance.GetSheetPath().LastScreen() );
 
-        if( i == 0 )
-            symbolCopy = std::make_unique<SCH_SYMBOL>( *symbol );
-
-        const std::map<wxString, wxString>& fieldStore = m_dataStore[symbol->m_Uuid];
+        const std::map<wxString, wxString>& fieldStore = m_dataStore[symbol.m_Uuid];
 
         for( const auto& [srcName, srcValue] : fieldStore )
         {
             // Attributes bypass the field logic, so handle them first
             if( isAttribute( srcName ) )
             {
-                symbolModified |= setAttributeValue( *symbol, srcName, srcValue );
+                setAttributeValue( symbol, srcName, srcValue );
                 continue;
             }
 
@@ -984,7 +967,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit, TEMPLATES& a
             if( IsGeneratedField( srcName ) )
                 continue;
 
-            SCH_FIELD* destField = symbol->GetField( srcName );
+            SCH_FIELD* destField = symbol.GetField( srcName );
 
             if( destField && destField->IsPrivate() )
             {
@@ -1002,16 +985,15 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit, TEMPLATES& a
 
             if( createField )
             {
-                destField = symbol->AddField( SCH_FIELD( symbol, FIELD_T::USER, srcName ) );
-                destField->SetTextAngle( symbol->GetField( FIELD_T::REFERENCE )->GetTextAngle() );
+                destField = symbol.AddField( SCH_FIELD( &symbol, FIELD_T::USER, srcName ) );
+                destField->SetTextAngle( symbol.GetField( FIELD_T::REFERENCE )->GetTextAngle() );
 
                 if( const TEMPLATE_FIELDNAME* srcTemplate = aTemplateFieldnames.GetFieldName( srcName ) )
                     destField->SetVisible( srcTemplate->m_Visible );
                 else
                     destField->SetVisible( false );
 
-                destField->SetTextPos( symbol->GetPosition() );
-                symbolModified = true;
+                destField->SetTextPos( symbol.GetPosition() );
             }
 
             if( !destField )
@@ -1023,38 +1005,16 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyData( SCH_COMMIT& aCommit, TEMPLATES& a
                 continue;
             }
 
-            wxString previousValue = destField->GetText();
-
-            destField->SetText( symbol->Schematic()->ConvertRefsToKIIDs( srcValue ) );
-
-            if( !createField && ( previousValue != srcValue ) )
-                symbolModified = true;
+            destField->SetText( symbol.Schematic()->ConvertRefsToKIIDs( srcValue ) );
         }
 
-        for( int ii = static_cast<int>( symbol->GetFields().size() ) - 1; ii >= 0; ii-- )
+        for( int ii = static_cast<int>( symbol.GetFields().size() ) - 1; ii >= 0; ii-- )
         {
-            if( symbol->GetFields()[ii].IsMandatory() || symbol->GetFields()[ii].IsPrivate() )
+            if( symbol.GetFields()[ii].IsMandatory() || symbol.GetFields()[ii].IsPrivate() )
                 continue;
 
-            if( fieldStore.count( symbol->GetFields()[ii].GetName() ) == 0 )
-            {
-                symbol->GetFields().erase( symbol->GetFields().begin() + ii );
-                symbolModified = true;
-            }
-        }
-
-        if( symbolModified && ( symbol != nextSymbol ) )
-            aCommit.Modified( symbol, symbolCopy.release(), m_symbolsList[i].GetSheetPath().LastScreen() );
-
-        // Only reset the modified flag and next symbol copy if the next symbol is different from the current one.
-        if( symbol != nextSymbol )
-        {
-            if( nextSymbol )
-                symbolCopy = std::make_unique<SCH_SYMBOL>( *nextSymbol );
-            else
-                symbolCopy.reset( nullptr );
-
-            symbolModified = false;
+            if( fieldStore.count( symbol.GetFields()[ii].GetName() ) == 0 )
+                symbol.GetFields().erase( symbol.GetFields().begin() + ii );
         }
     }
 
@@ -1246,8 +1206,6 @@ wxString FIELDS_EDITOR_GRID_DATA_MODEL::Export( const BOM_FMT_PRESET& settings )
 
 void FIELDS_EDITOR_GRID_DATA_MODEL::AddReferences( const SCH_REFERENCE_LIST& aRefs )
 {
-    bool refListChanged = false;
-
     for( const SCH_REFERENCE& ref : aRefs )
     {
         if( !m_symbolsList.Contains( ref ) )
@@ -1267,13 +1225,8 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::AddReferences( const SCH_REFERENCE_LIST& aRe
                     m_dataStore[symbol->m_Uuid][name] = value;
                 }
             }
-
-            refListChanged = true;
         }
     }
-
-    if( refListChanged )
-        m_symbolsList.SortBySymbolPtr();
 }
 
 
@@ -1314,8 +1267,6 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::RemoveReferences( const SCH_REFERENCE_LIST&
 
 void FIELDS_EDITOR_GRID_DATA_MODEL::UpdateReferences( const SCH_REFERENCE_LIST& aRefs )
 {
-    bool refListChanged = false;
-
     for( const SCH_REFERENCE& ref : aRefs )
     {
         // Update the fields of every reference. Do this by iterating through the data model
@@ -1325,12 +1276,6 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::UpdateReferences( const SCH_REFERENCE_LIST&
             updateDataStoreSymbolField( *ref.GetSymbol(), col.m_fieldName );
 
         if( !m_symbolsList.Contains( ref ) )
-        {
             m_symbolsList.AddItem( ref );
-            refListChanged = true;
-        }
     }
-
-    if( refListChanged )
-        m_symbolsList.SortBySymbolPtr();
 }

eeschema/fields_data_model.h

@@ -41,8 +41,7 @@ struct BOM_FMT_PRESET;
 class VIEW_CONTROLS_GRID_DATA_MODEL : public WX_GRID_TABLE_BASE
 {
 public:
-    VIEW_CONTROLS_GRID_DATA_MODEL( bool aForBOM ) :
-            m_forBOM( aForBOM )
+    VIEW_CONTROLS_GRID_DATA_MODEL()
     {}
 
     ~VIEW_CONTROLS_GRID_DATA_MODEL() override = default;
@@ -89,7 +88,6 @@ public:
     void SetCanonicalFieldName( int aRow, const wxString& aName );
 
 protected:
-    bool                   m_forBOM;
     std::vector<BOM_FIELD> m_fields;
 };
 
@@ -135,8 +133,8 @@ public:
     enum SCOPE : int
     {
         SCOPE_ALL = 0,
-        SCOPE_SHEET,
-        SCOPE_SHEET_RECURSIVE
+        SCOPE_SHEET = 1,
+        SCOPE_SHEET_RECURSIVE = 2
     };
 
     FIELDS_EDITOR_GRID_DATA_MODEL( const SCH_REFERENCE_LIST& aSymbolsList, wxGridCellAttr* aURLEditor ) :
@@ -334,25 +332,15 @@ public:
 private:
     static bool cmp( const DATA_MODEL_ROW& lhGroup, const DATA_MODEL_ROW& rhGroup,
                      FIELDS_EDITOR_GRID_DATA_MODEL* dataModel, int sortCol, bool ascending );
-
-    bool unitMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef );
-    bool groupMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef );
+    bool        unitMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef );
+    bool        groupMatch( const SCH_REFERENCE& lhRef, const SCH_REFERENCE& rhRef );
 
     // Helper functions to deal with translating wxGrid values to and from
     // named field values like ${DNP}
     bool     isAttribute( const wxString& aFieldName );
     wxString getAttributeValue( const SCH_SYMBOL&, const wxString& aAttributeName );
-
-    /**
-     * Set the attribute value.
-     *
-     * @param aSymbol is the symbol to set the attribute.
-     * @param aAttributeName is the name of the symbol attribute.
-     * @param aValue is the value to set the attribute.
-     * @retval true if the symbol attribute value has changed.
-     * @retval false if the symbol attribute has **not** changed.
-     */
-    bool setAttributeValue( SCH_SYMBOL& aSymbol, const wxString& aAttributeName, const wxString& aValue );
+    void     setAttributeValue( SCH_SYMBOL& aSymbol, const wxString& aAttributeName,
+                                const wxString& aValue );
 
     /* Helper function to get the resolved field value.
      * Handles symbols that are missing fields that would have a variable
@@ -362,21 +350,17 @@ private:
 
     void Sort();
 
+    SCH_REFERENCE_LIST getSymbolReferences( SCH_SYMBOL* aSymbol );
+    void               storeReferenceFields( SCH_REFERENCE& aRef );
     void updateDataStoreSymbolField( const SCH_SYMBOL& aSymbol, const wxString& aFieldName );
 
 protected:
-    /**
-     * The flattened by hierarchy list of symbols.
-     *
-     * @warning This list **must** be kept sorted by symbol pointer.  Otherwise, the undo/redo
-     *          commit actions will be broken.
-     */
     SCH_REFERENCE_LIST m_symbolsList;
     bool               m_edited;
     int                m_sortColumn;
     bool               m_sortAscending;
     wxString           m_filter;
-    SCOPE              m_scope;
+    enum SCOPE         m_scope;
     SCH_SHEET_PATH     m_path;
     bool               m_groupingEnabled;
     bool               m_excludeDNP;