diff --git a/3d-viewer/dialogs/panel_3D_colors_base.cpp b/3d-viewer/dialogs/panel_3D_colors_base.cpp index 7a7a1fc6e5..5ee58ca2fe 100644 --- a/3d-viewer/dialogs/panel_3D_colors_base.cpp +++ b/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.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -129,10 +129,10 @@ PANEL_3D_COLORS_BASE::PANEL_3D_COLORS_BASE( wxWindow* parent, wxWindowID id, con boardBodyLabel = new wxStaticText( sbBoardColors->GetStaticBox(), wxID_ANY, _("Board body:"), wxDefaultPosition, wxDefaultSize, 0 ); boardBodyLabel->Wrap( -1 ); - fgSizer2->Add( boardBodyLabel, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 20 ); + fgSizer2->Add( boardBodyLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 ); m_boardBody = new COLOR_SWATCH( sbBoardColors->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_boardBody, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer2->Add( m_boardBody, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); sbBoardColors->Add( fgSizer2, 1, wxEXPAND, 5 ); diff --git a/3d-viewer/dialogs/panel_3D_colors_base.fbp b/3d-viewer/dialogs/panel_3D_colors_base.fbp index 6ef159bd87..43d286c7dd 100644 --- a/3d-viewer/dialogs/panel_3D_colors_base.fbp +++ b/3d-viewer/dialogs/panel_3D_colors_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -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 RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + 0 wxTAB_TRAVERSAL @@ -1317,7 +1320,7 @@ 20 - wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1378,7 +1381,7 @@ 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 1 diff --git a/3d-viewer/dialogs/panel_3D_colors_base.h b/3d-viewer/dialogs/panel_3D_colors_base.h index 2e1a0424c0..45b68a79a7 100644 --- a/3d-viewer/dialogs/panel_3D_colors_base.h +++ b/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.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -59,6 +59,7 @@ class PANEL_3D_COLORS_BASE : public RESETTABLE_PANEL 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/common/dialogs/panel_mouse_settings_base.cpp b/common/dialogs/panel_mouse_settings_base.cpp index 4f0b003058..9e55004076 100644 --- a/common/dialogs/panel_mouse_settings_base.cpp +++ b/common/dialogs/panel_mouse_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Apr 22 2021) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -60,7 +60,7 @@ PANEL_MOUSE_SETTINGS_BASE::PANEL_MOUSE_SETTINGS_BASE( wxWindow* parent, wxWindow m_zoomSizer->Add( m_checkAutoZoomSpeed, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 ); - gbSizer1->Add( m_zoomSizer, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 5 ); + gbSizer1->Add( m_zoomSizer, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxEXPAND|wxTOP, 5 ); m_panSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -75,7 +75,7 @@ PANEL_MOUSE_SETTINGS_BASE::PANEL_MOUSE_SETTINGS_BASE( wxWindow* parent, wxWindow m_panSizer->Add( m_autoPanSpeed, 1, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 0 ); - gbSizer1->Add( m_panSizer, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 5 ); + gbSizer1->Add( m_panSizer, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxEXPAND|wxTOP, 5 ); gbSizer1->AddGrowableCol( 0 ); diff --git a/common/dialogs/panel_mouse_settings_base.fbp b/common/dialogs/panel_mouse_settings_base.fbp index e18a9da79f..1b8d9f1e9e 100644 --- a/common/dialogs/panel_mouse_settings_base.fbp +++ b/common/dialogs/panel_mouse_settings_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ panel_mouse_settings_base 1000 none + 1 PANEL_MOUSE_SETTINGS_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -46,6 +48,7 @@ -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare + 0 wxTAB_TRAVERSAL @@ -299,7 +302,7 @@ 5 1 0 - wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxTOP 2 1 @@ -503,7 +506,7 @@ 5 1 2 - wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxTOP 2 1 @@ -2655,6 +2658,7 @@ + 0 @@ -2728,6 +2732,7 @@ + 0 diff --git a/common/dialogs/panel_mouse_settings_base.h b/common/dialogs/panel_mouse_settings_base.h index 5dd9c3af81..eec95f6de4 100644 --- a/common/dialogs/panel_mouse_settings_base.h +++ b/common/dialogs/panel_mouse_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Apr 22 2021) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -92,6 +92,7 @@ class PANEL_MOUSE_SETTINGS_BASE : public RESETTABLE_PANEL public: PANEL_MOUSE_SETTINGS_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_MOUSE_SETTINGS_BASE(); }; diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp b/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp index 77ccac9890..bd94796036 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -40,28 +40,23 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( m_rbSortBy_X_Position = new wxRadioButton( sbSizerOrder->GetStaticBox(), ID_SORT_BY_X_POSITION, _("Sort symbols by &X position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); bSizerXpos->Add( m_rbSortBy_X_Position, 0, wxALIGN_CENTER_VERTICAL, 5 ); - annotate_down_right_bitmap = new wxStaticBitmap( sbSizerOrder->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); sbSizerOrder->Add( bSizerXpos, 0, wxEXPAND, 5 ); - - sbSizerOrder->Add( 0, 5, 0, wxEXPAND, 5 ); - wxBoxSizer* bSizerYpos; bSizerYpos = new wxBoxSizer( wxHORIZONTAL ); m_rbSortBy_Y_Position = new wxRadioButton( sbSizerOrder->GetStaticBox(), ID_SORT_BY_Y_POSITION, _("Sort symbols by &Y position"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALIGN_CENTER_VERTICAL, 5 ); - annotate_right_down_bitmap = new wxStaticBitmap( sbSizerOrder->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); - sbSizerOrder->Add( bSizerYpos, 0, wxEXPAND, 5 ); + sbSizerOrder->Add( bSizerYpos, 0, wxBOTTOM|wxEXPAND, 5 ); bLeftColumn->Add( sbSizerOrder, 0, wxALL|wxEXPAND, 5 ); @@ -94,7 +89,7 @@ PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE::PANEL_EESCHEMA_ANNOTATION_OPTIONS_BASE( gbSizerNumbering->Add( m_rbSheetX1000, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxTOP, 2 ); - sbSizerNumbering->Add( gbSizerNumbering, 1, wxEXPAND, 5 ); + sbSizerNumbering->Add( gbSizerNumbering, 1, wxBOTTOM|wxEXPAND, 5 ); fgSizerNumbering->Add( sbSizerNumbering, 1, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp b/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp index b2cdb744d4..1d95b52bd8 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.fbp @@ -35,7 +35,6 @@ 1 - 0 1 impl_virtual @@ -105,7 +104,6 @@ Dock 0 Left - 0 1 1 @@ -170,7 +168,6 @@ Dock 0 Left - 0 1 1 @@ -211,11 +208,11 @@ - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Order @@ -223,11 +220,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND 0 - + bSizerXpos wxHORIZONTAL @@ -257,7 +254,6 @@ Dock 0 Left - 0 1 1 @@ -324,7 +320,6 @@ Dock 0 Left - 0 1 1 @@ -359,11 +354,11 @@ - + 5 - wxEXPAND + wxBOTTOM|wxEXPAND 0 - + bSizerYpos wxHORIZONTAL @@ -393,7 +388,6 @@ Dock 0 Left - 0 1 1 @@ -434,16 +428,6 @@ OnOptionChanged - - 5 - - 1 - - 0 - protected - 0 - - 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT @@ -470,7 +454,6 @@ Dock 0 Left - 0 1 1 @@ -537,7 +520,7 @@ none 5 - wxEXPAND + wxBOTTOM|wxEXPAND 1 @@ -578,7 +561,6 @@ Dock 0 Left - 0 1 1 @@ -647,7 +629,6 @@ Dock 0 Left - 0 1 1 @@ -716,7 +697,6 @@ Dock 0 Left - 0 1 1 @@ -785,7 +765,6 @@ Dock 0 Left - 0 1 1 diff --git a/eeschema/dialogs/panel_eeschema_annotation_options_base.h b/eeschema/dialogs/panel_eeschema_annotation_options_base.h index 0fa96bb5d5..e067978cf2 100644 --- a/eeschema/dialogs/panel_eeschema_annotation_options_base.h +++ b/eeschema/dialogs/panel_eeschema_annotation_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-133-g388db8e4) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp index 8586b3fd79..a728f1c4ea 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -38,12 +38,12 @@ PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWind m_cbAutoStartWires = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _("Automatically start wires on unconnected pins"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbAutoStartWires->SetToolTip( _("When enabled, you can start wiring by clicking on unconnected pins even when the wire tool is not active") ); - sbSizerEditOpt->Add( m_cbAutoStartWires, 0, wxALL, 5 ); + sbSizerEditOpt->Add( m_cbAutoStartWires, 0, wxLEFT|wxTOP, 5 ); m_escClearsNetHighlight = new wxCheckBox( sbSizerEditOpt->GetStaticBox(), wxID_ANY, _(" clears net highlighting"), wxDefaultPosition, wxDefaultSize, 0 ); m_escClearsNetHighlight->SetToolTip( _("First in selection tool clears selection, next clears net highlighting") ); - sbSizerEditOpt->Add( m_escClearsNetHighlight, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + sbSizerEditOpt->Add( m_escClearsNetHighlight, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); bLeftColumn->Add( sbSizerEditOpt, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp index f9aa9dd2c4..5e829221f8 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.fbp @@ -269,7 +269,7 @@ 5 - wxALL + wxLEFT|wxTOP 0 1 @@ -333,7 +333,7 @@ 5 - wxLEFT|wxRIGHT|wxTOP + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 diff --git a/eeschema/dialogs/panel_eeschema_editing_options_base.h b/eeschema/dialogs/panel_eeschema_editing_options_base.h index 614ca20323..d54df7622d 100644 --- a/eeschema/dialogs/panel_eeschema_editing_options_base.h +++ b/eeschema/dialogs/panel_eeschema_editing_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/gerbview/dialogs/panel_gerbview_excellon_settings_base.cpp b/gerbview/dialogs/panel_gerbview_excellon_settings_base.cpp index 6de11c5928..f91b669063 100644 --- a/gerbview/dialogs/panel_gerbview_excellon_settings_base.cpp +++ b/gerbview/dialogs/panel_gerbview_excellon_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -63,7 +63,7 @@ PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE::PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE( wx sbSizerCoordinates->Add( m_staticText7, 0, wxALL, 5 ); wxFlexGridSizer* fgSizerFmt; - fgSizerFmt = new wxFlexGridSizer( 0, 4, 0, 0 ); + fgSizerFmt = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizerFmt->SetFlexibleDirection( wxBOTH ); fgSizerFmt->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -71,41 +71,53 @@ PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE::PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE( wx m_staticTextUnitsmm->Wrap( -1 ); fgSizerFmt->Add( m_staticTextUnitsmm, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + wxString m_choiceIntegerMMChoices[] = { _("2"), _("3"), _("4"), _("5"), _("6") }; int m_choiceIntegerMMNChoices = sizeof( m_choiceIntegerMMChoices ) / sizeof( wxString ); m_choiceIntegerMM = new wxChoice( sbSizerCoordinates->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceIntegerMMNChoices, m_choiceIntegerMMChoices, 0 ); m_choiceIntegerMM->SetSelection( 1 ); - fgSizerFmt->Add( m_choiceIntegerMM, 0, wxALL, 5 ); + bSizer4->Add( m_choiceIntegerMM, 0, wxALL, 5 ); m_staticText8 = new wxStaticText( sbSizerCoordinates->GetStaticBox(), wxID_ANY, _(":"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText8->Wrap( -1 ); - fgSizerFmt->Add( m_staticText8, 0, wxALL, 5 ); + bSizer4->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxString m_choiceMantissaMMChoices[] = { _("2"), _("3"), _("4"), _("5"), _("6") }; int m_choiceMantissaMMNChoices = sizeof( m_choiceMantissaMMChoices ) / sizeof( wxString ); m_choiceMantissaMM = new wxChoice( sbSizerCoordinates->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceMantissaMMNChoices, m_choiceMantissaMMChoices, 0 ); m_choiceMantissaMM->SetSelection( 1 ); - fgSizerFmt->Add( m_choiceMantissaMM, 0, wxALL, 5 ); + bSizer4->Add( m_choiceMantissaMM, 0, wxALL, 5 ); + + + fgSizerFmt->Add( bSizer4, 1, wxEXPAND, 5 ); m_staticTextUnitsInch = new wxStaticText( sbSizerCoordinates->GetStaticBox(), wxID_ANY, _("Format for inches"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextUnitsInch->Wrap( -1 ); fgSizerFmt->Add( m_staticTextUnitsInch, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + wxBoxSizer* bSizer3; + bSizer3 = new wxBoxSizer( wxHORIZONTAL ); + wxString m_choiceIntegerInchChoices[] = { _("2"), _("3"), _("4"), _("5"), _("6") }; int m_choiceIntegerInchNChoices = sizeof( m_choiceIntegerInchChoices ) / sizeof( wxString ); m_choiceIntegerInch = new wxChoice( sbSizerCoordinates->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceIntegerInchNChoices, m_choiceIntegerInchChoices, 0 ); m_choiceIntegerInch->SetSelection( 0 ); - fgSizerFmt->Add( m_choiceIntegerInch, 0, wxALL, 5 ); + bSizer3->Add( m_choiceIntegerInch, 0, wxALL, 5 ); m_staticText9 = new wxStaticText( sbSizerCoordinates->GetStaticBox(), wxID_ANY, _(":"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); - fgSizerFmt->Add( m_staticText9, 0, wxALL, 5 ); + bSizer3->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxString m_choiceMantissaInchChoices[] = { _("2"), _("3"), _("4"), _("5"), _("6") }; int m_choiceMantissaInchNChoices = sizeof( m_choiceMantissaInchChoices ) / sizeof( wxString ); m_choiceMantissaInch = new wxChoice( sbSizerCoordinates->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceMantissaInchNChoices, m_choiceMantissaInchChoices, 0 ); m_choiceMantissaInch->SetSelection( 2 ); - fgSizerFmt->Add( m_choiceMantissaInch, 0, wxALL, 5 ); + bSizer3->Add( m_choiceMantissaInch, 0, wxALL, 5 ); + + + fgSizerFmt->Add( bSizer3, 1, wxEXPAND, 5 ); sbSizerCoordinates->Add( fgSizerFmt, 1, wxEXPAND, 5 ); diff --git a/gerbview/dialogs/panel_gerbview_excellon_settings_base.fbp b/gerbview/dialogs/panel_gerbview_excellon_settings_base.fbp index 0be21923d9..c22fab08af 100644 --- a/gerbview/dialogs/panel_gerbview_excellon_settings_base.fbp +++ b/gerbview/dialogs/panel_gerbview_excellon_settings_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ panel_gerbview_excellon_settings_base 1000 none + 1 PanelGerbviewExcellonSettings @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -46,6 +48,7 @@ 440,336 RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare + 0 wxTAB_TRAVERSAL @@ -530,7 +533,7 @@ wxEXPAND 1 - 4 + 2 wxBOTH @@ -604,192 +607,203 @@ 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "2" "3" "4" "5" "6" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + wxEXPAND + 1 + - 1 - m_choiceIntegerMM - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onUnitsChange - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - : - 0 - - 0 - - - 0 - - 1 - m_staticText8 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "2" "3" "4" "5" "6" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceMantissaMM - 1 - - - protected - 1 - - Resizable - 1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + bSizer4 + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "2" "3" "4" "5" "6" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceIntegerMM + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onUnitsChange + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + : + 0 + + 0 + + + 0 + + 1 + m_staticText8 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "2" "3" "4" "5" "6" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceMantissaMM + 1 + + + protected + 1 + + Resizable + 1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + @@ -855,192 +869,203 @@ 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "2" "3" "4" "5" "6" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 + wxEXPAND + 1 + - 1 - m_choiceIntegerInch - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onUnitsChange - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - : - 0 - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "2" "3" "4" "5" "6" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceMantissaInch - 1 - - - protected - 1 - - Resizable - 2 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + bSizer3 + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "2" "3" "4" "5" "6" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceIntegerInch + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onUnitsChange + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + : + 0 + + 0 + + + 0 + + 1 + m_staticText9 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "2" "3" "4" "5" "6" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceMantissaInch + 1 + + + protected + 1 + + Resizable + 2 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + diff --git a/gerbview/dialogs/panel_gerbview_excellon_settings_base.h b/gerbview/dialogs/panel_gerbview_excellon_settings_base.h index 8d669a4ec3..96cd265350 100644 --- a/gerbview/dialogs/panel_gerbview_excellon_settings_base.h +++ b/gerbview/dialogs/panel_gerbview_excellon_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -51,13 +51,14 @@ class PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE : public RESETTABLE_PANEL wxStaticText* m_staticText9; wxChoice* m_choiceMantissaInch; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onUnitsChange( wxCommandEvent& event ) { event.Skip(); } public: PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 440,336 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~PANEL_GERBVIEW_EXCELLON_SETTINGS_BASE(); }; diff --git a/kicad/pcm/dialogs/panel_pcm_settings_base.cpp b/kicad/pcm/dialogs/panel_pcm_settings_base.cpp index b8e058e648..31e7ae12e3 100644 --- a/kicad/pcm/dialogs/panel_pcm_settings_base.cpp +++ b/kicad/pcm/dialogs/panel_pcm_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -22,7 +22,7 @@ PANEL_PCM_SETTINGS_BASE::PANEL_PCM_SETTINGS_BASE( wxWindow* parent, wxWindowID i sbSizer1->Add( m_updateCheck, 0, wxALL, 5 ); - bSizer1->Add( sbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer1->Add( sbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxStaticBoxSizer* sbSizer2; sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Library package handling") ), wxVERTICAL ); diff --git a/kicad/pcm/dialogs/panel_pcm_settings_base.fbp b/kicad/pcm/dialogs/panel_pcm_settings_base.fbp index 6f7d748402..b187035dd4 100644 --- a/kicad/pcm/dialogs/panel_pcm_settings_base.fbp +++ b/kicad/pcm/dialogs/panel_pcm_settings_base.fbp @@ -59,7 +59,7 @@ none 5 - wxEXPAND|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 wxID_ANY diff --git a/kicad/pcm/dialogs/panel_pcm_settings_base.h b/kicad/pcm/dialogs/panel_pcm_settings_base.h index 52084018e3..d8cb93aa5c 100644 --- a/kicad/pcm/dialogs/panel_pcm_settings_base.h +++ b/kicad/pcm/dialogs/panel_pcm_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp index 9c39728c87..de9e819171 100644 --- a/pcbnew/dialogs/panel_edit_options_base.cpp +++ b/pcbnew/dialogs/panel_edit_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -30,7 +30,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i bSizeFPEdit->Add( m_magneticPads, 0, wxBOTTOM, 3 ); m_magneticGraphics = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Magnetic graphics"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizeFPEdit->Add( m_magneticGraphics, 0, wxBOTTOM, 10 ); + bSizeFPEdit->Add( m_magneticGraphics, 0, wxBOTTOM, 5 ); bOptionsSizer->Add( bSizeFPEdit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -39,7 +39,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i bSizerBoardEdit = new wxBoxSizer( wxVERTICAL ); m_flipLeftRight = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Flip board items L/R (default is T/B)"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerBoardEdit->Add( m_flipLeftRight, 0, wxBOTTOM, 10 ); + bSizerBoardEdit->Add( m_flipLeftRight, 0, wxBOTTOM, 5 ); bOptionsSizer->Add( bSizerBoardEdit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -70,10 +70,10 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i m_allowFreePads = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _("Allow free pads"), wxDefaultPosition, wxDefaultSize, 0 ); m_allowFreePads->SetToolTip( _("If checked, pads can be moved with respect to the rest of the footprint.") ); - bSizerUniversal->Add( m_allowFreePads, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizerUniversal->Add( m_allowFreePads, 0, wxBOTTOM|wxRIGHT, 5 ); m_escClearsNetHighlight = new wxCheckBox( bOptionsSizer->GetStaticBox(), wxID_ANY, _(" clears net highlighting"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerUniversal->Add( m_escClearsNetHighlight, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bSizerUniversal->Add( m_escClearsNetHighlight, 0, wxBOTTOM|wxRIGHT, 5 ); bOptionsSizer->Add( bSizerUniversal, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp index 7a8c027538..efd7f3636c 100644 --- a/pcbnew/dialogs/panel_edit_options_base.fbp +++ b/pcbnew/dialogs/panel_edit_options_base.fbp @@ -161,7 +161,7 @@ - 10 + 5 wxBOTTOM 0 @@ -236,7 +236,7 @@ wxVERTICAL none - 10 + 5 wxBOTTOM 0 @@ -509,7 +509,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 @@ -573,7 +573,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxRIGHT 0 1 diff --git a/pcbnew/dialogs/panel_edit_options_base.h b/pcbnew/dialogs/panel_edit_options_base.h index bd9a1d9646..55eb1faa65 100644 --- a/pcbnew/dialogs/panel_edit_options_base.h +++ b/pcbnew/dialogs/panel_edit_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!