diff --git a/3d-viewer/dialogs/panel_3D_opengl_options_base.cpp b/3d-viewer/dialogs/panel_3D_opengl_options_base.cpp index 17cca1aed0..e32cb3f425 100644 --- a/3d-viewer/dialogs/panel_3D_opengl_options_base.cpp +++ b/3d-viewer/dialogs/panel_3D_opengl_options_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,7 @@ PANEL_3D_OPENGL_OPTIONS_BASE::PANEL_3D_OPENGL_OPTIONS_BASE( wxWindow* parent, wx bSizerMain->Add( 0, 3, 0, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); + bSizerMain->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizerMargins; bSizerMargins = new wxBoxSizer( wxVERTICAL ); @@ -77,7 +77,7 @@ PANEL_3D_OPENGL_OPTIONS_BASE::PANEL_3D_OPENGL_OPTIONS_BASE( wxWindow* parent, wx bSizerMain->Add( 0, 3, 0, wxEXPAND, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizerMain->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 5 ); + bSizerMain->Add( m_staticline2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); diff --git a/3d-viewer/dialogs/panel_3D_opengl_options_base.fbp b/3d-viewer/dialogs/panel_3D_opengl_options_base.fbp index ef33292ee4..df9b94fc08 100644 --- a/3d-viewer/dialogs/panel_3D_opengl_options_base.fbp +++ b/3d-viewer/dialogs/panel_3D_opengl_options_base.fbp @@ -1,1063 +1,1081 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_3D_opengl_options_base - 1000 - none - - - 1 - panel_3D_opengl_optionS_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + C++ + + 1 + connect + none + + + 0 + 0 + res + UTF-8 + panel_3D_opengl_options_base + 1000 + 1 + 1 + UI + panel_3D_opengl_optionS_base + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_3D_OPENGL_OPTIONS_BASE + + -1,-1 + RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + + 0 + + + wxTAB_TRAVERSAL + + + bSizerMain + wxVERTICAL + none + + 13 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + Rendering Options + 0 + + 0 + + 0 - PANEL_3D_OPENGL_OPTIONS_BASE + 1 + m_renderingLabel + 1 + + + protected + 1 - -1,-1 - RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare + Resizable + 1 + + + ; ; forward_declare + 0 - 0 - wxTAB_TRAVERSAL - - - bSizerMain - wxVERTICAL - none - - 13 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Rendering Options - 0 - - 0 - - - 0 - - 1 - m_renderingLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - - bSizerMargins - wxVERTICAL - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show model bounding boxes - - 0 - - - 0 - - 1 - m_checkBoxBoundingBoxes - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show copper and tech layers thickness (very slow) - - 0 - - - 0 - - 1 - m_checkBoxCuThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Highlight items on rollover - - 0 - - - 0 - - 1 - m_checkBoxHighlightOnRollOver - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - - 0 - - 2 - 0 - - gSizer1 - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Anti-aliasing: - 0 - - 0 - - - 0 - - 1 - m_staticText221 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Disabled" "2x" "4x" "8x" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceAntiAliasing - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - 3D-Viewer must be closed and re-opened to apply this setting - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Selection color: - 0 - - 0 - - - 0 - - 1 - m_selectionColorLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - COLOR_SWATCH - 1 - - - 1 - - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_selectionColorSwatch - 1 - - - protected - 1 - - Resizable - - 1 - - COLOR_SWATCH; widgets/color_swatch.h; forward_declare - 0 - - - - - - - - - - - - 5 - wxEXPAND - 0 - - 15 - protected - 0 - - - - 13 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - While Moving - 0 - - 0 - - - 0 - - 1 - m_movingLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline2 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - - bSizer3 - wxVERTICAL - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable anti-aliasing - - 0 - - - 0 - - 1 - m_checkBoxDisableAAMove - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable thickness - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable vias - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Disable holes - - 0 - - - 0 - - 1 - m_checkBoxDisableMoveHoles - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - + + -1 + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + + bSizerMargins + wxVERTICAL + none + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Show model bounding boxes + + 0 + + + 0 + + 1 + m_checkBoxBoundingBoxes + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Show copper and tech layers thickness (very slow) + + 0 + + + 0 + + 1 + m_checkBoxCuThickness + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Highlight items on rollover + + 0 + + + 0 + + 1 + m_checkBoxHighlightOnRollOver + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + + 0 + + 2 + 0 + + gSizer1 + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Anti-aliasing: + 0 + + 0 + + + 0 + + 1 + m_staticText221 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Disabled" "2x" "4x" "8x" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceAntiAliasing + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + 3D-Viewer must be closed and re-opened to apply this setting + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Selection color: + 0 + + 0 + + + 0 + + 1 + m_selectionColorLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + COLOR_SWATCH + 1 + + + 1 + + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_selectionColorSwatch + 1 + + + protected + 1 + + Resizable + + 1 + + COLOR_SWATCH; widgets/color_swatch.h; forward_declare + 0 + + + + + + + + + + + + 5 + wxEXPAND + 0 + + 15 + protected + 0 + + + + 13 + wxTOP|wxRIGHT|wxLEFT|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + While Moving + 0 + + 0 + + + 0 + + 1 + m_movingLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline2 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + + bSizer3 + wxVERTICAL + none + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable anti-aliasing + + 0 + + + 0 + + 1 + m_checkBoxDisableAAMove + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable thickness + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveThickness + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable vias + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveVias + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Disable holes + + 0 + + + 0 + + 1 + m_checkBoxDisableMoveHoles + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + diff --git a/3d-viewer/dialogs/panel_3D_opengl_options_base.h b/3d-viewer/dialogs/panel_3D_opengl_options_base.h index eed70c709d..2b2327b883 100644 --- a/3d-viewer/dialogs/panel_3D_opengl_options_base.h +++ b/3d-viewer/dialogs/panel_3D_opengl_options_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -27,7 +27,6 @@ class COLOR_SWATCH; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_3D_OPENGL_OPTIONS_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp index 21b1003793..757e24a93d 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.cpp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -23,7 +23,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizerScale = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Scale") ), wxVERTICAL ); wxFlexGridSizer* fgSizerScale; - fgSizerScale = new wxFlexGridSizer( 0, 3, 1, 3 ); + fgSizerScale = new wxFlexGridSizer( 0, 3, 3, 3 ); fgSizerScale->AddGrowableCol( 1 ); fgSizerScale->SetFlexibleDirection( wxBOTH ); fgSizerScale->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -36,7 +36,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerScale->Add( xscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 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 ); + fgSizerScale->Add( m_spinXscale, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_staticText2 = new wxStaticText( sbSizerScale->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); @@ -56,7 +56,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerScale->Add( zscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 5 ); m_spinZscale = new wxSpinButton( sbSizerScale->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL ); - fgSizerScale->Add( m_spinZscale, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerScale->Add( m_spinZscale, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); sbSizerScale->Add( fgSizerScale, 0, wxBOTTOM|wxEXPAND|wxRIGHT, 2 ); @@ -81,7 +81,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerRotate->Add( xrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 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 ); + fgSizerRotate->Add( m_spinXrot, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_staticText21 = new wxStaticText( sbSizerRotation->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); @@ -101,13 +101,13 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerRotate->Add( zrot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 5 ); m_spinZrot = new wxSpinButton( sbSizerRotation->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL ); - fgSizerRotate->Add( m_spinZrot, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerRotate->Add( m_spinZrot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); sbSizerRotation->Add( fgSizerRotate, 0, wxBOTTOM|wxRIGHT|wxEXPAND, 2 ); - bSizerLeft->Add( sbSizerRotation, 0, wxLEFT|wxRIGHT|wxEXPAND, 5 ); + bSizerLeft->Add( sbSizerRotation, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizerOffset; sbSizerOffset = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Offset") ), wxVERTICAL ); @@ -126,7 +126,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerOffset->Add( xoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 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 ); + fgSizerOffset->Add( m_spinXoffset, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_staticText22 = new wxStaticText( sbSizerOffset->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText22->Wrap( -1 ); @@ -146,13 +146,13 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi fgSizerOffset->Add( zoff, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 5 ); m_spinZoffset = new wxSpinButton( sbSizerOffset->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_VERTICAL ); - fgSizerOffset->Add( m_spinZoffset, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerOffset->Add( m_spinZoffset, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); sbSizerOffset->Add( fgSizerOffset, 0, wxBOTTOM|wxRIGHT|wxEXPAND, 2 ); - bSizerLeft->Add( sbSizerOffset, 0, wxLEFT|wxRIGHT|wxEXPAND, 5 ); + bSizerLeft->Add( sbSizerOffset, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizer4; sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Opacity") ), wxVERTICAL ); @@ -161,7 +161,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi sbSizer4->Add( m_opacity, 0, wxRIGHT|wxLEFT, 2 ); - bSizerLeft->Add( sbSizer4, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizerLeft->Add( sbSizer4, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); bSizermain->Add( bSizerLeft, 0, 0, 5 ); @@ -241,7 +241,7 @@ PANEL_PREVIEW_3D_MODEL_BASE::PANEL_PREVIEW_3D_MODEL_BASE( wxWindow* parent, wxWi bSizer3DButtons->Add( 0, 10, 0, 0, 5 ); - bSizermain->Add( bSizer3DButtons, 0, wxEXPAND|wxTOP, 5 ); + bSizermain->Add( bSizer3DButtons, 0, wxEXPAND|wxRIGHT|wxTOP, 5 ); this->SetSizer( bSizermain ); diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp index ab10f0523a..7ec911b20d 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.fbp +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 0 res UTF-8 - connect panel_preview_3d_model_base 1000 - none - - 1 + 1 + UI panel_preview_3d_model_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -94,7 +96,7 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 1 + 3 5 wxALIGN_CENTER_VERTICAL|wxLEFT @@ -104,10 +106,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -166,10 +168,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -226,17 +228,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -294,10 +296,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -356,10 +358,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -423,10 +425,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -484,10 +486,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -546,10 +548,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -606,17 +608,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -671,7 +673,7 @@ 5 - wxLEFT|wxRIGHT|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -706,10 +708,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -768,10 +770,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -828,17 +830,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -896,10 +898,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -958,10 +960,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1025,10 +1027,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1086,10 +1088,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1148,10 +1150,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1208,17 +1210,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -1273,7 +1275,7 @@ 5 - wxLEFT|wxRIGHT|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -1308,10 +1310,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1370,10 +1372,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1430,17 +1432,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -1498,10 +1500,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1560,10 +1562,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1627,10 +1629,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1688,10 +1690,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1750,10 +1752,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1810,17 +1812,17 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxBOTTOM 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -1875,7 +1877,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 wxID_ANY @@ -1894,10 +1896,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1983,10 +1985,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2053,7 +2055,7 @@ 5 - wxEXPAND|wxTOP + wxEXPAND|wxRIGHT|wxTOP 0 @@ -2079,10 +2081,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2154,10 +2156,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2239,10 +2241,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2314,10 +2316,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2389,10 +2391,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2464,10 +2466,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2539,10 +2541,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2614,10 +2616,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2699,10 +2701,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2774,10 +2776,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 diff --git a/3d-viewer/dialogs/panel_preview_3d_model_base.h b/3d-viewer/dialogs/panel_preview_3d_model_base.h index 8e7b0a53be..b912548d43 100644 --- a/3d-viewer/dialogs/panel_preview_3d_model_base.h +++ b/3d-viewer/dialogs/panel_preview_3d_model_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -32,7 +32,6 @@ class STD_BITMAP_BUTTON; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_PREVIEW_3D_MODEL_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/common/dialogs/panel_color_settings_base.cpp b/common/dialogs/panel_color_settings_base.cpp index 2365f63244..bbc763e937 100644 --- a/common/dialogs/panel_color_settings_base.cpp +++ b/common/dialogs/panel_color_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -66,12 +66,12 @@ PANEL_COLOR_SETTINGS_BASE::PANEL_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindow m_colorsListWindow->SetSizer( m_colorsGridSizer ); m_colorsListWindow->Layout(); m_colorsGridSizer->Fit( m_colorsListWindow ); - m_colorsMainSizer->Add( m_colorsListWindow, 0, wxEXPAND, 5 ); + m_colorsMainSizer->Add( m_colorsListWindow, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_previewPanelSizer = new wxBoxSizer( wxVERTICAL ); - m_colorsMainSizer->Add( m_previewPanelSizer, 1, wxEXPAND, 5 ); + m_colorsMainSizer->Add( m_previewPanelSizer, 1, wxEXPAND|wxRIGHT, 5 ); m_panel1->SetSizer( m_colorsMainSizer ); diff --git a/common/dialogs/panel_color_settings_base.fbp b/common/dialogs/panel_color_settings_base.fbp index fbc3078abc..5be83d7937 100644 --- a/common/dialogs/panel_color_settings_base.fbp +++ b/common/dialogs/panel_color_settings_base.fbp @@ -1,507 +1,516 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_color_settings_base - 1000 - none - - - 1 - PanelColorSettings - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT + + + C++ + ; + 1 + connect + none + + + 0 + 1 + res + UTF-8 + panel_color_settings_base + 1000 + 1 + 1 + UI + PanelColorSettings + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_COLOR_SETTINGS_BASE + + -1,-1 + RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare + + 0 + + + wxTAB_TRAVERSAL + OnSize + + + m_mainSizer + wxVERTICAL + protected + + 5 + wxEXPAND|wxALL + 0 + + + bControlSizer + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Theme: + 0 + + 0 + + + 0 + + 1 + m_staticText9 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 150,-1 + 1 + m_cbTheme + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnThemeChanged + OnLeftDownTheme + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Override individual item colors + + 0 + + + 0 + + 1 + m_optOverrideColors + 1 + + + public + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Show all items in their default color even if they have specific colors set in their properties. + + wxFILTER_NONE + wxDefaultValidator + + + + + OnOverrideItemColorsClicked + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Open Theme Folder + + 0 + + 0 + + + 0 + + 1 + m_btnOpenFolder + 1 + + + protected + 1 + + + + Resizable + 1 + + + ; ; forward_declare + 0 + Open the folder containing color themes + + wxFILTER_NONE + wxDefaultValidator + + + + + OnBtnOpenThemeFolderClicked + + + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + 1 + 0 + 1 1 + 0 + Dock + 0 + Left + 0 1 - impl_virtual + 1 + 0 0 wxID_ANY + + 0 + + 0 - PANEL_COLOR_SETTINGS_BASE + 1 + m_panel1 + 1 + + + protected + 1 - -1,-1 - RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare + Resizable + 1 + + WX_PANEL; widgets/wx_panel.h; forward_declare + 0 - 0 wxTAB_TRAVERSAL - OnSize - - - m_mainSizer - wxVERTICAL - protected - - 5 - wxEXPAND|wxALL - 0 - - - bControlSizer - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Theme: - 0 - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 150,-1 - 1 - m_cbTheme - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnThemeChanged - OnLeftDownTheme - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Override individual item colors - - 0 - - - 0 - - 1 - m_optOverrideColors - 1 - - - public - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Show all items in their default color even if they have specific colors set in their properties. - - wxFILTER_NONE - wxDefaultValidator - - - - - OnOverrideItemColorsClicked - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Open Theme Folder - - 0 - - 0 - - - 0 - - 1 - m_btnOpenFolder - 1 - - - protected - 1 - - - - Resizable - 1 - - - ; ; forward_declare - 0 - Open the folder containing color themes - - wxFILTER_NONE - wxDefaultValidator - - - - - OnBtnOpenThemeFolderClicked - - - + + + m_colorsMainSizer + wxHORIZONTAL + protected + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + wxSYS_COLOUR_WINDOW + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 240,240 + 1 + m_colorsListWindow + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + ; ; forward_declare + 0 + + + + wxVSCROLL + + 2 + wxHORIZONTAL + 0 + + 0 + 100,-1 + m_colorsGridSizer + wxFLEX_GROWMODE_NONE + protected + 0 + 0 + - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel1 - 1 - - - protected - 1 - - Resizable - 1 - - WX_PANEL; widgets/wx_panel.h; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - m_colorsMainSizer - wxHORIZONTAL - protected - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_WINDOW - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 240,240 - 1 - m_colorsListWindow - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - ; ; forward_declare - 0 - - - - wxVSCROLL - - 2 - wxHORIZONTAL - 0 - - 0 - 100,-1 - m_colorsGridSizer - wxFLEX_GROWMODE_NONE - protected - 0 - 0 - - - - - 5 - wxEXPAND - 1 - - - m_previewPanelSizer - wxVERTICAL - protected - - - - + + + 5 + wxEXPAND|wxRIGHT + 1 + + + m_previewPanelSizer + wxVERTICAL + protected + + + + diff --git a/common/dialogs/panel_color_settings_base.h b/common/dialogs/panel_color_settings_base.h index 1f28266827..b153143817 100644 --- a/common/dialogs/panel_color_settings_base.h +++ b/common/dialogs/panel_color_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/dialogs/panel_embedded_files_base.cpp b/common/dialogs/panel_embedded_files_base.cpp index 77ff4830fe..7da8245cf1 100644 --- a/common/dialogs/panel_embedded_files_base.cpp +++ b/common/dialogs/panel_embedded_files_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -60,7 +60,7 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow m_browse_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_browse_button->SetToolTip( _("Add embedded file") ); - bButtonsSizer->Add( m_browse_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_browse_button, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); bButtonsSizer->Add( 20, 0, 0, wxEXPAND, 5 ); @@ -68,16 +68,16 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow m_delete_button = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW|0 ); m_delete_button->SetToolTip( _("Remove embedded file") ); - bButtonsSizer->Add( m_delete_button, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bButtonsSizer->Add( m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bButtonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_export = new wxButton( this, wxID_ANY, _("&Export"), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonsSizer->Add( m_export, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bButtonsSizer->Add( m_export, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - bMainSizer->Add( bButtonsSizer, 0, wxEXPAND|wxALL, 3 ); + bMainSizer->Add( bButtonsSizer, 0, wxBOTTOM|wxEXPAND|wxTOP, 3 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -88,7 +88,7 @@ PANEL_EMBEDDED_FILES_BASE::PANEL_EMBEDDED_FILES_BASE( wxWindow* parent, wxWindow m_cbEmbedFonts = new wxCheckBox( this, wxID_ANY, _("Embed Fonts"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbEmbedFonts->SetToolTip( _("Store a copy of all fonts used") ); - bSizer4->Add( m_cbEmbedFonts, 0, wxALL, 5 ); + bSizer4->Add( m_cbEmbedFonts, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); bMainSizer->Add( bSizer4, 0, wxEXPAND, 5 ); diff --git a/common/dialogs/panel_embedded_files_base.fbp b/common/dialogs/panel_embedded_files_base.fbp index caef388d38..e0b168c399 100644 --- a/common/dialogs/panel_embedded_files_base.fbp +++ b/common/dialogs/panel_embedded_files_base.fbp @@ -65,7 +65,7 @@ 5 wxEXPAND 1 - + m_global_sizer wxVERTICAL @@ -164,16 +164,16 @@ 3 - wxEXPAND|wxALL + wxBOTTOM|wxEXPAND|wxTOP 0 - + bButtonsSizer wxHORIZONTAL none 5 - wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -258,7 +258,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -343,7 +343,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -488,7 +488,7 @@ none 5 - wxALL + wxBOTTOM|wxLEFT|wxRIGHT 0 1 diff --git a/common/dialogs/panel_embedded_files_base.h b/common/dialogs/panel_embedded_files_base.h index 22270be115..c29d5effe7 100644 --- a/common/dialogs/panel_embedded_files_base.h +++ b/common/dialogs/panel_embedded_files_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/dialogs/panel_hotkeys_editor.cpp b/common/dialogs/panel_hotkeys_editor.cpp index 640ee70626..ff05ff7264 100644 --- a/common/dialogs/panel_hotkeys_editor.cpp +++ b/common/dialogs/panel_hotkeys_editor.cpp @@ -76,10 +76,10 @@ PANEL_HOTKEYS_EDITOR::PANEL_HOTKEYS_EDITOR( EDA_BASE_FRAME* aFrame, wxWindow* aW wxBoxSizer* bMargins = new wxBoxSizer( wxVERTICAL ); m_filterSearch = CreateTextFilterBox( this, _( "Type filter text" ) ); - bMargins->Add( m_filterSearch, 0, wxEXPAND, 0 ); + bMargins->Add( m_filterSearch, 0, wxEXPAND | wxTOP | wxRIGHT, 5 ); m_hotkeyListCtrl = new WIDGET_HOTKEY_LIST( this, m_hotkeyStore, m_readOnly ); - bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND | wxTOP, 5 ); + bMargins->Add( m_hotkeyListCtrl, 1, wxEXPAND | wxTOP | wxRIGHT, 5 ); if( !m_readOnly ) installButtons( bMargins ); @@ -160,7 +160,7 @@ void PANEL_HOTKEYS_EDITOR::installButtons( wxSizer* aSizer ) auto btnPanel = std::make_unique( this, l_btn_defs, r_btn_defs ); - aSizer->Add( btnPanel.release(), 0, wxEXPAND | wxALL, KIUI::GetStdMargin() * 2 ); + aSizer->Add( btnPanel.release(), 0, wxEXPAND | wxALL, KIUI::GetStdMargin() ); } diff --git a/common/dialogs/panel_packages_and_updates_base.cpp b/common/dialogs/panel_packages_and_updates_base.cpp index 4dcb6af781..0ada7e5da1 100644 --- a/common/dialogs/panel_packages_and_updates_base.cpp +++ b/common/dialogs/panel_packages_and_updates_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,12 +18,12 @@ PANEL_PACKAGES_AND_UPDATES_BASE::PANEL_PACKAGES_AND_UPDATES_BASE( wxWindow* pare m_generalLabel->Wrap( -1 ); bSizer1->Add( m_generalLabel, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); - - bSizer1->Add( 0, 0, 0, wxEXPAND, 5 ); - m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer1->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 ); + + bSizer1->Add( 0, 0, 0, wxEXPAND, 5 ); + wxBoxSizer* bSizer41; bSizer41 = new wxBoxSizer( wxVERTICAL ); @@ -35,17 +35,14 @@ PANEL_PACKAGES_AND_UPDATES_BASE::PANEL_PACKAGES_AND_UPDATES_BASE( wxWindow* pare bSizer1->Add( bSizer41, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); - bSizer1->Add( 0, 20, 0, wxEXPAND, 5 ); + bSizer1->Add( 0, 3, 0, wxALL|wxEXPAND, 5 ); m_pcmLabel = new wxStaticText( this, wxID_ANY, _("Plugin and Content Manager"), wxDefaultPosition, wxDefaultSize, 0 ); m_pcmLabel->Wrap( -1 ); bSizer1->Add( m_pcmLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - - bSizer1->Add( 0, 3, 0, wxEXPAND, 5 ); - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer1->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); + bSizer1->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); @@ -60,15 +57,12 @@ PANEL_PACKAGES_AND_UPDATES_BASE::PANEL_PACKAGES_AND_UPDATES_BASE( wxWindow* pare bSizer1->Add( 0, 20, 0, wxEXPAND, 5 ); - m_staticText4 = new wxStaticText( this, wxID_ANY, _("Library package handling"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4 = new wxStaticText( this, wxID_ANY, _("Library Package Handling"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); bSizer1->Add( m_staticText4, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); - - bSizer1->Add( 0, 3, 0, wxEXPAND, 5 ); - m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - bSizer1->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 5 ); + bSizer1->Add( m_staticline2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); diff --git a/common/dialogs/panel_packages_and_updates_base.fbp b/common/dialogs/panel_packages_and_updates_base.fbp index ab605f00bb..48dc8999bb 100644 --- a/common/dialogs/panel_packages_and_updates_base.fbp +++ b/common/dialogs/panel_packages_and_updates_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 0 res UTF-8 - connect panel_packages_and_updates_base 1000 - none - - 1 + 1 + UI panel_packages_and_updates_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -67,10 +69,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -120,16 +122,6 @@ -1 - - 5 - wxEXPAND - 0 - - 0 - protected - 0 - - 5 wxEXPAND | wxALL @@ -139,10 +131,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -189,6 +181,16 @@ + + 5 + wxEXPAND + 0 + + 0 + protected + 0 + + 5 wxEXPAND|wxLEFT|wxTOP @@ -207,10 +209,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -267,10 +269,10 @@ 5 - wxEXPAND + wxALL|wxEXPAND 0 - 20 + 3 protected 0 @@ -284,10 +286,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -339,27 +341,17 @@ 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -424,10 +416,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -501,10 +493,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -525,7 +517,7 @@ 0 0 wxID_ANY - Library package handling + Library Package Handling 0 0 @@ -556,27 +548,17 @@ 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -641,10 +623,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -706,10 +688,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -780,10 +762,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -842,10 +824,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -869,7 +851,7 @@ 0 - + 0 0 diff --git a/common/dialogs/panel_packages_and_updates_base.h b/common/dialogs/panel_packages_and_updates_base.h index c53c09ccf2..e025f693ec 100644 --- a/common/dialogs/panel_packages_and_updates_base.h +++ b/common/dialogs/panel_packages_and_updates_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,6 @@ /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class PANEL_PACKAGES_AND_UPDATES_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp index 984871e63e..38d27a35a9 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -176,7 +176,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind bOptionsRight->Add( sbSizer4, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_otherOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Other options") ), wxVERTICAL ); + m_otherOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Other Options") ), wxVERTICAL ); m_openFileAfterPlot = new wxCheckBox( m_otherOptions->GetStaticBox(), wxID_ANY, _("Open file after plot"), wxDefaultPosition, wxDefaultSize, 0 ); m_openFileAfterPlot->SetToolTip( _("Open output file with associated application after successful plot") ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp index eaf58a2f3c..4094b04ffe 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.fbp +++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp @@ -1,34 +1,36 @@ - + - ; C++ - 1 - source_name - 0 - 0 + ; + 1 + connect + none + + + 0 + 0 res UTF-8 - connect dialog_plot_schematic_base 1000 - none - - 1 + 1 + UI Dialog_plot_schematic_base - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -1705,7 +1707,7 @@ 1 wxID_ANY - Other options + Other Options m_otherOptions wxVERTICAL diff --git a/eeschema/dialogs/dialog_plot_schematic_base.h b/eeschema/dialogs/dialog_plot_schematic_base.h index 9d3f67191f..ee19f209b5 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.h +++ b/eeschema/dialogs/dialog_plot_schematic_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -37,7 +37,6 @@ class WX_HTML_REPORT_PANEL; /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_PLOT_SCHEMATIC_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/eeschema/dialogs/dialog_sim_command_base.cpp b/eeschema/dialogs/dialog_sim_command_base.cpp index 302d05cad3..688bd39da6 100644 --- a/eeschema/dialogs/dialog_sim_command_base.cpp +++ b/eeschema/dialogs/dialog_sim_command_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -524,7 +524,7 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i bSizer31->Add( fgSizer12, 0, wxEXPAND|wxALL, 5 ); m_spDoNoise = new wxCheckBox( m_pgSP, wxID_ANY, _("Compute noise current correlation matrix"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer31->Add( m_spDoNoise, 0, wxTOP|wxRIGHT|wxLEFT, 10 ); + bSizer31->Add( m_spDoNoise, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); m_pgSP->SetSizer( bSizer31 ); @@ -618,16 +618,16 @@ DIALOG_SIM_COMMAND_BASE::DIALOG_SIM_COMMAND_BASE( wxWindow* parent, wxWindowID i m_pzAnalysesLabel = new wxStaticText( m_pgPZ, wxID_ANY, _("Find:"), wxDefaultPosition, wxDefaultSize, 0 ); m_pzAnalysesLabel->Wrap( -1 ); - bSizer17->Add( m_pzAnalysesLabel, 0, wxALL, 5 ); + bSizer17->Add( m_pzAnalysesLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxString m_pzAnalysesChoices[] = { _("Poles and Zeros"), _("Poles"), _("Zeros"), wxEmptyString }; int m_pzAnalysesNChoices = sizeof( m_pzAnalysesChoices ) / sizeof( wxString ); m_pzAnalyses = new wxChoice( m_pgPZ, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_pzAnalysesNChoices, m_pzAnalysesChoices, 0 ); m_pzAnalyses->SetSelection( 0 ); - bSizer17->Add( m_pzAnalyses, 0, wxALL, 5 ); + bSizer17->Add( m_pzAnalyses, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - bSizer821->Add( bSizer17, 1, wxEXPAND|wxTOP|wxLEFT, 5 ); + bSizer821->Add( bSizer17, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_pgPZ->SetSizer( bSizer821 ); diff --git a/eeschema/dialogs/dialog_sim_command_base.fbp b/eeschema/dialogs/dialog_sim_command_base.fbp index 1ea0fc95ee..59ad626757 100644 --- a/eeschema/dialogs/dialog_sim_command_base.fbp +++ b/eeschema/dialogs/dialog_sim_command_base.fbp @@ -1,34 +1,36 @@ - + - C++ - 1 - source_name - 0 - 0 + + 1 + connect + none + + + 0 + 0 res UTF-8 - connect dialog_sim_command_base 1000 - none - - 1 + 1 + UI DIALOG_SIM_COMMAND_BASE - . - + 0 + source_name + 1 + 0 + source_name + + + 1 1 - 1 - 1 - 1 - UI - 0 - 0 0 + 0 0 wxAUI_MGR_DEFAULT @@ -81,10 +83,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -143,10 +145,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -221,10 +223,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -279,10 +281,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -340,10 +342,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -395,10 +397,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -456,10 +458,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -539,10 +541,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -601,10 +603,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -628,7 +630,7 @@ 0 - + 0 0 @@ -676,10 +678,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -738,10 +740,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -765,7 +767,7 @@ 0 - + 0 0 100,-1 @@ -803,10 +805,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -865,10 +867,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -927,10 +929,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -954,7 +956,7 @@ 0 - + 0 0 @@ -992,10 +994,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1058,10 +1060,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1137,10 +1139,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1206,10 +1208,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1275,10 +1277,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1344,10 +1346,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1409,10 +1411,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1474,10 +1476,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1539,10 +1541,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1607,10 +1609,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1675,10 +1677,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1740,10 +1742,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1767,7 +1769,7 @@ 0 - + 0 0 100,-1 @@ -1808,10 +1810,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1873,10 +1875,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -1900,7 +1902,7 @@ 0 - + 0 0 100,-1 @@ -1941,10 +1943,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2006,10 +2008,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2071,10 +2073,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2098,7 +2100,7 @@ 0 - + 0 0 @@ -2139,10 +2141,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2204,10 +2206,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2231,7 +2233,7 @@ 0 - + 0 0 @@ -2272,10 +2274,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2337,10 +2339,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2402,10 +2404,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2429,7 +2431,7 @@ 0 - + 0 0 @@ -2470,10 +2472,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2535,10 +2537,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2562,7 +2564,7 @@ 0 - + 0 0 @@ -2603,10 +2605,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2677,10 +2679,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -2754,10 +2756,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2817,10 +2819,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2896,10 +2898,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2961,10 +2963,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -2988,7 +2990,7 @@ 0 - + 0 0 100,-1 @@ -3029,10 +3031,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3094,10 +3096,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3159,10 +3161,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3186,7 +3188,7 @@ 0 - + 0 0 @@ -3227,10 +3229,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3292,10 +3294,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3357,10 +3359,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3384,7 +3386,7 @@ 0 - + 0 0 @@ -3425,10 +3427,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3490,10 +3492,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3555,10 +3557,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3620,10 +3622,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3647,7 +3649,7 @@ 0 - + 0 0 @@ -3688,10 +3690,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3753,10 +3755,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3818,10 +3820,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3887,10 +3889,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -3957,10 +3959,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4019,10 +4021,10 @@ 1 1 1 - + 0 - - + 0 + 0 1 @@ -4087,10 +4089,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4151,10 +4153,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4220,10 +4222,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4297,10 +4299,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4359,10 +4361,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4434,10 +4436,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4496,10 +4498,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4561,10 +4563,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4623,10 +4625,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4685,10 +4687,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4771,10 +4773,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4854,10 +4856,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4916,10 +4918,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -4991,10 +4993,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5053,10 +5055,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5118,10 +5120,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5180,10 +5182,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5242,10 +5244,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5307,10 +5309,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5373,10 +5375,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5432,7 +5434,7 @@ - + a page 0 @@ -5440,10 +5442,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5501,10 +5503,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5584,10 +5586,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5646,10 +5648,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5673,7 +5675,7 @@ 0 - + 0 0 100,-1 @@ -5721,10 +5723,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5783,10 +5785,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5810,7 +5812,7 @@ 0 - + 0 0 100,-1 @@ -5848,10 +5850,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5910,10 +5912,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5972,10 +5974,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -5999,7 +6001,7 @@ 0 - + 0 0 100,-1 @@ -6037,10 +6039,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6093,18 +6095,18 @@ - 10 - wxTOP|wxRIGHT|wxLEFT + 5 + wxLEFT|wxRIGHT|wxTOP 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -6163,15 +6165,15 @@ a page 0 - + 1 1 1 1 - + 0 - - + 0 + 0 @@ -6215,7 +6217,7 @@ wxTAB_TRAVERSAL - + bSizer2 wxVERTICAL @@ -6229,10 +6231,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6291,10 +6293,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6356,10 +6358,10 @@ 1 1 1 - + 0 - - + 0 + 0 0 @@ -6425,7 +6427,7 @@ - + a page 0 @@ -6433,10 +6435,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6522,10 +6524,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6587,10 +6589,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6656,10 +6658,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6721,10 +6723,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6789,10 +6791,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6854,10 +6856,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6922,10 +6924,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -6987,10 +6989,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7055,10 +7057,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7120,10 +7122,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7180,8 +7182,8 @@ 5 - wxEXPAND|wxTOP|wxLEFT - 1 + wxEXPAND|wxLEFT|wxTOP + 0 bSizer17 @@ -7189,17 +7191,17 @@ none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -7251,17 +7253,17 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 1 1 1 - + 0 - - + 0 + 0 @@ -7339,10 +7341,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7404,10 +7406,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7469,10 +7471,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7534,10 +7536,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7599,10 +7601,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7673,10 +7675,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7735,10 +7737,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7807,10 +7809,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7877,10 +7879,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -7968,10 +7970,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8031,10 +8033,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8058,7 +8060,7 @@ 0 - + 0 0 -1,-1 @@ -8097,10 +8099,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8160,10 +8162,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8187,7 +8189,7 @@ 0 - + 0 0 -1,-1 @@ -8226,10 +8228,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8302,10 +8304,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8393,10 +8395,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8456,10 +8458,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8483,7 +8485,7 @@ 0 - + 0 0 -1,-1 @@ -8522,10 +8524,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8585,10 +8587,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8612,7 +8614,7 @@ 0 - + 0 0 -1,-1 @@ -8651,10 +8653,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8727,10 +8729,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8818,10 +8820,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8881,10 +8883,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -8908,7 +8910,7 @@ 0 - + 0 0 -1,-1 @@ -8947,10 +8949,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9010,10 +9012,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9037,7 +9039,7 @@ 0 - + 0 0 -1,-1 @@ -9076,10 +9078,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9152,10 +9154,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9217,10 +9219,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9282,10 +9284,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9359,10 +9361,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9439,10 +9441,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9501,10 +9503,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9528,7 +9530,7 @@ 0 - + 0 0 60,-1 @@ -9584,10 +9586,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9646,10 +9648,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9673,7 +9675,7 @@ 0 - + 0 0 60,-1 @@ -9711,10 +9713,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9773,10 +9775,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9800,7 +9802,7 @@ 0 - + 0 0 60,-1 @@ -9849,10 +9851,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9911,10 +9913,10 @@ 1 1 1 - + 0 - - + 0 + 0 @@ -9938,7 +9940,7 @@ 0 - + 0 0 60,-1 diff --git a/eeschema/dialogs/dialog_sim_command_base.h b/eeschema/dialogs/dialog_sim_command_base.h index b5c25da783..a6590a0933 100644 --- a/eeschema/dialogs/dialog_sim_command_base.h +++ b/eeschema/dialogs/dialog_sim_command_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -37,7 +37,6 @@ /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////// /// Class DIALOG_SIM_COMMAND_BASE /////////////////////////////////////////////////////////////////////////////// diff --git a/eeschema/dialogs/panel_setup_buses_base.cpp b/eeschema/dialogs/panel_setup_buses_base.cpp index fb1dbc0d21..f26e32b9af 100644 --- a/eeschema/dialogs/panel_setup_buses_base.cpp +++ b/eeschema/dialogs/panel_setup_buses_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -23,7 +23,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, m_busesLabel = new wxStaticText( this, wxID_ANY, _("Bus definitions:"), wxDefaultPosition, wxDefaultSize, 0 ); m_busesLabel->Wrap( -1 ); - bLeftCol->Add( m_busesLabel, 0, wxTOP|wxLEFT, 8 ); + bLeftCol->Add( m_busesLabel, 0, wxLEFT|wxTOP, 5 ); bLeftCol->Add( 0, 3, 0, wxEXPAND, 5 ); @@ -56,7 +56,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, m_aliasesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); m_aliasesGrid->SetMinSize( wxSize( -1,180 ) ); - bLeftCol->Add( m_aliasesGrid, 1, wxEXPAND, 10 ); + bLeftCol->Add( m_aliasesGrid, 1, wxEXPAND, 5 ); wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxHORIZONTAL ); @@ -93,7 +93,7 @@ PANEL_SETUP_BUSES_BASE::PANEL_SETUP_BUSES_BASE( wxWindow* parent, wxWindowID id, m_membersLabel = new wxStaticText( membersPanel, wxID_ANY, _("Members of '%s':"), wxDefaultPosition, wxDefaultSize, 0 ); m_membersLabel->Wrap( -1 ); - bSizer7->Add( m_membersLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); + bSizer7->Add( m_membersLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer7->Add( 0, 3, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/panel_setup_buses_base.fbp b/eeschema/dialogs/panel_setup_buses_base.fbp index 7a8d87e943..c3576cfaba 100644 --- a/eeschema/dialogs/panel_setup_buses_base.fbp +++ b/eeschema/dialogs/panel_setup_buses_base.fbp @@ -1,1001 +1,1016 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - panel_setup_buses_base - 1000 - none - - - 1 - PanelSetupBuses - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - + + + C++ + + 1 + connect + none + + + 0 + 1 + res + UTF-8 + panel_setup_buses_base + 1000 + 1 + 1 + UI + PanelSetupBuses + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_SETUP_BUSES_BASE + + -1,-1 + ; forward_declare + + 0 + + + wxTAB_TRAVERSAL + OnUpdateUI + + + bPanelSizer + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + - PANEL_SETUP_BUSES_BASE - - -1,-1 - ; forward_declare - - 0 - - - wxTAB_TRAVERSAL - OnUpdateUI - + bMargins + wxHORIZONTAL + protected + + 5 + wxEXPAND|wxRIGHT + 1 + - bPanelSizer - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bMargins - wxHORIZONTAL - protected - - 5 - wxEXPAND|wxRIGHT - 1 - - - bLeftCol - wxVERTICAL - protected - - 8 - wxTOP|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Bus definitions: - 0 - - 0 - - - 0 - - 1 - m_busesLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 10 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - wxGRID_AUTOSIZE - "Alias" - wxALIGN_CENTER - 1 - 300 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 1 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - -1,-1 - 0 - -1,180 - 1 - m_aliasesGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnSizeGrid - - - - 10 - wxEXPAND - 0 - - - bSizer10 - wxHORIZONTAL - none - - 5 - wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Bus - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_addAlias - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddAlias - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Delete Bus - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_deleteAlias - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnDeleteAlias - - - - 5 - - 0 - - 0 - protected - 15 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - (source) - 0 - - 0 - - - 0 - - 1 - m_source - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND|wxLEFT - 1 - - - bRightColumn - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_membersBook - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - - - a page - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - membersPanel - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer7 - wxVERTICAL - none - - 8 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Members of '%s': - 0 - - 0 - - - 0 - - 1 - m_membersLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - 0 - 0 - - - - 1 - - - wxALIGN_LEFT - - wxALIGN_CENTER - 0 - 1 - wxALIGN_CENTER - wxGRID_AUTOSIZE - "Net / Nested Bus Name" - wxALIGN_CENTER - 1 - 300 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - 0 - 1 - 1 - 1 - - 1 - - - 1 - 0 - 0 - wxID_ANY - - - - 0 - 0 - - 0 - - -1,-1 - 0 - -1,180 - 1 - m_membersGrid - 1 - - - protected - 1 - - Resizable - wxALIGN_CENTER - 0 - - wxALIGN_CENTER - - 0 - 1 - - WX_GRID; widgets/wx_grid.h; forward_declare - 0 - - - - - OnSizeGrid - - - - 5 - wxEXPAND - 0 - - - bSizer101 - wxHORIZONTAL - none - - 5 - wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Add Member - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_addMember - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnAddMember - - - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Remove Member - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_removeMember - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - OnRemoveMember - - - - - - - - - a page - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - emptyPanel - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - - - - - + bLeftCol + wxVERTICAL + protected + + 5 + wxLEFT|wxTOP + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Bus definitions: + 0 + + 0 + + + 0 + + 1 + m_busesLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + wxGRID_AUTOSIZE + "Alias" + wxALIGN_CENTER + 1 + 300 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 1 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + -1,-1 + 0 + -1,180 + 1 + m_aliasesGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnSizeGrid + + + + 10 + wxEXPAND + 0 + + + bSizer10 + wxHORIZONTAL + none + + 5 + wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Bus + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_addAlias + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddAlias + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Delete Bus + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_deleteAlias + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDeleteAlias + + + + 5 + + 0 + + 0 + protected + 15 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + (source) + 0 + + 0 + + + 0 + + 1 + m_source + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + 5 + wxEXPAND|wxLEFT + 1 + + + bRightColumn + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_membersBook + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + a page + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + membersPanel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer7 + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Members of '%s': + 0 + + 0 + + + 0 + + 1 + m_membersLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 3 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + 0 + + + + 1 + + + wxALIGN_LEFT + + wxALIGN_CENTER + 0 + 1 + wxALIGN_CENTER + wxGRID_AUTOSIZE + "Net / Nested Bus Name" + wxALIGN_CENTER + 1 + 300 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + 1 + 0 + 1 + 1 + 1 + + 1 + + + 1 + 0 + 0 + wxID_ANY + + + + 0 + 0 + + 0 + + -1,-1 + 0 + -1,180 + 1 + m_membersGrid + 1 + + + protected + 1 + + Resizable + wxALIGN_CENTER + 0 + + wxALIGN_CENTER + + 0 + 1 + + WX_GRID; widgets/wx_grid.h; forward_declare + 0 + + + + + OnSizeGrid + + + + 5 + wxEXPAND + 0 + + + bSizer101 + wxHORIZONTAL + none + + 5 + wxTOP|wxBOTTOM|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Add Member + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_addMember + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnAddMember + + + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Remove Member + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_removeMember + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRemoveMember + + + + + + + + + a page + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 0 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + emptyPanel + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + diff --git a/eeschema/dialogs/panel_setup_buses_base.h b/eeschema/dialogs/panel_setup_buses_base.h index 5b0a2dc9dc..ad69759890 100644 --- a/eeschema/dialogs/panel_setup_buses_base.h +++ b/eeschema/dialogs/panel_setup_buses_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/panel_sym_editing_options_base.cpp b/eeschema/dialogs/panel_sym_editing_options_base.cpp index f48208d640..d65c94db30 100644 --- a/eeschema/dialogs/panel_sym_editing_options_base.cpp +++ b/eeschema/dialogs/panel_sym_editing_options_base.cpp @@ -19,13 +19,10 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent m_defaultsLabel = new wxStaticText( this, wxID_ANY, _("Defaults for New Objects"), wxDefaultPosition, wxDefaultSize, 0 ); m_defaultsLabel->Wrap( -1 ); - leftColumn->Add( m_defaultsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - - - leftColumn->Add( 0, 3, 0, wxEXPAND, 5 ); + leftColumn->Add( m_defaultsLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - leftColumn->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 5 ); + leftColumn->Add( m_staticline1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxGridBagSizer* gbSizer1; gbSizer1 = new wxGridBagSizer( 2, 0 ); @@ -93,20 +90,17 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent gbSizer1->Add( m_pinNameSizeUnits, wxGBPosition( 6, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); - leftColumn->Add( gbSizer1, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + leftColumn->Add( gbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); leftColumn->Add( 0, 15, 0, wxEXPAND, 5 ); m_repeatLabel = new wxStaticText( this, wxID_ANY, _("Repeated Items"), wxDefaultPosition, wxDefaultSize, 0 ); m_repeatLabel->Wrap( -1 ); - leftColumn->Add( m_repeatLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 ); - - - leftColumn->Add( 0, 3, 0, wxEXPAND, 5 ); + leftColumn->Add( m_repeatLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - leftColumn->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 5 ); + leftColumn->Add( m_staticline2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxGridBagSizer* gbSizer2; gbSizer2 = new wxGridBagSizer( 5, 0 ); @@ -140,21 +134,21 @@ PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent wxBoxSizer* rightColumn; rightColumn = new wxBoxSizer( wxVERTICAL ); - m_generalOption1 = new wxStaticText( this, wxID_ANY, _("General editing"), wxDefaultPosition, wxDefaultSize, 0 ); + m_generalOption1 = new wxStaticText( this, wxID_ANY, _("General Editing"), wxDefaultPosition, wxDefaultSize, 0 ); m_generalOption1->Wrap( -1 ); - rightColumn->Add( m_generalOption1, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); + rightColumn->Add( m_generalOption1, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - rightColumn->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 ); + rightColumn->Add( m_staticline4, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_dragPinsWithEdges = new wxCheckBox( this, wxID_ANY, _("Keep pins attached when dragging edges"), wxDefaultPosition, wxDefaultSize, 0 ); - rightColumn->Add( m_dragPinsWithEdges, 0, wxBOTTOM|wxLEFT, 10 ); + rightColumn->Add( m_dragPinsWithEdges, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); rightColumn->Add( 0, 15, 1, wxEXPAND, 5 ); - p1mainSizer->Add( rightColumn, 1, wxEXPAND|wxLEFT, 5 ); + p1mainSizer->Add( rightColumn, 1, wxEXPAND, 5 ); this->SetSizer( p1mainSizer ); diff --git a/eeschema/dialogs/panel_sym_editing_options_base.fbp b/eeschema/dialogs/panel_sym_editing_options_base.fbp index f8b86d6e27..ac25d64e71 100644 --- a/eeschema/dialogs/panel_sym_editing_options_base.fbp +++ b/eeschema/dialogs/panel_sym_editing_options_base.fbp @@ -70,7 +70,7 @@ wxVERTICAL none - 13 + 5 wxTOP|wxRIGHT|wxLEFT 0 @@ -133,17 +133,7 @@ 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -202,7 +192,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 -1,8 @@ -1283,7 +1273,7 @@ - 13 + 5 wxTOP|wxRIGHT|wxLEFT 0 @@ -1346,17 +1336,7 @@ 5 - wxEXPAND - 0 - - 3 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1764,7 +1744,7 @@ 5 - wxEXPAND|wxLEFT + wxEXPAND 1 @@ -1772,7 +1752,7 @@ wxVERTICAL none - 13 + 5 wxLEFT|wxRIGHT|wxTOP 0 @@ -1804,7 +1784,7 @@ 0 0 wxID_ANY - General editing + General Editing 0 0 @@ -1835,7 +1815,7 @@ 5 - wxEXPAND | wxALL + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 0 1 @@ -1893,8 +1873,8 @@ - 10 - wxBOTTOM|wxLEFT + 5 + wxBOTTOM|wxLEFT|wxRIGHT 0 1 diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp index 0642044e37..0fbb9ff7d1 100644 --- a/pcbnew/dialogs/panel_edit_options_base.cpp +++ b/pcbnew/dialogs/panel_edit_options_base.cpp @@ -249,12 +249,12 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i wxStaticText* staticText102; staticText102 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Option"), wxDefaultPosition, wxDefaultSize, 0 ); staticText102->Wrap( -1 ); - fgSizerCmdsOSX->Add( staticText102, 0, wxRIGHT|wxLEFT, 5 ); + fgSizerCmdsOSX->Add( staticText102, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); wxStaticText* staticText112; staticText112 = new wxStaticText( m_mouseCmdsOSX->GetStaticBox(), wxID_ANY, _("Clarify selection from menu"), wxDefaultPosition, wxDefaultSize, 0 ); staticText112->Wrap( -1 ); - fgSizerCmdsOSX->Add( staticText112, 0, wxRIGHT|wxLEFT, 5 ); + fgSizerCmdsOSX->Add( staticText112, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_mouseCmdsOSX->Add( fgSizerCmdsOSX, 1, wxEXPAND|wxTOP, 5 ); @@ -299,7 +299,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 0, 2, 5, 0 ); - fgSizer2->SetFlexibleDirection( wxBOTH ); + fgSizer2->SetFlexibleDirection( wxVERTICAL ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticText2 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to pads:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -314,7 +314,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i m_magneticPadChoice->SetSelection( 1 ); m_magneticPadChoice->SetToolTip( _("Capture cursor when the mouse enters a pad area") ); - fgSizer2->Add( m_magneticPadChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgSizer2->Add( m_magneticPadChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); m_staticText21 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to tracks and vias:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp index d83ce851eb..2a80b792c4 100644 --- a/pcbnew/dialogs/panel_edit_options_base.fbp +++ b/pcbnew/dialogs/panel_edit_options_base.fbp @@ -1652,7 +1652,7 @@ 5 wxEXPAND|wxALL 1 - + wxID_ANY Left Click Mouse Commands @@ -1781,11 +1781,11 @@ - + 5 wxEXPAND|wxTOP 1 - + 2 wxBOTH @@ -2424,7 +2424,7 @@ 5 - wxRIGHT|wxLEFT + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -2486,7 +2486,7 @@ 5 - wxRIGHT|wxLEFT + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -2893,7 +2893,7 @@ 1 2 - wxBOTH + wxVERTICAL 0 @@ -2967,7 +2967,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT 0 1 diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp index 3f3c8c27a8..9e2b49e343 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.cpp @@ -53,7 +53,7 @@ PANEL_PCBNEW_ACTION_PLUGINS_BASE::PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* pa // Cell Defaults m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); - bGridSizer->Add( m_grid, 1, wxBOTTOM|wxEXPAND|wxLEFT, 5 ); + bGridSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 ); bPanelSizer->Add( bGridSizer, 1, wxEXPAND, 0 ); @@ -90,7 +90,7 @@ PANEL_PCBNEW_ACTION_PLUGINS_BASE::PANEL_PCBNEW_ACTION_PLUGINS_BASE( wxWindow* pa bButtonsSizer->Add( m_showErrorsButton, 0, wxBOTTOM|wxRIGHT, 5 ); - bPanelSizer->Add( bButtonsSizer, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + bPanelSizer->Add( bButtonsSizer, 0, wxEXPAND|wxTOP, 5 ); bSizer4->Add( bPanelSizer, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp index b10d199453..0b1f19e30c 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins_base.fbp @@ -80,7 +80,7 @@ none 5 - wxBOTTOM|wxEXPAND|wxLEFT + wxALL|wxEXPAND 1 1 @@ -172,7 +172,7 @@ 5 - wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxTOP 0