diff --git a/common/dialogs/panel_setup_netclasses_base.cpp b/common/dialogs/panel_setup_netclasses_base.cpp index 86c1f2d466..cd0545f7ca 100644 --- a/common/dialogs/panel_setup_netclasses_base.cpp +++ b/common/dialogs/panel_setup_netclasses_base.cpp @@ -74,7 +74,7 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi // Cell Defaults m_netclassGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - bUpperSizer->Add( m_netclassGrid, 1, wxEXPAND|wxLEFT, 1 ); + bUpperSizer->Add( m_netclassGrid, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 1 ); wxBoxSizer* buttonBoxSizer; buttonBoxSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -93,10 +93,10 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi m_colorDefaultHelpText = new wxStaticText( m_netclassesPane, wxID_ANY, _("Set color to transparent to use KiCad default color."), wxDefaultPosition, wxDefaultSize, 0 ); m_colorDefaultHelpText->Wrap( -1 ); - buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 10 ); + buttonBoxSizer->Add( m_colorDefaultHelpText, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 10 ); - bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bUpperSizer->Add( buttonBoxSizer, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); m_netclassesPane->SetSizer( bUpperSizer ); @@ -147,13 +147,13 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi // Cell Defaults m_assignmentGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - bSizer14->Add( m_assignmentGrid, 1, wxEXPAND|wxLEFT, 1 ); + bSizer14->Add( m_assignmentGrid, 2, wxEXPAND|wxLEFT, 5 ); bColumns->Add( bSizer14, 3, wxEXPAND, 5 ); m_matchingNets = new WX_HTML_REPORT_BOX( m_membershipPane, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); - bColumns->Add( m_matchingNets, 2, wxEXPAND|wxLEFT, 15 ); + bColumns->Add( m_matchingNets, 2, wxEXPAND|wxLEFT|wxRIGHT, 5 ); bLowerSizer->Add( bColumns, 1, wxEXPAND|wxTOP, 3 ); diff --git a/common/dialogs/panel_setup_netclasses_base.fbp b/common/dialogs/panel_setup_netclasses_base.fbp index 9bd598b565..05582983d2 100644 --- a/common/dialogs/panel_setup_netclasses_base.fbp +++ b/common/dialogs/panel_setup_netclasses_base.fbp @@ -258,7 +258,7 @@ 1 - wxEXPAND|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -347,7 +347,7 @@ 5 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + wxEXPAND|wxLEFT|wxTOP 0 @@ -524,7 +524,7 @@ 10 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -736,9 +736,9 @@ wxVERTICAL none - 1 + 5 wxEXPAND|wxLEFT - 1 + 2 1 1 @@ -828,8 +828,8 @@ - 15 - wxEXPAND|wxLEFT + 5 + wxEXPAND|wxLEFT|wxRIGHT 2 1 diff --git a/common/dialogs/panel_text_variables_base.cpp b/common/dialogs/panel_text_variables_base.cpp index 54a1eab2d0..c187ce4b34 100644 --- a/common/dialogs/panel_text_variables_base.cpp +++ b/common/dialogs/panel_text_variables_base.cpp @@ -50,7 +50,7 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow m_TextVars->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_TextVars->SetMinSize( wxSize( 604,170 ) ); - bSizer3->Add( m_TextVars, 1, wxEXPAND|wxBOTTOM, 5 ); + bSizer3->Add( m_TextVars, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxBoxSizer* bSizerEnvVarBtns; bSizerEnvVarBtns = new wxBoxSizer( wxHORIZONTAL ); @@ -65,7 +65,7 @@ PANEL_TEXT_VARIABLES_BASE::PANEL_TEXT_VARIABLES_BASE( wxWindow* parent, wxWindow bSizerEnvVarBtns->Add( m_btnDeleteTextVar, 0, wxRIGHT|wxLEFT, 5 ); - bSizer3->Add( bSizerEnvVarBtns, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + bSizer3->Add( bSizerEnvVarBtns, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); bPanelSizer->Add( bSizer3, 1, wxEXPAND, 5 ); diff --git a/common/dialogs/panel_text_variables_base.fbp b/common/dialogs/panel_text_variables_base.fbp index 0efd91f64a..cbcc52ece1 100644 --- a/common/dialogs/panel_text_variables_base.fbp +++ b/common/dialogs/panel_text_variables_base.fbp @@ -69,7 +69,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -159,7 +159,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 diff --git a/pcbnew/dialogs/panel_setup_formatting_base.cpp b/pcbnew/dialogs/panel_setup_formatting_base.cpp index ff97ef53ba..855da005f8 100644 --- a/pcbnew/dialogs/panel_setup_formatting_base.cpp +++ b/pcbnew/dialogs/panel_setup_formatting_base.cpp @@ -27,14 +27,14 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi dashLengthLabel = new wxStaticText( sbSizer6->GetStaticBox(), wxID_ANY, _("Dash length:"), wxDefaultPosition, wxDefaultSize, 0 ); dashLengthLabel->Wrap( -1 ); - fgSizer41->Add( dashLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizer41->Add( dashLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_dashLengthCtrl = new wxTextCtrl( sbSizer6->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer41->Add( m_dashLengthCtrl, 0, wxALIGN_CENTER_VERTICAL, 5 ); gapLengthLabel = new wxStaticText( sbSizer6->GetStaticBox(), wxID_ANY, _("Gap length:"), wxDefaultPosition, wxDefaultSize, 0 ); gapLengthLabel->Wrap( -1 ); - fgSizer41->Add( gapLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + fgSizer41->Add( gapLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_gapLengthCtrl = new wxTextCtrl( sbSizer6->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer41->Add( m_gapLengthCtrl, 0, wxALIGN_CENTER_VERTICAL, 5 ); @@ -44,7 +44,7 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi m_dashedLineHelp = new wxStaticText( sbSizer6->GetStaticBox(), wxID_ANY, _("Dash and dot lengths are ratios of the line width."), wxDefaultPosition, wxDefaultSize, 0 ); m_dashedLineHelp->Wrap( -1 ); - sbSizer6->Add( m_dashedLineHelp, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + sbSizer6->Add( m_dashedLineHelp, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); bMargins->Add( sbSizer6, 0, wxEXPAND|wxALL, 5 ); diff --git a/pcbnew/dialogs/panel_setup_formatting_base.fbp b/pcbnew/dialogs/panel_setup_formatting_base.fbp index d2de7be9b4..38298d3907 100644 --- a/pcbnew/dialogs/panel_setup_formatting_base.fbp +++ b/pcbnew/dialogs/panel_setup_formatting_base.fbp @@ -96,7 +96,7 @@ 5 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -221,7 +221,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -348,7 +348,7 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxBOTTOM|wxLEFT|wxRIGHT|wxTOP 0 1 diff --git a/pcbnew/dialogs/panel_setup_rules_base.cpp b/pcbnew/dialogs/panel_setup_rules_base.cpp index 004faf703a..1bbf1517ac 100644 --- a/pcbnew/dialogs/panel_setup_rules_base.cpp +++ b/pcbnew/dialogs/panel_setup_rules_base.cpp @@ -21,7 +21,7 @@ PANEL_SETUP_RULES_BASE::PANEL_SETUP_RULES_BASE( wxWindow* parent, wxWindowID id, m_title = new wxStaticText( this, wxID_ANY, _("DRC rules:"), wxDefaultPosition, wxDefaultSize, 0 ); m_title->Wrap( -1 ); - bSizer4->Add( m_title, 0, wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer4->Add( m_title, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 ); bSizer4->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -29,7 +29,7 @@ PANEL_SETUP_RULES_BASE::PANEL_SETUP_RULES_BASE( wxWindow* parent, wxWindowID id, m_syntaxHelp = new wxHyperlinkCtrl( this, wxID_ANY, _("Syntax help"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_syntaxHelp->SetToolTip( _("Show syntax help window") ); - bSizer4->Add( m_syntaxHelp, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); + bSizer4->Add( m_syntaxHelp, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bPanelSizer->Add( bSizer4, 0, wxEXPAND, 5 ); @@ -67,7 +67,7 @@ PANEL_SETUP_RULES_BASE::PANEL_SETUP_RULES_BASE( wxWindow* parent, wxWindowID id, m_textEditor->MarkerDefine( wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY ); m_textEditor->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) ); m_textEditor->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - m_topMargin->Add( m_textEditor, 3, wxEXPAND|wxTOP|wxBOTTOM, 5 ); + m_topMargin->Add( m_textEditor, 3, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 5 ); wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); @@ -75,12 +75,12 @@ PANEL_SETUP_RULES_BASE::PANEL_SETUP_RULES_BASE( wxWindow* parent, wxWindowID id, m_compileButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|0 ); m_compileButton->SetToolTip( _("Check rule syntax") ); - bSizer5->Add( m_compileButton, 0, wxALL, 3 ); + bSizer5->Add( m_compileButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_errorsReport = new WX_HTML_REPORT_BOX( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); m_errorsReport->SetMinSize( wxSize( 400,60 ) ); - bSizer5->Add( m_errorsReport, 1, wxEXPAND|wxTOP|wxLEFT, 5 ); + bSizer5->Add( m_errorsReport, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_topMargin->Add( bSizer5, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_setup_rules_base.fbp b/pcbnew/dialogs/panel_setup_rules_base.fbp index 0428fd3506..9415ae8174 100644 --- a/pcbnew/dialogs/panel_setup_rules_base.fbp +++ b/pcbnew/dialogs/panel_setup_rules_base.fbp @@ -68,7 +68,7 @@ none 5 - wxTOP|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP 0 1 @@ -138,7 +138,7 @@ - 10 + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 @@ -214,7 +214,7 @@ protected 5 - wxEXPAND|wxTOP|wxBOTTOM + wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP 3 1 @@ -291,7 +291,7 @@ none 3 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -365,7 +365,7 @@ 5 - wxEXPAND|wxTOP|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp index a1b8e13d9d..42c23171b4 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp @@ -57,7 +57,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_trackWidthsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - bSizerTracks->Add( m_trackWidthsGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bSizerTracks->Add( m_trackWidthsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); @@ -121,7 +121,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_viaSizesGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - bSizerVias->Add( m_viaSizesGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bSizerVias->Add( m_viaSizesGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); @@ -187,7 +187,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa // Cell Defaults m_diffPairsGrid->SetDefaultCellBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_diffPairsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); - bSizerDiffPairs->Add( m_diffPairsGrid, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 ); + bSizerDiffPairs->Add( m_diffPairsGrid, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp index 8f9b7b2921..390a57d00b 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp @@ -129,7 +129,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 1 @@ -532,7 +532,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 1 @@ -935,7 +935,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT 1 1