diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp index ab70e79c5f..595d701027 100644 --- a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -156,7 +156,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Opacity") ), wxVERTICAL ); m_opacity = new wxSlider( sbSizer4->GetStaticBox(), wxID_ANY, 50, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - sbSizer4->Add( m_opacity, 0, wxEXPAND|wxBOTTOM, 5 ); + sbSizer4->Add( m_opacity, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizerLeft->Add( sbSizer4, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); @@ -186,7 +186,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi bSizer3DButtons = new wxBoxSizer( wxVERTICAL ); - bSizer3DButtons->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); + bSizer3DButtons->Add( 0, 0, 0, wxEXPAND, 5 ); m_bpvISO = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_bpvISO->SetToolTip( _("Change to isometric perspective") ); diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp index a67b9c3b3d..5def7e5ddf 100644 --- a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp +++ b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp @@ -14,6 +14,7 @@ panel_preview_3d_model_base 1000 none + 1 panel_preview_3d_model_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ -1,-1 + 0 wxTAB_TRAVERSAL @@ -1856,7 +1859,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -2018,7 +2021,7 @@ none 5 - wxEXPAND|wxTOP + wxEXPAND 0 0 @@ -2039,6 +2042,7 @@ + 0 @@ -2122,6 +2126,7 @@ + 0 @@ -2195,6 +2200,7 @@ + 0 @@ -2268,6 +2274,7 @@ + 0 @@ -2341,6 +2348,7 @@ + 0 @@ -2414,6 +2422,7 @@ + 0 @@ -2487,6 +2496,7 @@ + 0 @@ -2570,6 +2580,7 @@ + 0 diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h index cb270baa17..95a7ecae1d 100644 --- a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h +++ b/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -76,7 +76,7 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel wxBitmapButton* m_bpvBottom; wxBitmapButton* m_bpUpdate; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onMouseWheelScale( wxMouseEvent& event ) { event.Skip(); } virtual void updateOrientation( wxCommandEvent& event ) { event.Skip(); } virtual void onDecrementScale( wxSpinEvent& event ) { event.Skip(); } @@ -102,6 +102,7 @@ class PANEL_PREVIEW_3D_MODEL_BASE : public wxPanel wxTextCtrl* yoff; PANEL_PREVIEW_3D_MODEL_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_PREVIEW_3D_MODEL_BASE(); }; diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp index 72a13494e1..108b850c9f 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -29,14 +29,14 @@ PANEL_3D_COLORS_BASE::PANEL_3D_COLORS_BASE( wxWindow* parent, wxWindowID id, con backgroundTopLabel = new wxStaticText( sbEnvironmentColors->GetStaticBox(), wxID_ANY, _("Background gradient start:"), wxDefaultPosition, wxDefaultSize, 0 ); backgroundTopLabel->Wrap( -1 ); - fgSizer1->Add( backgroundTopLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( backgroundTopLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_backgroundTop = new COLOR_SWATCH( sbEnvironmentColors->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_backgroundTop, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); backgroundBotLabel = new wxStaticText( sbEnvironmentColors->GetStaticBox(), wxID_ANY, _("Background gradient end:"), wxDefaultPosition, wxDefaultSize, 0 ); backgroundBotLabel->Wrap( -1 ); - fgSizer1->Add( backgroundBotLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( backgroundBotLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_backgroundBottom = new COLOR_SWATCH( sbEnvironmentColors->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_backgroundBottom, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); @@ -49,7 +49,7 @@ PANEL_3D_COLORS_BASE::PANEL_3D_COLORS_BASE( wxWindow* parent, wxWindowID id, con solderPasteLabel = new wxStaticText( sbEnvironmentColors->GetStaticBox(), wxID_ANY, _("Solder paste:"), wxDefaultPosition, wxDefaultSize, 0 ); solderPasteLabel->Wrap( -1 ); - fgSizer1->Add( solderPasteLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer1->Add( solderPasteLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_solderPaste = new COLOR_SWATCH( sbEnvironmentColors->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer1->Add( m_solderPaste, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp index b9a5939703..0ceefbf5e4 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp @@ -14,6 +14,7 @@ panel_3D_colors_base 1000 none + 1 panel_3D_colors_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ -1,-1 ; ; forward_declare + 0 wxTAB_TRAVERSAL @@ -93,7 +96,7 @@ 5 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -216,7 +219,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -359,7 +362,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h index d2bdbc60d2..80a646b505 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -58,6 +58,7 @@ class PANEL_3D_COLORS_BASE : public wxPanel public: PANEL_3D_COLORS_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_3D_COLORS_BASE(); }; diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp index 64c5c702d0..13580cdcf7 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,7 +51,7 @@ PANEL_3D_OPENGL_OPTIONS_BASE::PANEL_3D_OPENGL_OPTIONS_BASE( wxWindow* parent, wx gSizer1->Add( m_selectionColorLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_selectionColorSwatch = new COLOR_SWATCH( sbSizerOpenGLRenderoptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - gSizer1->Add( m_selectionColorSwatch, 0, wxALL|wxEXPAND, 5 ); + gSizer1->Add( m_selectionColorSwatch, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); sbSizerOpenGLRenderoptions->Add( gSizer1, 0, 0, 5 ); diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp index d0eae350a2..a220dcbd72 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp @@ -14,6 +14,7 @@ panel_3D_opengl_options_base 1000 none + 1 panel_3D_opengl_optionS_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ -1,-1 ; ; forward_declare + 0 wxTAB_TRAVERSAL @@ -467,7 +470,7 @@ 5 - wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h index 51a5d98a29..366ee2b69c 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -50,6 +50,7 @@ class PANEL_3D_OPENGL_OPTIONS_BASE : public wxPanel public: PANEL_3D_OPENGL_OPTIONS_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_3D_OPENGL_OPTIONS_BASE(); }; diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp index 7752edce36..b12aea8575 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -348,11 +348,12 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE::PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* pa bSizerMargins->Add( sbSizerRaytracingLightConfiguration, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bSizerMain->Add( bSizerMargins, 1, wxEXPAND|wxRIGHT, 5 ); + bSizerMain->Add( bSizerMargins, 1, wxEXPAND, 5 ); this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); } PANEL_3D_RAYTRACING_OPTIONS_BASE::~PANEL_3D_RAYTRACING_OPTIONS_BASE() diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp index 8a273c8c18..6e391e95fc 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp @@ -14,6 +14,7 @@ panel_3D_raytracing_options_base 1000 none + 1 panel_3D_raytracing_options_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -43,9 +45,10 @@ PANEL_3D_RAYTRACING_OPTIONS_BASE - 795,478 + -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + 0 wxTAB_TRAVERSAL @@ -56,7 +59,7 @@ none 5 - wxEXPAND|wxRIGHT + wxEXPAND 1 diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h index dc5ecf07ae..06e9000c99 100644 --- a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h +++ b/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -98,7 +98,8 @@ class PANEL_3D_RAYTRACING_OPTIONS_BASE : public RESETTABLE_PANEL public: - PANEL_3D_RAYTRACING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 795,478 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_3D_RAYTRACING_OPTIONS_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_3D_RAYTRACING_OPTIONS_BASE(); }; diff --git a/common/dialogs/panel_setup_netclasses_base.cpp b/common/dialogs/panel_setup_netclasses_base.cpp index 05acd8158a..3671b503ae 100644 --- a/common/dialogs/panel_setup_netclasses_base.cpp +++ b/common/dialogs/panel_setup_netclasses_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,7 +38,6 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi // Columns m_netclassGrid->EnableDragColMove( false ); m_netclassGrid->EnableDragColSize( true ); - m_netclassGrid->SetColLabelSize( 24 ); m_netclassGrid->SetColLabelValue( 0, _("Net Class") ); m_netclassGrid->SetColLabelValue( 1, _("Clearance") ); m_netclassGrid->SetColLabelValue( 2, _("Track Width") ); @@ -52,12 +51,13 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_netclassGrid->SetColLabelValue( 10, _("Bus Thickness") ); m_netclassGrid->SetColLabelValue( 11, _("Color") ); m_netclassGrid->SetColLabelValue( 12, _("Line Style") ); + m_netclassGrid->SetColLabelSize( 24 ); m_netclassGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows m_netclassGrid->EnableDragRowSize( true ); - m_netclassGrid->SetRowLabelSize( 0 ); m_netclassGrid->SetRowLabelValue( 0, _("Default") ); + m_netclassGrid->SetRowLabelSize( 0 ); m_netclassGrid->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); // Label Appearance @@ -81,9 +81,9 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi buttonBoxSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - m_colorDefaultHelpText = new wxStaticText( m_netclassesPane, wxID_ANY, _("Set color to transparent to use Kicad default color."), wxDefaultPosition, wxDefaultSize, 0 ); + m_colorDefaultHelpText = new wxStaticText( m_netclassesPane, wxID_ANY, _("Set color to transparent to use KiCad default color."), wxDefaultPosition, wxDefaultSize, 0 ); m_colorDefaultHelpText->Wrap( -1 ); - buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -138,13 +138,13 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi bSizer131 = new wxBoxSizer( wxHORIZONTAL ); m_showAllButton = new wxButton( sbFilters->GetStaticBox(), wxID_ANY, _("Show All Nets"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer131->Add( m_showAllButton, 1, wxALL, 5 ); + bSizer131->Add( m_showAllButton, 1, wxLEFT|wxTOP, 5 ); bSizer131->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_filterNetsButton = new wxButton( sbFilters->GetStaticBox(), wxID_ANY, _("Apply Filters"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer131->Add( m_filterNetsButton, 1, wxALL, 5 ); + bSizer131->Add( m_filterNetsButton, 1, wxRIGHT|wxTOP, 5 ); sbFilters->Add( bSizer131, 1, wxEXPAND|wxTOP|wxBOTTOM, 6 ); @@ -152,6 +152,9 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi bLeft->Add( sbFilters, 0, wxEXPAND|wxBOTTOM, 5 ); + + bLeft->Add( 0, 0, 1, wxEXPAND, 5 ); + wxStaticBoxSizer* sbEdit; sbEdit = new wxStaticBoxSizer( new wxStaticBox( m_membershipPane, wxID_ANY, _("Assign Net Class") ), wxVERTICAL ); @@ -176,19 +179,19 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi bSizer12 = new wxBoxSizer( wxHORIZONTAL ); m_assignAllButton = new wxButton( sbEdit->GetStaticBox(), wxID_ANY, _("Assign To All Listed Nets"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer12->Add( m_assignAllButton, 1, wxALL, 5 ); + bSizer12->Add( m_assignAllButton, 1, wxBOTTOM|wxLEFT|wxTOP, 5 ); bSizer12->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_assignSelectedButton = new wxButton( sbEdit->GetStaticBox(), wxID_ANY, _("Assign To Selected Nets"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer12->Add( m_assignSelectedButton, 1, wxALL, 5 ); + bSizer12->Add( m_assignSelectedButton, 1, wxBOTTOM|wxRIGHT|wxTOP, 5 ); sbEdit->Add( bSizer12, 0, wxEXPAND|wxTOP, 6 ); - bLeft->Add( sbEdit, 1, wxEXPAND|wxTOP, 8 ); + bLeft->Add( sbEdit, 0, wxEXPAND|wxTOP, 8 ); bLowerSizer->Add( bLeft, 1, wxEXPAND|wxTOP|wxRIGHT, 5 ); @@ -208,9 +211,9 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi // Columns m_membershipGrid->EnableDragColMove( false ); m_membershipGrid->EnableDragColSize( true ); - m_membershipGrid->SetColLabelSize( 24 ); m_membershipGrid->SetColLabelValue( 0, _("Net") ); m_membershipGrid->SetColLabelValue( 1, _("Net Class") ); + m_membershipGrid->SetColLabelSize( 24 ); m_membershipGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); // Rows diff --git a/common/dialogs/panel_setup_netclasses_base.fbp b/common/dialogs/panel_setup_netclasses_base.fbp index e04e8ea3bc..35d86d653a 100644 --- a/common/dialogs/panel_setup_netclasses_base.fbp +++ b/common/dialogs/panel_setup_netclasses_base.fbp @@ -14,6 +14,7 @@ panel_setup_netclasses_base 1000 none + 1 panel_setup_netclasses_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -46,6 +48,7 @@ -1,-1 ; forward_declare + 0 wxTAB_TRAVERSAL @@ -293,6 +296,7 @@ + 0 @@ -376,6 +380,7 @@ + 0 @@ -448,7 +453,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -478,7 +483,7 @@ 0 0 wxID_ANY - Set color to transparent to use Kicad default color. + Set color to transparent to use KiCad default color. 0 0 @@ -864,18 +869,18 @@ - + 6 wxEXPAND|wxTOP|wxBOTTOM 1 - + bSizer131 wxHORIZONTAL none 5 - wxALL + wxLEFT|wxTOP 1 1 @@ -886,6 +891,7 @@ + 0 @@ -958,7 +964,7 @@ 5 - wxALL + wxRIGHT|wxTOP 1 1 @@ -969,6 +975,7 @@ + 0 @@ -1033,10 +1040,20 @@ + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + 8 wxEXPAND|wxTOP - 1 + 0 wxID_ANY Assign Net Class @@ -1181,18 +1198,18 @@ - + 6 wxEXPAND|wxTOP 0 - + bSizer12 wxHORIZONTAL none 5 - wxALL + wxBOTTOM|wxLEFT|wxTOP 1 1 @@ -1203,6 +1220,7 @@ + 0 @@ -1275,7 +1293,7 @@ 5 - wxALL + wxBOTTOM|wxRIGHT|wxTOP 1 1 @@ -1286,6 +1304,7 @@ + 0 diff --git a/common/dialogs/panel_setup_netclasses_base.h b/common/dialogs/panel_setup_netclasses_base.h index 918588da75..b0bd39cf51 100644 --- a/common/dialogs/panel_setup_netclasses_base.h +++ b/common/dialogs/panel_setup_netclasses_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -60,7 +60,7 @@ class PANEL_SETUP_NETCLASSES_BASE : public wxPanel wxButton* m_assignSelectedButton; WX_GRID* m_membershipGrid; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnSizeNetclassGrid( wxSizeEvent& event ) { event.Skip(); } virtual void OnAddNetclassClick( wxCommandEvent& event ) { event.Skip(); } @@ -76,6 +76,7 @@ class PANEL_SETUP_NETCLASSES_BASE : public wxPanel public: PANEL_SETUP_NETCLASSES_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_SETUP_NETCLASSES_BASE(); }; diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.cpp b/eeschema/dialogs/dialog_sch_import_settings_base.cpp index 30dcb6f1e3..ad6d7f3646 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.cpp +++ b/eeschema/dialogs/dialog_sch_import_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -21,13 +21,13 @@ DIALOG_SCH_IMPORT_SETTINGS_BASE::DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* pare wxStaticText* importFromLabel; importFromLabel = new wxStaticText( this, wxID_ANY, _("Import from:"), wxDefaultPosition, wxDefaultSize, 0 ); importFromLabel->Wrap( -1 ); - bupperSizer->Add( importFromLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + bupperSizer->Add( importFromLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_filePathCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_filePathCtrl->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); m_filePathCtrl->SetMinSize( wxSize( 300,-1 ) ); - bupperSizer->Add( m_filePathCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + bupperSizer->Add( m_filePathCtrl, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_browseButton->SetMinSize( wxSize( 29,29 ) ); @@ -75,7 +75,7 @@ DIALOG_SCH_IMPORT_SETTINGS_BASE::DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* pare m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); + m_buttonsSizer->Add( m_sdbSizer1, 1, wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_MainSizer->Add( m_buttonsSizer, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.fbp b/eeschema/dialogs/dialog_sch_import_settings_base.fbp index 98d7fa61fd..7766d594a1 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.fbp +++ b/eeschema/dialogs/dialog_sch_import_settings_base.fbp @@ -52,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h Import Settings + 0 @@ -71,7 +72,7 @@ none 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -132,7 +133,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxTOP 1 1 @@ -747,7 +748,7 @@ 5 - wxALL|wxEXPAND + wxBOTTOM|wxEXPAND|wxTOP 1 0 diff --git a/eeschema/dialogs/dialog_sch_import_settings_base.h b/eeschema/dialogs/dialog_sch_import_settings_base.h index 16d4a1f5f0..a84144440c 100644 --- a/eeschema/dialogs/dialog_sch_import_settings_base.h +++ b/eeschema/dialogs/dialog_sch_import_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Aug 10 2021) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -46,7 +46,7 @@ class DIALOG_SCH_IMPORT_SETTINGS_BASE : public DIALOG_SHIM wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnBrowseClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnSelectAll( wxCommandEvent& event ) { event.Skip(); } @@ -59,6 +59,7 @@ class DIALOG_SCH_IMPORT_SETTINGS_BASE : public DIALOG_SHIM wxCheckBox* m_NetClassesOpt; DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_SCH_IMPORT_SETTINGS_BASE(); };