diff --git a/pcbnew/dialogs/dialog_constraints_reporter_base.cpp b/pcbnew/dialogs/dialog_constraints_reporter_base.cpp index d2c42c60e5..201cc9c367 100644 --- a/pcbnew/dialogs/dialog_constraints_reporter_base.cpp +++ b/pcbnew/dialogs/dialog_constraints_reporter_base.cpp @@ -20,7 +20,7 @@ DIALOG_CONSTRAINTS_REPORTER_BASE::DIALOG_CONSTRAINTS_REPORTER_BASE( wxWindow* pa m_notebook->SetMinSize( wxSize( 550,480 ) ); - bMainSizer->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + bMainSizer->Add( m_notebook, 1, wxEXPAND|wxALL, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_constraints_reporter_base.fbp b/pcbnew/dialogs/dialog_constraints_reporter_base.fbp index 2bbec62eb7..bfc4821077 100644 --- a/pcbnew/dialogs/dialog_constraints_reporter_base.fbp +++ b/pcbnew/dialogs/dialog_constraints_reporter_base.fbp @@ -63,7 +63,7 @@ none 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxALL 1 1 diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 7a16cf530b..7412d281b7 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -850,14 +850,14 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_bSizerPanelPrimitives->Fit( m_panelCustomShapePrimitives ); m_notebook->AddPage( m_panelCustomShapePrimitives, _("Custom Shape Primitives"), false ); - bSizerUpper->Add( m_notebook, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 10 ); + bSizerUpper->Add( m_notebook, 0, wxEXPAND|wxTOP|wxBOTTOM, 12 ); wxBoxSizer* bSizerDisplayPad; bSizerDisplayPad = new wxBoxSizer( wxVERTICAL ); bSizerDisplayPad->SetMinSize( wxSize( 290,-1 ) ); - bSizerDisplayPad->Add( 0, 10, 0, wxEXPAND, 5 ); + bSizerDisplayPad->Add( 0, 25, 0, wxEXPAND, 5 ); m_stackupImagesBook = new wxSimplebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); page0 = new wxPanel( m_stackupImagesBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); @@ -954,7 +954,10 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind page7Sizer->Fit( page7 ); m_stackupImagesBook->AddPage( page7, _("a page"), false ); - bSizerDisplayPad->Add( m_stackupImagesBook, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 6 ); + bSizerDisplayPad->Add( m_stackupImagesBook, 0, wxEXPAND|wxRIGHT|wxLEFT, 7 ); + + + bSizerDisplayPad->Add( 0, 4, 0, wxEXPAND, 5 ); m_boardViewPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_padPreviewSizer = new wxBoxSizer( wxVERTICAL ); @@ -964,13 +967,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_boardViewPanel->SetSizer( m_padPreviewSizer ); m_boardViewPanel->Layout(); m_padPreviewSizer->Fit( m_boardViewPanel ); - bSizerDisplayPad->Add( m_boardViewPanel, 1, wxEXPAND|wxALL, 2 ); + bSizerDisplayPad->Add( m_boardViewPanel, 1, wxEXPAND|wxRIGHT|wxLEFT, 2 ); - bSizerUpper->Add( bSizerDisplayPad, 1, wxEXPAND|wxTOP|wxRIGHT, 10 ); + bSizerUpper->Add( bSizerDisplayPad, 1, wxEXPAND|wxTOP, 5 ); - m_MainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 ); + m_MainSizer->Add( bSizerUpper, 1, wxEXPAND|wxLEFT, 8 ); wxBoxSizer* bottomSizer; bottomSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index 5bc20c90b2..9b752a698a 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -63,8 +63,8 @@ wxVERTICAL protected - 5 - wxEXPAND + 8 + wxEXPAND|wxLEFT 1 @@ -72,10 +72,10 @@ wxHORIZONTAL none - 10 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 12 + wxEXPAND|wxTOP|wxBOTTOM 0 - + 1 1 1 @@ -128,11 +128,11 @@ - + General 1 - + 1 1 1 @@ -184,16 +184,16 @@ wxTAB_TRAVERSAL OnUpdateUI - + bGeneralSizer wxHORIZONTAL none - + 5 wxEXPAND|wxALL 0 - + m_LeftBoxSizer wxVERTICAL @@ -1056,11 +1056,11 @@ - + 5 wxEXPAND 0 - + wxBOTH 0 @@ -1071,7 +1071,7 @@ wxFLEX_GROWMODE_SPECIFIED none 4 - + 5 1 0 @@ -1203,14 +1203,14 @@ OnPadShapeSelection - + 25 6 0 wxEXPAND|wxLEFT 1 1 - + 1 1 1 @@ -1317,10 +1317,10 @@ wxTAB_TRAVERSAL - + a page 0 - + 1 1 1 @@ -1699,10 +1699,10 @@ - + a page 0 - + 1 1 1 @@ -2142,10 +2142,10 @@ - + a page 0 - + 1 1 1 @@ -2196,7 +2196,7 @@ wxTAB_TRAVERSAL - + 2 wxBOTH 1 @@ -2269,11 +2269,11 @@ -1 - + 5 wxEXPAND 1 - + bSizer29 wxHORIZONTAL @@ -2744,10 +2744,10 @@ - + a page 0 - + 1 1 1 @@ -2798,7 +2798,7 @@ wxTAB_TRAVERSAL - + 2 wxBOTH 1 @@ -2871,11 +2871,11 @@ -1 - + 5 wxEXPAND 1 - + bSizer30 wxHORIZONTAL @@ -3404,11 +3404,11 @@ -1 - + 5 wxEXPAND 1 - + bSizer31 wxHORIZONTAL @@ -4795,11 +4795,11 @@ - + 5 wxEXPAND 0 - + bSizer35 wxHORIZONTAL @@ -4932,21 +4932,21 @@ - + 5 wxEXPAND 0 - + 2 protected 0 - + 25 wxEXPAND|wxLEFT|wxRESERVE_SPACE_EVEN_IF_HIDDEN 0 - + 6 wxBOTH 1,4 @@ -5334,11 +5334,11 @@ - + 12 wxEXPAND|wxTOP|wxBOTTOM 0 - + 1 1 1 @@ -5392,11 +5392,11 @@ - + 5 wxEXPAND 0 - + 3 wxBOTH 1 @@ -6869,11 +6869,11 @@ - + Clearance Overrides and Settings 0 - + 1 1 1 @@ -6924,25 +6924,25 @@ wxTAB_TRAVERSAL - + bSizerPanelClearance wxVERTICAL none - + 5 wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - + bSizerClearance wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Clearance Overrides @@ -7133,11 +7133,11 @@ -1 - + 10 wxTOP|wxBOTTOM 0 - + 3 wxBOTH 1 @@ -8321,20 +8321,20 @@ - + 5 wxEXPAND 1 - + bSizerLower wxHORIZONTAL none - + 5 wxALL|wxEXPAND 1 - + wxID_ANY Connection to Copper Zones @@ -8342,11 +8342,11 @@ wxVERTICAL 1 protected - + 5 0 - + 2 wxBOTH 1 @@ -8612,11 +8612,11 @@ - + 5 wxEXPAND|wxALL 1 - + wxID_ANY Thermal Relief Overrides @@ -8624,11 +8624,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND 1 - + 3 wxBOTH 1 @@ -8640,11 +8640,11 @@ none 0 0 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -8701,11 +8701,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND 0 - + 1 1 1 @@ -8765,11 +8765,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -8826,11 +8826,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP 0 - + 1 1 1 @@ -8887,11 +8887,11 @@ -1 - + 5 wxEXPAND|wxLEFT|wxTOP|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -8951,11 +8951,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -9012,11 +9012,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -9073,11 +9073,11 @@ -1 - + 5 wxEXPAND|wxTOP|wxBOTTOM|wxLEFT 0 - + 1 1 1 @@ -9137,11 +9137,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 - + 1 1 1 @@ -9875,8 +9875,8 @@ - 10 - wxEXPAND|wxTOP|wxRIGHT + 5 + wxEXPAND|wxTOP 1 290,-1 @@ -9888,16 +9888,16 @@ wxEXPAND 0 - 10 + 25 protected 0 - 6 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 7 + wxEXPAND|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -9948,10 +9948,10 @@ wxBORDER_SIMPLE - + a page 0 - + 1 1 1 @@ -10002,7 +10002,7 @@ wxTAB_TRAVERSAL - + page0Sizer wxVERTICAL @@ -10068,10 +10068,10 @@ - + a page 0 - + 1 1 1 @@ -10122,7 +10122,7 @@ wxTAB_TRAVERSAL - + page1Sizer wxVERTICAL @@ -10852,11 +10852,21 @@ - + + 5 + wxEXPAND + 0 + + 4 + protected + 0 + + + 2 - wxEXPAND|wxALL + wxEXPAND|wxRIGHT|wxLEFT 1 - + 1 1 1