From fa869a96903ad2979e68215fb7d8b82f0bbcbcb1 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Mon, 4 Mar 2013 11:04:53 -0500 Subject: [PATCH] Minor Pcbnew dialog spacing and consistency fixes. (fixes lp:1143465) * Fix spacing and consistency issues and debug warning due to improper flex grid sizer in module editor module properties dialog. * Fix spacing and consistency issues in Pcbnew module properties dialog. * Fix spelling error in DRC dialog message box text. --- pcbnew/dialogs/dialog_design_rules.cpp | 12 +-- ...ialog_edit_module_for_BoardEditor_base.cpp | 8 +- ...ialog_edit_module_for_BoardEditor_base.fbp | 16 ++-- .../dialog_edit_module_for_Modedit_base.cpp | 59 +++++++------ .../dialog_edit_module_for_Modedit_base.fbp | 84 ++++++++----------- 5 files changed, 83 insertions(+), 96 deletions(-) diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index e5d11fddc2..208194fa79 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -700,7 +700,7 @@ void DIALOG_DESIGN_RULES::OnAddNetclassClick( wxCommandEvent& event ) wxTextEntryDialog dlg( this, _( "New Net Class Name:" ), wxEmptyString, class_name ); if( dlg.ShowModal() != wxID_OK ) - return; // cancelled by user + return; // canceled by user class_name = dlg.GetValue(); class_name.Trim( true ); @@ -757,7 +757,7 @@ void DIALOG_DESIGN_RULES::OnRemoveNetclassClick( wxCommandEvent& event ) bool reinit = false; // rows labels are not removed when deleting rows: they are not deleted. - // So we must store them, remove correponding labels and reinit them + // So we must store them, remove corresponding labels and reinit them wxArrayString labels; for( int ii = 0; ii < m_grid->GetNumberRows(); ii++ ) labels.Add( m_grid->GetRowLabelValue( ii ) ); @@ -778,7 +778,7 @@ void DIALOG_DESIGN_RULES::OnRemoveNetclassClick( wxCommandEvent& event ) swapNetClass( classname, NETCLASS::Default ); } else - wxMessageBox( _( "The defaut Netclass cannot be removed" ) ); + wxMessageBox( _( "The default Netclass cannot be removed" ) ); } if( reinit ) @@ -916,7 +916,7 @@ void DIALOG_DESIGN_RULES::OnLeftToRightCopyButton( wxCommandEvent& event ) /* Called on clicking the left "select all" button: - * select alls items of the left netname list lisxt box + * select all items of the left netname list lisxt box */ void DIALOG_DESIGN_RULES::OnLeftSelectAllButton( wxCommandEvent& event ) { @@ -926,7 +926,7 @@ void DIALOG_DESIGN_RULES::OnLeftSelectAllButton( wxCommandEvent& event ) /* Called on clicking the right "select all" button: - * select alls items of the right netname list lisxt box + * select all items of the right netname list lisxt box */ void DIALOG_DESIGN_RULES::OnRightSelectAllButton( wxCommandEvent& event ) { @@ -1110,7 +1110,7 @@ bool DIALOG_DESIGN_RULES::TestDataValidity() m_MessagesList->AppendToPage( msg ); } - // Test for a reasonnable via size: + // Test for a reasonable via size: if( viadia > maxval ) // 1 inch! { result = false; diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp index 1a5b61d665..a856dbe724 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp @@ -128,7 +128,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") }; int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString ); - m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place:"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_AutoPlaceCtrl->SetSelection( 0 ); bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 ); @@ -136,7 +136,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerAutoplace; - sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place:") ), wxHORIZONTAL ); + sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL ); wxBoxSizer* bSizerRotOpt; bSizerRotOpt = new wxBoxSizer( wxVERTICAL ); @@ -204,7 +204,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare fgSizerClearances->SetFlexibleDirection( wxBOTH ); fgSizerClearances->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("All pads nets clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("Pad clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNetClearance->Wrap( -1 ); m_staticTextNetClearance->SetToolTip( _("This is the local net clearance for all pad of this footprint\nIf 0, the Netclass values are used\nThis value can be superseded by a pad local value.") ); @@ -300,7 +300,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Position") ), wxVERTICAL ); - bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 ); + bLowerSizer3D->Add( m_Sizer3DValues, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer3DButtons; bSizer3DButtons = new wxBoxSizer( wxVERTICAL ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp index c437dc8f90..08119313df 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp @@ -1586,11 +1586,11 @@ - + 5 wxEXPAND 1 - + bSizer12 wxHORIZONTAL @@ -1718,7 +1718,7 @@ 0 0 wxID_ANY - Move and Place: + Move and Place 1 0 @@ -1777,13 +1777,13 @@ - + 5 wxEXPAND|wxALL 1 - + wxID_ANY - Auto Place: + Auto Place sbSizerAutoplace wxHORIZONTAL @@ -2531,7 +2531,7 @@ 0 0 wxID_ANY - All pads nets clearance: + Pad clearance: 0 @@ -4044,7 +4044,7 @@ none 5 - wxEXPAND + wxALL|wxEXPAND 1 wxID_ANY diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp index 994faaa65e..901779efdb 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.cpp @@ -21,7 +21,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_PanelPropertiesBoxSizer = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* PropLeftSizer; - PropLeftSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Fields:") ), wxVERTICAL ); + PropLeftSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Fields") ), wxVERTICAL ); wxStaticBoxSizer* sbSizerDoc; sbSizerDoc = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Doc") ), wxHORIZONTAL ); @@ -29,68 +29,65 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa sbSizerDoc->SetMinSize( wxSize( 300,-1 ) ); m_DocCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_DocCtrl->SetMaxLength( 0 ); - sbSizerDoc->Add( m_DocCtrl, 1, 0, 5 ); + sbSizerDoc->Add( m_DocCtrl, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - PropLeftSizer->Add( sbSizerDoc, 0, wxEXPAND, 5 ); + PropLeftSizer->Add( sbSizerDoc, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizerKeysW; sbSizerKeysW = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Keywords") ), wxHORIZONTAL ); m_KeywordCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_KeywordCtrl->SetMaxLength( 0 ); - sbSizerKeysW->Add( m_KeywordCtrl, 1, 0, 5 ); + sbSizerKeysW->Add( m_KeywordCtrl, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - PropLeftSizer->Add( sbSizerKeysW, 0, wxEXPAND, 5 ); - - - PropLeftSizer->Add( 0, 20, 0, 0, 5 ); + PropLeftSizer->Add( sbSizerKeysW, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizerRef; sbSizerRef = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Reference") ), wxHORIZONTAL ); m_ReferenceCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_ReferenceCtrl->SetMaxLength( 0 ); - sbSizerRef->Add( m_ReferenceCtrl, 1, 0, 5 ); + sbSizerRef->Add( m_ReferenceCtrl, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_button4 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - sbSizerRef->Add( m_button4, 0, 0, 5 ); + sbSizerRef->Add( m_button4, 0, wxBOTTOM|wxRIGHT, 5 ); - PropLeftSizer->Add( sbSizerRef, 0, wxEXPAND, 5 ); + PropLeftSizer->Add( sbSizerRef, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizerValue; sbSizerValue = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Value") ), wxHORIZONTAL ); m_ValueCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_ValueCtrl->SetMaxLength( 0 ); - sbSizerValue->Add( m_ValueCtrl, 1, 0, 5 ); + sbSizerValue->Add( m_ValueCtrl, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_button5 = new wxButton( m_PanelProperties, wxID_ANY, _("Edit"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); - sbSizerValue->Add( m_button5, 0, 0, 5 ); + sbSizerValue->Add( m_button5, 0, wxBOTTOM|wxRIGHT, 5 ); - PropLeftSizer->Add( sbSizerValue, 0, wxEXPAND, 5 ); + PropLeftSizer->Add( sbSizerValue, 0, wxALL|wxEXPAND, 5 ); PropLeftSizer->Add( 0, 20, 0, 0, 5 ); wxStaticBoxSizer* sbSizerFootprintName; - sbSizerFootprintName = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Footprint Name in Lib") ), wxHORIZONTAL ); + sbSizerFootprintName = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Footprint Name in Library") ), wxHORIZONTAL ); m_FootprintNameCtrl = new wxTextCtrl( m_PanelProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_FootprintNameCtrl->SetMaxLength( 0 ); - sbSizerFootprintName->Add( m_FootprintNameCtrl, 1, 0, 5 ); + sbSizerFootprintName->Add( m_FootprintNameCtrl, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - sbSizerFootprintName->Add( 0, 0, 0, 0, 5 ); + PropLeftSizer->Add( sbSizerFootprintName, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); - PropLeftSizer->Add( sbSizerFootprintName, 0, wxEXPAND, 5 ); + PropLeftSizer->Add( 0, 0, 0, wxEXPAND, 5 ); - m_PanelPropertiesBoxSizer->Add( PropLeftSizer, 1, wxEXPAND, 5 ); + m_PanelPropertiesBoxSizer->Add( PropLeftSizer, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_PropRightSizer = new wxBoxSizer( wxVERTICAL ); @@ -99,13 +96,13 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa wxString m_AttributsCtrlChoices[] = { _("Normal"), _("Normal+Insert"), _("Virtual") }; int m_AttributsCtrlNChoices = sizeof( m_AttributsCtrlChoices ) / sizeof( wxString ); - m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributs:"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_AttributsCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Attributes"), wxDefaultPosition, wxDefaultSize, m_AttributsCtrlNChoices, m_AttributsCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_AttributsCtrl->SetSelection( 0 ); bSizerAttrib->Add( m_AttributsCtrl, 1, wxALL|wxEXPAND, 5 ); wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") }; int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString ); - m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place:"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_AutoPlaceCtrl->SetSelection( 0 ); bSizerAttrib->Add( m_AutoPlaceCtrl, 1, wxEXPAND|wxALL, 5 ); @@ -113,7 +110,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_PropRightSizer->Add( bSizerAttrib, 1, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerAutoplace; - sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place:") ), wxHORIZONTAL ); + sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place") ), wxHORIZONTAL ); wxBoxSizer* bSizerRot90; bSizerRot90 = new wxBoxSizer( wxVERTICAL ); @@ -133,7 +130,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_staticText12 = new wxStaticText( m_PanelProperties, wxID_ANY, _("Rotation 180 degree"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); - bSizerRot180->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerRot180->Add( m_staticText12, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT, 5 ); m_CostRot180Ctrl = new wxSlider( m_PanelProperties, wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); bSizerRot180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); @@ -145,20 +142,20 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_PropRightSizer->Add( sbSizerAutoplace, 1, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer8; - sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Masks clearances local values:") ), wxVERTICAL ); + sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Local Clearance Values") ), wxVERTICAL ); - m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set these values to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInfo = new wxStaticText( m_PanelProperties, wxID_ANY, _("Set clearances to 0 to use global values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInfo->Wrap( -1 ); m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); sbSizer8->Add( m_staticTextInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 3, 3, 0, 0 ); + fgSizer1 = new wxFlexGridSizer( 5, 3, 0, 0 ); fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("All pads nets clearance"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextNetClearance = new wxStaticText( m_PanelProperties, wxID_ANY, _("Pad clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNetClearance->Wrap( -1 ); fgSizer1->Add( m_staticTextNetClearance, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); @@ -234,7 +231,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa m_PanelProperties->SetSizer( m_PanelPropertiesBoxSizer ); m_PanelProperties->Layout(); m_PanelPropertiesBoxSizer->Fit( m_PanelProperties ); - m_NoteBook->AddPage( m_PanelProperties, _("Properties"), true ); + m_NoteBook->AddPage( m_PanelProperties, _("Properties"), false ); m_Panel3D = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); wxBoxSizer* bSizerMain3D; bSizerMain3D = new wxBoxSizer( wxVERTICAL ); @@ -249,7 +246,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa wxBoxSizer* bLowerSizer3D; bLowerSizer3D = new wxBoxSizer( wxHORIZONTAL ); - m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Pos") ), wxVERTICAL ); + m_Sizer3DValues = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, _("3D Scale and Position") ), wxVERTICAL ); bLowerSizer3D->Add( m_Sizer3DValues, 1, wxEXPAND, 5 ); @@ -267,13 +264,13 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa bLowerSizer3D->Add( bSizer3DButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); - bSizerMain3D->Add( bLowerSizer3D, 1, wxEXPAND, 5 ); + bSizerMain3D->Add( bLowerSizer3D, 1, wxALL|wxEXPAND, 5 ); m_Panel3D->SetSizer( bSizerMain3D ); m_Panel3D->Layout(); bSizerMain3D->Fit( m_Panel3D ); - m_NoteBook->AddPage( m_Panel3D, _("3D settings"), false ); + m_NoteBook->AddPage( m_Panel3D, _("3D settings"), true ); m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp index cb5611d71a..ca377e7ddc 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit_base.fbp @@ -176,7 +176,7 @@ Properties - 1 + 0 1 1 @@ -258,11 +258,11 @@ none 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 wxID_ANY - Fields: + Fields PropLeftSizer wxVERTICAL @@ -270,7 +270,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -282,7 +282,7 @@ 5 - + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -375,7 +375,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -387,7 +387,7 @@ 5 - + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -480,17 +480,7 @@ 5 - - 0 - - 20 - protected - 0 - - - - 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT|wxTOP 0 wxID_ANY @@ -502,7 +492,7 @@ 5 - + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -593,7 +583,7 @@ 5 - + wxBOTTOM|wxRIGHT 0 1 @@ -683,7 +673,7 @@ 5 - wxEXPAND + wxALL|wxEXPAND 0 wxID_ANY @@ -695,7 +685,7 @@ 5 - + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -786,7 +776,7 @@ 5 - + wxBOTTOM|wxRIGHT 0 1 @@ -886,11 +876,11 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 wxID_ANY - Footprint Name in Lib + Footprint Name in Library sbSizerFootprintName wxHORIZONTAL @@ -898,7 +888,7 @@ 5 - + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -987,16 +977,16 @@ - - 5 - - 0 - - 0 - protected - 0 - - + + + + 5 + wxEXPAND + 0 + + 0 + protected + 0 @@ -1052,7 +1042,7 @@ 0 0 wxID_ANY - Attributs: + Attributes 1 0 @@ -1142,7 +1132,7 @@ 0 0 wxID_ANY - Move and Place: + Move and Place 1 0 @@ -1207,7 +1197,7 @@ 1 wxID_ANY - Auto Place: + Auto Place sbSizerAutoplace wxHORIZONTAL @@ -1426,7 +1416,7 @@ none 5 - wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL + wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT 0 1 @@ -1625,7 +1615,7 @@ 0 wxID_ANY - Masks clearances local values: + Local Clearance Values sbSizer8 wxVERTICAL @@ -1663,7 +1653,7 @@ 0 0 wxID_ANY - Set these values to 0 to use global values + Set clearances to 0 to use global values 0 @@ -1728,7 +1718,7 @@ fgSizer1 wxFLEX_GROWMODE_SPECIFIED none - 3 + 5 0 5 @@ -1762,7 +1752,7 @@ 0 0 wxID_ANY - All pads nets clearance + Pad clearance: 0 @@ -3013,7 +3003,7 @@ 3D settings - 0 + 1 1 1 @@ -3266,7 +3256,7 @@ 5 - wxEXPAND + wxALL|wxEXPAND 1 @@ -3279,7 +3269,7 @@ 1 wxID_ANY - 3D Scale and Pos + 3D Scale and Position m_Sizer3DValues wxVERTICAL