From a6c436c2cdf3a18b10aa5f6f1760862b6a0ef4c0 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 3 Feb 2018 23:22:45 +0000 Subject: [PATCH] Move Pad Properties flipped warning. This makes it more visible and keeps it from messing up the layout of the dialog. Fixes: lp:1426756 * https://bugs.launchpad.net/kicad/+bug/1426756 --- pcbnew/dialogs/dialog_pad_properties.cpp | 4 +- pcbnew/dialogs/dialog_pad_properties_base.cpp | 130 +- pcbnew/dialogs/dialog_pad_properties_base.fbp | 1216 ++++++++++------- pcbnew/dialogs/dialog_pad_properties_base.h | 25 +- 4 files changed, 823 insertions(+), 552 deletions(-) diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index 2f4df7591c..1b5191ee62 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -543,7 +544,8 @@ void DIALOG_PAD_PROPERTIES::initValues() m_primitives = m_dummyPad->GetPrimitives(); - m_staticTextWarningPadFlipped->Show(m_isFlipped); + m_FlippedWarningIcon->SetBitmap( KiBitmap( dialog_warning_xpm ) ); + m_FlippedWarningSizer->Show(m_isFlipped); m_PadNumCtrl->SetValue( m_dummyPad->GetName() ); m_PadNetNameCtrl->SetValue( m_dummyPad->GetNetname() ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 3abc55bed5..1bdecd822a 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 2 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "widgets/text_ctrl_eval.h" @@ -65,14 +65,14 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticText45->Wrap( -1 ); fgSizerPadType->Add( m_staticText45, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 ); - wxString m_PadShapeChoices[] = { _("Circular"), _("Oval"), _("Rectangular"), _("Trapezoidal"), _("Rounded Rectangle"), _("Custom Shape (Circular Anchor)"), _("Custom Shape (Rectangular Anchor)") }; + wxString m_PadShapeChoices[] = { _("Circular"), _("Oval"), _("Rectangular"), _("Trapezoidal"), _("Rounded Rectangle"), _("Custom (Circ. Anchor)"), _("Custom (Rect. Anchor)") }; int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString ); m_PadShape = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 0 ); m_PadShape->SetSelection( 0 ); fgSizerPadType->Add( m_PadShape, 0, wxALL|wxEXPAND, 5 ); - m_LeftBoxSizer->Add( fgSizerPadType, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + m_LeftBoxSizer->Add( fgSizerPadType, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxFlexGridSizer* fgSizerShapeType; fgSizerShapeType = new wxFlexGridSizer( 0, 3, 0, 0 ); @@ -82,14 +82,14 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticText4 = new wxStaticText( m_panelGeneral, wxID_ANY, _("Position X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); - fgSizerShapeType->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_PadPosition_X_Ctrl = new TEXT_CTRL_EVAL( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerShapeType->Add( m_PadPosition_X_Ctrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadPosition_X_Ctrl, 0, wxEXPAND|wxLEFT, 5 ); m_PadPosX_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosX_Unit->Wrap( -1 ); - fgSizerShapeType->Add( m_PadPosX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizerShapeType->Add( m_PadPosX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_staticText41 = new wxStaticText( m_panelGeneral, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText41->Wrap( -1 ); @@ -184,13 +184,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizerShapeType->Add( m_PadLengthDie_Unit, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticline4 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline4, 0, wxEXPAND|wxTOP, 6 ); m_staticline5 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline5, 0, wxEXPAND|wxTOP, 6 ); m_staticline6 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline6, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline6, 0, wxEXPAND|wxTOP, 6 ); m_staticText21 = new wxStaticText( m_panelGeneral, wxID_ANY, _("Trapezoid delta:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); @@ -214,16 +214,16 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind fgSizerShapeType->Add( m_trapDeltaDirChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 ); - fgSizerShapeType->Add( 0, 0, 1, wxEXPAND, 5 ); + fgSizerShapeType->Add( 0, 0, 1, wxBOTTOM|wxEXPAND, 5 ); m_staticline7 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline7, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline7, 0, wxEXPAND|wxTOP, 2 ); m_staticline8 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline8, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline8, 0, wxEXPAND|wxTOP, 2 ); m_staticline9 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - fgSizerShapeType->Add( m_staticline9, 0, wxEXPAND | wxALL, 5 ); + fgSizerShapeType->Add( m_staticline9, 0, wxEXPAND|wxTOP, 2 ); m_staticTextCornerSizeRatio = new wxStaticText( m_panelGeneral, wxID_ANY, _("Corner size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCornerSizeRatio->Wrap( -1 ); @@ -254,11 +254,48 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticTextCornerSizeUnit->Wrap( -1 ); fgSizerShapeType->Add( m_staticTextCornerSizeUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); + m_staticline91 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + fgSizerShapeType->Add( m_staticline91, 0, wxBOTTOM|wxEXPAND|wxTOP, 6 ); + + m_staticline92 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + fgSizerShapeType->Add( m_staticline92, 0, wxBOTTOM|wxEXPAND|wxTOP, 6 ); + + m_staticline93 = new wxStaticLine( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + fgSizerShapeType->Add( m_staticline93, 0, wxBOTTOM|wxEXPAND|wxTOP, 6 ); + m_LeftBoxSizer->Add( fgSizerShapeType, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + wxStaticBoxSizer* sbSizeModuleInfo; + sbSizeModuleInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Parent Footprint Orientation") ), wxVERTICAL ); - bGeneralSizer->Add( m_LeftBoxSizer, 3, wxALL|wxEXPAND, 5 ); + wxFlexGridSizer* fgSizer4; + fgSizer4 = new wxFlexGridSizer( 1, 3, 0, 0 ); + fgSizer4->AddGrowableCol( 0 ); + fgSizer4->AddGrowableCol( 2 ); + fgSizer4->SetFlexibleDirection( wxBOTH ); + fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_staticModuleSideValue = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Front side (footprint is mirrored)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticModuleSideValue->Wrap( -1 ); + fgSizer4->Add( m_staticModuleSideValue, 0, wxBOTTOM, 5 ); + + m_staticTitleModuleRot = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTitleModuleRot->Wrap( -1 ); + fgSizer4->Add( m_staticTitleModuleRot, 1, wxBOTTOM, 5 ); + + m_staticModuleRotValue = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("180.0"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticModuleRotValue->Wrap( -1 ); + fgSizer4->Add( m_staticModuleRotValue, 0, wxBOTTOM, 5 ); + + + sbSizeModuleInfo->Add( fgSizer4, 0, wxEXPAND, 5 ); + + + m_LeftBoxSizer->Add( sbSizeModuleInfo, 0, wxBOTTOM|wxEXPAND, 5 ); + + + bGeneralSizer->Add( m_LeftBoxSizer, 5, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer10; bSizer10 = new wxBoxSizer( wxVERTICAL ); @@ -274,13 +311,13 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_staticText47 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Shape:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText47->Wrap( -1 ); - fgSizerGeometry->Add( m_staticText47, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); + fgSizerGeometry->Add( m_staticText47, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); wxString m_DrillShapeCtrlChoices[] = { _("Circular hole"), _("Oval hole") }; int m_DrillShapeCtrlNChoices = sizeof( m_DrillShapeCtrlChoices ) / sizeof( wxString ); m_DrillShapeCtrl = new wxChoice( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DrillShapeCtrlNChoices, m_DrillShapeCtrlChoices, 0 ); m_DrillShapeCtrl->SetSelection( 0 ); - fgSizerGeometry->Add( m_DrillShapeCtrl, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); + fgSizerGeometry->Add( m_DrillShapeCtrl, 0, wxEXPAND|wxLEFT, 5 ); m_staticText51 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_staticText51->Wrap( -1 ); @@ -317,18 +354,32 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind wxStaticBoxSizer* m_LayersSizer; m_LayersSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Layers") ), wxVERTICAL ); + m_FlippedWarningSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_FlippedWarningIcon = new wxStaticBitmap( m_LayersSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); + m_FlippedWarningIcon->SetMinSize( wxSize( 48,48 ) ); + + m_FlippedWarningSizer->Add( m_FlippedWarningIcon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 6 ); + + m_staticText86 = new wxStaticText( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Parent footprint on board is flipped.\nLayers will be reversed."), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText86->Wrap( 150 ); + m_FlippedWarningSizer->Add( m_staticText86, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 10 ); + + + m_LayersSizer->Add( m_FlippedWarningSizer, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer11; bSizer11 = new wxBoxSizer( wxHORIZONTAL ); m_staticText511 = new wxStaticText( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Copper:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText511->Wrap( -1 ); - bSizer11->Add( m_staticText511, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer11->Add( m_staticText511, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxTOP, 5 ); wxString m_rbCopperLayersSelChoices[] = { _("Front layer"), _("Back layer"), _("All copper layers"), _("None") }; int m_rbCopperLayersSelNChoices = sizeof( m_rbCopperLayersSelChoices ) / sizeof( wxString ); m_rbCopperLayersSel = new wxChoice( m_LayersSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_rbCopperLayersSelNChoices, m_rbCopperLayersSelChoices, 0 ); m_rbCopperLayersSel->SetSelection( 0 ); - bSizer11->Add( m_rbCopperLayersSel, 1, wxALL|wxEXPAND, 5 ); + bSizer11->Add( m_rbCopperLayersSel, 1, wxALL|wxEXPAND|wxTOP, 5 ); m_LayersSizer->Add( bSizer11, 0, wxEXPAND, 5 ); @@ -337,7 +388,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind sbSizerTechlayers = new wxStaticBoxSizer( new wxStaticBox( m_LayersSizer->GetStaticBox(), wxID_ANY, _("Technical Layers") ), wxVERTICAL ); m_PadLayerAdhCmp = new wxCheckBox( sbSizerTechlayers->GetStaticBox(), wxID_ANY, _("Front adhesive"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerTechlayers->Add( m_PadLayerAdhCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + sbSizerTechlayers->Add( m_PadLayerAdhCmp, 0, wxLEFT|wxRIGHT, 5 ); m_PadLayerAdhCu = new wxCheckBox( sbSizerTechlayers->GetStaticBox(), wxID_ANY, _("Back adhesive"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerTechlayers->Add( m_PadLayerAdhCu, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -375,39 +426,8 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind bSizer10->Add( m_LayersSizer, 0, wxALL|wxEXPAND, 5 ); - wxStaticBoxSizer* sbSizeModuleInfo; - sbSizeModuleInfo = new wxStaticBoxSizer( new wxStaticBox( m_panelGeneral, wxID_ANY, _("Parent Footprint Orientation") ), wxVERTICAL ); - wxFlexGridSizer* fgSizer4; - fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgSizer4->AddGrowableCol( 1 ); - fgSizer4->SetFlexibleDirection( wxBOTH ); - fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTitleModuleRot = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTitleModuleRot->Wrap( -1 ); - fgSizer4->Add( m_staticTitleModuleRot, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 ); - - m_staticModuleRotValue = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticModuleRotValue->Wrap( -1 ); - fgSizer4->Add( m_staticModuleRotValue, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - - m_staticTitleModuleSide = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Board side:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTitleModuleSide->Wrap( -1 ); - fgSizer4->Add( m_staticTitleModuleSide, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 ); - - m_staticModuleSideValue = new wxStaticText( sbSizeModuleInfo->GetStaticBox(), wxID_ANY, _("Front side"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticModuleSideValue->Wrap( -1 ); - fgSizer4->Add( m_staticModuleSideValue, 0, wxALL|wxEXPAND, 5 ); - - - sbSizeModuleInfo->Add( fgSizer4, 0, 0, 5 ); - - - bSizer10->Add( sbSizeModuleInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - - bGeneralSizer->Add( bSizer10, 2, wxALL|wxEXPAND, 5 ); + bGeneralSizer->Add( bSizer10, 4, wxALL|wxEXPAND, 5 ); m_panelGeneral->SetSizer( bGeneralSizer ); @@ -665,12 +685,6 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_MainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 ); - m_staticTextWarningPadFlipped = new wxStaticText( this, wxID_ANY, _("Warning:\nThis pad is flipped on board.\nBack and front layers will be swapped."), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextWarningPadFlipped->Wrap( -1 ); - m_staticTextWarningPadFlipped->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - - m_MainSizer->Add( m_staticTextWarningPadFlipped, 0, wxALL, 5 ); - m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index c25953ef3d..1fc99e3734 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -267,18 +267,18 @@ bGeneralSizer wxHORIZONTAL none - + 5 wxALL|wxEXPAND - 3 - + 5 + m_LeftBoxSizer wxVERTICAL none - + 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT|wxRIGHT 0 2 @@ -912,7 +912,7 @@ 1 0 - "Circular" "Oval" "Rectangular" "Trapezoidal" "Rounded Rectangle" "Custom Shape (Circular Anchor)" "Custom Shape (Rectangular Anchor)" + "Circular" "Oval" "Rectangular" "Trapezoidal" "Rounded Rectangle" "Custom (Circ. Anchor)" "Custom (Rect. Anchor)" 1 1 @@ -984,7 +984,7 @@ - + 5 wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND 0 @@ -1002,7 +1002,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1085,7 +1085,7 @@ 5 - wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT 0 1 @@ -1176,7 +1176,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -3238,8 +3238,8 @@ - 5 - wxEXPAND | wxALL + 6 + wxEXPAND|wxTOP 0 1 @@ -3319,8 +3319,8 @@ - 5 - wxEXPAND | wxALL + 6 + wxEXPAND|wxTOP 0 1 @@ -3400,8 +3400,8 @@ - 5 - wxEXPAND | wxALL + 6 + wxEXPAND|wxTOP 0 1 @@ -3910,7 +3910,7 @@ 5 - wxEXPAND + wxBOTTOM|wxEXPAND 1 0 @@ -3919,8 +3919,8 @@ - 5 - wxEXPAND | wxALL + 2 + wxEXPAND|wxTOP 0 1 @@ -4000,8 +4000,8 @@ - 5 - wxEXPAND | wxALL + 2 + wxEXPAND|wxTOP 0 1 @@ -4081,8 +4081,8 @@ - 5 - wxEXPAND | wxALL + 2 + wxEXPAND|wxTOP 0 1 @@ -4667,6 +4667,531 @@ + + 6 + wxBOTTOM|wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline91 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + wxBOTTOM|wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline92 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + wxBOTTOM|wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline93 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND + 0 + + wxID_ANY + Parent Footprint Orientation + + sbSizeModuleInfo + wxVERTICAL + 1 + none + + + 5 + wxEXPAND + 0 + + 3 + wxBOTH + 0,2 + + 0 + + fgSizer4 + wxFLEX_GROWMODE_SPECIFIED + none + 1 + 0 + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Front side (footprint is mirrored) + + 0 + + + 0 + + 1 + m_staticModuleSideValue + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Rotation: + + 0 + + + 0 + + 1 + m_staticTitleModuleRot + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 180.0 + + 0 + + + 0 + + 1 + m_staticModuleRotValue + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4674,17 +5199,17 @@ 5 wxALL|wxEXPAND - 2 - + 4 + bSizer10 wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + wxID_ANY Drill @@ -4693,11 +5218,11 @@ 1 none - + 5 wxEXPAND 0 - + 3 wxBOTH 1 @@ -4711,7 +5236,7 @@ 0 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -4794,7 +5319,7 @@ 5 - wxEXPAND|wxLEFT|wxTOP + wxEXPAND|wxLEFT 0 1 @@ -5494,6 +6019,181 @@ 1 none + + 5 + wxEXPAND + 1 + + + m_FlippedWarningSizer + wxHORIZONTAL + protected + + 6 + wxALIGN_CENTER_VERTICAL|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 48,48 + 1 + m_FlippedWarningIcon + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; forward_declare + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Parent footprint on board is flipped. Layers will be reversed. + + 0 + + + 0 + + 1 + m_staticText86 + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + 150 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND @@ -5505,7 +6205,7 @@ none 5 - wxALL|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL|wxTOP 0 1 @@ -5588,7 +6288,7 @@ 5 - wxALL|wxEXPAND + wxALL|wxEXPAND|wxTOP 1 1 @@ -5691,7 +6391,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxLEFT|wxRIGHT 0 1 @@ -6661,371 +7361,6 @@ - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 0 - - wxID_ANY - Parent Footprint Orientation - - sbSizeModuleInfo - wxVERTICAL - 1 - none - - - 5 - - 0 - - 2 - wxBOTH - 1 - - 0 - - fgSizer4 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Rotation: - - 0 - - - 0 - - 1 - m_staticTitleModuleRot - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 - - 0 - - - 0 - - 1 - m_staticModuleRotValue - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Board side: - - 0 - - - 0 - - 1 - m_staticTitleModuleSide - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Front side - - 0 - - - 0 - - 1 - m_staticModuleSideValue - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10564,89 +10899,6 @@ - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Warning: This pad is flipped on board. Back and front layers will be swapped. - - 0 - - - 0 - - 1 - m_staticTextWarningPadFlipped - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT diff --git a/pcbnew/dialogs/dialog_pad_properties_base.h b/pcbnew/dialogs/dialog_pad_properties_base.h index 22f3ad266f..1c1ffb0f41 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.h +++ b/pcbnew/dialogs/dialog_pad_properties_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 2 2017) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_PAD_PROPERTIES_BASE_H__ @@ -11,9 +11,7 @@ #include #include #include -class DIALOG_SHIM; class TEXT_CTRL_EVAL; -class wxListView; #include "dialog_shim.h" #include @@ -27,11 +25,12 @@ class wxListView; #include #include #include -#include -#include #include #include #include +#include +#include +#include #include #include #include @@ -111,6 +110,12 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_staticTextCornerRadius; wxStaticText* m_staticTextCornerRadiusValue; wxStaticText* m_staticTextCornerSizeUnit; + wxStaticLine* m_staticline91; + wxStaticLine* m_staticline92; + wxStaticLine* m_staticline93; + wxStaticText* m_staticModuleSideValue; + wxStaticText* m_staticTitleModuleRot; + wxStaticText* m_staticModuleRotValue; wxStaticText* m_staticText47; wxChoice* m_DrillShapeCtrl; wxStaticText* m_staticText51; @@ -120,6 +125,9 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM wxStaticText* m_textPadDrillY; TEXT_CTRL_EVAL* m_PadDrill_Y_Ctrl; wxStaticText* m_PadDrill_Y_Unit; + wxBoxSizer* m_FlippedWarningSizer; + wxStaticBitmap* m_FlippedWarningIcon; + wxStaticText* m_staticText86; wxStaticText* m_staticText511; wxChoice* m_rbCopperLayersSel; wxCheckBox* m_PadLayerAdhCmp; @@ -133,10 +141,6 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM wxCheckBox* m_PadLayerDraft; wxCheckBox* m_PadLayerECO1; wxCheckBox* m_PadLayerECO2; - wxStaticText* m_staticTitleModuleRot; - wxStaticText* m_staticModuleRotValue; - wxStaticText* m_staticTitleModuleSide; - wxStaticText* m_staticModuleSideValue; wxPanel* m_localSettingsPanel; wxStaticText* m_staticTextWarning; wxStaticText* m_staticTextNetClearance; @@ -180,7 +184,6 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM PCB_DRAW_PANEL_GAL* m_panelShowPadGal; KIGFX::GAL_DISPLAY_OPTIONS m_galOptions; wxCheckBox* m_cbShowPadOutline; - wxStaticText* m_staticTextWarningPadFlipped; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel;