Fix compatibility with some old V4 schematic files.

From master branch, commit #bfe59581

.gitignore

@@ -1,5 +1,6 @@
-boost_root
 .downloads-by-cmake
+.gdb_history
+boost_root
 Build*
 build*
 common/fp_lib_table_keywords.cpp
@@ -95,3 +96,20 @@ pcbnew/Info.plist
 .cproject
 .pydevproject
 __pycache__
+
+# Visual Studio
+.vs/
+.editorconfig
+CMakeSettings.json
+
+# Sublime Text
+*.sublime-*
+
+# KDevelop
+.kdev4/
+*.kdev4
+
+# Translations
+*.mo
+i18n_status.svg
+i18n_status.csv

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

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun  5 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -9,209 +9,209 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
-PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+PANEL_PREV_3D_BASE::PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
 	wxBoxSizer* bSizermain;
 	bSizermain = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizerLeft;
 	bSizerLeft = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticBoxSizer* sbSizerScale;
 	sbSizerScale = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scale") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerScale;
 	fgSizerScale = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerScale->SetFlexibleDirection( wxBOTH );
 	fgSizerScale->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText1 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText1->Wrap( -1 );
 	fgSizerScale->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( xscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinXscale, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText2 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText2->Wrap( -1 );
 	fgSizerScale->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( yscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinYscale, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText3 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3->Wrap( -1 );
 	fgSizerScale->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zscale = new wxTextCtrl( sbSizerScale->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerScale->Add( zscale, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerScale->Add( m_spinZscale, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerScale->Add( fgSizerScale, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerScale, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxStaticBoxSizer* sbSizerRotation;
 	sbSizerRotation = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Rotation") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerRotate;
 	fgSizerRotate = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerRotate->SetFlexibleDirection( wxBOTH );
 	fgSizerRotate->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText11 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText11->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( xrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinXrot, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText21 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText21->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( yrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinYrot, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText31 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText31->Wrap( -1 );
 	fgSizerRotate->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zrot = new wxTextCtrl( sbSizerRotation->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRotate->Add( zrot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerRotate->Add( m_spinZrot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerRotation->Add( fgSizerRotate, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerRotation, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	wxStaticBoxSizer* sbSizerOffset;
 	sbSizerOffset = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Offset") ), wxVERTICAL );
-	
+
 	wxFlexGridSizer* fgSizerOffset;
 	fgSizerOffset = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerOffset->SetFlexibleDirection( wxBOTH );
 	fgSizerOffset->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
+
 	m_staticText12 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText12->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	xoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( xoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinXoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinXoffset, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText22 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText22->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText22, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	yoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( yoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
+
 	m_spinYoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinYoffset, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_staticText32 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("Z:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText32->Wrap( -1 );
 	fgSizerOffset->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	zoff = new wxTextCtrl( sbSizerOffset->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerOffset->Add( zoff, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
+
 	m_spinZoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL );
 	fgSizerOffset->Add( m_spinZoffset, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
+
+
 	sbSizerOffset->Add( fgSizerOffset, 0, wxEXPAND|wxLEFT|wxRIGHT, 10 );
-	
-	
+
+
 	bSizerLeft->Add( sbSizerOffset, 0, wxEXPAND|wxALL, 5 );
-	
-	
+
+
 	bSizermain->Add( bSizerLeft, 0, 0, 5 );
-	
+
 	wxBoxSizer* bSizerRight;
 	bSizerRight = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticText* staticPreviewLabel;
 	staticPreviewLabel = new wxStaticText( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );
 	staticPreviewLabel->Wrap( -1 );
 	staticPreviewLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
-	
-	bSizerRight->Add( staticPreviewLabel, 0, wxLEFT, 15 );
-	
+
+	bSizerRight->Add( staticPreviewLabel, 0, wxALL, 5 );
+
 	m_SizerPanelView = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 8 );
-	
-	
+
+
+	bSizerRight->Add( m_SizerPanelView, 1, wxEXPAND|wxBOTTOM, 5 );
+
+
 	bSizermain->Add( bSizerRight, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 4 );
-	
+
 	wxBoxSizer* bSizer3DButtons;
 	bSizer3DButtons = new wxBoxSizer( wxVERTICAL );
-	
-	
+
+
 	bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxTOP, 4 );
-	
-	m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_bpvISO->SetToolTip( _("Change to isometric perspective") );
-	
+
 	bSizer3DButtons->Add( m_bpvISO, 0, wxTOP|wxBOTTOM, 5 );
-	
-	m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvLeft = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	bSizer3DButtons->Add( m_bpvLeft, 0, 0, 5 );
-	
-	m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvRight, 0, 0, 5 );
-	
-	m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvFront, 0, 0, 5 );
-	
-	m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvBack, 0, 0, 5 );
-	
-	m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvTop, 0, 0, 5 );
-	
-	m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizer3DButtons->Add( m_bpvBottom, 0, 0, 5 );
-	
-	m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+
+	m_bpvRight = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvRight, 0, wxTOP, 5 );
+
+	m_bpvFront = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvFront, 0, wxTOP, 5 );
+
+	m_bpvBack = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvBack, 0, wxTOP, 5 );
+
+	m_bpvTop = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvTop, 0, wxTOP, 5 );
+
+	m_bpvBottom = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
+	bSizer3DButtons->Add( m_bpvBottom, 0, wxTOP, 5 );
+
+	m_bpUpdate = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_bpUpdate->SetToolTip( _("Reload board and 3D models") );
-	
+
 	bSizer3DButtons->Add( m_bpUpdate, 0, wxTOP, 5 );
-	
-	
+
+
 	bSizermain->Add( bSizer3DButtons, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	this->SetSizer( bSizermain );
 	this->Layout();
 	bSizermain->Fit( this );
-	
+
 	// Connect Events
 	xscale->Connect( wxEVT_MOUSEWHEEL, wxMouseEventHandler( PANEL_PREV_3D_BASE::onMouseWheelScale ), NULL, this );
 	xscale->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_PREV_3D_BASE::updateOrientation ), NULL, this );
@@ -306,5 +306,5 @@ PANEL_PREV_3D_BASE::~PANEL_PREV_3D_BASE()
 	m_bpvTop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DTop ), NULL, this );
 	m_bpvBottom->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DBottom ), NULL, this );
 	m_bpUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_PREV_3D_BASE::View3DUpdate ), NULL, this );
-	
+
 }

3d-viewer/3d_cache/dialogs/panel_prev_3d_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun  5 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __PANEL_PREV_3D_BASE_H__
-#define __PANEL_PREV_3D_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -21,10 +20,10 @@
 #include <wx/spinbutt.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
+#include <wx/bmpbuttn.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/panel.h>
 
@@ -34,10 +33,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PANEL_PREV_3D_BASE
 ///////////////////////////////////////////////////////////////////////////////
-class PANEL_PREV_3D_BASE : public wxPanel 
+class PANEL_PREV_3D_BASE : public wxPanel
 {
 	private:
-	
+
 	protected:
 		wxStaticText* m_staticText1;
 		wxTextCtrl* xscale;
@@ -74,7 +73,7 @@ class PANEL_PREV_3D_BASE : public wxPanel
 		wxBitmapButton* m_bpvTop;
 		wxBitmapButton* m_bpvBottom;
 		wxBitmapButton* m_bpUpdate;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void onMouseWheelScale( wxMouseEvent& event ) { event.Skip(); }
 		virtual void updateOrientation( wxCommandEvent& event ) { event.Skip(); }
@@ -94,14 +93,13 @@ class PANEL_PREV_3D_BASE : public wxPanel
 		virtual void View3DTop( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DBottom( wxCommandEvent& event ) { event.Skip(); }
 		virtual void View3DUpdate( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
 		wxTextCtrl* yoff;
-		
-		PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
+
+		PANEL_PREV_3D_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
 		~PANEL_PREV_3D_BASE();
-	
+
 };
 
-#endif //__PANEL_PREV_3D_BASE_H__

3d-viewer/3d_cache/sg/CMakeLists.txt

@@ -44,7 +44,7 @@ if( APPLE )
 endif()
 
 find_file( S3DSG_VERSION_FILE sg_version.h
-        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH )
+        PATHS ${CMAKE_SOURCE_DIR}/include/plugins/3dapi NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 
 if( NOT ${S3DSG_VERSION_FILE} STREQUAL "S3DSG_VERSION_FILE-NOTFOUND" )
 
@@ -95,8 +95,12 @@ target_compile_definitions( kicad_3dsg PRIVATE -DCOMPILE_SGLIB )
 
 target_link_libraries( kicad_3dsg ${wxWidgets_LIBRARIES} )
 
+# Don't specify the ARCHIVE DESTINATION parameter to prevent
+# the install of the import library on Windows
+# https://cmake.org/pipermail/cmake/2011-November/047746.html
 install( TARGETS
     kicad_3dsg
-    DESTINATION ${KICAD_LIB}
+    RUNTIME DESTINATION ${KICAD_LIB}
+    LIBRARY DESTINATION ${KICAD_LIB}
     COMPONENT binary
     )

3d-viewer/3d_canvas/cinfo3d_visu.cpp

@@ -272,13 +272,9 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
 {
     wxLogTrace( m_logTrace, wxT( "CINFO3D_VISU::InitSettings" ) );
 
-    // Calculates the board bounding box
-    // First, use only the board outlines
-    EDA_RECT bbbox = m_board->ComputeBoundingBox( true );
-
-    // If no outlines, use the board with items
-    if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )
-        bbbox = m_board->ComputeBoundingBox( false );
+    // Calculates the board bounding box (board outlines + items)
+    // to ensure any item, even outside the board outlines can be seen
+    EDA_RECT bbbox = m_board->ComputeBoundingBox( false );
 
     // Gives a non null size to avoid issues in zoom / scale calculations
     if( ( bbbox.GetWidth() == 0 ) && ( bbbox.GetHeight() == 0 ) )

3d-viewer/3d_canvas/eda_3d_canvas.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 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
@@ -57,6 +57,9 @@ const wxChar * EDA_3D_CANVAS::m_logTrace = wxT( "KI_TRACE_EDA_3D_CANVAS" );
 
 const float EDA_3D_CANVAS::m_delta_move_step_factor = 0.7f;
 
+// A custom event, used to call DoRePaint during an idle time
+wxDEFINE_EVENT( wxEVT_REFRESH_CUSTOM_COMMAND, wxEvent);
+
 
 BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )
     EVT_PAINT( EDA_3D_CANVAS::OnPaint )
@@ -78,6 +81,7 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas )
 
     // other events
     EVT_ERASE_BACKGROUND( EDA_3D_CANVAS::OnEraseBackground )
+    EVT_CUSTOM(wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1, EDA_3D_CANVAS::OnRefreshRequest )
     EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START,
                     ID_POPUP_3D_VIEW_END, EDA_3D_CANVAS::OnPopUpMenu )
 
@@ -312,17 +316,22 @@ void EDA_3D_CANVAS::DisplayStatus()
 }
 
 
-void EDA_3D_CANVAS::OnPaint( wxPaintEvent &event )
+void EDA_3D_CANVAS::OnPaint( wxPaintEvent& aEvent )
 {
     // Please have a look at:
     // https://lists.launchpad.net/kicad-developers/msg25149.html
     // wxPaintDC( this );
-    // event.Skip( false );
+    // aEvent.Skip( false );
+    DoRePaint();
+}
 
+
+void EDA_3D_CANVAS::DoRePaint()
+{
     // SwapBuffer requires the window to be shown before calling
     if( !IsShownOnScreen() )
     {
-        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::OnPaint !IsShown" );
+        wxLogTrace( m_logTrace, "EDA_3D_CANVAS::DoRePaint !IsShown" );
         return;
     }
 
@@ -856,13 +865,13 @@ void EDA_3D_CANVAS::restart_editingTimeOut_Timer()
 
 void EDA_3D_CANVAS::OnTimerTimeout_Redraw( wxTimerEvent &event )
 {
-    (void)event;
+    Request_refresh( true );
+}
 
-    //Refresh();
-    //Update();
 
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+void EDA_3D_CANVAS::OnRefreshRequest( wxEvent& aEvent )
+{
+   DoRePaint();
 }
 
 
@@ -870,22 +879,12 @@ void EDA_3D_CANVAS::Request_refresh( bool aRedrawImmediately )
 {
     if( aRedrawImmediately )
     {
-        // On some systems, just calling Refresh does not work always
-        // (Issue experienced on Win7 MSYS2)
-        //Refresh();
-        //Update();
-
-        // Using PostEvent will take priority to other events, like
-        // mouse movements, keys, etc.
-        wxPaintEvent redrawEvent;
+        // Just calling Refresh() does not work always
+        // Using an event to call DoRepaint ensure the repaint code will be executed,
+        // and PostEvent will take priority to other events like mouse movements, keys, etc.
+        // and is executed during the next idle time
+        wxCommandEvent redrawEvent( wxEVT_REFRESH_CUSTOM_COMMAND, ID_CUSTOM_EVENT_1 );
         wxPostEvent( this, redrawEvent );
-
-        // This behaves the same
-        // wxQueueEvent( this,
-                        // From wxWidget documentation: "The heap-allocated and
-                        // non-NULL event to queue, the function takes ownership of it."
-        //               new wxPaintEvent()
-        //               );
     }
     else
     {

3d-viewer/3d_canvas/eda_3d_canvas.h

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 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
@@ -135,10 +135,21 @@ class EDA_3D_CANVAS : public HIDPI_GL_CANVAS
 
 private:
 
-    void OnPaint( wxPaintEvent &event );
+    /** Called by a wxPaintEvent event
+     */
+    void OnPaint( wxPaintEvent& aEvent );
+
+    /**
+     * The actual function to repaint the canvas.
+     * It is usually called by OnPaint() but because it does not use a wxPaintDC
+     * it can be called outside a wxPaintEvent
+     */
+    void DoRePaint();
 
     void OnEraseBackground( wxEraseEvent &event );
 
+    void OnRefreshRequest( wxEvent& aEvent );
+
     void OnMouseWheel( wxMouseEvent &event );
 
 #if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT )

3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp

@@ -449,6 +449,10 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
          ++ii )
     {
         PCB_LAYER_ID layer_id = static_cast<PCB_LAYER_ID>(ii->first);
+        const CBVHCONTAINER2D *container2d = static_cast<const CBVHCONTAINER2D *>(ii->second);
+
+        if( !container2d )
+            continue;
 
         // Mask kayers are not processed here because they are a special case
         if( (layer_id == B_Mask) || (layer_id == F_Mask) )
@@ -509,7 +513,6 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
             break;
         }
 
-        const CBVHCONTAINER2D *container2d = static_cast<const CBVHCONTAINER2D *>(ii->second);
         const LIST_OBJECT2D &listObject2d = container2d->GetList();
 
         for( LIST_OBJECT2D::const_iterator itemOnLayer = listObject2d.begin();
@@ -655,6 +658,9 @@ void C3D_RENDER_RAYTRACING::reload( REPORTER *aStatusTextReporter )
             const CBVHCONTAINER2D *containerLayer2d =
                     static_cast<const CBVHCONTAINER2D *>(ii->second);
 
+            if( !containerLayer2d )
+                continue;
+
             // Only get the Solder mask layers
             if( !((layer_id == B_Mask) || (layer_id == F_Mask)) )
                 continue;

3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 11 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -12,251 +12,252 @@
 DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_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( wxDefaultSize, wxDefaultSize );
-	
+
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxBoxSizer* bSizerUpper;
 	bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizeLeft;
 	bSizeLeft = new wxBoxSizer( wxVERTICAL );
-	
+
 	m_staticText3DRenderOpts = new wxStaticText( this, wxID_ANY, _("Render options:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3DRenderOpts->Wrap( -1 );
 	m_staticText3DRenderOpts->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLeft->Add( m_staticText3DRenderOpts, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerRenderOptions;
 	fgSizerRenderOptions = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerRenderOptions->SetFlexibleDirection( wxBOTH );
 	fgSizerRenderOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapRealisticMode = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxRealisticMode = new wxCheckBox( this, wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapBoardBody = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxBoardBody = new wxCheckBox( this, wxID_ANY, _("Show board body"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxBoardBody, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 1, wxEXPAND, 5 );
-	
+
 	m_bitmapCuThickness = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxCuThickness = new wxCheckBox( this, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapBoundingBoxes = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapBoundingBoxes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxBoundingBoxes = new wxCheckBox( this, wxID_ANY, _("Show model bounding boxes"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxBoundingBoxes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerRenderOptions->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapAreas = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_bitmapAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxAreas = new wxCheckBox( this, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerRenderOptions->Add( m_checkBoxAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	wxFlexGridSizer* fgSizer3;
 	fgSizer3 = new wxFlexGridSizer( 0, 2, 0, 0 );
 	fgSizer3->SetFlexibleDirection( wxBOTH );
 	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerRenderOptions->Add( fgSizer3, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizeLeft->Add( fgSizerRenderOptions, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	
+
+
 	bSizeLeft->Add( 0, 10, 0, 0, 5 );
-	
+
 	m_staticText3DmodelVisibility = new wxStaticText( this, wxID_ANY, _("3D model visibility:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText3DmodelVisibility->Wrap( -1 );
 	m_staticText3DmodelVisibility->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLeft->Add( m_staticText3DmodelVisibility, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizer3DVisibility;
 	fgSizer3DVisibility = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizer3DVisibility->SetFlexibleDirection( wxBOTH );
 	fgSizer3DVisibility->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 1, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesTH = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesTH = new wxCheckBox( this, wxID_ANY, _("Show 3D through hole models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesTH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesSMD = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesSMD = new wxCheckBox( this, wxID_ANY, _("Show 3D SMD models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesSMD, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizer3DVisibility->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmap3DshapesVirtual = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_bitmap3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBox3DshapesVirtual = new wxCheckBox( this, wxID_ANY, _("Show 3D virtual models"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer3DVisibility->Add( m_checkBox3DshapesVirtual, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLeft->Add( fgSizer3DVisibility, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerUpper->Add( bSizeLeft, 1, wxEXPAND, 5 );
-	
+
 	m_staticlineVertical = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
 	bSizerUpper->Add( m_staticlineVertical, 0, wxEXPAND | wxALL, 5 );
-	
+
 	wxBoxSizer* bSizerRight;
 	bSizerRight = new wxBoxSizer( wxHORIZONTAL );
-	
+
 	wxBoxSizer* bSizeLayer;
 	bSizeLayer = new wxBoxSizer( wxVERTICAL );
-	
+
 	m_staticTextBoardLayers = new wxStaticText( this, wxID_ANY, _("Board layers:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextBoardLayers->Wrap( -1 );
 	m_staticTextBoardLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLayer->Add( m_staticTextBoardLayers, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerShowBrdLayersOpts;
 	fgSizerShowBrdLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerShowBrdLayersOpts->SetFlexibleDirection( wxBOTH );
 	fgSizerShowBrdLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSilkscreen = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSilkscreen = new wxCheckBox( this, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSilkscreen, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSolderMask = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSolderMask = new wxCheckBox( this, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapSolderPaste = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapSolderPaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxSolderpaste = new wxCheckBox( this, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxSolderpaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowBrdLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapAdhesive = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_bitmapAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxAdhesive = new wxCheckBox( this, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowBrdLayersOpts->Add( m_checkBoxAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLayer->Add( fgSizerShowBrdLayersOpts, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizeLayer->Add( 0, 10, 0, 0, 5 );
-	
+
 	m_staticTextUserLayers = new wxStaticText( this, wxID_ANY, _("User layers (not shown in realistic mode):"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextUserLayers->Wrap( -1 );
 	m_staticTextUserLayers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
-	
+
 	bSizeLayer->Add( m_staticTextUserLayers, 0, wxALL, 5 );
-	
+
 	wxFlexGridSizer* fgSizerShowUserLayersOpts;
 	fgSizerShowUserLayersOpts = new wxFlexGridSizer( 0, 3, 0, 0 );
 	fgSizerShowUserLayersOpts->SetFlexibleDirection( wxBOTH );
 	fgSizerShowUserLayersOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
+
+
 	fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_bitmapComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_checkBoxComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	fgSizerShowUserLayersOpts->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 );
-	
+
 	m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_bitmapECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+
 	m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerShowUserLayersOpts->Add( m_checkBoxECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
+
+
 	bSizeLayer->Add( fgSizerShowUserLayersOpts, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerRight->Add( bSizeLayer, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerUpper->Add( bSizerRight, 1, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 );
-	
+
 	m_staticlineH = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bSizerMain->Add( m_staticlineH, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
+
 	m_sdbSizer = new wxStdDialogButtonSizer();
 	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
 	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
 	m_sdbSizer->AddButton( m_sdbSizerCancel );
 	m_sdbSizer->Realize();
-	
+
 	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 );
-	
-	
+
+
 	this->SetSizer( bSizerMain );
 	this->Layout();
-	
+	bSizerMain->Fit( this );
+
 	this->Centre( wxBOTH );
-	
+
 	// Connect Events
 	m_checkBoxRealisticMode->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCheckRealisticMode ), NULL, this );
 }
@@ -265,5 +266,5 @@ DIALOG_3D_VIEW_OPTIONS_BASE::~DIALOG_3D_VIEW_OPTIONS_BASE()
 {
 	// Disconnect Events
 	m_checkBoxRealisticMode->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_3D_VIEW_OPTIONS_BASE::OnCheckRealisticMode ), NULL, this );
-	
+
 }

3d-viewer/3d_viewer/dialogs/dialog_3D_view_option_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul 11 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIALOG_3D_VIEW_OPTION_BASE_H__
-#define __DIALOG_3D_VIEW_OPTION_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -37,7 +36,7 @@
 class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
 		wxStaticText* m_staticText3DRenderOpts;
 		wxStaticBitmap* m_bitmapRealisticMode;
@@ -76,16 +75,15 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
 		wxStdDialogButtonSizer* m_sdbSizer;
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerCancel;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnCheckRealisticMode( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
-		
-		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 571,372 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+
+		DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_3D_VIEW_OPTIONS_BASE();
-	
+
 };
 
-#endif //__DIALOG_3D_VIEW_OPTION_BASE_H__

3d-viewer/3d_viewer/eda_3d_viewer.cpp

@@ -683,11 +683,11 @@ void EDA_3D_VIEWER::OnDisableRayTracing( wxCommandEvent& aEvent )
 }
 
 
-void EDA_3D_VIEWER::OnActivate( wxActivateEvent &event )
+void EDA_3D_VIEWER::OnActivate( wxActivateEvent &aEvent )
 {
     wxLogTrace( m_logTrace, "EDA_3D_VIEWER::OnActivate" );
 
-    if( m_canvas )
+    if( aEvent.GetActive() && m_canvas )
     {
         // Reload data if 3D frame shows a board,
         // because it can be changed since last frame activation
@@ -698,17 +698,17 @@ void EDA_3D_VIEWER::OnActivate( wxActivateEvent &event )
         m_canvas->SetFocus();
     }
 
-    event.Skip();    // required under wxMAC
+    aEvent.Skip(); // required under wxMAC
 }
 
 
-void EDA_3D_VIEWER::OnSetFocus(wxFocusEvent &event)
+void EDA_3D_VIEWER::OnSetFocus( wxFocusEvent& aEvent )
 {
     // Activates again the focus of the canvas so it will catch mouse and key events
     if( m_canvas )
         m_canvas->SetFocus();
 
-    event.Skip();
+    aEvent.Skip();
 }
 
 

3d-viewer/3d_viewer_id.h

@@ -103,6 +103,8 @@ enum id_3dview_frm
 
     ID_DISABLE_RAY_TRACING,
 
+    ID_CUSTOM_EVENT_1,      // A id for a custom event (canvas refresh request)
+
     ID_POPUP_3D_VIEW_START,
     ID_POPUP_ZOOMIN,
     ID_POPUP_ZOOMOUT,

CMakeLists.txt

@@ -21,14 +21,7 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-cmake_minimum_required( VERSION 2.8.12 FATAL_ERROR )
-# because of http://public.kitware.com/Bug/view.php?id=10395
-
-# See https://gitlab.kitware.com/cmake/cmake/issues/15943
-# Remove as soon as 3.1 is minimum required version
-if(POLICY CMP0025)
-  cmake_policy(SET CMP0025 NEW) # CMake 3.0
-endif()
+cmake_minimum_required( VERSION 3.2 FATAL_ERROR )
 
 # Default to CMAKE_BUILD_TYPE = Release unless overridden on command line
 # http://www.cmake.org/pipermail/cmake/2008-September/023808.html
@@ -91,12 +84,12 @@ option( KICAD_SCRIPTING_ACTION_MENU
     ON )
 
 option( KICAD_USE_OCE
-    "Build tools and plugins related to OpenCascade Community Edition (default ON)"
-    ON )
+    "Build tools and plugins related to OpenCascade Community Edition (default OFF)"
+    OFF )
 
 option( KICAD_USE_OCC
-    "Build tools and plugins related to OpenCascade Technology (overrides KICAD_USE_OCE, default OFF)"
-    OFF )
+    "Build tools and plugins related to OpenCascade Technology (overrides KICAD_USE_OCE, default ON)"
+    ON )
 
 option( KICAD_INSTALL_DEMOS
     "Install KiCad demos and examples (default ON)"
@@ -200,24 +193,6 @@ include( PerformFeatureChecks )
 perform_feature_checks()
 
 
-# Workaround: CMake < 3.1 does not support CMAKE_CXX_STANDARD
-if( NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1 )
-    message( FATAL_ERROR "Remove compatibility code" )
-endif()
-
-if( CMAKE_VERSION VERSION_LESS 3.1 AND ( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) )
-    include(CheckCXXCompilerFlag)
-
-    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-
-    if(COMPILER_SUPPORTS_CXX11)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    else()
-        message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
-    endif()
-endif()
-
-
 # Warn about missing override specifiers, if supported
 if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     include(CheckCXXCompilerFlag)

CMakeModules/FindPythonInterp.cmake

@@ -37,7 +37,7 @@ unset(_Python_NAMES)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonInterp_FIND_VERSION)
     if(PythonInterp_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")

CMakeModules/FindPythonLibs.cmake

@@ -44,7 +44,7 @@ cmake_find_frameworks(Python)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonLibs_FIND_VERSION)
     if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")

CMakeModules/FindSWIG.cmake

@@ -55,7 +55,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-find_program(SWIG_EXECUTABLE NAMES swig3.0 swig2.0 swig)
+find_program(SWIG_EXECUTABLE NAMES swig4.0 swig3.0 swig2.0 swig)
 
 if(SWIG_EXECUTABLE)
   execute_process(COMMAND ${SWIG_EXECUTABLE} -swiglib

CMakeModules/Findngspice.cmake

@@ -1,6 +1,8 @@
 # CMake script for finding libngspice
 
 # Copyright (C) 2016 CERN
+# Copyright (C) 2020 Kicad Developers, see AUTHORS.txt for contributors.
+#
 # Author: Maciej Suminski <maciej.suminski@cern.ch>
 #
 # This program is free software; you can redistribute it and/or
@@ -20,21 +22,108 @@
 # or you may write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
+# Usage:
+#
+# ngspice uses pkg-config to gather the configuration information so the pkg-config
+# information is used to populate the CMake find_* commands.  When pkg-config is not
+# available, the fallback is the default platform search paths set up by CMake.  The
+# default search paths can be overridden by user.  The order of precedence is as
+# follows:
+#
+# User defined root path NGSPICE_ROOT_DIR on CMake command line.
+# User defined root path environment variable NGSPICE_ROOT_DIR.
+# Paths generated by pkg-config.
+# The default system paths configured by CMake
+#
+# For a specific ngspice include path not defined above set NGSPICE_INCLUDE_PATH.
+#
+# For a specific ngspice library path not defined above set NGSPICE_LIBRARY_PATH.
+
+# Use pkg-config if it's available.
+find_package(PkgConfig)
+
+if( PKG_CONFIG_FOUND )
+    pkg_check_modules( _NGSPICE ngspice )
+
+    if( _NGSPICE_FOUND )
+        set( NGSPICE_BUILD_VERSION "${_NGSPICE_VERSION}" CACHE STRING
+             "ngspice version returned by pkg-config" )
+    endif()
+endif()
+
 find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_INCLUDE_PATH}
-          ${NGSPICE_ROOT_DIR}/include
-    PATH_SUFFIXES src/include share/ngspice/include share/ngspice/include/ngspice
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_INCLUDE_PATH}
+        ${_NGSPICE_INCLUDE_DIRS}
+    PATH_SUFFIXES
+        include
+        src/include
+        share/ngspice/include
+        share/ngspice/include/ngspice
 )
 
-find_library( NGSPICE_LIBRARY ngspice
-    PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_LIBRARY_PATH}
-    PATH_SUFFIXES src/.libs lib
+if( UNIX )
+    set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned name of the shared library" )
+else()
+    set( NGSPICE_LIB_NAME ngspice CACHE STRING "Optionally versioned name of the shared library" )
+endif()
+
+find_library( NGSPICE_LIBRARY ${NGSPICE_LIB_NAME}
+    PATHS
+        ${NGSPICE_ROOT_DIR}
+        $ENV{NGSPICE_ROOT_DIR}
+        ${NGSPICE_LIBRARY_PATH}
+        ${_NGSPICE_LIBRARY_DIRS}
+    PATH_SUFFIXES
+        src/.libs
+        lib
 )
 
+# If the ngspice version is not set by pkg-config, see if ngspice/config.h is available.
+if( NOT NGSPICE_BUILD_VERSION )
+    find_file( NGSPICE_CONFIG_H ngspice/config.h
+        PATHS
+            ${NGSPICE_ROOT_DIR}
+            $ENV{NGSPICE_ROOT_DIR}
+            ${NGSPICE_INCLUDE_PATH}
+            ${_NGSPICE_INCLUDE_DIRS}
+        PATH_SUFFIXES
+            include
+            src/include
+            share/ngspice/include
+            share/ngspice/include/ngspice
+        )
+
+    if( NOT NGSPICE_CONFIG_H-NOTFOUND )
+        message( STATUS "ngspice configuration file ${NGSPICE_CONFIG_H} found." )
+        set( NGSPICE_HAVE_CONFIG_H "1" CACHE STRING "ngspice/config.h header found." )
+    endif()
+endif()
+
 if( WIN32 AND MSYS )
     # NGSPICE_LIBRARY points to libngspice.dll.a on Windows,
     # but the goal is to find out the DLL name.
     find_library( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll )
+
+    # Some msys versions do not find xxx.dll lib files, only xxx.dll.a files
+    # so try a find_file in exec paths
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        find_file( NGSPICE_DLL NAMES libngspice-0.dll libngspice-1.dll
+            PATHS
+                ${NGSPICE_ROOT_DIR}
+            PATH_SUFFIXES
+                bin
+                lib
+            )
+    endif()
+
+    if( NGSPICE_DLL STREQUAL "NGSPICE_DLL-NOTFOUND" )
+        message( ERROR ":\n***** libngspice-x.dll not found in any executable path *****\n\n" )
+    else()
+        message( STATUS ": libngspice shared lib found: ${NGSPICE_DLL}\n" )
+    endif()
 else()
     set( NGSPICE_DLL "${NGSPICE_LIBRARY}" )
 endif()
@@ -62,4 +151,6 @@ mark_as_advanced(
     NGSPICE_INCLUDE_DIR
     NGSPICE_LIBRARY
     NGSPICE_DLL
+    NGSPICE_BUILD_VERSION
+    NGSPICE_HAVE_CONFIG_H
 )

CMakeModules/KiCadVersion.cmake

@@ -2,7 +2,7 @@
 #  This program source code file is part of KICAD, a free EDA CAD application.
 #
 #  Copyright (C) 2016 Wayne Stambaugh <stambaughw@gmail.com>
-#  Copyright (C) 2016 - 2019 KiCad Developers, see AUTHORS.txt for contributors.
+#  Copyright (C) 2016 - 2021 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
@@ -35,4 +35,4 @@
 # be set after each version tag is added to the git repo.  This will
 # give developers a reasonable idea where which branch was used to build
 # KiCad.
-set( KICAD_VERSION "5.1.6" )
+set( KICAD_VERSION "5.1.12-unknown" )

CMakeModules/config.h.cmake

@@ -75,4 +75,10 @@
 /// Allows scripts install directory to be referenced by the program code.
 #define PYTHON_DEST                     "@PYTHON_DEST@"
 
+/// ngspice version string detected by pkg-config when available.
+#cmakedefine NGSPICE_BUILD_VERSION           "@NGSPICE_BUILD_VERSION@"
+
+/// When pkg-config config is not available for ngspice, use ngspice/config.h for version.
+#cmakedefine NGSPICE_HAVE_CONFIG_H
+
 #endif  // CONFIG_H_

Documentation/development/compiling.md

@@ -471,8 +471,8 @@ to download and [build Boost][] from source.  If you are building Boost on windo
 you will have to apply the Boost patches in the KiCad source [patches folder][].
 
 
-[download]: http://kicad-pcb.org/download/
-[KiCad website]: http://kicad-pcb.org/
+[download]: http://kicad.org/download/
+[KiCad website]: http://kicad.org/
 [KiCad Launchpad]: https://launchpad.net/kicad
 [GNU GCC]: https://gcc.gnu.org/
 [Clang]: http://clang.llvm.org/

Documentation/development/pcbnew-plugins.md

@@ -19,11 +19,11 @@ interpreter installed on the system.
 The Pcbnew Python API can be used stand-alone, i.e. no instance of Pcbnew is
 running and the board project to be manipulated is loaded and saved from and to
 file.  This approach is shown with some examples in the [user's
-documentation](http://docs.kicad-pcb.org/stable/en/pcbnew.html#_kicad_scripting_reference).
+documentation](http://docs.kicad.org/stable/en/pcbnew.html#_kicad_scripting_reference).
 
 Another documentation source is the auto-generated Doxygen reference of the
 API. It can be found
-[here](http://docs.kicad-pcb.org/doxygen-python/namespacepcbnew.html).
+[here](http://docs.kicad.org/doxygen-python/namespacepcbnew.html).
 
 # `Action Plugin` Support # {#ppi_action_pi}
 Besides the stand-alone usage of the generated Python plugin interface,

Documentation/development/road-map.md

@@ -101,5 +101,5 @@ capabilities.
 - In progress.
 
 
-[kicad-website]:http://kicad-pcb.org/
-[kicad-docs]:http://ci.kicad-pcb.org/job/kicad-doxygen/ws/Documentation/doxygen/html/index.html
+[kicad-website]:http://kicad.org/
+[kicad-docs]:http://ci.kicad.org/job/kicad-doxygen/ws/Documentation/doxygen/html/index.html

Documentation/development/stable-release-policy.md

@@ -71,7 +71,7 @@ GitHub plugin.
 
 To provide a convenient method for system packagers to build KiCad from known stable sources,
 source archives in the most common formats along with the resulting md5sum checksum will be
-added to either the KiCad developer's site on Launchpad or the main website at www.kicad-pcb.org.
+added to either the KiCad developer's site on Launchpad or the main website at www.kicad.org.
 
 # Stable Release Announcement # {#announcement}
 

Documentation/development/testing.md

@@ -304,6 +304,6 @@ Issues are still welcome for defects discovered.
 [Boost Unit Test framework]: https://www.boost.org/doc/libs/1_68_0/libs/test/doc/html/index.html
 [boost-test-functions]: https://www.boost.org/doc/libs/1_68_0/libs/test/doc/html/boost_test/utf_reference/testing_tool_ref.html
 [AFL fuzzing tool]: http://lcamtuf.coredump.cx/afl/
-[trace mask documentation]: http://docs.kicad-pcb.org/doxygen/group__trace__env__vars.html
-[trace mask documentation]: http://docs.kicad-pcb.org/doxygen/group__trace__env__vars.html
-[advanced config documentation]: http://docs.kicad-pcb.org/doxygen/namespaceAC__KEYS.html
+[trace mask documentation]: http://docs.kicad.org/doxygen/group__trace__env__vars.html
+[trace mask documentation]: http://docs.kicad.org/doxygen/group__trace__env__vars.html
+[advanced config documentation]: http://docs.kicad.org/doxygen/namespaceAC__KEYS.html

bitmap2component/CMakeLists.txt

@@ -37,7 +37,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE bitmap2component.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME bitmap2component )
 endif()
 

bitmap2component/bitmap2cmp_gui_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jan 17 2019)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -38,7 +38,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 	brightSizer = new wxBoxSizer( wxVERTICAL );
 
 	wxStaticBoxSizer* sbSizerInfo;
-	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info:") ), wxVERTICAL );
+	sbSizerInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Bitmap Info") ), wxVERTICAL );
 
 	wxFlexGridSizer* fgSizerInfo;
 	fgSizerInfo = new wxFlexGridSizer( 0, 4, 0, 0 );
@@ -99,12 +99,12 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 	fgSizerInfo->Add( m_staticTextBPI, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_DPIValueX = new wxTextCtrl( sbSizerInfo->GetStaticBox(), wxID_ANY, _("300"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_DPIValueX->SetMinSize( wxSize( 40,-1 ) );
+	m_DPIValueX->SetMinSize( wxSize( 45,-1 ) );
 
 	fgSizerInfo->Add( m_DPIValueX, 0, wxBOTTOM|wxRIGHT, 5 );
 
 	m_DPIValueY = new wxTextCtrl( sbSizerInfo->GetStaticBox(), wxID_ANY, _("300"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_DPIValueY->SetMinSize( wxSize( 40,-1 ) );
+	m_DPIValueY->SetMinSize( wxSize( 45,-1 ) );
 
 	fgSizerInfo->Add( m_DPIValueY, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 
@@ -128,12 +128,12 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	wxString m_radioBoxFormatChoices[] = { _("Eeschema (.lib file)"), _("Pcbnew (.kicad_mod file)"), _("Postscript (.ps file)"), _("Logo for title block (.kicad_wks file)") };
 	int m_radioBoxFormatNChoices = sizeof( m_radioBoxFormatChoices ) / sizeof( wxString );
-	m_radioBoxFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format:"), wxDefaultPosition, wxDefaultSize, m_radioBoxFormatNChoices, m_radioBoxFormatChoices, 1, wxRA_SPECIFY_COLS );
+	m_radioBoxFormat = new wxRadioBox( m_panelRight, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_radioBoxFormatNChoices, m_radioBoxFormatChoices, 1, wxRA_SPECIFY_COLS );
 	m_radioBoxFormat->SetSelection( 1 );
 	brightSizer->Add( m_radioBoxFormat, 0, wxEXPAND|wxALL, 5 );
 
 	wxStaticBoxSizer* sbSizer2;
-	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options:") ), wxVERTICAL );
+	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRight, wxID_ANY, _("Image Options") ), wxVERTICAL );
 
 	m_ThresholdText = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Black / White Threshold:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_ThresholdText->Wrap( -1 );
@@ -152,7 +152,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	wxString m_radio_PCBLayerChoices[] = { _("Front silk screen"), _("Front solder mask"), _("User layer Eco1"), _("User layer Eco2") };
 	int m_radio_PCBLayerNChoices = sizeof( m_radio_PCBLayerChoices ) / sizeof( wxString );
-	m_radio_PCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline:"), wxDefaultPosition, wxDefaultSize, m_radio_PCBLayerNChoices, m_radio_PCBLayerChoices, 1, wxRA_SPECIFY_COLS );
+	m_radio_PCBLayer = new wxRadioBox( m_panelRight, wxID_ANY, _("Board Layer for Outline"), wxDefaultPosition, wxDefaultSize, m_radio_PCBLayerNChoices, m_radio_PCBLayerChoices, 1, wxRA_SPECIFY_COLS );
 	m_radio_PCBLayer->SetSelection( 3 );
 	m_radio_PCBLayer->SetToolTip( _("Choose the board layer to place the outline.\nThe 2 invisible fields reference and value are always placed on the silk screen layer.") );
 
@@ -167,6 +167,7 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
 
 	this->SetSizer( bMainSizer );
 	this->Layout();
+	bMainSizer->Fit( this );
 	m_statusBar = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY );
 
 	// Connect Events

bitmap2component/bitmap2cmp_gui_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">bitmap2cmp_gui_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="name">bitmap2cmp_gui</property>
@@ -25,6 +26,7 @@
         <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>
         <object class="Frame" expanded="1">
@@ -45,7 +47,7 @@
             <property name="minimum_size"></property>
             <property name="name">BM2CMP_FRAME_BASE</property>
             <property name="pos"></property>
-            <property name="size">733,634</property>
+            <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
             <property name="title">Bitmap to Component Converter</property>
@@ -364,7 +366,7 @@
                                 <property name="proportion">0</property>
                                 <object class="wxStaticBoxSizer" expanded="1">
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Bitmap Info:</property>
+                                    <property name="label">Bitmap Info</property>
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizerInfo</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -1166,7 +1168,7 @@
                                                     <property name="maxlength"></property>
                                                     <property name="min_size"></property>
                                                     <property name="minimize_button">0</property>
-                                                    <property name="minimum_size">40,-1</property>
+                                                    <property name="minimum_size">45,-1</property>
                                                     <property name="moveable">1</property>
                                                     <property name="name">m_DPIValueX</property>
                                                     <property name="pane_border">1</property>
@@ -1232,7 +1234,7 @@
                                                     <property name="maxlength"></property>
                                                     <property name="min_size"></property>
                                                     <property name="minimize_button">0</property>
-                                                    <property name="minimum_size">40,-1</property>
+                                                    <property name="minimum_size">45,-1</property>
                                                     <property name="moveable">1</property>
                                                     <property name="name">m_DPIValueY</property>
                                                     <property name="pane_border">1</property>
@@ -1338,6 +1340,7 @@
                                     <property name="aui_name"></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>
                                     <property name="bitmap"></property>
@@ -1411,6 +1414,7 @@
                                     <property name="aui_name"></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>
                                     <property name="bitmap"></property>
@@ -1504,7 +1508,7 @@
                                     <property name="gripper">0</property>
                                     <property name="hidden">0</property>
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Format:</property>
+                                    <property name="label">Format</property>
                                     <property name="majorDimension">1</property>
                                     <property name="max_size"></property>
                                     <property name="maximize_button">0</property>
@@ -1544,7 +1548,7 @@
                                 <property name="proportion">0</property>
                                 <object class="wxStaticBoxSizer" expanded="1">
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Image Options:</property>
+                                    <property name="label">Image Options</property>
                                     <property name="minimum_size"></property>
                                     <property name="name">sbSizer2</property>
                                     <property name="orient">wxVERTICAL</property>
@@ -1777,7 +1781,7 @@
                                     <property name="gripper">0</property>
                                     <property name="hidden">0</property>
                                     <property name="id">wxID_ANY</property>
-                                    <property name="label">Board Layer for Outline:</property>
+                                    <property name="label">Board Layer for Outline</property>
                                     <property name="majorDimension">1</property>
                                     <property name="max_size"></property>
                                     <property name="maximize_button">0</property>

bitmap2component/bitmap2cmp_gui_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jan 17 2019)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -89,7 +89,7 @@ class BM2CMP_FRAME_BASE : public KIWAY_PLAYER
 
 	public:
 
-		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 733,634 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
+		BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bitmap to Component Converter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 
 		~BM2CMP_FRAME_BASE();
 

bitmap2component/bitmap2component.cpp

@@ -490,9 +490,9 @@ void BITMAPCONV_INFO::CreateOutputFile( BMP2CMP_MOD_LAYER aModLayer )
         if( paths->next == NULL || paths->next->sign == '+' )
         {
             // Substract holes to main polygon:
-            polyset_areas.Simplify( SHAPE_POLY_SET::PM_FAST );
-            polyset_holes.Simplify( SHAPE_POLY_SET::PM_FAST );
-            polyset_areas.BooleanSubtract( polyset_holes, SHAPE_POLY_SET::PM_FAST );
+            polyset_areas.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
+            polyset_holes.Simplify( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
+            polyset_areas.BooleanSubtract( polyset_holes, SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
             polyset_areas.Fracture( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
 
             // Output current resulting polygon(s)

common/CMakeLists.txt

@@ -170,6 +170,7 @@ add_custom_target(
         -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
         -P ${CMAKE_MODULE_PATH}/WriteVersionHeader.cmake
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    BYPRODUCTS ${CMAKE_BINARY_DIR}/kicad_build_version.h
     COMMENT "Generating version string header"
     )
 
@@ -326,6 +327,7 @@ set( COMMON_SRCS
     kiway_express.cpp
     kiway_holder.cpp
     kiway_player.cpp
+    launch_ext.cpp
     lib_id.cpp
     lib_table_base.cpp
     lib_table_keywords.cpp

common/common.cpp

@@ -42,6 +42,7 @@
 #include <wx/url.h>
 
 #include <pgm_base.h>
+#include <clocale>
 
 using KIGFX::COLOR4D;
 
@@ -59,16 +60,33 @@ COLOR4D        g_GhostColor;
 
 // When reading/writing files, we need to swtich to setlocale( LC_NUMERIC, "C" ).
 // Works fine to read/write files with floating point numbers.
-// We can call setlocale( LC_NUMERIC, "C" ) of wxLocale( "C", "C", "C", false )
+// We can call setlocale( LC_NUMERIC, "C" ) or wxLocale( "C", "C", "C", false )
 // wxWidgets discourage a direct call to setlocale
 // However, for us, calling wxLocale( "C", "C", "C", false ) has a unwanted effect:
-// The I18N translations are no longer active, because the English dixtionary is selected.
+// The I18N translations are no longer active, because the English dictionary is selected.
 // To read files, this is not a major issues, but the resul can differ
 // from using setlocale(xx, "C").
-// Previouly, we called setlocale( LC_NUMERIC, "C" )
-// The old code will be removed when calling wxLocale( "C", "C", "C", false )
-// is fully tested, and all issues fixed
-#define USE_WXLOCALE 1      /* 0 to call setlocale, 1 to call wxLocale */
+// Previouly, we used only setlocale( LC_NUMERIC, "C" )
+//
+// Known issues are
+// on MSW
+//    using setlocale( LC_NUMERIC, "C" ) generates an alert message in debug mode,
+//    and this message ("Decimal separator mismatch") must be disabled.
+//    But calling wxLocale( "C", "C", "C", false ) works fine
+// On unix:
+//    calling wxLocale( "C", "C", "C", false ) breaks env vars containing non ASCII7 chars.
+//    these env vars return a empty string from wxGetEnv() in many cases, and if such a
+//    var must be read after calling wxLocale( "C", "C", "C", false ), it looks like empty
+//
+// So use wxLocale on Windows and setlocale on unix
+
+
+// set USE_WXLOCALE 0 to use setlocale, 1 to use wxLocale:
+#if defined( _WIN32 )
+#define USE_WXLOCALE 1
+#else
+#define USE_WXLOCALE 0
+#endif
 
 // On Windows, when using setlocale, a wx alert is generated
 // in some cases (reading a bitmap for instance)
@@ -469,6 +487,11 @@ wxString KIwxExpandEnvVars(const wxString& str)
         }
     }
 
+#ifndef __WINDOWS__
+    if( strResult.StartsWith( "~" ) )
+        strResult.Replace( "~", wxGetHomeDir(), false );
+#endif // __WINDOWS__
+
     return strResult;
 }
 

common/dialog_about/AboutDialog_main.cpp

@@ -130,11 +130,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "The official KiCad website - " )
-                << HtmlHyperlink( "http://www.kicad-pcb.org" )
-                << "</li>";
-    description << "<li>"
-                << _( "Developer website on Launchpad - " )
-                << HtmlHyperlink( "https://launchpad.net/kicad" )
+                << HtmlHyperlink( "https://www.kicad.org" )
                 << "</li>";
 
     description << "<li>"
@@ -163,7 +159,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     description << "<ul>";
     description << "<li>"
                 << _( "KiCad forum - " )
-                << HtmlHyperlink( "https://forum.kicad.info" )
+                << HtmlHyperlink( "https://go.kicad.org/forum" )
                 << "</li>";
 
     description << "</ul></p>";

common/dialogs/dialog_configure_paths.cpp

@@ -221,14 +221,17 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
 
     for( int row = 0; row < m_EnvVars->GetNumberRows(); ++row )
     {
-        wxString name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
-        wxString path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
-        wxString external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        wxString     name = m_EnvVars->GetCellValue( row, EV_NAME_COL );
+        wxString     path = m_EnvVars->GetCellValue( row, EV_PATH_COL );
+        wxString     external = m_EnvVars->GetCellValue( row, EV_FLAG_COL );
+        ENV_VAR_ITEM var( path );
 
         if( external.Length() )
-            continue;
-
-        if( name.IsEmpty() )
+        {
+            // Don't check for consistency on external variables, just use them as-is
+            var.SetDefinedExternally( true );
+        }
+        else if( name.IsEmpty() )
         {
             m_errorGrid = m_EnvVars;
             m_errorRow = row;
@@ -245,7 +248,7 @@ bool DIALOG_CONFIGURE_PATHS::TransferDataFromWindow()
             return false;
         }
 
-        envVarMap[ name ] = ENV_VAR_ITEM( path );
+        envVarMap[ name ] = var;
     }
 
     Pgm().SetLocalEnvVariables( envVarMap );

common/dialogs/dialog_configure_paths_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -14,22 +14,22 @@
 DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_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 );
-	
+
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
-	
+
 	wxStaticBoxSizer* sbEnvVars;
 	sbEnvVars = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Environment Variables") ), wxVERTICAL );
-	
+
 	m_EnvVars = new WX_GRID( sbEnvVars->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
+
 	// Grid
 	m_EnvVars->CreateGrid( 1, 2 );
 	m_EnvVars->EnableEditing( true );
 	m_EnvVars->EnableGridLines( true );
 	m_EnvVars->EnableDragGridSize( false );
 	m_EnvVars->SetMargins( 0, 0 );
-	
+
 	// Columns
 	m_EnvVars->SetColSize( 0, 150 );
 	m_EnvVars->SetColSize( 1, 454 );
@@ -38,54 +38,50 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_EnvVars->SetColLabelSize( 22 );
 	m_EnvVars->SetColLabelValue( 0, _("Name") );
 	m_EnvVars->SetColLabelValue( 1, _("Path") );
-	m_EnvVars->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_EnvVars->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Rows
 	m_EnvVars->EnableDragRowSize( true );
 	m_EnvVars->SetRowLabelSize( 0 );
-	m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_EnvVars->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Label Appearance
-	
+
 	// Cell Defaults
 	m_EnvVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_EnvVars->SetMinSize( wxSize( 604,170 ) );
-	
-	sbEnvVars->Add( m_EnvVars, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
+	sbEnvVars->Add( m_EnvVars, 1, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
+
 	wxBoxSizer* bSizerEnvVarBtns;
 	bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnAddEnvVar->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxRIGHT, 5 );
-	
-	
+
+	m_btnAddEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerEnvVarBtns->Add( m_btnAddEnvVar, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	bSizerEnvVarBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnDeleteEnvVar->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
+
+	m_btnDeleteEnvVar = new wxBitmapButton( sbEnvVars->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerEnvVarBtns->Add( m_btnDeleteEnvVar, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	sbEnvVars->Add( bSizerEnvVarBtns, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( sbEnvVars, 1, wxEXPAND|wxALL, 5 );
-	
+
 	m_sb3DSearchPaths = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("3D Search Paths") ), wxVERTICAL );
-	
+
 	m_SearchPaths = new WX_GRID( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
+
 	// Grid
 	m_SearchPaths->CreateGrid( 1, 3 );
 	m_SearchPaths->EnableEditing( true );
 	m_SearchPaths->EnableGridLines( true );
 	m_SearchPaths->EnableDragGridSize( false );
 	m_SearchPaths->SetMargins( 0, 0 );
-	
+
 	// Columns
 	m_SearchPaths->SetColSize( 0, 150 );
 	m_SearchPaths->SetColSize( 1, 300 );
@@ -96,54 +92,46 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_SearchPaths->SetColLabelValue( 0, _("Alias") );
 	m_SearchPaths->SetColLabelValue( 1, _("Path") );
 	m_SearchPaths->SetColLabelValue( 2, _("Description") );
-	m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_SearchPaths->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Rows
 	m_SearchPaths->AutoSizeRows();
 	m_SearchPaths->EnableDragRowSize( false );
 	m_SearchPaths->SetRowLabelSize( 0 );
-	m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
+	m_SearchPaths->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
+
 	// Label Appearance
-	
+
 	// Cell Defaults
 	m_SearchPaths->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
 	m_SearchPaths->SetMinSize( wxSize( 604,150 ) );
-	
-	m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+
+	m_sb3DSearchPaths->Add( m_SearchPaths, 1, wxBOTTOM|wxEXPAND|wxLEFT, 5 );
+
 	wxBoxSizer* bSizerSearchPathBtns;
 	bSizerSearchPathBtns = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnAddSearchPath->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxRIGHT, 5 );
-	
-	m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnMoveUp->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxRIGHT, 5 );
-	
-	m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnMoveDown->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxRIGHT, 5 );
-	
-	
+
+	m_btnAddSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnAddSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+	m_btnMoveUp = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnMoveUp, 0, wxBOTTOM|wxRIGHT, 5 );
+
+	m_btnMoveDown = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnMoveDown, 0, wxBOTTOM|wxRIGHT, 5 );
+
+
 	bSizerSearchPathBtns->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_btnDeleteSearchPath->SetMinSize( wxSize( 30,29 ) );
-	
-	bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxRIGHT|wxLEFT, 5 );
-	
-	
+
+	m_btnDeleteSearchPath = new wxBitmapButton( m_sb3DSearchPaths->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizerSearchPathBtns->Add( m_btnDeleteSearchPath, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+
+
 	m_sb3DSearchPaths->Add( bSizerSearchPathBtns, 0, wxEXPAND, 5 );
-	
-	
+
+
 	bSizerMain->Add( m_sb3DSearchPaths, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
+
 	m_sdbSizer = new wxStdDialogButtonSizer();
 	m_sdbSizerOK = new wxButton( this, wxID_OK );
 	m_sdbSizer->AddButton( m_sdbSizerOK );
@@ -152,16 +140,16 @@ DIALOG_CONFIGURE_PATHS_BASE::DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWi
 	m_sdbSizerHelp = new wxButton( this, wxID_HELP );
 	m_sdbSizer->AddButton( m_sdbSizerHelp );
 	m_sdbSizer->Realize();
-	
+
 	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );
-	
-	
+
+
 	this->SetSizer( bSizerMain );
 	this->Layout();
 	bSizerMain->Fit( this );
-	
+
 	this->Centre( wxBOTH );
-	
+
 	// Connect Events
 	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnUpdateUI ) );
 	m_EnvVars->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnGridCellChange ), NULL, this );
@@ -192,5 +180,5 @@ DIALOG_CONFIGURE_PATHS_BASE::~DIALOG_CONFIGURE_PATHS_BASE()
 	m_btnMoveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnSearchPathMoveDown ), NULL, this );
 	m_btnDeleteSearchPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnDeleteSearchPath ), NULL, this );
 	m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_CONFIGURE_PATHS_BASE::OnHelp ), NULL, this );
-	
+
 }

common/dialogs/dialog_configure_paths_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">dialog_configure_paths_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="name">DIALOG_CONFIGURE_PATHS_BASE</property>
@@ -25,6 +26,7 @@
         <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>
         <object class="Dialog" expanded="1">
@@ -73,7 +75,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxGrid" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -172,7 +174,7 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -183,6 +185,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -215,7 +218,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnAddEnvVar</property>
                                         <property name="pane_border">1</property>
@@ -255,7 +258,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="1">
                                         <property name="BottomDockable">1</property>
@@ -266,6 +269,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -298,7 +302,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnDeleteEnvVar</property>
                                         <property name="pane_border">1</property>
@@ -344,7 +348,7 @@
                         <property name="permission">protected</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxEXPAND|wxBOTTOM</property>
+                            <property name="flag">wxBOTTOM|wxEXPAND|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxGrid" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -443,7 +447,7 @@
                                 <property name="permission">none</property>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -454,6 +458,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -486,7 +491,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnAddSearchPath</property>
                                         <property name="pane_border">1</property>
@@ -516,7 +521,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -527,6 +532,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -559,7 +565,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnMoveUp</property>
                                         <property name="pane_border">1</property>
@@ -589,7 +595,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT</property>
+                                    <property name="flag">wxBOTTOM|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -600,6 +606,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -632,7 +639,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnMoveDown</property>
                                         <property name="pane_border">1</property>
@@ -672,7 +679,7 @@
                                 </object>
                                 <object class="sizeritem" expanded="0">
                                     <property name="border">5</property>
-                                    <property name="flag">wxRIGHT|wxLEFT</property>
+                                    <property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxBitmapButton" expanded="0">
                                         <property name="BottomDockable">1</property>
@@ -683,6 +690,7 @@
                                         <property name="aui_name"></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>
                                         <property name="bitmap"></property>
@@ -715,7 +723,7 @@
                                         <property name="maximum_size"></property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size">30,29</property>
+                                        <property name="minimum_size">-1,-1</property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_btnDeleteSearchPath</property>
                                         <property name="pane_border">1</property>

common/dialogs/dialog_configure_paths_base.h

@@ -1,12 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 30 2017)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIALOG_CONFIGURE_PATHS_BASE_H__
-#define __DIALOG_CONFIGURE_PATHS_BASE_H__
+#pragma once
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
@@ -20,10 +19,10 @@ class WX_GRID;
 #include <wx/font.h>
 #include <wx/grid.h>
 #include <wx/gdicmn.h>
+#include <wx/bmpbuttn.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
 #include <wx/icon.h>
-#include <wx/bmpbuttn.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
@@ -38,7 +37,7 @@ class WX_GRID;
 class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 {
 	private:
-	
+
 	protected:
 		WX_GRID* m_EnvVars;
 		wxBitmapButton* m_btnAddEnvVar;
@@ -53,7 +52,7 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 		wxButton* m_sdbSizerOK;
 		wxButton* m_sdbSizerCancel;
 		wxButton* m_sdbSizerHelp;
-		
+
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void OnGridCellChange( wxGridEvent& event ) { event.Skip(); }
@@ -66,13 +65,12 @@ class DIALOG_CONFIGURE_PATHS_BASE : public DIALOG_SHIM
 		virtual void OnSearchPathMoveDown( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnDeleteSearchPath( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		
-	
+
+
 	public:
-		
-		DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+
+		DIALOG_CONFIGURE_PATHS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure Paths"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_CONFIGURE_PATHS_BASE();
-	
+
 };
 
-#endif //__DIALOG_CONFIGURE_PATHS_BASE_H__

common/dialogs/panel_common_settings.cpp

@@ -174,6 +174,7 @@ bool PANEL_COMMON_SETTINGS::TransferDataFromWindow()
 void PANEL_COMMON_SETTINGS::OnScaleSlider( wxScrollEvent& aEvent )
 {
     m_iconScaleAuto->SetValue( false );
+    aEvent.Skip();
 }
 
 

common/dialogs/panel_common_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 10 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -97,8 +97,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 	gridHelperApps->Add( m_textEditorPath, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_textEditorBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_textEditorBtn->SetMinSize( wxSize( 29,29 ) );
-
 	gridHelperApps->Add( m_textEditorBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_defaultPDFViewer = new wxRadioButton( sizerHelperApps->GetStaticBox(), wxID_ANY, _("System default PDF viewer"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -113,8 +111,6 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind
 	gridHelperApps->Add( m_PDFViewerPath, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_pdfViewerBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
-	m_pdfViewerBtn->SetMinSize( wxSize( 29,29 ) );
-
 	gridHelperApps->Add( m_pdfViewerBtn, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 
 

common/dialogs/panel_common_settings_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">panel_common_settings_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="name">PanelCommonSettings</property>
@@ -25,6 +26,7 @@
         <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">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Panel" expanded="1">
@@ -846,6 +848,7 @@
                                                 <property name="aui_name"></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>
                                                 <property name="bitmap"></property>
@@ -878,7 +881,7 @@
                                                 <property name="maximum_size"></property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size">29,29</property>
+                                                <property name="minimum_size">-1,-1</property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_textEditorBtn</property>
                                                 <property name="pane_border">1</property>
@@ -1124,6 +1127,7 @@
                                                 <property name="aui_name"></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>
                                                 <property name="bitmap"></property>
@@ -1156,7 +1160,7 @@
                                                 <property name="maximum_size"></property>
                                                 <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size">29,29</property>
+                                                <property name="minimum_size">-1,-1</property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_pdfViewerBtn</property>
                                                 <property name="pane_border">1</property>

common/dialogs/panel_common_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 10 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!

common/dialogs/wx_html_report_panel.cpp

@@ -26,6 +26,7 @@
 #include <wildcards_and_files_ext.h>
 #include <gal/color4d.h>
 #include <wx/clipbrd.h>
+#include <kicad_string.h>
 
 WX_HTML_REPORT_PANEL::WX_HTML_REPORT_PANEL( wxWindow*      parent,
                                             wxWindowID     id,
@@ -402,7 +403,10 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event )
 
     for( const REPORT_LINE& l : m_report )
     {
-        f.Write( generatePlainText( l ) );
+        wxString s = generatePlainText( l );
+
+        ConvertSmartQuotesAndDashes( &s );
+        f.Write( s );
     }
 
     f.Close();

common/draw_panel_gal.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2013-2017 CERN
- * Copyright (C) 2013-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2013-2020 KiCad Developers, see AUTHORS.txt for contributors.
  * @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
@@ -76,7 +76,7 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
     EnableScrolling( false, false );    // otherwise Zoom Auto disables GAL canvas
 
     Connect( wxEVT_SIZE, wxSizeEventHandler( EDA_DRAW_PANEL_GAL::onSize ), NULL, this );
-    Connect( wxEVT_ENTER_WINDOW, wxEventHandler( EDA_DRAW_PANEL_GAL::onEnter ), NULL, this );
+    Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( EDA_DRAW_PANEL_GAL::onEnter ), NULL, this );
     Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( EDA_DRAW_PANEL_GAL::onLostFocus ), NULL, this );
 
     const wxEventType events[] =
@@ -132,15 +132,6 @@ EDA_DRAW_PANEL_GAL::~EDA_DRAW_PANEL_GAL()
 
 void EDA_DRAW_PANEL_GAL::SetFocus()
 {
-// Windows has a strange manner on bringing up and activating windows
-// containing a GAL canvas just after moving the mouse cursor into its area.
-// Feel free to uncomment or extend the following #ifdef if you experience
-// similar problems on your platform.
-#ifdef __WINDOWS__
-    if( !GetParent()->IsDescendant( wxWindow::FindFocus() ) )
-        return;
-#endif
-
     wxScrolledCanvas::SetFocus();
     m_lostFocus = false;
 }
@@ -148,6 +139,16 @@ void EDA_DRAW_PANEL_GAL::SetFocus()
 
 void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
 {
+    DoRePaint();
+}
+
+
+void EDA_DRAW_PANEL_GAL::DoRePaint()
+{
+    // Repaint the canvas, and fix scrollbar cursors
+    // Usually called by a OnPaint event, but because it does not use a wxPaintDC,
+    // it can be called outside a wxPaintEvent.
+
     // Update current zoom settings if the canvas is managed by a EDA frame
     // (i.e. not by a preview panel in a dialog)
     if( GetParentEDAFrame() && GetParentEDAFrame()->GetScreen() )
@@ -231,7 +232,7 @@ void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
 
 #ifdef __WXDEBUG__
     totalRealTime.Stop();
-    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::onPaint(): %.1f ms", totalRealTime.msecs() );
+    wxLogTrace( "GAL_PROFILE", "EDA_DRAW_PANEL_GAL::DoRePaint(): %.1f ms", totalRealTime.msecs() );
 #endif /* PROFILE */
 
     m_lastRefresh = wxGetLocalTimeMillis();
@@ -255,37 +256,32 @@ void EDA_DRAW_PANEL_GAL::onSize( wxSizeEvent& aEvent )
 
 void EDA_DRAW_PANEL_GAL::Refresh( bool aEraseBackground, const wxRect* aRect )
 {
-    if( m_pendingRefresh )
-        return;
-
-    m_pendingRefresh = true;
-
-#ifdef __WXMAC__
-    // Timers on OS X may have a high latency (seen up to 500ms and more) which
-    // makes repaints jerky. No negative impact seen without throttling, so just
-    // do an unconditional refresh for OS X.
-    ForceRefresh();
-#else
     wxLongLong t = wxGetLocalTimeMillis();
     wxLongLong delta = t - m_lastRefresh;
 
+    // If it has been too long since the last frame (possible depending on platform timer latency),
+    // just do a refresh.  Otherwise, start the refresh timer if it hasn't already been started.
+    // This ensures that we will render often enough but not too often.
     if( delta >= MinRefreshPeriod )
     {
-        ForceRefresh();
+        if( !m_pendingRefresh )
+            ForceRefresh();
+
+        m_refreshTimer.Start( MinRefreshPeriod, true );
     }
-    else
+    else if( !m_refreshTimer.IsRunning() )
     {
-        // One shot timer
         m_refreshTimer.Start( ( MinRefreshPeriod - delta ).ToLong(), true );
     }
-#endif
 }
 
 
 void EDA_DRAW_PANEL_GAL::ForceRefresh()
 {
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    m_pendingRefresh = true;
+    DoRePaint();
 }
 
 
@@ -377,21 +373,23 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
         switch( aGalType )
         {
         case GAL_TYPE_OPENGL:
-            try
+        {
+            wxString errormsg = KIGFX::OPENGL_GAL::CheckFeatures( m_options );
+
+            if( errormsg.empty() )
             {
                 new_gal = new KIGFX::OPENGL_GAL( m_options, this, this, this );
-                break;
             }
-            catch( std::runtime_error& err )
+            else
             {
                 aGalType = GAL_TYPE_CAIRO;
                 DisplayInfoMessage( m_parent,
-                        _( "Could not use OpenGL, falling back to software rendering" ),
-                        wxString( err.what() ) );
+                        _( "Could not use OpenGL, falling back to software rendering" ), errormsg );
+                new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
             }
 
-            new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
             break;
+        }
 
         case GAL_TYPE_CAIRO:
             new_gal = new KIGFX::CAIRO_GAL( m_options, this, this, this );
@@ -446,7 +444,15 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
 
 void EDA_DRAW_PANEL_GAL::OnEvent( wxEvent& aEvent )
 {
-    if( m_lostFocus && m_stealsFocus )
+    bool shouldSetFocus = m_lostFocus && m_stealsFocus;
+
+#if defined( _WIN32 )
+    // Ensure we are the active foreground window before we attempt to steal focus
+    // mouse events are generated on Win32 regardless if window is active
+    shouldSetFocus = shouldSetFocus && ( m_edaFrame->GetHWND() == GetForegroundWindow() );
+#endif
+
+    if( shouldSetFocus )
         SetFocus();
 
     if( !m_eventDispatcher )
@@ -458,10 +464,18 @@ void EDA_DRAW_PANEL_GAL::OnEvent( wxEvent& aEvent )
 }
 
 
-void EDA_DRAW_PANEL_GAL::onEnter( wxEvent& aEvent )
+void EDA_DRAW_PANEL_GAL::onEnter( wxMouseEvent& aEvent )
 {
+    bool shouldSetFocus = m_stealsFocus;
+
+#if defined( _WIN32 )
+    // Ensure we are the active foreground window before we attempt to steal focus
+    // mouse events are generated on Win32 regardless if window is active
+    shouldSetFocus = shouldSetFocus && ( m_edaFrame->GetHWND() == GetForegroundWindow() );
+#endif
+
     // Getting focus is necessary in order to receive key events properly
-    if( m_stealsFocus )
+    if( shouldSetFocus )
         SetFocus();
 
     aEvent.Skip();
@@ -495,8 +509,9 @@ void EDA_DRAW_PANEL_GAL::onRefreshTimer( wxTimerEvent& aEvent )
         }
     }
 
-    wxPaintEvent redrawEvent;
-    wxPostEvent( this, redrawEvent );
+    //wxPaintEvent redrawEvent;
+    //wxPostEvent( this, redrawEvent );
+    DoRePaint();
 }
 
 

common/eda_base_frame.cpp

@@ -47,7 +47,7 @@
 /// The default auto save interval is 10 minutes.
 #define DEFAULT_AUTO_SAVE_INTERVAL 600
 
-#define URL_GET_INVOLVED "http://kicad-pcb.org/contribute/"
+#define URL_GET_INVOLVED "https://www.kicad.org/contribute/"
 
 ///@{
 /// \ingroup config
@@ -289,7 +289,10 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
     int displayIndex = wxDisplay::GetFromPoint( m_FramePos );
 
     if( displayIndex == wxNOT_FOUND )
+    {
         displayIndex = 0;
+        m_FramePos = wxDefaultPosition;
+    }
 
     wxDisplay display( displayIndex );
     wxRect clientSize = display.GetClientArea();

common/footprint_info.cpp

@@ -143,8 +143,7 @@ FOOTPRINT_LIST* FOOTPRINT_LIST::GetInstance( KIWAY& aKiway )
 
     if( !footprintInfo->GetCount() )
     {
-        wxTextFile footprintInfoCache( aKiway.Prj().GetProjectPath() + "fp-info-cache" );
-        footprintInfo->ReadCacheFromFile( &footprintInfoCache );
+        footprintInfo->ReadCacheFromFile( aKiway.Prj().GetProjectPath() + "fp-info-cache" );
     }
 
     return footprintInfo;

common/gal/cairo/cairo_gal.cpp

@@ -1297,6 +1297,16 @@ void CAIRO_GAL::endDrawing()
 }
 
 
+void CAIRO_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
 void CAIRO_GAL::ResizeScreen( int aWidth, int aHeight )
 {
     CAIRO_GAL_BASE::ResizeScreen( aWidth, aHeight );
@@ -1502,9 +1512,9 @@ void CAIRO_GAL::setCompositor()
 }
 
 
-void CAIRO_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void CAIRO_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }
 
 

common/gal/cairo/cairo_print.cpp

@@ -135,14 +135,6 @@ CAIRO_PRINT_GAL::CAIRO_PRINT_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions,
 }
 
 
-void CAIRO_PRINT_GAL::SetLineWidth( float aLineWidth )
-{
-    storePath();
-    lineWidth = aLineWidth;
-    cairo_set_line_width( currentContext, aLineWidth );
-}
-
-
 void CAIRO_PRINT_GAL::ComputeWorldScreenMatrix()
 {
     worldScale = screenDPI * worldUnitLength * zoomFactor;

common/gal/opengl/cached_container_gpu.cpp

@@ -65,7 +65,8 @@ CACHED_CONTAINER_GPU::~CACHED_CONTAINER_GPU()
     if( m_isMapped )
         Unmap();
 
-    glDeleteBuffers( 1, &m_glBufferHandle );
+    if( glDeleteBuffers )
+        glDeleteBuffers( 1, &m_glBufferHandle );
 }
 
 
@@ -73,6 +74,10 @@ void CACHED_CONTAINER_GPU::Map()
 {
     wxCHECK( !IsMapped(), /*void*/ );
 
+    // OpenGL version might suddenly stop being available in Windows when an RDP session is started
+    if( !glBindBuffer )
+        throw std::runtime_error( "OpenGL no longer available!" );
+
     glBindBuffer( GL_ARRAY_BUFFER, m_glBufferHandle );
     m_vertices = static_cast<VERTEX*>( glMapBuffer( GL_ARRAY_BUFFER, GL_READ_WRITE ) );
 

common/gal/opengl/cached_container_ram.cpp

@@ -51,7 +51,9 @@ CACHED_CONTAINER_RAM::CACHED_CONTAINER_RAM( unsigned int aSize ) :
 
 CACHED_CONTAINER_RAM::~CACHED_CONTAINER_RAM()
 {
-    glDeleteBuffers( 1, &m_verticesBuffer );
+    if( glDeleteBuffers )
+        glDeleteBuffers( 1, &m_verticesBuffer );
+
     free( m_vertices );
 }
 

common/gal/opengl/gl_builtin_shaders.cpp

@@ -282,7 +282,6 @@ const float SHADER_FILLED_CIRCLE        = 2.0;
 const float SHADER_STROKED_CIRCLE       = 3.0;
 const float SHADER_FONT                 = 4.0;
 const float SHADER_LINE_A               = 5.0;
-const float SHADER_LINE_B               = 6.0;
 
 varying vec4 shaderParams;
 varying vec2 circleCoords;
@@ -302,12 +301,6 @@ void filledCircle( vec2 aCoord )
 
 float pixelSegDistance( vec2 aCoord )
 {
-    if( shaderParams[0] == SHADER_LINE_B )
-    {
-        gl_FragColor = gl_Color;
-        return 0.0;
-    }
-
     float aspect = shaderParams[1];
     float dist;
     vec2 v = vec2( 1.0 - ( aspect - abs( aCoord.s ) ), aCoord.t );
@@ -361,19 +354,23 @@ float median( vec3 v )
 
 void main()
 {
-    if( shaderParams[0] == SHADER_LINE_A )
+    // VS to FS pipeline does math that means we can't rely on the mode
+    // parameter being bit-exact without rounding it first.
+    float mode = floor( shaderParams[0] + 0.5 );
+
+    if( mode == SHADER_LINE_A )
     {
         drawLine( gl_TexCoord[0].st );
     }
-    else if( shaderParams[0] == SHADER_FILLED_CIRCLE )
+    else if( mode == SHADER_FILLED_CIRCLE )
     {
         filledCircle( circleCoords );
     }
-    else if( shaderParams[0] == SHADER_STROKED_CIRCLE )
+    else if( mode == SHADER_STROKED_CIRCLE )
     {
         strokedCircle( circleCoords, shaderParams[2], shaderParams[3] );
     }
-    else if( shaderParams[0] == SHADER_FONT )
+    else if( mode == SHADER_FONT )
     {
         vec2 tex           = shaderParams.yz;
 

common/gal/opengl/gpu_manager.cpp

@@ -85,8 +85,11 @@ GPU_CACHED_MANAGER::~GPU_CACHED_MANAGER()
 {
     if( m_buffersInitialized )
     {
-        glBindBuffer( GL_ARRAY_BUFFER, 0 );
-        glDeleteBuffers( 1, &m_indicesBuffer );
+        if( glBindBuffer )
+            glBindBuffer( GL_ARRAY_BUFFER, 0 );
+
+        if( glDeleteBuffers )
+            glDeleteBuffers( 1, &m_indicesBuffer );
     }
 }
 

common/gal/opengl/opengl_compositor.cpp

@@ -399,8 +399,11 @@ void OPENGL_COMPOSITOR::clean()
 
     m_buffers.clear();
 
-    glDeleteFramebuffersEXT( 1, &m_mainFbo );
-    glDeleteRenderbuffersEXT( 1, &m_depthBuffer );
+    if( glDeleteFramebuffersEXT )
+        glDeleteFramebuffersEXT( 1, &m_mainFbo );
+
+    if( glDeleteRenderbuffersEXT )
+        glDeleteRenderbuffersEXT( 1, &m_depthBuffer );
 
     m_initialized = false;
 }

common/gal/opengl/opengl_gal.cpp

@@ -198,30 +198,16 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     isContextLocked( false ),
     lockClientCookie( 0 )
 {
-// IsDisplayAttr() handles WX_GL_{MAJOR,MINOR}_VERSION correctly only in 3.0.4
-// starting with 3.1.0 one should use wxGLContext::IsOk() (done by GL_CONTEXT_MANAGER)
-#if wxCHECK_VERSION( 3, 0, 3 ) and !wxCHECK_VERSION( 3, 1, 0 )
-    const int attr[] = { WX_GL_MAJOR_VERSION, 2, WX_GL_MINOR_VERSION, 1, 0 };
-
-    if( !IsDisplaySupported( attr ) )
-        throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
-#endif /* wxCHECK_VERSION( 3, 0, 3 ) */
 
     if( glMainContext == NULL )
     {
         glMainContext = GL_CONTEXT_MANAGER::Get().CreateCtx( this );
 
-        if( !glMainContext )
-            throw std::runtime_error( "Could not create the main OpenGL context" );
-
         glPrivContext = glMainContext;
     }
     else
     {
         glPrivContext = GL_CONTEXT_MANAGER::Get().CreateCtx( this, glMainContext );
-
-        if( !glPrivContext )
-            throw std::runtime_error( "Could not create a private OpenGL context" );
     }
 
     shader = new SHADER();
@@ -272,9 +258,6 @@ OPENGL_GAL::OPENGL_GAL( GAL_DISPLAY_OPTIONS& aDisplayOptions, wxWindow* aParent,
     tesselator = gluNewTess();
     InitTesselatorCallbacks( tesselator );
 
-    if( tesselator == NULL )
-        throw std::runtime_error( "Could not create the tesselator" );
-
     gluTessProperty( tesselator, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_POSITIVE );
 
     SetTarget( TARGET_NONCACHED );
@@ -326,6 +309,46 @@ OPENGL_GAL::~OPENGL_GAL()
 }
 
 
+void OPENGL_GAL::PostPaint( wxPaintEvent& aEvent )
+{
+    // posts an event to m_paint_listener to ask for redraw the canvas.
+    if( paintListener )
+    {
+        wxPostEvent( paintListener, aEvent );
+    }
+}
+
+
+wxString OPENGL_GAL::CheckFeatures( GAL_DISPLAY_OPTIONS& aOptions )
+{
+    wxString retVal = wxEmptyString;
+
+    wxFrame* testFrame = new wxFrame( NULL, wxID_ANY, wxT( "" ), wxDefaultPosition, wxSize( 1, 1 ),
+                                      wxFRAME_TOOL_WINDOW | wxNO_BORDER );
+
+    KIGFX::OPENGL_GAL* opengl_gal = new KIGFX::OPENGL_GAL( aOptions, testFrame );
+
+    testFrame->Raise();
+    testFrame->Show();
+
+    try
+    {
+        GAL_CONTEXT_LOCKER lock( opengl_gal );
+        opengl_gal->init();
+    }
+    catch( std::runtime_error& err )
+    {
+        //Test failed
+        retVal = wxString( err.what() );
+    }
+
+    delete opengl_gal;
+    delete testFrame;
+
+    return retVal;
+}
+
+
 bool OPENGL_GAL::updatedGalDisplayOptions( const GAL_DISPLAY_OPTIONS& aOptions )
 {
     bool refresh = false;
@@ -603,7 +626,12 @@ void OPENGL_GAL::DrawLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoin
 void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint,
                               double aWidth )
 {
-    if( aStartPoint == aEndPoint )  // 0 length segments are just a circle.
+    VECTOR2D startEndVector = aEndPoint - aStartPoint;
+    double lineLength = startEndVector.EuclideanNorm();
+
+    // segments having a length <= 1 are just a circle.
+    // Moreover trying to draw them as a segment does not work fine.
+    if( lineLength <= 1 )
     {
         DrawCircle( aStartPoint, aWidth/2 );
         return;
@@ -618,10 +646,8 @@ void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
     }
     else
     {
-        auto startEndVector = aEndPoint - aStartPoint;
         auto lineAngle      = startEndVector.Angle();
         // Outlined tracks
-        double lineLength = startEndVector.EuclideanNorm();
 
         SetLineWidth( 1.0 );
         currentManager->Color( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );
@@ -1911,9 +1937,9 @@ std::pair<VECTOR2D, float> OPENGL_GAL::computeBitmapTextSize( const UTF8& aText
 }
 
 
-void OPENGL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
+void OPENGL_GAL::onPaint( wxPaintEvent& aEvent )
 {
-    PostPaint();
+    PostPaint( aEvent );
 }
 
 
@@ -1977,6 +2003,26 @@ void OPENGL_GAL::init()
 
     wxASSERT_MSG( isContextLocked, "This should only be called from within a locked context." );
 
+// IsDisplayAttr() handles WX_GL_{MAJOR,MINOR}_VERSION correctly only in 3.0.4
+// starting with 3.1.0 one should use wxGLContext::IsOk() (done by GL_CONTEXT_MANAGER)
+#if wxCHECK_VERSION( 3, 0, 3 ) and !wxCHECK_VERSION( 3, 1, 0 )
+    const int attr[] = { WX_GL_MAJOR_VERSION, 2, WX_GL_MINOR_VERSION, 1, 0 };
+
+    if( !IsDisplaySupported( attr ) )
+        throw std::runtime_error( "OpenGL 2.1 or higher is required!" );
+#endif /* wxCHECK_VERSION( 3, 0, 3 ) */
+
+    // Check correct initialization from the constructor
+    if( !glMainContext )
+        throw std::runtime_error( "Could not create the main OpenGL context" );
+
+    if( !glPrivContext )
+        throw std::runtime_error( "Could not create a private OpenGL context" );
+
+    if( tesselator == NULL )
+        throw std::runtime_error( "Could not create the tesselator" );
+    // End initialzation checks
+
     GLenum err = glewInit();
 
     if( GLEW_OK != err )

common/gal/opengl/shader.cpp

@@ -59,20 +59,23 @@ SHADER::~SHADER()
 
     if( isProgramCreated )
     {
-        // Delete the shaders and the program
-        for( std::deque<GLuint>::iterator it = shaderNumbers.begin();
-                it != shaderNumbers.end(); ++it )
+        if( glIsShader )
         {
-            GLuint shader = *it;
-
-            if( glIsShader( shader ) )
+            // Delete the shaders and the program
+            for( std::deque<GLuint>::iterator it = shaderNumbers.begin(); it != shaderNumbers.end();
+                    ++it )
             {
-                glDetachShader( programNumber, shader );
-                glDeleteShader( shader );
-            }
-        }
+                GLuint shader = *it;
 
-        glDeleteProgram( programNumber );
+                if( glIsShader( shader ) )
+                {
+                    glDetachShader( programNumber, shader );
+                    glDeleteShader( shader );
+                }
+            }
+
+            glDeleteProgram( programNumber );
+        }
     }
 }
 

common/geometry/geometry_utils.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2020 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
@@ -54,6 +54,25 @@ int GetArcToSegmentCount( int aRadius, int aErrorMax, double aArcAngleDegree )
 }
 
 
+// When creating polygons to create a clearance polygonal area, the polygon must
+// be same or bigger than the original shape.
+// Polygons are bigger if the original shape has arcs (round rectangles, ovals, circles...)
+// In some cases (in fact only one: when building layer solder mask) modifying
+// shapes when converting them to polygons is not acceptable (the modification
+// can break calculations)
+// so one can disable the shape expansion by calling KeepPolyInsideShape( true )
+// Important: calling KeepPolyInsideShape( false ) after calculations is
+// mandatory to break oher calculations
+static bool s_disable_arc_correction = false;
+
+// Enable (aInside = false) or disable (aInside = true) polygonal shape expansion
+// when converting pads shapes and other items shapes to polygons:
+void DisableArcRadiusCorrection( bool aDisable )
+{
+    s_disable_arc_correction = aDisable;
+}
+
+
 double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
 {
     /* calculates the coeff to compensate radius reduction of circle
@@ -66,7 +85,7 @@ double GetCircletoPolyCorrectionFactor( int aSegCountforCircle )
     if( aSegCountforCircle < MIN_SEGCOUNT_FOR_CIRCLE )
         aSegCountforCircle = MIN_SEGCOUNT_FOR_CIRCLE;
 
-    return 1.0 / cos( M_PI / aSegCountforCircle );
+    return s_disable_arc_correction ? 1.0 : 1.0 / cos( M_PI / aSegCountforCircle );
 }
 
 

common/launch_ext.cpp

@@ -0,0 +1,42 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <gestfich.h>
+#include <launch_ext.h>
+
+
+void LaunchExternal( const wxString& aPath )
+{
+#ifdef __WXMAC__
+    wxExecute( wxString::Format( "open \"%s\"", aPath ) );
+#else
+    wxString path( aPath );
+
+#if !wxCHECK_VERSION( 3, 1, 0 )
+    // Quote in case there are spaces in the path.
+    // Not needed on 3.1.4, but needed in 3.0 versions
+    // Moreover, on Linux, on 3.1.4 wx version, adding quotes breaks
+    // wxLaunchDefaultApplication
+    AddDelimiterString( path );
+#endif
+
+    wxLaunchDefaultApplication( path );
+#endif
+}

common/legacy_gal/eda_draw_frame.cpp

@@ -268,6 +268,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
 
 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
     UpdateStatusBar();
     UpdateMsgPanel();
 }
@@ -298,6 +299,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
     m_canvas->SetEnableAutoPan( option );
 
     m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }
 
 
@@ -428,6 +431,7 @@ void EDA_DRAW_FRAME::OnUpdateUnits( wxUpdateUIEvent& aEvent )
 
     aEvent.Check( enable );
     DisplayUnitsMsg();
+    ReCreateAuxiliaryToolbar();
 }
 
 
@@ -1087,6 +1091,11 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
 
 bool EDA_DRAW_FRAME::SwitchCanvas( EDA_DRAW_PANEL_GAL::GAL_TYPE aCanvasType )
 {
+#ifdef __WXMAC__
+    // Cairo is unsupported on Mac
+    if( aCanvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO )
+        aCanvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
+#endif
     auto galCanvas = GetGalCanvas();
     wxCHECK( galCanvas, false );
     bool use_gal = galCanvas->SwitchBackend( aCanvasType );
@@ -1116,6 +1125,12 @@ EDA_DRAW_PANEL_GAL::GAL_TYPE EDA_DRAW_FRAME::LoadCanvasTypeSetting()
         canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE;
     }
 
+#ifdef __WXMAC__
+    // Did Cairo get saved on Mac?  Force OpenGL; Cairo doesn't work on Retina displays
+    if( canvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO )
+        canvasType = EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL;
+#endif
+
     // Coerce the value into a GAL type when Legacy is not available
     // Default to Cairo, and on the first, user will be prompted for OpenGL
     if( canvasType == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE

common/legacy_wx/eda_draw_frame.cpp

@@ -271,6 +271,7 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
 
 void EDA_DRAW_FRAME::unitsChangeRefresh()
 {
+    ReCreateAuxiliaryToolbar();
     UpdateStatusBar();
     UpdateMsgPanel();
 }
@@ -300,6 +301,8 @@ void EDA_DRAW_FRAME::CommonSettingsChanged()
     m_canvas->SetEnableAutoPan( option );
 
     m_galDisplayOptions.ReadCommonConfig( *settings, this );
+
+    ReCreateAuxiliaryToolbar();
 }
 
 

common/lib_tree_model.cpp

@@ -21,6 +21,7 @@
 
 #include <lib_tree_model.h>
 
+#include <algorithm>
 #include <eda_pattern_match.h>
 #include <lib_tree_item.h>
 #include <make_unique.h>

common/lib_tree_model_adapter.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2017 Chris Pavlina <pavlina.chris@gmail.com>
  * Copyright (C) 2014 Henner Zeller <h.zeller@acm.org>
- * Copyright (C) 2014-2017 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2014-2020 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
@@ -136,38 +136,53 @@ void LIB_TREE_MODEL_ADAPTER::DoAddLibrary( wxString const& aNodeName, wxString c
 }
 
 
-void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch )
+void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch, bool aState )
 {
-    m_tree.ResetScore();
-
-    wxStringTokenizer tokenizer( aSearch );
-
-    while( tokenizer.HasMoreTokens() )
-    {
-        const wxString term = tokenizer.GetNextToken().Lower();
-        EDA_COMBINED_MATCHER matcher( term );
-
-        m_tree.UpdateScore( matcher );
-    }
-
-    m_tree.SortNodes();
-
     {
         wxWindowUpdateLocker updateLock( m_widget );
 
-        // Even with the updateLock, wxWidgets sometimes ties its knickers in
-        // a knot when trying to run a wxdataview_selection_changed_callback()
-        // on a row that has been deleted.
+        // Even with the updateLock, wxWidgets sometimes ties its knickers in a knot trying to
+        // run a wxdataview_selection_changed_callback() on a row that has been deleted.
         // https://bugs.launchpad.net/kicad/+bug/1756255
         m_widget->UnselectAll();
 
-        Cleared();
-#ifndef __WINDOWS__
-        // The fastest method to update wxDataViewCtrl is to rebuild from
-        // scratch by calling Cleared(). Linux requires to reassociate model to
-        // display data, but Windows will create multiple associations.
-        AttachTo( m_widget );
-#endif
+        // This collapse is required before the call to "Freeze()" below.  Once Freeze()
+        // is called, GetParent() will return nullptr.  While this works for some calls, it
+        // segfaults when we have any expanded elements b/c the sub units in the tree don't
+        // have explicit references that are maintained over a search
+        // The tree will be expanded again below when we get our matches
+        //
+        // Also note that this cannot happen when we have deleted a symbol as GTK will also
+        // iterate over the tree in this case and find a symbol that has an invalid link
+        // and crash https://gitlab.com/kicad/code/kicad/-/issues/6910
+        if( !aState && m_tree.Children.size() )
+        {
+            for( std::unique_ptr<LIB_TREE_NODE>& child: m_tree.Children )
+                m_widget->Collapse( wxDataViewItem( &*child ) );
+        }
+
+        // DO NOT REMOVE THE FREEZE/THAW. This freeze/thaw is a flag for this model adapter
+        // that tells it when it shouldn't trust any of the data in the model. When set, it will
+        // not return invalid data to the UI, since this invalid data can cause crashes.
+        // This is different than the update locker, which locks the UI aspects only.
+        Freeze();
+        BeforeReset();
+
+        m_tree.ResetScore();
+
+        wxStringTokenizer tokenizer( aSearch );
+
+        while( tokenizer.HasMoreTokens() )
+        {
+            const wxString term = tokenizer.GetNextToken().Lower();
+            EDA_COMBINED_MATCHER matcher( term );
+
+            m_tree.UpdateScore( matcher );
+        }
+
+        m_tree.SortNodes();
+        AfterReset();
+        Thaw();
     }
 
     LIB_TREE_NODE* bestMatch = ShowResults();
@@ -310,6 +325,9 @@ bool LIB_TREE_MODEL_ADAPTER::IsContainer( wxDataViewItem const& aItem ) const
 
 wxDataViewItem LIB_TREE_MODEL_ADAPTER::GetParent( wxDataViewItem const& aItem ) const
 {
+    if( m_freeze )
+        return ToItem( nullptr );
+
     auto node = ToNode( aItem );
     auto parent = node ? node->Parent : nullptr;
 
@@ -451,7 +469,7 @@ LIB_TREE_NODE* LIB_TREE_MODEL_ADAPTER::ShowResults()
                    []( LIB_TREE_NODE const* n )
                    {
                        // return leaf nodes with some level of matching
-                       return n->Children.size() == 0 && n->Score > 1;
+                       return n->Type == LIB_TREE_NODE::TYPE::LIBID && n->Score > 1;
                    },
                    &highScore );
 

common/lib_tree_model_adapter.h

@@ -171,8 +171,9 @@ public:
      * Set the search string provided by the user.
      *
      * @param aSearch   full, unprocessed search text
+     * @param aState    Are we keeping the selection/search state?
      */
-    void UpdateSearchString( wxString const& aSearch );
+    void UpdateSearchString( wxString const& aSearch, bool aState );
 
     /**
      * Attach to a wxDataViewCtrl and initialize it. This will set up columns

common/md5_hash.cpp

@@ -92,6 +92,34 @@ bool MD5_HASH::operator!=( const MD5_HASH& aOther ) const
 }
 
 
+std::string MD5_HASH::Format( bool aCompactForm )
+{
+    std::string data;
+
+    // Build a hexadecimal string from the 16 bytes of MD5_HASH:
+    for( int ii = 0; ii < 16; ++ii )
+    {
+        char lsb = ( m_hash[ii] & 0x0F ) + '0';
+
+        if( lsb > '9' )
+            lsb += 'A'-'9';
+
+        char msb = ( ( m_hash[ii] >> 4 ) & 0x0F ) + '0';
+
+        if( msb > '9' )
+            msb += 'A'-'9';
+
+         data += msb;
+         data += lsb;
+
+        if( !aCompactForm )
+            data += ' ';
+    }
+
+    return data;
+}
+
+
 void MD5_HASH::md5_transform(MD5_CTX *ctx, uint8_t data[])
 {
    uint32_t a,b,c,d,m[16],i,j;

common/msgpanel.cpp

@@ -43,6 +43,10 @@ EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId,
 {
     SetFont( wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ) );
     SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    // informs wx not to paint the background itself as we will paint it later in erase()
+    SetBackgroundStyle( wxBG_STYLE_PAINT );
+
     m_last_x = 0;
 
     m_fontSize = computeFontSize();

common/page_layout/page_layout_reader.cpp

@@ -128,6 +128,14 @@ void PAGE_LAYOUT_READER_PARSER::Parse( WORKSHEET_LAYOUT* aLayout )
         if( token == T_LEFT )
             token = NextTok();
 
+        if( token == T_kicad_wks || token == T_drawing_sheet )
+        {
+            THROW_PARSE_ERROR( _( "KiCad was unable to open this file because it was created with "
+                                  "a more recent version than the one you are running.\n\n"
+                                  "To open it you will need to upgrade KiCad to 5.99 or later." ),
+                               CurSource(), CurLine(), CurLineNumber(), CurOffset() );
+        }
+
         if( token == T_page_layout )
             continue;
 

common/page_layout/page_layout_reader.keywords

@@ -1,3 +1,5 @@
+drawing_sheet
+kicad_wks
 page_layout
 setup
 left_margin

common/plotters/GERBER_plotter.cpp

@@ -170,9 +170,8 @@ bool GERBER_PLOTTER::StartPlot()
 
     finalFile = outputFile;     // the actual gerber file will be created later
 
-    // Create a temporary filename to store gerber file
-    // note tmpfile() does not work under Vista and W7 in user mode
-    m_workFilename = filename + wxT(".tmp");
+    // Create a temp file in system temp to avoid potential network share buffer issues for the final read and save
+    m_workFilename = wxFileName::CreateTempFileName( "" );
     workFile   = wxFopen( m_workFilename, wxT( "wt" ));
     outputFile = workFile;
     wxASSERT( outputFile );
@@ -988,6 +987,9 @@ void GERBER_PLOTTER::plotRoundRectAsRegion( const wxPoint& aRectCenter, const wx
     rr_outline.push_back( curr_edge );
 
     // Move relative coordinates to the actual location and rotation:
+    wxPoint arc_last_center;
+    int arc_last_angle = curr_edge.m_arc_angle_start+arc_angle;
+
     for( RR_EDGE& rr_edge: rr_outline )
     {
         RotatePoint( &rr_edge.m_start, aOrient );
@@ -996,19 +998,38 @@ void GERBER_PLOTTER::plotRoundRectAsRegion( const wxPoint& aRectCenter, const wx
         rr_edge.m_start += aRectCenter;
         rr_edge.m_end += aRectCenter;
         rr_edge.m_center += aRectCenter;
+        arc_last_center = rr_edge.m_center;
     }
 
-    fputs( "G36*\n", outputFile );      // Start region
-    fputs( "G01*\n", outputFile );      // Set linear interpolation.
-    MoveTo( rr_outline[0].m_start );    // Start point of region
+    // Ensure the region is a closed polygon, i.e. the end point of last segment
+    // (end of arc) is the same as the first point. Rounding issues can create a
+    // small difference, mainly for rotated pads.
+    // calculate last point (end of last arc):
+    wxPoint last_pt;
+    last_pt.x = arc_last_center.x + KiROUND( cosdecideg( aCornerRadius, arc_last_angle ) );
+    last_pt.y = arc_last_center.y - KiROUND( sindecideg( aCornerRadius, arc_last_angle ) );
+
+    wxPoint first_pt = rr_outline[0].m_start;
+
+#if 0    // For test only:
+    if( last_pt != first_pt )
+        wxLogMessage( "first pt %d %d last pt %d %d",
+                      first_pt.x, first_pt.y, last_pt.x, last_pt.y );
+#endif
+
+    fputs( "G36*\n", outputFile );  // Start region
+    fputs( "G01*\n", outputFile );  // Set linear interpolation.
+    first_pt = last_pt;
+    MoveTo( first_pt );             // Start point of region, must be same as end point
 
     for( RR_EDGE& rr_edge: rr_outline )
     {
         if( aCornerRadius )     // Guard: ensure we do not create arcs with radius = 0
         {
             // LineTo( rr_edge.m_end ); // made in plotArc()
-            plotArc( rr_edge.m_center, rr_edge.m_arc_angle_start, rr_edge.m_arc_angle_start+arc_angle,
-                 aCornerRadius, true );
+            plotArc( rr_edge.m_center,
+                     rr_edge.m_arc_angle_start, rr_edge.m_arc_angle_start+arc_angle,
+                     aCornerRadius, true );
         }
         else
             LineTo( rr_edge.m_end );

common/plotters/PDF_plotter.cpp

@@ -495,7 +495,7 @@ int PDF_PLOTTER::startPdfStream(int handle)
              "stream\n", handle + 1 );
 
     // Open a temporary file to accumulate the stream
-    workFilename = filename + wxT(".tmp");
+    workFilename = wxFileName::CreateTempFileName( "" );
     workFile = wxFopen( workFilename, wxT( "w+b" ));
     wxASSERT( workFile );
     return handle;
@@ -755,8 +755,7 @@ bool PDF_PLOTTER::EndPlot()
              "/Producer (KiCAD PDF)\n"
              "/CreationDate (%s)\n"
              "/Creator (%s)\n"
-             "/Title (%s)\n"
-             "/Trapped false\n",
+             "/Title (%s)\n",
              date_buf,
              TO_UTF8( creator ),
              TO_UTF8( title ) );

common/plotters/SVG_plotter.cpp

@@ -796,10 +796,15 @@ void SVG_PLOTTER::Text( const wxPoint&              aPos,
     }
 
     fprintf( outputFile,
-             "<text x=\"%g\" y=\"%g\"\n"
+             "<text x=\"%g\" y=\"%g\"\n", text_pos_dev.x, text_pos_dev.y );
+
+    /// If the text is mirrored, we should also mirror the hidden text to match
+    if( aSize.x < 0 )
+        fprintf( outputFile, "transform=\"scale(-1 1) translate(%f 0)\"\n", -2 * text_pos_dev.x );
+
+    fprintf( outputFile,
              "textLength=\"%g\" font-size=\"%g\" lengthAdjust=\"spacingAndGlyphs\"\n"
              "text-anchor=\"%s\" opacity=\"0\">%s</text>\n",
-             text_pos_dev.x, text_pos_dev.y,
              sz_dev.x, sz_dev.y,
              hjust, TO_UTF8( XmlEsc( aText ) ) );
 

common/plotters/plotter.cpp

@@ -478,9 +478,16 @@ void PLOTTER::ThickSegment( const wxPoint& start, const wxPoint& end, int width,
 {
     if( tracemode == FILLED )
     {
-        SetCurrentLineWidth( width );
-        MoveTo( start );
-        FinishTo( end );
+        if( start == end )
+        {
+            Circle( start, width, FILLED_SHAPE, 0 );
+        }
+        else
+        {
+            SetCurrentLineWidth( width );
+            MoveTo( start );
+            FinishTo( end );
+        }
     }
     else
     {

common/preview_items/polygon_item.cpp

@@ -31,7 +31,7 @@
 
 using namespace KIGFX::PREVIEW;
 
-const double POLYGON_ITEM::POLY_LINE_WIDTH = 150000.0;
+const double POLYGON_ITEM::POLY_LINE_WIDTH = 1;
 
 POLYGON_ITEM::POLYGON_ITEM():
         SIMPLE_OVERLAY_ITEM()
@@ -61,7 +61,7 @@ void POLYGON_ITEM::drawPreviewShape( KIGFX::VIEW* aView ) const
     auto& gal = *aView->GetGAL();
     auto rs = static_cast<KIGFX::PCB_RENDER_SETTINGS*>( aView->GetPainter()->GetSettings() );
 
-    gal.SetLineWidth( POLY_LINE_WIDTH );
+    gal.SetLineWidth( (float) aView->ToWorld( POLY_LINE_WIDTH ) );
     gal.DrawPolyline( m_lockedChain );
 
     // draw the leader line in a different color

common/string.cpp

@@ -40,6 +40,40 @@
 static const char illegalFileNameChars[] = "\\/:\"<>|";
 
 
+bool ConvertSmartQuotesAndDashes( wxString* aString )
+{
+    bool retVal = false;
+
+    for( wxString::iterator ii = aString->begin(); ii != aString->end(); ++ii )
+    {
+        if( *ii == L'\u0060' || *ii == L'\u00B4' || *ii == L'\u2018' || *ii == L'\u2019' )
+        {
+            *ii = '\'';
+            retVal = true;
+        }
+        if( *ii == L'\u201C' || *ii == L'\u201D' )
+        {
+            *ii = '"';
+            retVal = true;
+        }
+        if( *ii == L'\u2013' || *ii == L'\u2014' )
+        {
+            *ii = '-';
+            retVal = true;
+        }
+    }
+
+    return retVal;
+}
+
+
+/**
+ * These Escape/Unescape routines use HTML-entity-reference-style encoding to handle
+ * characters which are:
+ *   (a) not legal in filenames
+ *   (b) used as control characters in LIB_IDs
+ *   (c) used to delineate hierarchical paths
+ */
 wxString EscapeString( const wxString& aSource )
 {
 #if 1

common/system/libcontext.cpp

@@ -151,7 +151,7 @@ __asm (
 "	push   %rax\n"
 "	mov    0x1478(%r10),%rax\n"
 "	push   %rax\n"
-"	mov    0x18(%r10),%rax\n"
+"	mov    0x20(%r10),%rax\n"
 "	push   %rax\n"
 "	lea    -0xa8(%rsp),%rsp\n"
 "	test   %r9,%r9\n"
@@ -197,7 +197,7 @@ __asm (
 "	lea    (%rsp,%rcx,1),%rsp\n"
 "	mov    %gs:0x30,%r10\n"
 "	pop    %rax\n"
-"	mov    %rax,0x18(%r10)\n"
+"	mov    %rax,0x20(%r10)\n"
 "	pop    %rax\n"
 "	mov    %rax,0x1478(%r10)\n"
 "	pop    %rax\n"
@@ -249,7 +249,7 @@ __asm (
 "retq\n"
 "finish:\n"
 "xor    %rcx,%rcx\n"
-"callq  0x63\n"
+"call  _exit\n"
 "hlt\n"
 "   .seh_endproc\n"
 ".def	_exit;	.scl	2;	.type	32;	.endef  \n"

common/tool/tool_dispatcher.cpp

@@ -315,6 +315,14 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
     int unicode = 0;
     bool keyIsSpecial = false;  // True if the key is a special key code
 
+#if defined(_WIN32)
+    // Fix a constant stream of events being able to stall out wxTimers from firing
+    // Which results in GAL not updating
+    // https://devblogs.microsoft.com/oldnewthing/20191108-00/?p=103080
+    MSG msg;
+    PeekMessage(&msg, nullptr, WM_TIMER, WM_TIMER, PM_NOREMOVE);
+#endif
+
     int type = aEvent.GetEventType();
 
     // Sometimes there is no window that has the focus (it happens when another PCB_BASE_FRAME

common/tool/tool_manager.cpp

@@ -795,7 +795,7 @@ bool TOOL_MANAGER::ProcessEvent( const TOOL_EVENT& aEvent )
         if( f )
             f->GetGalCanvas()->Refresh(); // fixme: ugly hack, provide a method in TOOL_DISPATCHER.
 
-#if defined( __WXMAC__ ) || defined( __WINDOWS__ )
+#if defined( __WXMAC__ )
         wxTheApp->ProcessPendingEvents(); // required for updating brightening behind a popup menu
 #endif
     }

common/view/wx_view_controls.cpp

@@ -273,7 +273,20 @@ void WX_VIEW_CONTROLS::onButton( wxMouseEvent& aEvent )
 
 void WX_VIEW_CONTROLS::onEnter( wxMouseEvent& aEvent )
 {
+#if defined( _WIN32 )
+    // Win32 transmits mouse move and wheel events to all controls below the mouse regardless of focus
+    // Forcing the focus here will cause the EDA FRAMES to immediately become the top level active window
+    if( m_parentPanel->GetParent() != nullptr )
+    {
+        // this assumes the parent panel's parent is the eda window
+        if( GetForegroundWindow() == m_parentPanel->GetParent()->GetHWND() )
+        {
+            m_parentPanel->SetFocus();
+        }
+    }
+#else
     m_parentPanel->SetFocus();
+#endif
 }
 
 
@@ -668,7 +681,7 @@ void WX_VIEW_CONTROLS::UpdateScrollbars()
         m_parentPanel->SetScrollbars( 1, 1, newRange.x, newRange.y, newScroll.x, newScroll.y, true );
         m_scrollPos = newScroll;
 
-#ifndef __APPLE__
+#if !defined( __APPLE__ ) && !defined( WIN32 )
         // Trigger a mouse refresh to get the canvas update in GTK (re-draws the scrollbars).
         // Note that this causes an infinite loop on OSX as it generates a paint event.
         refreshMouse();

common/widgets/grid_combobox.cpp

@@ -79,6 +79,10 @@ void GRID_CELL_COMBOBOX::BeginEdit( int aRow, int aCol, wxGrid* aGrid )
     // Don't immediately end if we get a kill focus event within BeginEdit
     evtHandler->SetInSetFocus( true );
 
+    // These event handlers are needed to properly dismiss the editor when the popup is closed
+    m_control->Bind(wxEVT_COMBOBOX_DROPDOWN, &GRID_CELL_COMBOBOX::onComboDropDown, this);
+    m_control->Bind(wxEVT_COMBOBOX_CLOSEUP, &GRID_CELL_COMBOBOX::onComboCloseUp, this);
+
     m_value = aGrid->GetTable()->GetValue( aRow, aCol );
 
     Combo()->SetFocus();
@@ -126,3 +130,24 @@ void GRID_CELL_COMBOBOX::Reset()
 }
 
 
+void GRID_CELL_COMBOBOX::onComboDropDown( wxCommandEvent& aEvent )
+{
+    auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
+
+    // Once the combobox is dropped, reset the flag to allow the focus-loss handler
+    // to function and close the editor.
+    evtHandler->SetInSetFocus( false );
+}
+
+
+void GRID_CELL_COMBOBOX::onComboCloseUp( wxCommandEvent& aEvent )
+{
+    auto evtHandler = static_cast<wxGridCellEditorEvtHandler*>( m_control->GetEventHandler() );
+
+    // Forward the combobox close up event to the cell event handler as a focus kill event
+    // so that the grid editor is dismissed when the combox closes, otherwise it leaves the
+    // dropdown arrow visible in the cell.
+    wxFocusEvent event( wxEVT_KILL_FOCUS, m_control->GetId() );
+    event.SetEventObject( m_control );
+    evtHandler->ProcessEvent( event );
+}

common/widgets/lib_tree.cpp

@@ -124,8 +124,10 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, LIB_TABLE* aLibTable, LIB_TREE_MODEL_ADAP
     {
         m_query_ctrl->SetHint( _( "Filter" ) );
         m_query_ctrl->SetFocus();
-        m_query_ctrl->SetValue( wxEmptyString );    // SetValue() is required here to kick off
-                                                    // initial sorting and pre-selection.
+        m_query_ctrl->SetValue( wxEmptyString );
+
+        // Force an update of the adapter with the empty text to ensure preselect is done
+        Regenerate( false );
     }
 
     // There may be a part preselected in the model. Make sure it is displayed.
@@ -194,7 +196,7 @@ void LIB_TREE::Regenerate( bool aKeepState )
         m_unfilteredState = getState();
 
     wxString filter = m_query_ctrl->GetValue();
-    m_adapter->UpdateSearchString( filter );
+    m_adapter->UpdateSearchString( filter, aKeepState );
     postPreselectEvent();
 
     // Restore the state

common/widgets/mathplot.cpp

@@ -696,9 +696,20 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
         }
         else
         {
-            wxCoord x0, y0;
-            bool first = true;
+            int count = 0;
+            int x0=0;               // X position of merged current vertical line
+            int ymin0=0;            // y min coord of merged current vertical line
+            int ymax0=0;            // y max coord of merged current vertical line
+            int dupx0 = 0;          // count of currently merged vertical lines
+            wxPoint line_start;     // starting point of the current line to draw
 
+            // Note: we do not use dc.DrawLines(), because at least on Windows
+            // dc.DrawLine() is faster, and dc.DrawLines() can hang for a lot
+            // (> 10000 points) (can happens when a lot of points is calculated)
+            // To avoid long draw time (and perhaps hanging) one plot only not redundant lines.
+            // To avoid artifacts when skipping points to the same x coordinate, for each
+            // group of points at a give, x coordinate we also draw a vertical line at this coord,
+            // from the ymin to the ymax vertical coordinates of skipped points
             while( GetNextXY( x, y ) )
             {
                 double px = m_scaleX->TransformToPlot( x );
@@ -707,29 +718,34 @@ void mpFXY::Plot( wxDC& dc, mpWindow& w )
                 wxCoord x1 = w.x2p( px );
                 wxCoord y1 = w.y2p( py );
 
-                if( first )
+                // Plot only points on the drawing area, to speed up the drawing time
+                if( x1 >= startPx && x1 <= endPx )
                 {
-                    first = false;
-                    x0 = x1;
-                    y0 = y1;
-                    continue;
+                    if( !count || line_start.x != x1 )
+                    {
+                        if( dupx0 > 1 ) // Vertical points are merged,
+                                        // draw the pending vertical line
+                            dc.DrawLine( x0, ymin0, x0, ymax0 );
+
+                        x0 = x1;
+                        ymin0 = ymax0 = y1;
+                        dupx0 = 0;
+
+                        if( count )
+                            dc.DrawLine( line_start, wxPoint( x1, y1 ) );
+
+                        line_start.x = x1;
+                        line_start.y = y1;
+                        count++;
+                    }
+                    else
+                    {
+                        // "Merge" points on a vertical line at x0:
+                        ymin0 = std::min( ymin0, y1 );
+                        ymax0 = std::max( ymax0, y1 );
+                        dupx0++;
+                    }
                 }
-
-//                This gives disastrous results with very high-frequency plots where the
-//                X coordinate may not increment until several waves later
-//
-//                if( x0 == x1 )      // continue until a new X coordinate is reached
-//                    continue;
-
-                bool outDown = ( y0 > maxYpx ) && ( y1 > maxYpx );
-                bool outUp = ( y0 < minYpx ) && ( y1 < minYpx );
-                bool outLeft = ( x1 < startPx ) && ( x0 < startPx );
-                bool outRight = ( x1 > endPx ) && ( x0 > endPx );
-                if( !( outUp || outDown || outLeft || outRight ) )
-                    dc.DrawLine( x0, y0, x1, y1 );
-
-                x0 = x1;
-                y0 = y1;
             }
         }
 

common/widgets/unit_binder.cpp

@@ -57,7 +57,8 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
         textEntry->ChangeValue( wxT( "0" ) );
     }
 
-    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
+    if( m_unitLabel )
+        m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
 
     m_value->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( UNIT_BINDER::onSetFocus ), NULL, this );
     m_value->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this );
@@ -69,7 +70,9 @@ void UNIT_BINDER::SetUnits( EDA_UNITS_T aUnits, bool aUseMils )
 {
     m_units = aUnits;
     m_useMils = aUseMils;
-    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
+
+    if( m_unitLabel )
+        m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
 }
 
 
@@ -208,7 +211,8 @@ void UNIT_BINDER::SetValue( wxString aValue )
     if( m_allowEval )
         m_eval.Clear();
 
-    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
+    if( m_unitLabel )
+        m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
 }
 
 
@@ -231,7 +235,8 @@ void UNIT_BINDER::ChangeValue( wxString aValue )
     if( m_allowEval )
         m_eval.Clear();
 
-    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
+    if( m_unitLabel )
+        m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
 }
 
 
@@ -278,7 +283,9 @@ void UNIT_BINDER::Enable( bool aEnable )
 {
     m_label->Enable( aEnable );
     m_value->Enable( aEnable );
-    m_unitLabel->Enable( aEnable );
+
+    if( m_unitLabel )
+        m_unitLabel->Enable( aEnable );
 }
 
 
@@ -286,6 +293,8 @@ void UNIT_BINDER::Show( bool aShow )
 {
     m_label->Show( aShow );
     m_value->Show( aShow );
-    m_unitLabel->Show( aShow );
+
+    if( m_unitLabel )
+        m_unitLabel->Show( aShow );
 }
 

cvpcb/CMakeLists.txt

@@ -60,77 +60,6 @@ else()
 endif()
 
 
-if( false )
-    # setup bundle
-    set( CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns" PROPERTIES
-        MACOSX_PACKAGE_LOCATION Resources
-        )
-    set_source_files_properties( "${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns" PROPERTIES
-        MACOSX_PACKAGE_LOCATION Resources
-        )
-    set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
-    set( MACOSX_BUNDLE_NAME cvpcb )
-endif()
-
-
-if( false ) # no CVPCB exe any more, only the *.kiface
-    add_executable( cvpcb WIN32 MACOSX_BUNDLE
-        ../common/single_top.cpp
-        ../common/pgm_base.cpp
-        ${CVPCB_RESOURCES}
-        )
-    set_source_files_properties( ../common/single_top.cpp PROPERTIES
-        COMPILE_DEFINITIONS "TOP_FRAME=FRAME_CVPCB;PGM_DATA_FILE_EXT=\"net\";BUILD_KIWAY_DLL"
-        )
-    target_link_libraries( cvpcb
-        #singletop  # replaces common, giving us restrictive control and link warnings.
-        # There's way too much crap coming in from common yet.
-        common
-        ${wxWidgets_LIBRARIES}
-        )
-    if( MAKE_LINK_MAPS )
-        set_target_properties( cvpcb PROPERTIES
-            LINK_FLAGS "${TO_LINKER},-cref ${TO_LINKER},-Map=cvpcb.map" )
-    endif()
-
-    if( APPLE )
-        include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-        configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist @ONLY )
-
-        set_target_properties( cvpcb PROPERTIES
-            MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
-            )
-
-        # put individual bundle outside of main bundle as a first step
-        # will be pulled into the main bundle when creating main bundle
-        install( TARGETS cvpcb
-            DESTINATION ${KICAD_BIN}
-            COMPONENT binary
-            )
-        install( CODE "
-                # override default embedded path settings
-                ${OSX_BUNDLE_OVERRIDE_PATHS}
-
-                # do all the work
-                include( BundleUtilities )
-                fixup_bundle( ${KICAD_BIN}/cvpcb.app/Contents/MacOS/cvpcb
-                    \"\"
-                    \"\"
-                    )
-                " COMPONENT Runtime
-            )
-    else()
-        install( TARGETS cvpcb
-            DESTINATION ${KICAD_BIN}
-            COMPONENT binary
-            )
-    endif()
-
-endif() # no CVPCB exe
-
-
 # the main cvpcb program, in DSO form.
 add_library( cvpcb_kiface MODULE
     cvpcb.cpp

cvpcb/cvpcb_mainframe.cpp

@@ -125,6 +125,7 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
     m_libListBox            = NULL;
     m_mainToolBar           = NULL;
     m_modified              = false;
+    m_cannotClose           = false;
     m_skipComponentSelect   = false;
     m_filteringOptions      = 0;
     m_tcFilterString        = NULL;
@@ -307,6 +308,10 @@ void CVPCB_MAINFRAME::OnCloseWindow( wxCloseEvent& Event )
     // clear highlight symbol in schematic:
     SendMessageToEESCHEMA( true );
 
+
+    if( m_cannotClose )
+        return;
+
     // Delete window
     Destroy();
 }
@@ -1117,7 +1122,11 @@ void CVPCB_MAINFRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
     switch( mail.Command() )
     {
     case MAIL_EESCHEMA_NETLIST:
+        // Disable Close events during ReadNetListAndFpFiles() to avoid crash when updating
+        // widgets:
+        m_cannotClose = true;
         ReadNetListAndFpFiles( payload );
+        m_cannotClose = false;
         /* @todo
         Go into SCH_EDIT_FRAME::OnOpenCvpcb( wxCommandEvent& event ) and trim GNL_ALL down.
         */

cvpcb/cvpcb_mainframe.h

@@ -80,11 +80,13 @@ public:
 
 protected:
     bool            m_modified;
-    bool            m_skipComponentSelect;      // true to skip OnSelectComponent event
-                                                // (in automatic selection/deletion of associations)
+    bool            m_skipComponentSelect;  // true to skip OnSelectComponent event
+                                            // (in automatic selection/deletion of associations)
     PARAM_CFG_ARRAY m_projectFileParams;
 
     bool            m_initialized;
+    bool            m_cannotClose;          // true when the cvpcb frame cannot be closed
+                                            // (mainly during reading a netlist sent by Eeschema)
 
     CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent );
 

demos/simulation/rectifier/diode.mod

@@ -0,0 +1,2 @@
+*generic diode model
+.model 1N4148 D

demos/simulation/rectifier/rectifier-cache.lib

@@ -1,101 +1,101 @@
-EESchema-LIBRARY Version 2.4
-#encoding utf-8
-#
-# C
-#
-DEF C C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
- Capacitors_ThroughHole:C_Radial_D10_L13_P5
- Capacitors_SMD:C_0805
- Capacitors_SMD:C_1206
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# D
-#
-DEF D D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Diode_*
- D-Pak_TO252AA
- *SingleDiode
- *_Diode_*
- *SingleDiode*
-$ENDFPLIST
-DRAW
-P 2 0 1 6 -50 50 -50 -50 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-X K 1 -150 0 100 R 50 50 1 1 P
-X A 2 150 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 -150 50 H I C CNN
-F1 "GND" 0 -123 30 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
-X GND 1 0 0 0 D 20 30 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# VSOURCE
-#
-DEF ~VSOURCE V 0 40 Y Y 1 F N
-F0 "V" 200 200 50 H V C CNN
-F1 "VSOURCE" 250 100 50 H I C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-F4 "Value" 0 0 60 H I C CNN "Fieldname"
-F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
-F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
-DRAW
-C 0 0 100 0 1 0 N
-P 2 0 1 0 0 -75 0 75 N
-P 4 0 1 0 0 75 -25 25 25 25 0 75 F
-X ~ 1 0 200 100 D 50 50 1 1 I
-X ~ 2 0 -200 100 U 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-#End Library
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# rectifier_schlib_C
+#
+DEF rectifier_schlib_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "rectifier_schlib_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ C?
+ C_????_*
+ C_????
+ SMD*_c
+ Capacitor*
+ Capacitors_ThroughHole:C_Radial_D10_L13_P5
+ Capacitors_SMD:C_0805
+ Capacitors_SMD:C_1206
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 40 40 1 1 P
+X ~ 2 0 -150 110 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# rectifier_schlib_D
+#
+DEF rectifier_schlib_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "rectifier_schlib_D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+$ENDFPLIST
+DRAW
+P 2 0 1 6 -50 50 -50 -50 N
+P 3 0 1 0 50 50 -50 0 50 -50 F
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# rectifier_schlib_GND
+#
+DEF rectifier_schlib_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "rectifier_schlib_GND" 0 -123 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 20 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# rectifier_schlib_R
+#
+DEF rectifier_schlib_R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "rectifier_schlib_R" 0 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S -40 -100 40 100 0 1 10 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# rectifier_schlib_VSOURCE
+#
+DEF rectifier_schlib_VSOURCE V 0 40 Y Y 1 F N
+F0 "V" 200 200 50 H V C CNN
+F1 "rectifier_schlib_VSOURCE" 250 100 50 H I C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+F4 "Value" 0 0 60 H I C CNN "Fieldname"
+F5 "V" 0 0 60 H I C CNN "Spice_Primitive"
+F6 "1 2" -300 200 60 H I C CNN "Spice_Node_Sequence"
+DRAW
+C 0 0 100 0 1 0 N
+P 2 0 1 0 0 -75 0 75 N
+P 4 0 1 0 0 75 -25 25 25 25 0 75 F
+X ~ 1 0 200 100 D 50 50 1 1 I
+X ~ 2 0 -200 100 U 50 50 1 1 I
+ENDDRAW
+ENDDEF
+#
+#End Library

demos/simulation/rectifier/rectifier.sch

@@ -1,129 +1,137 @@
-EESchema Schematic File Version 4
-LIBS:rectifier-cache
-EELAYER 26 0
-EELAYER END
-$Descr A4 11693 8268
-encoding utf-8
-Sheet 1 1
-Title ""
-Date ""
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-$Comp
-L rectifier_schlib:VSOURCE V1
-U 1 1 57336052
-P 4400 4050
-F 0 "V1" H 4528 4096 50  0000 L CNN
-F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
-F 2 "" H 4400 4050 50  0000 C CNN
-F 3 "" H 4400 4050 50  0000 C CNN
-F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
-F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
-	1    4400 4050
-	-1   0    0    1   
-$EndComp
-$Comp
-L rectifier_schlib:GND #PWR01
-U 1 1 573360D3
-P 4400 4350
-F 0 "#PWR01" H 4400 4100 50  0001 C CNN
-F 1 "GND" H 4405 4177 50  0000 C CNN
-F 2 "" H 4400 4350 50  0000 C CNN
-F 3 "" H 4400 4350 50  0000 C CNN
-	1    4400 4350
-	1    0    0    -1  
-$EndComp
-$Comp
-L rectifier_schlib:R R1
-U 1 1 573360F5
-P 4650 3700
-F 0 "R1" V 4443 3700 50  0000 C CNN
-F 1 "1k" V 4534 3700 50  0000 C CNN
-F 2 "" V 4580 3700 50  0000 C CNN
-F 3 "" H 4650 3700 50  0000 C CNN
-F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
-	1    4650 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L rectifier_schlib:D D1
-U 1 1 573361B8
-P 5100 3700
-F 0 "D1" H 5100 3485 50  0000 C CNN
-F 1 "1N4148" H 5100 3576 50  0000 C CNN
-F 2 "" H 5100 3700 50  0000 C CNN
-F 3 "" H 5100 3700 50  0000 C CNN
-F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
-F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
-F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
-	1    5100 3700
-	-1   0    0    1   
-$EndComp
-$Comp
-L rectifier_schlib:C C1
-U 1 1 5733628F
-P 5400 4000
-F 0 "C1" H 5515 4046 50  0000 L CNN
-F 1 "100n" H 5515 3955 50  0000 L CNN
-F 2 "" H 5438 3850 50  0000 C CNN
-F 3 "" H 5400 4000 50  0000 C CNN
-F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
-F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
-F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
-	1    5400 4000
-	1    0    0    -1  
-$EndComp
-$Comp
-L rectifier_schlib:R R2
-U 1 1 573362F7
-P 5750 4000
-F 0 "R2" H 5680 3954 50  0000 R CNN
-F 1 "100k" H 5680 4045 50  0000 R CNN
-F 2 "" V 5680 4000 50  0000 C CNN
-F 3 "" H 5750 4000 50  0000 C CNN
-F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
-F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
-F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
-	1    5750 4000
-	-1   0    0    1   
-$EndComp
-Text Notes 4300 4900 0    60   ~ 0
-.tran 1u 10m\n
-Wire Wire Line
-	4400 4350 4400 4250
-Wire Wire Line
-	4400 4300 5750 4300
-Connection ~ 4400 4300
-Wire Wire Line
-	5250 3700 5750 3700
-Wire Wire Line
-	5750 3700 5750 3850
-Wire Wire Line
-	5400 3850 5400 3700
-Connection ~ 5400 3700
-Wire Wire Line
-	5400 4300 5400 4150
-Wire Wire Line
-	5750 4300 5750 4150
-Connection ~ 5400 4300
-Wire Wire Line
-	4800 3700 4950 3700
-Wire Wire Line
-	4400 3850 4400 3700
-Wire Wire Line
-	4400 3700 4500 3700
-Text Label 4400 3700 2    60   ~ 0
-signal_in
-Text Label 5750 3700 0    60   ~ 0
-rect_out
-Text Notes 4300 5000 0    60   ~ 0
-*.ac dec 10 1 1Meg\n
-$EndSCHEMATC
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Comp
+L rectifier_schlib:VSOURCE V1
+U 1 1 57336052
+P 4400 4050
+F 0 "V1" H 4528 4096 50  0000 L CNN
+F 1 "SINE(0 1.5 1k 0 0 0 0)" H 4528 4005 50  0000 L CNN
+F 2 "" H 4400 4050 50  0000 C CNN
+F 3 "" H 4400 4050 50  0000 C CNN
+F 4 "Value" H 4400 4050 60  0001 C CNN "Fieldname"
+F 5 "V" H 4400 4050 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 4100 4250 60  0001 C CNN "Spice_Node_Sequence"
+	1    4400 4050
+	-1   0    0    1   
+$EndComp
+$Comp
+L rectifier_schlib:GND #PWR01
+U 1 1 573360D3
+P 4400 4350
+F 0 "#PWR01" H 4400 4100 50  0001 C CNN
+F 1 "GND" H 4405 4177 50  0000 C CNN
+F 2 "" H 4400 4350 50  0000 C CNN
+F 3 "" H 4400 4350 50  0000 C CNN
+	1    4400 4350
+	1    0    0    -1  
+$EndComp
+$Comp
+L rectifier_schlib:R R1
+U 1 1 573360F5
+P 4650 3700
+F 0 "R1" V 4443 3700 50  0000 C CNN
+F 1 "1k" V 4534 3700 50  0000 C CNN
+F 2 "" V 4580 3700 50  0000 C CNN
+F 3 "" H 4650 3700 50  0000 C CNN
+F 4 "Value" H 4650 3700 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 4650 3700 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 4650 3700 60  0001 C CNN "Spice_Primitive"
+	1    4650 3700
+	0    1    1    0   
+$EndComp
+$Comp
+L rectifier_schlib:D D1
+U 1 1 573361B8
+P 5100 3700
+F 0 "D1" H 5100 3485 50  0000 C CNN
+F 1 "1N4148" H 5100 3576 50  0000 C CNN
+F 2 "" H 5100 3700 50  0000 C CNN
+F 3 "" H 5100 3700 50  0000 C CNN
+F 4 "Value" H 5100 3700 60  0001 C CNN "Fieldname"
+F 5 "D" H 5100 3700 60  0001 C CNN "Spice_Primitive"
+F 6 "2 1" H 5100 3700 60  0001 C CNN "Spice_Node_Sequence"
+F 7 "1N4148" H 5100 3700 50  0001 C CNN "Spice_Model"
+F 8 "Y" H 5100 3700 50  0001 C CNN "Spice_Netlist_Enabled"
+F 9 "diode.mod" H 5100 3700 50  0001 C CNN "Spice_Lib_File"
+	1    5100 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L rectifier_schlib:C C1
+U 1 1 5733628F
+P 5400 4000
+F 0 "C1" H 5515 4046 50  0000 L CNN
+F 1 "100n" H 5515 3955 50  0000 L CNN
+F 2 "" H 5438 3850 50  0000 C CNN
+F 3 "" H 5400 4000 50  0000 C CNN
+F 4 "Value" H 5400 4000 60  0001 C CNN "Fieldname"
+F 5 "C" H 5400 4000 60  0001 C CNN "Spice_Primitive"
+F 6 "1 2" H 5400 4000 60  0001 C CNN "SpiceMapping"
+	1    5400 4000
+	1    0    0    -1  
+$EndComp
+$Comp
+L rectifier_schlib:R R2
+U 1 1 573362F7
+P 5750 4000
+F 0 "R2" H 5680 3954 50  0000 R CNN
+F 1 "100k" H 5680 4045 50  0000 R CNN
+F 2 "" V 5680 4000 50  0000 C CNN
+F 3 "" H 5750 4000 50  0000 C CNN
+F 4 "Value" H 5750 4000 60  0001 C CNN "Fieldname"
+F 5 "1 2" H 5750 4000 60  0001 C CNN "SpiceMapping"
+F 6 "R" V 5750 4000 60  0001 C CNN "Spice_Primitive"
+	1    5750 4000
+	-1   0    0    1   
+$EndComp
+Text Notes 4300 4900 0    60   ~ 0
+.tran 1u 10m\n
+Wire Wire Line
+	4400 4350 4400 4300
+Wire Wire Line
+	4400 4300 5400 4300
+Connection ~ 4400 4300
+Wire Wire Line
+	5250 3700 5400 3700
+Wire Wire Line
+	5750 3700 5750 3850
+Wire Wire Line
+	5400 3850 5400 3700
+Connection ~ 5400 3700
+Wire Wire Line
+	5400 4300 5400 4150
+Wire Wire Line
+	5750 4300 5750 4150
+Connection ~ 5400 4300
+Wire Wire Line
+	4800 3700 4950 3700
+Wire Wire Line
+	4400 3850 4400 3700
+Wire Wire Line
+	4400 3700 4500 3700
+Text Label 4400 3700 2    60   ~ 0
+signal_in
+Text Label 5750 3700 0    60   ~ 0
+rect_out
+Text Notes 4300 5000 0    60   ~ 0
+*.ac dec 10 1 1Meg\n
+Wire Wire Line
+	4400 4300 4400 4250
+Wire Wire Line
+	5400 3700 5750 3700
+Wire Wire Line
+	5400 4300 5750 4300
+$EndSCHEMATC

dxflib_qcad/dl_dxf.cpp

@@ -1714,7 +1714,7 @@ bool DL_Dxf::handleLWPolylineData( DL_CreationInterface*    /*creationInterface*
                 vertices[4 * vertexIndex + (groupCode / 10 - 1)] = toReal( groupValue );
             }
         }
-        else if( groupCode==42 && vertexIndex<maxVertices )
+        else if( groupCode==42 && vertexIndex<maxVertices && vertexIndex >= 0 )
         {
             vertices[4 * vertexIndex + 3] = toReal( groupValue );
         }

eeschema/CMakeLists.txt

@@ -9,8 +9,8 @@ if( KICAD_SPICE )
     set( INC_AFTER ${INC_AFTER} ${NGSPICE_INCLUDE_DIR} )
 
     # Find out the exact libngspice file name
-    get_filename_component( NGSPICE_DLL_REALPATH "${NGSPICE_DLL}" REALPATH )
-    get_filename_component( NGSPICE_DLL_FILE "${NGSPICE_DLL_REALPATH}" NAME )
+    get_filename_component( NGSPICE_DLL_ABSPATH "${NGSPICE_DLL}" ABSOLUTE )
+    get_filename_component( NGSPICE_DLL_FILE "${NGSPICE_DLL_ABSPATH}" NAME )
 
     set_property( SOURCE sim/ngspice.cpp
         APPEND PROPERTY COMPILE_DEFINITIONS
@@ -304,7 +304,7 @@ if( APPLE )
         MACOSX_PACKAGE_LOCATION Resources
         )
     set( MACOSX_BUNDLE_ICON_FILE eeschema.icns )
-    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad.kicad )
     set( MACOSX_BUNDLE_NAME eeschema )
 endif()
 
@@ -423,11 +423,13 @@ if( APPLE )
         )
 
     if( KICAD_SPICE )
-        # bundle libngspice, codemodels and scripts
-        get_filename_component( REAL_LIBNGSPICE ${NGSPICE_LIBRARY} REALPATH )
-        get_filename_component( LIBNGSPICE_PATH ${REAL_LIBNGSPICE} DIRECTORY )
-        install( FILES "${REAL_LIBNGSPICE}"
-                 DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" )
+        # bundle libngspice and codemodels
+        get_filename_component( ABS_LIBNGSPICE ${NGSPICE_LIBRARY} ABSOLUTE )
+        get_filename_component( LIBNGSPICE_PATH ${ABS_LIBNGSPICE} DIRECTORY )
+
+        install( DIRECTORY "${LIBNGSPICE_PATH}/"
+                DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim"
+                FILES_MATCHING PATTERN "*.dylib")
         install( DIRECTORY "${LIBNGSPICE_PATH}/ngspice"
                  DESTINATION "${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/sim" )
         install( DIRECTORY "${LIBNGSPICE_PATH}/../share/ngspice/scripts"

eeschema/block.cpp

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
  * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
- * Copyright (C) 2004-2018 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see change_log.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
@@ -147,6 +147,7 @@ void SCH_EDIT_FRAME::HandleBlockPlace( wxDC* DC )
             item->Move( block->GetMoveVector() );
             item->SetFlags( IS_MOVED );
             GetCanvas()->GetView()->Update( item, KIGFX::GEOMETRY );
+            item->ClearFlags();
         }
         break;
 
@@ -176,7 +177,7 @@ void SCH_EDIT_FRAME::HandleBlockPlace( wxDC* DC )
     TestDanglingEnds();
     OnModify();
 
-    // clear dome flags and pointers
+    // clear some flags and pointers
     GetScreen()->ClearDrawingState();
     GetScreen()->ClearBlockCommand();
     GetScreen()->SetCurItem( NULL );
@@ -450,7 +451,7 @@ void SCH_EDIT_FRAME::PasteListOfItems( wxDC* DC )
 {
     unsigned       i;
     SCH_ITEM*      item;
-    SCH_SHEET_LIST hierarchy( g_RootSheet );    // This is the entire schematic hierarcy.
+    SCH_SHEET_LIST hierarchy( g_RootSheet, false );    // This is the entire schematic hierarcy.
 
     if( m_blockItems.GetCount() == 0 )
     {
@@ -467,8 +468,9 @@ void SCH_EDIT_FRAME::PasteListOfItems( wxDC* DC )
     // the destination sheet. Moreover new sheets create new sheetpaths, and component
     // alternante references must be created and cleared
     bool hasSheetPasted = false;
+
     // Keep trace of existing sheet paths. Paste block can modify this list
-    SCH_SHEET_LIST initial_sheetpathList( g_RootSheet );
+    SCH_SHEET_LIST initial_sheetpathList( g_RootSheet, false );
 
     for( i = 0; i < m_blockItems.GetCount(); i++ )
     {

eeschema/bom_plugins.cpp

@@ -2,6 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2018 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
  * @author Maciej Suminski <maciej.suminski@cern.ch>
  *
  * This program is free software; you can redistribute it and/or
@@ -48,24 +49,28 @@ BOM_PLUGIN::BOM_PLUGIN( const wxString& aFile )
     if( extension == "xsl" )
     {
         m_info = readHeader( "-->" );
-        m_cmd = wxString::Format( "xsltproc -o \"%%O\" \"%s\" \"%%I\"", m_file.GetFullPath() );
+        m_cmd = wxString::Format( "xsltproc -o \"%%O%s\" \"%s\" \"%%I\"",
+                                  getOutputExtension( m_info ), m_file.GetFullPath() );
     }
     else if( extension == "py" )
     {
         m_info = readHeader( "\"\"\"" );
 #ifdef __WINDOWS__
-        m_cmd = wxString::Format( "python \"%s/%s\" \"%%I\" \"%%O\"",
-                                  m_file.GetPath(), m_file.GetFullName() );
+        m_cmd = wxString::Format( "python \"%s/%s\" \"%%I\" \"%%O%s\"",
+                                  m_file.GetPath(), m_file.GetFullName(),
+                                  getOutputExtension( m_info ) );
 #else
-        m_cmd = wxString::Format( "python \"%s\" \"%%I\" \"%%O\"", m_file.GetFullPath() );
+        m_cmd = wxString::Format( "python \"%s\" \"%%I\" \"%%O%s\"", m_file.GetFullPath(),
+                                  getOutputExtension( m_info ) );
 #endif
     }
 #ifdef __WINDOWS__
     else if( extension == "pyw" )
     {
         m_info = readHeader( "\"\"\"" );
-        m_cmd = wxString::Format( "pythonw \"%s/%s\" \"%%I\" \"%%O\"",
-                                  m_file.GetPath(),m_file.GetFullName() );
+        m_cmd = wxString::Format( "pythonw \"%s/%s\" \"%%I\" \"%%O%s\"",
+                                  m_file.GetPath(), m_file.GetFullName(),
+                                  getOutputExtension( m_info ) );
     }
 #endif /* __WINDOWS__ */
     else // fallback
@@ -112,7 +117,7 @@ wxString BOM_PLUGIN::readHeader( const wxString& aEndSection )
     strstart += header.Length();
     int strend = data.find( aEndSection, strstart );
 
-    if( strend == wxNOT_FOUND)
+    if( strend == wxNOT_FOUND )
         return wxEmptyString;
 
     // Remove empty line if any
@@ -121,3 +126,24 @@ wxString BOM_PLUGIN::readHeader( const wxString& aEndSection )
 
     return data.SubString( strstart, strend - 1 );
 }
+
+
+wxString BOM_PLUGIN::getOutputExtension( const wxString& aHeader )
+{
+    // search header for extension after %O (extension includes '.')
+    // looks for output argument of the form `"%O.extension"`
+    const wxString outputarg( "\"%O" );
+
+    int strstart = aHeader.Find( outputarg );
+
+    if( strstart == wxNOT_FOUND )
+        return wxEmptyString;
+
+    strstart += outputarg.Length();
+    int strend = aHeader.find( "\"", strstart );
+
+    if( strend == wxNOT_FOUND )
+        return wxEmptyString;
+
+    return aHeader.SubString( strstart, strend - 1 );
+}

eeschema/bom_plugins.h

@@ -121,6 +121,14 @@ protected:
      */
     wxString readHeader( const wxString& aEndSection );
 
+    /**
+     * Extracts the output BOM file's extension, including the '.', from the
+     * plugin file header. If the output extension cannot be determined from
+     * the plugin header, returns wxEmptyString.
+     * @param aHeader is the plugin file's header, as returned by readHeader()
+     **/
+    static wxString getOutputExtension( const wxString& aHeader );
+
     ///> true if the plugin is working (i.e. if the plugin file exists and was read
     bool m_isOk;
 

eeschema/bus-wire-junction.cpp

@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2004 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr
- * Copyright (C) 2004-2019 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2021 KiCad Developers, see change_log.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
@@ -298,11 +298,15 @@ void SCH_EDIT_FRAME::EndSegment()
     if( segment == NULL || segment->Type() != SCH_LINE_T || !segment->IsNew() )
         return;
 
-    // Remove segments backtracking over others
+    // Remove zero length segments and segments backtracking over other segments.
     RemoveBacktracks( s_wires );
 
     if( s_wires.GetCount() == 0 )
+    {
+        screen->ClearDrawingState();
+        screen->SetCurItem( NULL );
         return;
+    }
 
     // Collect the possible connection points for the new lines
     std::vector< wxPoint > connections;

eeschema/dialog_erc_listbox.h

@@ -83,7 +83,10 @@ public:
         {
             href.Printf( wxT( "href='%d'" ), ii );
             marker_text = m_MarkerListReferences[ii]->GetReporter().ShowHtml( aUnits );
-            marker_text.Replace( wxT( "href=''"), href );
+            marker_text.Replace( wxT( "href=''"), href, false );
+
+            href.Printf( wxT( "href='%d'" ), -ii );
+            marker_text.Replace( wxT( "href=''"), href, false );
             htmlpage += marker_text;
         }
 

eeschema/dialogs/dialog_bom.cpp

@@ -457,7 +457,6 @@ void DIALOG_BOM::OnRunPlugin( wxCommandEvent& event )
     // Calculate the xml netlist filename
     wxFileName fn = g_RootSheet->GetScreen()->GetFileName();
 
-    fn.SetPath( wxPathOnly( Prj().GetProjectFullName() ) );
     fn.ClearExt();
 
     wxString fullfilename = fn.GetFullPath();

eeschema/dialogs/dialog_bom_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec  1 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -32,7 +32,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	bLeftSizer->Add( m_lbPlugins, 1, wxEXPAND, 5 );
 
 
-	bUpperSizer->Add( bLeftSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
+	bUpperSizer->Add( bLeftSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
 	wxBoxSizer* bRightSizer;
 	bRightSizer = new wxBoxSizer( wxVERTICAL );
@@ -56,7 +56,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	bRightSizer->Add( m_Messages, 1, wxEXPAND|wxLEFT, 5 );
 
 
-	bUpperSizer->Add( bRightSizer, 2, wxEXPAND|wxRIGHT|wxTOP, 10 );
+	bUpperSizer->Add( bRightSizer, 2, wxEXPAND|wxRIGHT|wxTOP, 5 );
 
 
 	bMainSizer->Add( bUpperSizer, 2, wxEXPAND|wxALL, 5 );
@@ -64,13 +64,13 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	wxBoxSizer* bPluginButtons;
 	bPluginButtons = new wxBoxSizer( wxHORIZONTAL );
 
-	m_buttonAddPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_buttonAddPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_buttonAddPlugin->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	m_buttonAddPlugin->SetToolTip( _("Add a new plugin and its command line to the list") );
 
 	bPluginButtons->Add( m_buttonAddPlugin, 0, wxRIGHT|wxLEFT, 5 );
 
-	m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_buttonEdit->SetToolTip( _("Edit the plugin file in the text editor") );
 
 	bPluginButtons->Add( m_buttonEdit, 0, wxRIGHT, 5 );
@@ -78,13 +78,13 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 
 	bPluginButtons->Add( 0, 0, 0, wxRIGHT|wxLEFT, 5 );
 
-	m_buttonDelPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_buttonDelPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_buttonDelPlugin->SetToolTip( _("Remove the current plugin from list") );
 
 	bPluginButtons->Add( m_buttonDelPlugin, 0, wxRIGHT, 5 );
 
 
-	bMainSizer->Add( bPluginButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bMainSizer->Add( bPluginButtons, 0, wxALL|wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 	wxBoxSizer* bbottomSizer;
 	bbottomSizer = new wxBoxSizer( wxVERTICAL );
@@ -105,7 +105,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 	bbottomSizer->Add( m_checkBoxShowConsole, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
 
-	bMainSizer->Add( bbottomSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
+	bMainSizer->Add( bbottomSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bMainSizer->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
@@ -124,6 +124,7 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin
 
 	this->SetSizer( bMainSizer );
 	this->Layout();
+	bMainSizer->Fit( this );
 
 	this->Centre( wxBOTH );
 

eeschema/dialogs/dialog_bom_base.fbp

@@ -14,6 +14,7 @@
         <property name="file">dialog_bom_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="name">dialog_bom_base</property>
@@ -25,6 +26,7 @@
         <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">1</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -45,7 +47,7 @@
             <property name="minimum_size">-1,-1</property>
             <property name="name">DIALOG_BOM_BASE</property>
             <property name="pos"></property>
-            <property name="size">617,433</property>
+            <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Bill of Material</property>
@@ -69,7 +71,7 @@
                         <property name="orient">wxHORIZONTAL</property>
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">10</property>
+                            <property name="border">5</property>
                             <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
                             <property name="proportion">1</property>
                             <object class="wxBoxSizer" expanded="1">
@@ -205,7 +207,7 @@
                             </object>
                         </object>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">10</property>
+                            <property name="border">5</property>
                             <property name="flag">wxEXPAND|wxRIGHT|wxTOP</property>
                             <property name="proportion">2</property>
                             <object class="wxBoxSizer" expanded="1">
@@ -419,8 +421,8 @@
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
-                    <property name="border">10</property>
-                    <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND|wxLEFT|wxRIGHT</property>
                     <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">
                         <property name="minimum_size"></property>
@@ -440,6 +442,7 @@
                                 <property name="aui_name"></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>
                                 <property name="bitmap"></property>
@@ -485,7 +488,7 @@
                                 <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
-                                <property name="size">30,30</property>
+                                <property name="size">-1,-1</property>
                                 <property name="style"></property>
                                 <property name="subclass">; forward_declare</property>
                                 <property name="toolbar_pane">0</property>
@@ -513,6 +516,7 @@
                                 <property name="aui_name"></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>
                                 <property name="bitmap"></property>
@@ -558,7 +562,7 @@
                                 <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
-                                <property name="size">30,30</property>
+                                <property name="size">-1,-1</property>
                                 <property name="style"></property>
                                 <property name="subclass">; forward_declare</property>
                                 <property name="toolbar_pane">0</property>
@@ -596,6 +600,7 @@
                                 <property name="aui_name"></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>
                                 <property name="bitmap"></property>
@@ -641,7 +646,7 @@
                                 <property name="pressed"></property>
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
-                                <property name="size">30,30</property>
+                                <property name="size">-1,-1</property>
                                 <property name="style"></property>
                                 <property name="subclass">; forward_declare</property>
                                 <property name="toolbar_pane">0</property>
@@ -659,7 +664,7 @@
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
-                    <property name="border">10</property>
+                    <property name="border">5</property>
                     <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
                     <property name="proportion">0</property>
                     <object class="wxBoxSizer" expanded="1">

eeschema/dialogs/dialog_bom_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec  1 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -77,7 +77,7 @@ class DIALOG_BOM_BASE : public DIALOG_SHIM
 
 	public:
 
-		DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bill of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 617,433 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+		DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Bill of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_BOM_BASE();
 
 };

eeschema/dialogs/dialog_bom_help.html

@@ -44,7 +44,7 @@ Full documentation:</h1>
 <font face="Times New Roman, serif"><font size="3" style="font-size: 12pt"><span style="font-weight: normal">The
 </span><i><b>Eeschema documentation</b></i> <span style="font-weight: normal">describes
 this </span><b>intermediate netlist and gives examples<br></b><span style="font-weight: normal">See </span>
-<i><b>http://docs.kicad-pcb.org/stable/en/eeschema.html#creating-customized-netlists-and-bom-files</b></i></font></font></p>
+<i><b>https://go.kicad.org/docs/5.1/en/eeschema/eeschema.html#creating-customized-netlists-and-bom-files</b></i></font></font></p>
 <h1 class="western"><i>2 - </i>The intermediate Netlist File</h1>
 <p lang="en-US" class="western" style="margin-bottom: 0cm; widows: 0; orphans: 0; page-break-before: auto; page-break-after: auto">
 <font face="Times New Roman, serif"><font size="3" style="font-size: 12pt">BOM

eeschema/dialogs/dialog_edit_component_in_lib.cpp

@@ -393,6 +393,25 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::OnGridCellChanging( wxGridEvent& event )
         m_delayedFocusColumn = event.GetCol();
         m_delayedFocusPage = 0;
     }
+    else if( event.GetCol() == FDC_NAME )
+    {
+        wxString newName = event.GetString();
+
+        for( int i = 0; i < m_grid->GetNumberRows(); ++i )
+        {
+            if( i == event.GetRow() )
+                continue;
+
+            if( newName.CmpNoCase( m_grid->GetCellValue( i, FDC_NAME ) ) == 0 )
+            {
+                DisplayError( this, wxString::Format( _( "The name '%s' is already in use." ),
+                                                      newName ) );
+                event.Veto();
+                m_delayedFocusRow = event.GetRow();
+                m_delayedFocusColumn = event.GetCol();
+            }
+        }
+    }
     else if( event.GetRow() == VALUE && event.GetCol() == FDC_VALUE )
         m_SymbolNameCtrl->ChangeValue( event.GetString() );
 

eeschema/dialogs/dialog_edit_component_in_lib_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec  1 2018)
+// C++ code generated with wxFormBuilder (version 3.9.0 Nov  1 2020)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -84,19 +84,16 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	m_bpAdd = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bpAdd->SetToolTip( _("Add field") );
-	m_bpAdd->SetMinSize( wxSize( 30,29 ) );
 
 	bButtonSize->Add( m_bpAdd, 0, wxRIGHT|wxLEFT, 5 );
 
 	m_bpMoveUp = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bpMoveUp->SetToolTip( _("Move up") );
-	m_bpMoveUp->SetMinSize( wxSize( 30,29 ) );
 
 	bButtonSize->Add( m_bpMoveUp, 0, wxRIGHT, 5 );
 
 	m_bpMoveDown = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bpMoveDown->SetToolTip( _("Move down") );
-	m_bpMoveDown->SetMinSize( wxSize( 30,29 ) );
 
 	bButtonSize->Add( m_bpMoveDown, 0, wxRIGHT, 5 );
 
@@ -105,7 +102,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	m_bpDelete = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_bpDelete->SetToolTip( _("Delete field") );
-	m_bpDelete->SetMinSize( wxSize( 30,29 ) );
 
 	bButtonSize->Add( m_bpDelete, 0, wxRIGHT|wxLEFT, 10 );
 
@@ -127,7 +123,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	wxStaticText* staticNameLabel;
 	staticNameLabel = new wxStaticText( m_PanelBasic, wxID_ANY, _("Symbol name:"), wxDefaultPosition, wxDefaultSize, 0 );
 	staticNameLabel->Wrap( -1 );
-	fgSizerFPID->Add( staticNameLabel, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	fgSizerFPID->Add( staticNameLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
 	m_SymbolNameCtrl = new wxTextCtrl( m_PanelBasic, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizerFPID->Add( m_SymbolNameCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -188,7 +184,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	sbSizerSymbol->Add( bSizerUnitCount, 1, wxEXPAND, 5 );
 
 	m_OptionPartsLocked = new wxCheckBox( sbSizerSymbol->GetStaticBox(), wxID_ANY, _("All units are not interchangeable"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_OptionPartsLocked->SetToolTip( _("Check this option when creating multiple unit symbols and all units are not interchangeable") );
+	m_OptionPartsLocked->SetToolTip( _("Check this option to allow symbols with multiple units to have different\nelements.  Uncheck this option when all symbol units are identical except\nfor pin numbers.") );
 
 	sbSizerSymbol->Add( m_OptionPartsLocked, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
@@ -260,7 +256,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	m_PanelBasic->SetSizer( bSizerBasicPanel );
 	m_PanelBasic->Layout();
 	bSizerBasicPanel->Fit( m_PanelBasic );
-	m_NoteBook->AddPage( m_PanelBasic, _("General"), true );
+	m_NoteBook->AddPage( m_PanelBasic, _("General"), false );
 	m_PanelAlias = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizerMainPanelAlias;
 	bSizerMainPanelAlias = new wxBoxSizer( wxHORIZONTAL );
@@ -281,7 +277,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	m_addAliasButton = new wxBitmapButton( m_PanelAlias, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_addAliasButton->SetToolTip( _("Add alias") );
-	m_addAliasButton->SetMinSize( wxSize( 30,29 ) );
 
 	bSizerButtons->Add( m_addAliasButton, 0, wxALL, 5 );
 
@@ -290,7 +285,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	m_deleteAliasButton = new wxBitmapButton( m_PanelAlias, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_deleteAliasButton->SetToolTip( _("Delete alias") );
-	m_deleteAliasButton->SetMinSize( wxSize( 30,29 ) );
 
 	bSizerButtons->Add( m_deleteAliasButton, 0, wxALL, 5 );
 
@@ -388,7 +382,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	m_PanelAlias->SetSizer( bSizerMainPanelAlias );
 	m_PanelAlias->Layout();
 	bSizerMainPanelAlias->Fit( m_PanelAlias );
-	m_NoteBook->AddPage( m_PanelAlias, _("Aliases"), false );
+	m_NoteBook->AddPage( m_PanelAlias, _("Aliases"), true );
 	m_PanelFootprintFilter = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bPanelFpFilterBoxSizer;
 	bPanelFpFilterBoxSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -408,12 +402,12 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	wxBoxSizer* bFpFilterRightBoxSizer;
 	bFpFilterRightBoxSizer = new wxBoxSizer( wxHORIZONTAL );
 
-	m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_addFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_addFilterButton->SetToolTip( _("Add footprint filter") );
 
 	bFpFilterRightBoxSizer->Add( m_addFilterButton, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
 
-	m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_editFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_editFilterButton->SetToolTip( _("Edit footprint filter") );
 
 	bFpFilterRightBoxSizer->Add( m_editFilterButton, 0, wxALL, 5 );
@@ -421,7 +415,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	bFpFilterRightBoxSizer->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-	m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW|0 );
+	m_deleteFilterButton = new wxBitmapButton( m_PanelFootprintFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 );
 	m_deleteFilterButton->SetToolTip( _("Delete footprint filter") );
 
 	bFpFilterRightBoxSizer->Add( m_deleteFilterButton, 0, wxALL, 5 );
@@ -470,6 +464,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 
 	this->SetSizer( bMainSizer );
 	this->Layout();
+	bMainSizer->Fit( this );
 
 	// Connect Events
 	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnUpdateUI ) );