From e2b7ba4b19e8e4ac38a345b82be5d35e5b671a2c Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sat, 7 Dec 2013 22:46:25 -0600 Subject: [PATCH] eeschema/dialogs/dialog_lib_new_component.cpp was not expanding part name field nor setting initial focus. --- eeschema/dialogs/dialog_lib_new_component.cpp | 6 +- eeschema/dialogs/dialog_lib_new_component.fbp | 638 +++++------------- .../dialogs/dialog_lib_new_component_base.cpp | 233 ++----- .../dialogs/dialog_lib_new_component_base.h | 15 +- 4 files changed, 246 insertions(+), 646 deletions(-) diff --git a/eeschema/dialogs/dialog_lib_new_component.cpp b/eeschema/dialogs/dialog_lib_new_component.cpp index 3ffb0e8569..76e22aaba3 100644 --- a/eeschema/dialogs/dialog_lib_new_component.cpp +++ b/eeschema/dialogs/dialog_lib_new_component.cpp @@ -3,7 +3,9 @@ DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( wxWindow* parent ) : DIALOG_LIB_NEW_COMPONENT_BASE( parent ) { - /* Required to make escape key work correctly in wxGTK. */ - m_sdbSizerOK->SetFocus(); + // initial focus should be on first editable field. + m_textName->SetFocus(); + + // What happens when user presses "Enter"? OK button! OK? m_sdbSizerOK->SetDefault(); } diff --git a/eeschema/dialogs/dialog_lib_new_component.fbp b/eeschema/dialogs/dialog_lib_new_component.fbp index eabf24c837..9eb55f1c65 100644 --- a/eeschema/dialogs/dialog_lib_new_component.fbp +++ b/eeschema/dialogs/dialog_lib_new_component.fbp @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 1 0 @@ -88,23 +90,23 @@ - mainSizer - wxHORIZONTAL + bSizer7 + wxVERTICAL none - 12 + 5 wxALL|wxEXPAND - 1 + 0 - bSizer5 + bSizer16 wxVERTICAL none - - 3 - wxALIGN_LEFT + + 5 + wxALL 0 - + 1 1 1 @@ -140,7 +142,7 @@ 0 1 - m_staticText6 + m_staticText8 1 @@ -183,30 +185,27 @@ - - 0 - wxALL|wxEXPAND - 0 - + + 20 + wxEXPAND|wxLEFT|wxRIGHT + 1 + + 2 + wxBOTH + 1 + + 0 - bSizer2 - wxHORIZONTAL + fgSizer31 + wxFLEX_GROWMODE_SPECIFIED none - - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - + 0 + 0 + 3 wxALIGN_CENTER_VERTICAL|wxALL 0 - + 1 1 1 @@ -285,21 +284,11 @@ - + 3 - wxEXPAND + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -386,42 +375,11 @@ - - 3 - wxEXPAND + + 5 + wxALL 0 - - 0 - protected - 30 - - - - - - 0 - wxALL|wxEXPAND - 0 - - - bSizer3 - wxHORIZONTAL - none - - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -449,7 +407,7 @@ 0 0 wxID_ANY - Default &reference designator: + Default reference designator: 0 @@ -457,7 +415,7 @@ 0 1 - m_staticText3 + m_staticText9 1 @@ -470,7 +428,7 @@ 0 - This is the reference used in schematic for annotation. Do not use digits in reference. + @@ -500,21 +458,11 @@ - + 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL|wxEXPAND 0 - + 1 1 1 @@ -545,7 +493,7 @@ 0 - 0 + 0 @@ -559,7 +507,7 @@ Resizable 1 - 100,-1 + 0 @@ -568,7 +516,7 @@ wxFILTER_NONE wxDefaultValidator - U + @@ -601,42 +549,11 @@ - + 5 - wxEXPAND + wxALL 0 - - 0 - protected - 30 - - - - - - 0 - wxALL|wxEXPAND - 0 - - - bSizer4 - wxHORIZONTAL - none - - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -664,7 +581,7 @@ 0 0 wxID_ANY - Number of units per &package: + Number of units per package: 0 @@ -672,7 +589,7 @@ 0 1 - m_staticText4 + m_staticText10 1 @@ -685,7 +602,7 @@ 0 - This is the number of parts in this component package. A 74LS00 gate has 4 parts per packages. + @@ -715,21 +632,11 @@ - - 3 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + + 5 + wxALL 0 - + 1 1 1 @@ -758,11 +665,11 @@ 0 wxID_ANY 0 - 26 + 10 0 - 1 + 0 0 @@ -776,12 +683,12 @@ Resizable 1 - 100,-1 + wxSP_ARROW_KEYS 0 - 1 + @@ -812,42 +719,22 @@ - - 3 - wxEXPAND - 0 - - 0 - protected - 30 - - - - 0 - wxALL|wxEXPAND - 0 - + + 15 + wxEXPAND|wxLEFT|wxRIGHT + 1 + - bSizer7 - wxHORIZONTAL + bSizer17 + wxVERTICAL none - - 3 - wxEXPAND + + 5 + wxALL 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -876,7 +763,7 @@ 0 0 wxID_ANY - Create component with &alternate body style (DeMorgan) + Create component with alternate body style (DeMorgan) 0 @@ -897,7 +784,7 @@ 0 - Check this option for components that have a De Morgan representation. This is usual for gates. + wxFILTER_NONE wxDefaultValidator @@ -931,32 +818,11 @@ - - - - 0 - wxALL|wxEXPAND - 0 - - - bSizer8 - wxHORIZONTAL - none - - 3 - wxEXPAND + + 5 + wxALL 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -985,7 +851,7 @@ 0 0 wxID_ANY - Create component as power &symbol + Create component as power symbol 0 @@ -1006,7 +872,7 @@ 0 - Check this option for power symbols. Power symbols have specific properties for Eeschema: - Value cannot be edited (to avoid mistakes) because this is the pin name that is important for a power symbol - Reference is updated automatically when a netlist is created (no need to run Annotate) + wxFILTER_NONE wxDefaultValidator @@ -1040,32 +906,11 @@ - - - - 0 - wxALL|wxEXPAND - 0 - - - bSizer9 - wxHORIZONTAL - none - - 3 - wxEXPAND + + 5 + wxALL 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - + 1 1 1 @@ -1094,7 +939,7 @@ 0 0 wxID_ANY - Units are not &interchangeable + Units are not interchangeable 0 @@ -1115,7 +960,7 @@ 0 - Check this option if Eeschema cannot change parts selections inside a given package This happens when parts are different in this package. When this option is not checked, Eeschema automatically choose the parts in packages to minimize packages count + wxFILTER_NONE wxDefaultValidator @@ -1151,19 +996,30 @@ + + + + 5 + wxALL|wxEXPAND + 1 + + + bSizer18 + wxVERTICAL + none - 10 - wxALL|wxEXPAND + 5 + wxEXPAND 0 - 0 + 10 protected 0 - 3 - wxALIGN_LEFT|wxBOTTOM + 5 + wxALL 0 1 @@ -1193,7 +1049,7 @@ 0 0 wxID_ANY - Global Pin Settings + General Pin Settings 0 @@ -1201,7 +1057,7 @@ 0 1 - m_staticText7 + m_staticText11 1 @@ -1245,27 +1101,24 @@ - 0 - wxALL|wxEXPAND - 1 - + 20 + wxLEFT|wxRIGHT + 0 + + 2 + wxBOTH + + + 55 - bSizer6 - wxHORIZONTAL + fgSizer4 + wxFLEX_GROWMODE_SPECIFIED none + 0 + 0 - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALL 0 1 @@ -1295,7 +1148,7 @@ 0 0 wxID_ANY - Pin text position &offset: + Pin text position offset: 0 @@ -1303,7 +1156,7 @@ 0 1 - m_staticText41 + m_staticText12 1 @@ -1316,7 +1169,7 @@ 0 - Margin (in 0.001 inches) between a pin name position and the component body. A value from 10 to 40 is usually good. + @@ -1347,18 +1200,8 @@ - 3 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALL 0 1 @@ -1388,12 +1231,12 @@ 0 0 wxID_ANY - 40 - 100 + 0 + 10 0 - 1 + 0 0 @@ -1407,12 +1250,12 @@ Resizable 1 - 100,-1 + wxSP_ARROW_KEYS 0 - 40 + @@ -1443,113 +1286,20 @@ - - 3 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - 30,-1 - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxALL|wxEXPAND + 15 + wxEXPAND|wxLEFT|wxRIGHT 0 - bSizer10 - wxHORIZONTAL + bSizer19 + wxVERTICAL none - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALL 0 1 @@ -1565,7 +1315,7 @@ 1 0 - 1 + 0 1 1 @@ -1580,7 +1330,7 @@ 0 0 wxID_ANY - Show pin n&umber text + Show pin number text 0 @@ -1635,30 +1385,9 @@ - - - - 0 - wxALL|wxEXPAND - 0 - - - bSizer12 - wxHORIZONTAL - none - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALL 0 1 @@ -1674,7 +1403,7 @@ 1 0 - 1 + 0 1 1 @@ -1689,7 +1418,7 @@ 0 0 wxID_ANY - Show pin name te&xt + Show pin name text 0 @@ -1744,30 +1473,9 @@ - - - - 5 - wxEXPAND - 1 - - - bSizer121 - wxHORIZONTAL - none - 3 - wxEXPAND - 0 - - 0 - protected - 12 - - - - 3 - wxALIGN_CENTER_VERTICAL|wxALL + 5 + wxALL 0 1 @@ -1783,7 +1491,7 @@ 1 0 - 1 + 0 1 1 @@ -1798,7 +1506,7 @@ 0 0 wxID_ANY - Pin name &inside + Pin name inside 0 @@ -1855,42 +1563,32 @@ - - 10 - wxALL|wxEXPAND - 0 - - 5 - protected - 0 - - - - 0 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - - - - - - - - - - + + + + 10 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + + + + + + + + diff --git a/eeschema/dialogs/dialog_lib_new_component_base.cpp b/eeschema/dialogs/dialog_lib_new_component_base.cpp index 744f72fa5f..34f888cd10 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.cpp +++ b/eeschema/dialogs/dialog_lib_new_component_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 5 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -13,209 +13,113 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bSizer7; + bSizer7 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizer16; + bSizer16 = new wxBoxSizer( wxVERTICAL ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("General Settings"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - m_staticText6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + m_staticText8 = new wxStaticText( this, wxID_ANY, _("General Settings"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText8->Wrap( -1 ); + m_staticText8->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer5->Add( m_staticText6, 0, wxALIGN_LEFT, 3 ); + bSizer16->Add( m_staticText8, 0, wxALL, 5 ); - wxBoxSizer* bSizer2; - bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer2->Add( 12, 0, 0, wxEXPAND, 3 ); + wxFlexGridSizer* fgSizer31; + fgSizer31 = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizer31->AddGrowableCol( 1 ); + fgSizer31->SetFlexibleDirection( wxBOTH ); + fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticText2 = new wxStaticText( this, wxID_ANY, _("Component &name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); m_staticText2->SetToolTip( _("This is the component name in library,\nand also the default component value when loaded in the schematic.") ); - bSizer2->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer2->Add( 0, 0, 1, wxEXPAND, 3 ); + fgSizer31->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 100,-1 ), 0 ); m_textName->SetMaxLength( 0 ); - bSizer2->Add( m_textName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + fgSizer31->Add( m_textName, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); + m_staticText9 = new wxStaticText( this, wxID_ANY, _("Default reference designator:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText9->Wrap( -1 ); + fgSizer31->Add( m_staticText9, 0, wxALL, 5 ); - bSizer2->Add( 30, 0, 0, wxEXPAND, 3 ); + m_textReference = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer31->Add( m_textReference, 0, wxALL|wxEXPAND, 5 ); + m_staticText10 = new wxStaticText( this, wxID_ANY, _("Number of units per package:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText10->Wrap( -1 ); + fgSizer31->Add( m_staticText10, 0, wxALL, 5 ); - bSizer5->Add( bSizer2, 0, wxALL|wxEXPAND, 0 ); + m_spinPartCount = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10, 0 ); + fgSizer31->Add( m_spinPartCount, 0, wxALL, 5 ); - wxBoxSizer* bSizer3; - bSizer3 = new wxBoxSizer( wxHORIZONTAL ); + bSizer16->Add( fgSizer31, 1, wxEXPAND|wxLEFT|wxRIGHT, 20 ); - bSizer3->Add( 12, 0, 0, wxEXPAND, 3 ); + wxBoxSizer* bSizer17; + bSizer17 = new wxBoxSizer( wxVERTICAL ); - m_staticText3 = new wxStaticText( this, wxID_ANY, _("Default &reference designator:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText3->Wrap( -1 ); - m_staticText3->SetToolTip( _("This is the reference used in schematic for annotation.\nDo not use digits in reference.") ); + m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create component with alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer17->Add( m_checkHasConversion, 0, wxALL, 5 ); - bSizer3->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create component as power symbol"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer17->Add( m_checkIsPowerSymbol, 0, wxALL, 5 ); + m_checkLockItems = new wxCheckBox( this, wxID_ANY, _("Units are not interchangeable"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer17->Add( m_checkLockItems, 0, wxALL, 5 ); - bSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - m_textReference = new wxTextCtrl( this, wxID_ANY, _("U"), wxDefaultPosition, wxSize( 100,-1 ), 0 ); - m_textReference->SetMaxLength( 0 ); - bSizer3->Add( m_textReference, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + bSizer16->Add( bSizer17, 1, wxEXPAND|wxLEFT|wxRIGHT, 15 ); - bSizer3->Add( 30, 0, 0, wxEXPAND, 5 ); + bSizer7->Add( bSizer16, 0, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizer18; + bSizer18 = new wxBoxSizer( wxVERTICAL ); - bSizer5->Add( bSizer3, 0, wxALL|wxEXPAND, 0 ); - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxHORIZONTAL ); + bSizer18->Add( 0, 10, 0, wxEXPAND, 5 ); + m_staticText11 = new wxStaticText( this, wxID_ANY, _("General Pin Settings"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText11->Wrap( -1 ); + m_staticText11->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - bSizer4->Add( 12, 0, 0, wxEXPAND, 3 ); + bSizer18->Add( m_staticText11, 0, wxALL, 5 ); - m_staticText4 = new wxStaticText( this, wxID_ANY, _("Number of units per &package:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText4->Wrap( -1 ); - m_staticText4->SetToolTip( _("This is the number of parts in this component package.\nA 74LS00 gate has 4 parts per packages.") ); + wxFlexGridSizer* fgSizer4; + fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 55 ); + fgSizer4->SetFlexibleDirection( wxBOTH ); + fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - bSizer4->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + m_staticText12 = new wxStaticText( this, wxID_ANY, _("Pin text position offset:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText12->Wrap( -1 ); + fgSizer4->Add( m_staticText12, 0, wxALL, 5 ); + m_spinPinTextPosition = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10, 0 ); + fgSizer4->Add( m_spinPinTextPosition, 0, wxALL, 5 ); - bSizer4->Add( 0, 0, 1, wxEXPAND, 3 ); - m_spinPartCount = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxSize( 100,-1 ), wxSP_ARROW_KEYS, 1, 26, 0 ); - bSizer4->Add( m_spinPartCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); + bSizer18->Add( fgSizer4, 0, wxLEFT|wxRIGHT, 20 ); + wxBoxSizer* bSizer19; + bSizer19 = new wxBoxSizer( wxVERTICAL ); - bSizer4->Add( 30, 0, 0, wxEXPAND, 3 ); + m_checkShowPinNumber = new wxCheckBox( this, wxID_ANY, _("Show pin number text"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer19->Add( m_checkShowPinNumber, 0, wxALL, 5 ); + m_checkShowPinName = new wxCheckBox( this, wxID_ANY, _("Show pin name text"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer19->Add( m_checkShowPinName, 0, wxALL, 5 ); - bSizer5->Add( bSizer4, 0, wxALL|wxEXPAND, 0 ); + m_checkShowPinNameInside = new wxCheckBox( this, wxID_ANY, _("Pin name inside"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer19->Add( m_checkShowPinNameInside, 0, wxALL, 5 ); - wxBoxSizer* bSizer7; - bSizer7 = new wxBoxSizer( wxHORIZONTAL ); + bSizer18->Add( bSizer19, 0, wxEXPAND|wxLEFT|wxRIGHT, 15 ); - bSizer7->Add( 12, 0, 0, wxEXPAND, 3 ); - m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create component with &alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkHasConversion->SetToolTip( _("Check this option for components that have a De Morgan representation.\nThis is usual for gates.") ); - - bSizer7->Add( m_checkHasConversion, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer7, 0, wxALL|wxEXPAND, 0 ); - - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer8->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create component as power &symbol"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkIsPowerSymbol->SetToolTip( _("Check this option for power symbols.\nPower symbols have specific properties for Eeschema:\n- Value cannot be edited (to avoid mistakes) because this is the pin name that is important for a power symbol\n- Reference is updated automatically when a netlist is created (no need to run Annotate)") ); - - bSizer8->Add( m_checkIsPowerSymbol, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer8, 0, wxALL|wxEXPAND, 0 ); - - wxBoxSizer* bSizer9; - bSizer9 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer9->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_checkLockItems = new wxCheckBox( this, wxID_ANY, _("Units are not &interchangeable"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkLockItems->SetToolTip( _("Check this option if Eeschema cannot change parts selections inside a given package\nThis happens when parts are different in this package.\nWhen this option is not checked, Eeschema automatically choose the parts in packages to minimize packages count") ); - - bSizer9->Add( m_checkLockItems, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer9, 0, wxALL|wxEXPAND, 0 ); - - - bSizer5->Add( 0, 0, 0, wxALL|wxEXPAND, 10 ); - - m_staticText7 = new wxStaticText( this, wxID_ANY, _("Global Pin Settings"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText7->Wrap( -1 ); - m_staticText7->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - - bSizer5->Add( m_staticText7, 0, wxALIGN_LEFT|wxBOTTOM, 3 ); - - wxBoxSizer* bSizer6; - bSizer6 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer6->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_staticText41 = new wxStaticText( this, wxID_ANY, _("Pin text position &offset:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText41->Wrap( -1 ); - m_staticText41->SetToolTip( _("Margin (in 0.001 inches) between a pin name position and the component body.\nA value from 10 to 40 is usually good.") ); - - bSizer6->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer6->Add( 0, 0, 1, wxEXPAND, 3 ); - - m_spinPinTextPosition = new wxSpinCtrl( this, wxID_ANY, wxT("40"), wxDefaultPosition, wxSize( 100,-1 ), wxSP_ARROW_KEYS, 1, 100, 40 ); - bSizer6->Add( m_spinPinTextPosition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - m_staticText5 = new wxStaticText( this, wxID_ANY, _("mils"), wxDefaultPosition, wxSize( 30,-1 ), 0 ); - m_staticText5->Wrap( -1 ); - bSizer6->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL, 3 ); - - - bSizer5->Add( bSizer6, 1, wxALL|wxEXPAND, 0 ); - - wxBoxSizer* bSizer10; - bSizer10 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer10->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_checkShowPinNumber = new wxCheckBox( this, wxID_ANY, _("Show pin n&umber text"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkShowPinNumber->SetValue(true); - bSizer10->Add( m_checkShowPinNumber, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer10, 0, wxALL|wxEXPAND, 0 ); - - wxBoxSizer* bSizer12; - bSizer12 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer12->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_checkShowPinName = new wxCheckBox( this, wxID_ANY, _("Show pin name te&xt"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkShowPinName->SetValue(true); - bSizer12->Add( m_checkShowPinName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer12, 0, wxALL|wxEXPAND, 0 ); - - wxBoxSizer* bSizer121; - bSizer121 = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer121->Add( 12, 0, 0, wxEXPAND, 3 ); - - m_checkShowPinNameInside = new wxCheckBox( this, wxID_ANY, _("Pin name &inside"), wxDefaultPosition, wxDefaultSize, 0 ); - m_checkShowPinNameInside->SetValue(true); - bSizer121->Add( m_checkShowPinNameInside, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - - - bSizer5->Add( bSizer121, 1, wxEXPAND, 5 ); - - - bSizer5->Add( 0, 5, 0, wxALL|wxEXPAND, 10 ); + bSizer7->Add( bSizer18, 1, wxALL|wxEXPAND, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); @@ -224,15 +128,12 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizer5->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 0 ); + bSizer7->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 10 ); - mainSizer->Add( bSizer5, 1, wxALL|wxEXPAND, 12 ); - - - this->SetSizer( mainSizer ); + this->SetSizer( bSizer7 ); this->Layout(); - mainSizer->Fit( this ); + bSizer7->Fit( this ); this->Centre( wxBOTH ); } diff --git a/eeschema/dialogs/dialog_lib_new_component_base.h b/eeschema/dialogs/dialog_lib_new_component_base.h index 0d07e105e1..e48977dcfe 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.h +++ b/eeschema/dialogs/dialog_lib_new_component_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 5 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -21,8 +21,8 @@ class DIALOG_SHIM; #include #include #include -#include #include +#include #include #include #include @@ -37,20 +37,19 @@ class DIALOG_LIB_NEW_COMPONENT_BASE : public DIALOG_SHIM private: protected: - wxStaticText* m_staticText6; + wxStaticText* m_staticText8; wxStaticText* m_staticText2; wxTextCtrl* m_textName; - wxStaticText* m_staticText3; + wxStaticText* m_staticText9; wxTextCtrl* m_textReference; - wxStaticText* m_staticText4; + wxStaticText* m_staticText10; wxSpinCtrl* m_spinPartCount; wxCheckBox* m_checkHasConversion; wxCheckBox* m_checkIsPowerSymbol; wxCheckBox* m_checkLockItems; - wxStaticText* m_staticText7; - wxStaticText* m_staticText41; + wxStaticText* m_staticText11; + wxStaticText* m_staticText12; wxSpinCtrl* m_spinPinTextPosition; - wxStaticText* m_staticText5; wxCheckBox* m_checkShowPinNumber; wxCheckBox* m_checkShowPinName; wxCheckBox* m_checkShowPinNameInside;