diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp index 9c39908721..084fcafe2b 100644 --- a/common/wildcards_and_files_ext.cpp +++ b/common/wildcards_and_files_ext.cpp @@ -283,7 +283,7 @@ wxString Shapes3DFileWildcard() wxString IDF3DFileWildcard() { - return _( "IDFv3 component files (*.idf)|*." ) + FormatWildcardExt( "idf" ); + return _( "IDFv3 footprint files (*.idf)|*." ) + FormatWildcardExt( "idf" ); } diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index 98c4989d1d..c47ecdbd5d 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -63,7 +63,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() // Save the footprints back into eeschema AddMenuItem( filesMenu, wxID_SAVE, _( "&Save Footprint Associations\tCtrl+S" ), - _( "Save footprint association in schematic component footprint fields" ), + _( "Save footprint association in schematic symbol footprint fields" ), KiBitmap( save_xpm ) ); // Separator @@ -93,7 +93,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() _( "Footprint &Association Files" ), _( "Configure footprint association file (.equ) list." "These files are used to automatically assign " - "the footprint name (FPID) from the component value" ), + "the footprint name from the symbol value" ), KiBitmap( library_table_xpm ) ); preferencesMenu->AppendSeparator(); diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp index 5207494590..321b3cef59 100644 --- a/cvpcb/tool_cvpcb.cpp +++ b/cvpcb/tool_cvpcb.cpp @@ -62,11 +62,11 @@ void CVPCB_MAINFRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_CVPCB_GOTO_PREVIOUSNA, wxEmptyString, KiBitmap( left_xpm ), - _( "Select previous unlinked component" ) ); + _( "Select previous unlinked symbol" ) ); m_mainToolBar->AddTool( ID_CVPCB_GOTO_FIRSTNA, wxEmptyString, KiBitmap( right_xpm ), - _( "Select next unlinked component" ) ); + _( "Select next unlinked symbol" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_CVPCB_AUTO_ASSOCIE, wxEmptyString, @@ -82,7 +82,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar() KiBitmap( module_filtered_list_xpm ), wxNullBitmap, true, NULL, - _( "Filter footprint list by schematic components keywords" ), + _( "Filter footprint list by schematic symbol keywords" ), wxEmptyString ); m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp index 91a7aeebc1..3c1cd7b08c 100644 --- a/eeschema/dialogs/dialog_annotate.cpp +++ b/eeschema/dialogs/dialog_annotate.cpp @@ -191,17 +191,17 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event ) if( GetResetItems() ) { if( GetLevel() ) - message += _( "Clear and annotate all of the components on the entire schematic?" ); + message += _( "Clear and annotate all of the symbols on the entire schematic?" ); else - message += _( "Clear and annotate all of the components on the current sheet?" ); + message += _( "Clear and annotate all of the symbols on the current sheet?" ); promptUser = true; } else { if( GetLevel() ) - message += _( "Annotate only the unannotated components on the entire schematic?" ); + message += _( "Annotate only the unannotated symbols on the entire schematic?" ); else - message += _( "Annotate only the unannotated components on the current sheet?" ); + message += _( "Annotate only the unannotated symbols on the current sheet?" ); } message += _( "\n\nThis operation will change the current annotation and cannot be undone." ); diff --git a/eeschema/dialogs/dialog_bom_editor.cpp b/eeschema/dialogs/dialog_bom_editor.cpp index 75a999af9b..d590422034 100644 --- a/eeschema/dialogs/dialog_bom_editor.cpp +++ b/eeschema/dialogs/dialog_bom_editor.cpp @@ -259,12 +259,12 @@ void DIALOG_BOM_EDITOR::UpdateTitle() if( m_bom->GetColumnGrouping() ) { - title.Printf ( _( "Component table - %u components in %u groups" ), + title.Printf ( _( "Symbo Table - %u symbols in %u groups" ), m_bom->ComponentCount(), (unsigned int) m_bom->Groups.size() ); } else - title.Printf ( _( "Component table - %u components" ), + title.Printf ( _( "Symbol Table - %u components" ), m_bom->ComponentCount() ); unsigned int count = m_bom->CountChangedComponents(); @@ -426,7 +426,7 @@ void DIALOG_BOM_EDITOR::OnRevertFieldChanges( wxCommandEvent& event ) { if( m_bom->HaveFieldsChanged() ) { - if( IsOK( this, _( "Revert all component table changes?" ) ) ) + if( IsOK( this, _( "Revert all symbol table changes?" ) ) ) { m_bom->RevertFieldChanges(); Update(); diff --git a/eeschema/dialogs/dialog_bom_editor_base.cpp b/eeschema/dialogs/dialog_bom_editor_base.cpp index 8bf2ac2627..4554f4bd43 100644 --- a/eeschema/dialogs/dialog_bom_editor_base.cpp +++ b/eeschema/dialogs/dialog_bom_editor_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 19 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_bom_editor_base.h" @@ -34,13 +34,13 @@ DIALOG_BOM_EDITOR_BASE::DIALOG_BOM_EDITOR_BASE( wxWindow* parent, wxWindowID id, wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_leftPanel, wxID_ANY, _("Options") ), wxVERTICAL ); - m_groupComponentsBox = new wxCheckBox( sbSizer1->GetStaticBox(), OPT_GROUP_COMPONENTS, _("Group components"), wxDefaultPosition, wxDefaultSize, 0 ); + m_groupComponentsBox = new wxCheckBox( sbSizer1->GetStaticBox(), OPT_GROUP_COMPONENTS, _("Group symbols"), wxDefaultPosition, wxDefaultSize, 0 ); m_groupComponentsBox->SetValue(true); m_groupComponentsBox->SetToolTip( _("Group components together based on common properties") ); sbSizer1->Add( m_groupComponentsBox, 0, wxALL|wxEXPAND, 5 ); - m_regroupComponentsButton = new wxButton( sbSizer1->GetStaticBox(), wxID_ANY, _("Regroup components"), wxDefaultPosition, wxDefaultSize, 0 ); + m_regroupComponentsButton = new wxButton( sbSizer1->GetStaticBox(), wxID_ANY, _("Regroup symbols"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_regroupComponentsButton, 0, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_bom_editor_base.fbp b/eeschema/dialogs/dialog_bom_editor_base.fbp index 7d32d4fe80..3d16934ab8 100644 --- a/eeschema/dialogs/dialog_bom_editor_base.fbp +++ b/eeschema/dialogs/dialog_bom_editor_base.fbp @@ -399,7 +399,7 @@ 0 0 OPT_GROUP_COMPONENTS - Group components + Group symbols 0 @@ -487,7 +487,7 @@ 0 0 wxID_ANY - Regroup components + Regroup symbols 0 diff --git a/eeschema/dialogs/dialog_bom_editor_base.h b/eeschema/dialogs/dialog_bom_editor_base.h index c55812ef67..56ba5e855b 100644 --- a/eeschema/dialogs/dialog_bom_editor_base.h +++ b/eeschema/dialogs/dialog_bom_editor_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 19 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_BOM_EDITOR_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp index 02036b1888..04f8fea865 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp @@ -206,7 +206,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::OnOkClick( wxCommandEvent& event ) alias = component->GetAlias( m_Parent->GetAliasName() ); wxCHECK_RET( alias != NULL, - wxT( "Alias \"" ) + m_Parent->GetAliasName() + wxT( "\" of component \"" ) + + wxT( "Alias \"" ) + m_Parent->GetAliasName() + wxT( "\" of symbol \"" ) + component->GetName() + wxT( "\" does not exist." ) ); alias->SetDescription( m_DocCtrl->GetValue() ); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp index 25ed8cad7e..af3a100b83 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_edit_component_in_lib_base.h" @@ -28,7 +28,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_OptionsBoxSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelBasic, wxID_ANY, _("General") ), wxVERTICAL ); m_AsConvertButt = new wxCheckBox( m_OptionsBoxSizer->GetStaticBox(), wxID_ANY, _("Has alternate symbol (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_AsConvertButt->SetToolTip( _("Check this option if the component has an alternate body style (De Morgan)") ); + m_AsConvertButt->SetToolTip( _("Check this option if the symbol has an alternate body style (De Morgan)") ); m_OptionsBoxSizer->Add( m_AsConvertButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -64,7 +64,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_staticTextNbUnits = new wxStaticText( m_PanelBasic, wxID_ANY, _("Number of Units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNbUnits->Wrap( -1 ); - m_staticTextNbUnits->SetToolTip( _("Enter the number of units for a component that contains more than one unit") ); + m_staticTextNbUnits->SetToolTip( _("Enter the number of units for a symbol that contains more than one unit") ); bSizernbunits->Add( m_staticTextNbUnits, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -96,12 +96,12 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx bSizerBasicPanel->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); m_OptionPower = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Define as power symbol"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptionPower->SetToolTip( _("Check this option when the component is a power symbol") ); + m_OptionPower->SetToolTip( _("Check this option when the symbol is a power symbol") ); bSizerBasicPanel->Add( m_OptionPower, 0, wxALL, 5 ); m_OptionPartsLocked = new wxCheckBox( m_PanelBasic, wxID_ANY, _("All units are not interchangeable"), wxDefaultPosition, wxDefaultSize, 0 ); - m_OptionPartsLocked->SetToolTip( _("Check this option when creating multiple unit components and all units are not interchangeable") ); + m_OptionPartsLocked->SetToolTip( _("Check this option when creating multiple unit symbols and all units are not interchangeable") ); bSizerBasicPanel->Add( m_OptionPartsLocked, 0, wxALL, 5 ); @@ -121,27 +121,24 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_PanelDocBoxSizer->Add( m_staticTextDescription, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_DocCtrl = new wxTextCtrl( m_PanelDoc, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_DocCtrl->SetMaxLength( 0 ); m_PanelDocBoxSizer->Add( m_DocCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextKeywords->Wrap( -1 ); - m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this component.\nKey words cannot have spaces and are separated by a space.") ); + m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this symbol.\nKey words cannot have spaces and are separated by a space.") ); m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_KeywordsCtrl = new wxTextCtrl( m_PanelDoc, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_KeywordsCtrl->SetMaxLength( 0 ); m_PanelDocBoxSizer->Add( m_KeywordsCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticTextDocFileName = new wxStaticText( m_PanelDoc, wxID_ANY, _("Documentation File Name"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDocFileName->Wrap( -1 ); - m_staticTextDocFileName->SetToolTip( _("Enter the documentation file (a .pdf document) associated to the component.") ); + m_staticTextDocFileName->SetToolTip( _("Enter the documentation file (a .pdf document) associated with the symbol.") ); m_PanelDocBoxSizer->Add( m_staticTextDocFileName, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_DocfileCtrl = new wxTextCtrl( m_PanelDoc, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 400,-1 ), 0 ); - m_DocfileCtrl->SetMaxLength( 0 ); m_PanelDocBoxSizer->Add( m_DocfileCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizerPaneldocbutts; @@ -170,7 +167,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_staticTextAlias = new wxStaticText( m_PanelAlias, wxID_ANY, _("Alias List"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextAlias->Wrap( -1 ); - m_staticTextAlias->SetToolTip( _("An alias is a component that uses the body of its root component.\nIt has its own documentation and keywords.\nA fast way to extend a library with similar components") ); + m_staticTextAlias->SetToolTip( _("An alias is a symbol that uses the body of its root symbol.\nIt has its own documentation and keywords.\nA fast way to extend a library with similar symbols.") ); bLeftBoxSizerPanelAlias->Add( m_staticTextAlias, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -209,7 +206,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx m_staticTextFootprints = new wxStaticText( m_PanelFootprintFilter, wxID_ANY, _("Footprints"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextFootprints->Wrap( -1 ); - m_staticTextFootprints->SetToolTip( _("A list of footprints names that can be used for this component.\nFootprints names can used jockers.\n(like sm* to allow all footprints names starting by sm).") ); + m_staticTextFootprints->SetToolTip( _("A list of footprints names that can be used for this symbol.\nFootprints names can used wildcards like sm* to allow all footprints names starting by sm.") ); bFpFilterLeftBoxSizer->Add( m_staticTextFootprints, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp index 60e6dd6447..a3638a3ed5 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.fbp @@ -47,7 +47,7 @@ -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Library Component Properties + Library Symbol Properties @@ -277,6 +277,7 @@ m_OptionsBoxSizer wxVERTICAL + 1 none @@ -333,7 +334,7 @@ 0 - Check this option if the component has an alternate body style (De Morgan) + Check this option if the symbol has an alternate body style (De Morgan) wxFILTER_NONE wxDefaultValidator @@ -785,7 +786,7 @@ 0 - Enter the number of units for a component that contains more than one unit + Enter the number of units for a symbol that contains more than one unit @@ -1224,7 +1225,7 @@ 0 - Check this option when the component is a power symbol + Check this option when the symbol is a power symbol wxFILTER_NONE wxDefaultValidator @@ -1312,7 +1313,7 @@ 0 - Check this option when creating multiple unit components and all units are not interchangeable + Check this option when creating multiple unit symbols and all units are not interchangeable wxFILTER_NONE wxDefaultValidator @@ -1659,7 +1660,7 @@ 0 - Enter key words that can be used to select this component. Key words cannot have spaces and are separated by a space. + Enter key words that can be used to select this symbol. Key words cannot have spaces and are separated by a space. @@ -1833,7 +1834,7 @@ 0 - Enter the documentation file (a .pdf document) associated to the component. + Enter the documentation file (a .pdf document) associated with the symbol. @@ -2289,7 +2290,7 @@ 0 - An alias is a component that uses the body of its root component. It has its own documentation and keywords. A fast way to extend a library with similar components + An alias is a symbol that uses the body of its root symbol. It has its own documentation and keywords. A fast way to extend a library with similar symbols. @@ -2832,7 +2833,7 @@ 0 - A list of footprints names that can be used for this component. Footprints names can used jockers. (like sm* to allow all footprints names starting by sm). + A list of footprints names that can be used for this symbol. Footprints names can used wildcards like sm* to allow all footprints names starting by sm. diff --git a/eeschema/dialogs/dialog_edit_component_in_lib_base.h b/eeschema/dialogs/dialog_edit_component_in_lib_base.h index 8baeff2431..8eb0b6c1e8 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_component_in_lib_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_EDIT_COMPONENT_IN_LIB_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -112,7 +110,7 @@ class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public DIALOG_SHIM public: - DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Library Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Library Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE(); }; diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp index 570122f248..28f669fc43 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_edit_component_in_schematic_fbp.h" @@ -49,7 +49,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( int orientationRadioBoxNChoices = sizeof( orientationRadioBoxChoices ) / sizeof( wxString ); orientationRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Orientation (degrees):"), wxDefaultPosition, wxDefaultSize, orientationRadioBoxNChoices, orientationRadioBoxChoices, 1, wxRA_SPECIFY_COLS ); orientationRadioBox->SetSelection( 0 ); - orientationRadioBox->SetToolTip( _("Select if the component is to be rotated when drawn") ); + orientationRadioBox->SetToolTip( _("Select if the symbol is to be rotated when drawn") ); optionsSizer->Add( orientationRadioBox, 0, wxEXPAND|wxALL, 5 ); @@ -57,12 +57,12 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( int mirrorRadioBoxNChoices = sizeof( mirrorRadioBoxChoices ) / sizeof( wxString ); mirrorRadioBox = new wxRadioBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Position:"), wxDefaultPosition, wxDefaultSize, mirrorRadioBoxNChoices, mirrorRadioBoxChoices, 1, wxRA_SPECIFY_COLS ); mirrorRadioBox->SetSelection( 0 ); - mirrorRadioBox->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") ); + mirrorRadioBox->SetToolTip( _("Pick the graphical transformation to be used when displaying the symbol") ); optionsSizer->Add( mirrorRadioBox, 0, wxALL|wxEXPAND, 5 ); convertCheckBox = new wxCheckBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Convert Shape"), wxDefaultPosition, wxDefaultSize, 0 ); - convertCheckBox->SetToolTip( _("Use the alternate shape of this component.\nFor gates, this is the \"De Morgan\" conversion") ); + convertCheckBox->SetToolTip( _("Use the alternate shape of this symbol.\nFor gates, this is the \"De Morgan\" conversion") ); optionsSizer->Add( convertCheckBox, 0, wxALL, 5 ); @@ -70,7 +70,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( sbSizerChipName = new wxStaticBoxSizer( new wxStaticBox( optionsSizer->GetStaticBox(), wxID_ANY, _("Component Name:") ), wxVERTICAL ); chipnameTextCtrl = new wxTextCtrl( sbSizerChipName->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - chipnameTextCtrl->SetToolTip( _("Name of the symbol in the library from which this component come from") ); + chipnameTextCtrl->SetToolTip( _("Name of the symbol in the library to which this symbol is linked") ); sbSizerChipName->Add( chipnameTextCtrl, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -94,7 +94,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( optionsSizer->Add( m_staticTextTimeStamp, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_textCtrlTimeStamp = new wxTextCtrl( optionsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - m_textCtrlTimeStamp->SetToolTip( _("Unique ID that identifies the component") ); + m_textCtrlTimeStamp->SetToolTip( _("Unique ID that identifies the symbol") ); optionsSizer->Add( m_textCtrlTimeStamp, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); @@ -105,7 +105,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( optionsSizer->Add( spiceFieldsButton, 0, wxALL|wxEXPAND, 5 ); resetFieldsStyleButton = new wxButton( optionsSizer->GetStaticBox(), wxID_ANY, _("Reset Field Properties"), wxDefaultPosition, wxDefaultSize, 0 ); - resetFieldsStyleButton->SetToolTip( _("Set position and style of fields and component orientation to default library value.\nField values are not modified.") ); + resetFieldsStyleButton->SetToolTip( _("Set position and style of fields and symbol orientation to default library value.\nField values are not modified.") ); optionsSizer->Add( resetFieldsStyleButton, 0, wxALL|wxEXPAND, 5 ); @@ -307,6 +307,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( this->SetSizer( mainSizer ); this->Layout(); + mainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::OnCloseDialog ) ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp index 05650a1fa1..8aaad491e2 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp @@ -44,10 +44,10 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP - 928,794 + -1,-1 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h - Component Properties + Symbol Properties @@ -519,7 +519,7 @@ wxRA_SPECIFY_COLS 0 - Select if the component is to be rotated when drawn + Select if the symbol is to be rotated when drawn wxFILTER_NONE wxDefaultValidator @@ -609,7 +609,7 @@ wxRA_SPECIFY_COLS 0 - Pick the graphical transformation to be used when displaying the component, if any + Pick the graphical transformation to be used when displaying the symbol wxFILTER_NONE wxDefaultValidator @@ -697,7 +697,7 @@ 0 - Use the alternate shape of this component. For gates, this is the "De Morgan" conversion + Use the alternate shape of this symbol. For gates, this is the "De Morgan" conversion wxFILTER_NONE wxDefaultValidator @@ -797,7 +797,7 @@ 0 - Name of the symbol in the library from which this component come from + Name of the symbol in the library to which this symbol is linked wxFILTER_NONE wxDefaultValidator @@ -1160,7 +1160,7 @@ wxTE_READONLY 0 - Unique ID that identifies the component + Unique ID that identifies the symbol wxFILTER_NONE wxDefaultValidator @@ -1421,7 +1421,7 @@ 0 - Set position and style of fields and component orientation to default library value. Field values are not modified. + Set position and style of fields and symbol orientation to default library value. Field values are not modified. wxFILTER_NONE wxDefaultValidator diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h index 52f461349d..fa252fb710 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_fbp.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -111,7 +109,7 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public DIALOG_SHIM public: - DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 928,794 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); + DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(); }; diff --git a/eeschema/dialogs/dialog_edit_components_libid.cpp b/eeschema/dialogs/dialog_edit_components_libid.cpp index 76a64689d3..9fd8f12b02 100644 --- a/eeschema/dialogs/dialog_edit_components_libid.cpp +++ b/eeschema/dialogs/dialog_edit_components_libid.cpp @@ -311,6 +311,7 @@ void DIALOG_EDIT_COMPONENTS_LIBID::initDlg() m_grid->SetSelectionMode( wxGrid::wxGridSelectRows ); m_buttonOrphanItems->Enable( m_OrphansRowIndexes.size() > 0 ); + Layout(); } @@ -616,4 +617,4 @@ bool InvokeDialogEditComponentsLibId( SCH_EDIT_FRAME* aCaller ) dlg.ShowModal(); return dlg.IsSchematicModified(); -} \ No newline at end of file +} diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.cpp b/eeschema/dialogs/dialog_edit_components_libid_base.cpp index 89451f0398..b07f055be1 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.cpp +++ b/eeschema/dialogs/dialog_edit_components_libid_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 2 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_edit_components_libid_base.h" @@ -23,25 +23,26 @@ DIALOG_EDIT_COMPONENTS_LIBID_BASE::DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* m_grid = new wxGrid( m_panelGrid, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); // Grid - m_grid->CreateGrid( 1, 3 ); + m_grid->CreateGrid( 5, 3 ); m_grid->EnableEditing( true ); m_grid->EnableGridLines( true ); m_grid->EnableDragGridSize( false ); m_grid->SetMargins( 0, 0 ); // Columns - m_grid->SetColSize( 0, 500 ); - m_grid->SetColSize( 1, 100 ); - m_grid->SetColSize( 2, 100 ); + m_grid->SetColSize( 0, 300 ); + m_grid->SetColSize( 1, 200 ); + m_grid->SetColSize( 2, 200 ); m_grid->EnableDragColMove( false ); m_grid->EnableDragColSize( true ); m_grid->SetColLabelSize( 30 ); - m_grid->SetColLabelValue( 0, _("Components") ); + m_grid->SetColLabelValue( 0, _("Symbols") ); m_grid->SetColLabelValue( 1, _("Current Symbol") ); m_grid->SetColLabelValue( 2, _("New Symbol") ); m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); // Rows + m_grid->AutoSizeRows(); m_grid->EnableDragRowSize( true ); m_grid->SetRowLabelSize( 30 ); m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); @@ -106,6 +107,7 @@ DIALOG_EDIT_COMPONENTS_LIBID_BASE::DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.fbp b/eeschema/dialogs/dialog_edit_components_libid_base.fbp index 2ddd6d935b..76eb012af6 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.fbp +++ b/eeschema/dialogs/dialog_edit_components_libid_base.fbp @@ -44,10 +44,10 @@ DIALOG_EDIT_COMPONENTS_LIBID_BASE - 766,311 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Edit Components Links to Symbols in Libraries + Edit Symbol Library Associations @@ -176,11 +176,11 @@ bSizerGrid wxVERTICAL none - + 5 wxALL|wxEXPAND 1 - + 1 1 1 @@ -190,7 +190,7 @@ 0 - 0 + 1 @@ -204,10 +204,10 @@ 1 wxALIGN_CENTRE 30 - "Components" "Current Symbol" "New Symbol" + "Symbols" "Current Symbol" "New Symbol" wxALIGN_CENTRE 3 - 500,100,100 + 300,200,200 1 0 @@ -253,7 +253,7 @@ wxALIGN_CENTRE - 1 + 5 1 @@ -412,11 +412,11 @@ bSizerMsgWarning wxVERTICAL none - + 5 wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 diff --git a/eeschema/dialogs/dialog_edit_components_libid_base.h b/eeschema/dialogs/dialog_edit_components_libid_base.h index 3a9b951266..90c4434afb 100644 --- a/eeschema/dialogs/dialog_edit_components_libid_base.h +++ b/eeschema/dialogs/dialog_edit_components_libid_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 2 2017) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_EDIT_COMPONENTS_LIBID_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -63,7 +61,7 @@ class DIALOG_EDIT_COMPONENTS_LIBID_BASE : public DIALOG_SHIM public: - DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Components Links to Symbols in Libraries"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 766,311 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EDIT_COMPONENTS_LIBID_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Edit Symbol Library Associations"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EDIT_COMPONENTS_LIBID_BASE(); }; diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp index 5745832d1d..a7edef1897 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp @@ -1,245 +1,245 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_edit_libentry_fields_in_lib_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* mainSizer; - mainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizerFieldsSetup; - bSizerFieldsSetup = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizerFiledsList; - bSizerFiledsList = new wxBoxSizer( wxVERTICAL ); - - fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES ); - bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); - - wxBoxSizer* bSizer8; - bSizer8 = new wxBoxSizer( wxHORIZONTAL ); - - moveUpButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - moveUpButton->SetToolTip( _("Move the selected optional field up one position") ); - - bSizer8->Add( moveUpButton, 0, wxALL, 5 ); - - moveDownButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - moveDownButton->SetToolTip( _("Move the selected optional field down one position") ); - - bSizer8->Add( moveDownButton, 0, wxALL, 5 ); - - - bSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - - deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - deleteFieldButton->SetToolTip( _("Delete one of the optional fields") ); - - bSizer8->Add( deleteFieldButton, 0, wxALL, 5 ); - - addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - addFieldButton->SetToolTip( _("Add a new custom field") ); - - bSizer8->Add( addFieldButton, 0, wxALL, 5 ); - - - bSizerFiledsList->Add( bSizer8, 0, wxEXPAND, 5 ); - - m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerFiledsList->Add( m_spiceFieldsButton, 0, wxALL|wxEXPAND, 5 ); - - - bSizerFieldsSetup->Add( bSizerFiledsList, 3, wxEXPAND, 5 ); - - wxBoxSizer* fieldEditBoxSizer; - fieldEditBoxSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizerJustify; - bSizerJustify = new wxBoxSizer( wxHORIZONTAL ); - - wxString m_FieldHJustifyCtrlChoices[] = { _("Left"), _("Center"), _("Right") }; - int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString ); - m_FieldHJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS ); - m_FieldHJustifyCtrl->SetSelection( 1 ); - m_FieldHJustifyCtrl->SetToolTip( _("Select if the component is to be rotated when drawn") ); - - bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxEXPAND|wxALL, 5 ); - - wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") }; - int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString ); - m_FieldVJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS ); - m_FieldVJustifyCtrl->SetSelection( 0 ); - m_FieldVJustifyCtrl->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") ); - - bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxEXPAND|wxALL, 5 ); - - - fieldEditBoxSizer->Add( bSizerJustify, 1, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* bSizerAspect; - bSizerAspect = new wxBoxSizer( wxHORIZONTAL ); - - wxStaticBoxSizer* visibilitySizer; - visibilitySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Visibility") ), wxVERTICAL ); - - showCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 ); - showCheckBox->SetToolTip( _("Check if you want this field visible") ); - - visibilitySizer->Add( showCheckBox, 0, wxALL, 5 ); - - rotateCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 ); - rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") ); - - visibilitySizer->Add( rotateCheckBox, 0, wxALL, 5 ); - - - bSizerAspect->Add( visibilitySizer, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - wxString m_StyleRadioBoxChoices[] = { _("Normal"), _("Italic"), _("Bold"), _("Bold Italic") }; - int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString ); - m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS ); - m_StyleRadioBox->SetSelection( 0 ); - bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - - fieldEditBoxSizer->Add( bSizerAspect, 1, wxALL|wxEXPAND|wxTOP, 5 ); - - wxBoxSizer* fieldNameBoxSizer; - fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL ); - - fieldNameLabel = new wxStaticText( this, wxID_ANY, _("Field Name"), wxDefaultPosition, wxDefaultSize, 0 ); - fieldNameLabel->Wrap( -1 ); - fieldNameBoxSizer->Add( fieldNameLabel, 0, 0, 5 ); - - fieldNameTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fieldNameTextCtrl->SetToolTip( _("The text (or value) of the currently selected field") ); - - fieldNameBoxSizer->Add( fieldNameTextCtrl, 0, wxBOTTOM|wxEXPAND, 5 ); - - fieldValueLabel = new wxStaticText( this, wxID_ANY, _("Field Value"), wxDefaultPosition, wxDefaultSize, 0 ); - fieldValueLabel->Wrap( -1 ); - fieldNameBoxSizer->Add( fieldValueLabel, 0, wxTOP, 5 ); - - fieldValueTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fieldValueTextCtrl->SetToolTip( _("The text (or value) of the currently selected field") ); - - fieldNameBoxSizer->Add( fieldValueTextCtrl, 0, wxBOTTOM|wxEXPAND, 5 ); - - m_show_datasheet_button = new wxButton( this, wxID_ANY, _("Show in Browser"), wxDefaultPosition, wxDefaultSize, 0 ); - m_show_datasheet_button->SetToolTip( _("If your datasheet is given as an http:// link, then pressing this button should bring it up in your webbrowser.") ); - - fieldNameBoxSizer->Add( m_show_datasheet_button, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); - - - fieldEditBoxSizer->Add( fieldNameBoxSizer, 0, wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* fgSizerPosSize; - fgSizerPosSize = new wxFlexGridSizer( 3, 3, 5, 5 ); - fgSizerPosSize->AddGrowableCol( 1 ); - fgSizerPosSize->SetFlexibleDirection( wxBOTH ); - fgSizerPosSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - textSizeLabel = new wxStaticText( this, wxID_ANY, _("Size"), wxDefaultPosition, wxDefaultSize, 0 ); - textSizeLabel->Wrap( -1 ); - fgSizerPosSize->Add( textSizeLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - textSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - textSizeTextCtrl->SetToolTip( _("The vertical height of the currently selected field's text in the schematic") ); - - fgSizerPosSize->Add( textSizeTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextUnitSize = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextUnitSize->Wrap( -1 ); - fgSizerPosSize->Add( m_staticTextUnitSize, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - posXLabel = new wxStaticText( this, wxID_ANY, _("X Position"), wxDefaultPosition, wxDefaultSize, 0 ); - posXLabel->Wrap( -1 ); - fgSizerPosSize->Add( posXLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - posXTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerPosSize->Add( posXTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextUnitPosX = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextUnitPosX->Wrap( -1 ); - fgSizerPosSize->Add( m_staticTextUnitPosX, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - posYLabel = new wxStaticText( this, wxID_ANY, _("Y Position"), wxDefaultPosition, wxDefaultSize, 0 ); - posYLabel->Wrap( -1 ); - fgSizerPosSize->Add( posYLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - posYTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - posYTextCtrl->SetToolTip( _("The Y coordinate of the text relative to the component") ); - - fgSizerPosSize->Add( posYTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - - m_staticTextUnitPosY = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextUnitPosY->Wrap( -1 ); - fgSizerPosSize->Add( m_staticTextUnitPosY, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - fieldEditBoxSizer->Add( fgSizerPosSize, 1, wxALL|wxEXPAND, 5 ); - - - bSizerFieldsSetup->Add( fieldEditBoxSizer, 2, wxEXPAND, 5 ); - - - mainSizer->Add( bSizerFieldsSetup, 1, wxEXPAND, 5 ); - - m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - stdDialogButtonSizer = new wxStdDialogButtonSizer(); - stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); - stdDialogButtonSizer->AddButton( stdDialogButtonSizerOK ); - stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL ); - stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel ); - stdDialogButtonSizer->Realize(); - - mainSizer->Add( stdDialogButtonSizer, 0, wxALL|wxEXPAND, 6 ); - - - this->SetSizer( mainSizer ); - this->Layout(); - mainSizer->Fit( this ); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) ); - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); - fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); - fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); - moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); - moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this ); - deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this ); - addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this ); - m_spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); - m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); - stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); - stdDialogButtonSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnOKButtonClick ), NULL, this ); -} - -DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) ); - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); - fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); - fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); - moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); - moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this ); - deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this ); - addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this ); - m_spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); - m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); - stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); - stdDialogButtonSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnOKButtonClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Nov 22 2017) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_edit_libentry_fields_in_lib_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* mainSizer; + mainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerFieldsSetup; + bSizerFieldsSetup = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizerFiledsList; + bSizerFiledsList = new wxBoxSizer( wxVERTICAL ); + + fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES ); + bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); + + wxBoxSizer* bSizer8; + bSizer8 = new wxBoxSizer( wxHORIZONTAL ); + + moveUpButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + moveUpButton->SetToolTip( _("Move the selected optional field up one position") ); + + bSizer8->Add( moveUpButton, 0, wxALL, 5 ); + + moveDownButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + moveDownButton->SetToolTip( _("Move the selected optional field down one position") ); + + bSizer8->Add( moveDownButton, 0, wxALL, 5 ); + + + bSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); + + deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + deleteFieldButton->SetToolTip( _("Delete one of the optional fields") ); + + bSizer8->Add( deleteFieldButton, 0, wxALL, 5 ); + + addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + addFieldButton->SetToolTip( _("Add a new custom field") ); + + bSizer8->Add( addFieldButton, 0, wxALL, 5 ); + + + bSizerFiledsList->Add( bSizer8, 0, wxEXPAND, 5 ); + + m_spiceFieldsButton = new wxButton( this, wxID_ANY, _("Edit Spice model"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerFiledsList->Add( m_spiceFieldsButton, 0, wxALL|wxEXPAND, 5 ); + + + bSizerFieldsSetup->Add( bSizerFiledsList, 3, wxEXPAND, 5 ); + + wxBoxSizer* fieldEditBoxSizer; + fieldEditBoxSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bSizerJustify; + bSizerJustify = new wxBoxSizer( wxHORIZONTAL ); + + wxString m_FieldHJustifyCtrlChoices[] = { _("Left"), _("Center"), _("Right") }; + int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString ); + m_FieldHJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_FieldHJustifyCtrl->SetSelection( 1 ); + m_FieldHJustifyCtrl->SetToolTip( _("Select if the symbol is to be rotated when drawn") ); + + bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxEXPAND|wxALL, 5 ); + + wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") }; + int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString ); + m_FieldVJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS ); + m_FieldVJustifyCtrl->SetSelection( 0 ); + m_FieldVJustifyCtrl->SetToolTip( _("Pick the graphical transformation to be used when displaying the symbol") ); + + bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxEXPAND|wxALL, 5 ); + + + fieldEditBoxSizer->Add( bSizerJustify, 1, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* bSizerAspect; + bSizerAspect = new wxBoxSizer( wxHORIZONTAL ); + + wxStaticBoxSizer* visibilitySizer; + visibilitySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Visibility") ), wxVERTICAL ); + + showCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 ); + showCheckBox->SetToolTip( _("Check if you want this field visible") ); + + visibilitySizer->Add( showCheckBox, 0, wxALL, 5 ); + + rotateCheckBox = new wxCheckBox( visibilitySizer->GetStaticBox(), wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 ); + rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") ); + + visibilitySizer->Add( rotateCheckBox, 0, wxALL, 5 ); + + + bSizerAspect->Add( visibilitySizer, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + + wxString m_StyleRadioBoxChoices[] = { _("Normal"), _("Italic"), _("Bold"), _("Bold Italic") }; + int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString ); + m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS ); + m_StyleRadioBox->SetSelection( 0 ); + bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + + + fieldEditBoxSizer->Add( bSizerAspect, 1, wxALL|wxEXPAND|wxTOP, 5 ); + + wxBoxSizer* fieldNameBoxSizer; + fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL ); + + fieldNameLabel = new wxStaticText( this, wxID_ANY, _("Field Name"), wxDefaultPosition, wxDefaultSize, 0 ); + fieldNameLabel->Wrap( -1 ); + fieldNameBoxSizer->Add( fieldNameLabel, 0, 0, 5 ); + + fieldNameTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fieldNameTextCtrl->SetToolTip( _("The text (or value) of the currently selected field") ); + + fieldNameBoxSizer->Add( fieldNameTextCtrl, 0, wxBOTTOM|wxEXPAND, 5 ); + + fieldValueLabel = new wxStaticText( this, wxID_ANY, _("Field Value"), wxDefaultPosition, wxDefaultSize, 0 ); + fieldValueLabel->Wrap( -1 ); + fieldNameBoxSizer->Add( fieldValueLabel, 0, wxTOP, 5 ); + + fieldValueTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fieldValueTextCtrl->SetToolTip( _("The text (or value) of the currently selected field") ); + + fieldNameBoxSizer->Add( fieldValueTextCtrl, 0, wxBOTTOM|wxEXPAND, 5 ); + + m_show_datasheet_button = new wxButton( this, wxID_ANY, _("Show in Browser"), wxDefaultPosition, wxDefaultSize, 0 ); + m_show_datasheet_button->SetToolTip( _("If your datasheet is given as an http:// link, then pressing this button should bring it up in your webbrowser.") ); + + fieldNameBoxSizer->Add( m_show_datasheet_button, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 ); + + + fieldEditBoxSizer->Add( fieldNameBoxSizer, 0, wxALL|wxEXPAND, 5 ); + + wxFlexGridSizer* fgSizerPosSize; + fgSizerPosSize = new wxFlexGridSizer( 3, 3, 5, 5 ); + fgSizerPosSize->AddGrowableCol( 1 ); + fgSizerPosSize->SetFlexibleDirection( wxBOTH ); + fgSizerPosSize->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + textSizeLabel = new wxStaticText( this, wxID_ANY, _("Size"), wxDefaultPosition, wxDefaultSize, 0 ); + textSizeLabel->Wrap( -1 ); + fgSizerPosSize->Add( textSizeLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + textSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + textSizeTextCtrl->SetToolTip( _("The vertical height of the currently selected field's text in the schematic") ); + + fgSizerPosSize->Add( textSizeTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextUnitSize = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextUnitSize->Wrap( -1 ); + fgSizerPosSize->Add( m_staticTextUnitSize, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + posXLabel = new wxStaticText( this, wxID_ANY, _("X Position"), wxDefaultPosition, wxDefaultSize, 0 ); + posXLabel->Wrap( -1 ); + fgSizerPosSize->Add( posXLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + posXTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerPosSize->Add( posXTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextUnitPosX = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextUnitPosX->Wrap( -1 ); + fgSizerPosSize->Add( m_staticTextUnitPosX, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + posYLabel = new wxStaticText( this, wxID_ANY, _("Y Position"), wxDefaultPosition, wxDefaultSize, 0 ); + posYLabel->Wrap( -1 ); + fgSizerPosSize->Add( posYLabel, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + posYTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + posYTextCtrl->SetToolTip( _("The Y coordinate of the text relative to the symbol anchor position") ); + + fgSizerPosSize->Add( posYTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_staticTextUnitPosY = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextUnitPosY->Wrap( -1 ); + fgSizerPosSize->Add( m_staticTextUnitPosY, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + + fieldEditBoxSizer->Add( fgSizerPosSize, 1, wxALL|wxEXPAND, 5 ); + + + bSizerFieldsSetup->Add( fieldEditBoxSizer, 2, wxEXPAND, 5 ); + + + mainSizer->Add( bSizerFieldsSetup, 1, wxEXPAND, 5 ); + + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); + mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + stdDialogButtonSizer = new wxStdDialogButtonSizer(); + stdDialogButtonSizerOK = new wxButton( this, wxID_OK ); + stdDialogButtonSizer->AddButton( stdDialogButtonSizerOK ); + stdDialogButtonSizerCancel = new wxButton( this, wxID_CANCEL ); + stdDialogButtonSizer->AddButton( stdDialogButtonSizerCancel ); + stdDialogButtonSizer->Realize(); + + mainSizer->Add( stdDialogButtonSizer, 0, wxALL|wxEXPAND, 6 ); + + + this->SetSizer( mainSizer ); + this->Layout(); + mainSizer->Fit( this ); + + // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) ); + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); + fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); + fieldListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); + moveUpButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); + moveDownButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this ); + deleteFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this ); + addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this ); + m_spiceFieldsButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); + m_show_datasheet_button->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); + stdDialogButtonSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); + stdDialogButtonSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnOKButtonClick ), NULL, this ); +} + +DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE() +{ + // Disconnect Events + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) ); + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnInitDialog ) ); + fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemDeselected ), NULL, this ); + fieldListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnListItemSelected ), NULL, this ); + moveUpButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveUpButtonHandler ), NULL, this ); + moveDownButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::moveDownButtonHandler ), NULL, this ); + deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::deleteFieldButtonHandler ), NULL, this ); + addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::addFieldButtonHandler ), NULL, this ); + m_spiceFieldsButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::EditSpiceModel ), NULL, this ); + m_show_datasheet_button->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::showButtonHandler ), NULL, this ); + stdDialogButtonSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCancelButtonClick ), NULL, this ); + stdDialogButtonSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnOKButtonClick ), NULL, this ); + +} diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp index ed1fb5d7a9..7df8a132ea 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp @@ -1,2544 +1,2544 @@ - - - - - ; - C++ - 1 - source_name - 0 - 0 - res - ANSI - connect - dialog_edit_libentry_fields_in_lib_base - 1000 - none - 1 - DialogEditLibentryFields_in_lib_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE - - -1,-1 - wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU - DIALOG_SHIM; dialog_shim.h - Field Properties - - - - - - - - - - - - - - OnCloseDialog - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - mainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bSizerFieldsSetup - wxHORIZONTAL - none - - 5 - wxEXPAND - 3 - - - bSizerFiledsList - wxVERTICAL - none - - 6 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - fieldListCtrl - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnListItemDeselected - - - - OnListItemSelected - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer8 - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - moveUpButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - - 0 - Move the selected optional field up one position - - wxFILTER_NONE - wxDefaultValidator - - - - - moveUpButtonHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - moveDownButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - - 0 - Move the selected optional field down one position - - wxFILTER_NONE - wxDefaultValidator - - - - - moveDownButtonHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - deleteFieldButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - - 0 - Delete one of the optional fields - - wxFILTER_NONE - wxDefaultValidator - - - - - deleteFieldButtonHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - - wxID_ANY - MyButton - - 0 - - - 0 - - 1 - addFieldButton - 1 - - - protected - 1 - - Resizable - - 1 - - wxBU_AUTODRAW - - 0 - Add a new custom field - - wxFILTER_NONE - wxDefaultValidator - - - - - addFieldButtonHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Edit Spice model - - 0 - - - 0 - - 1 - m_spiceFieldsButton - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - EditSpiceModel - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 2 - - - fieldEditBoxSizer - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - - bSizerJustify - wxHORIZONTAL - none - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Left" "Center" "Right" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Horiz. Justify - 1 - - 0 - - - 0 - - 1 - m_FieldHJustifyCtrl - 1 - - - protected - 1 - - Resizable - 1 - 1 - - wxRA_SPECIFY_COLS - - 0 - Select if the component is to be rotated when drawn - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Bottom" "Center" "Top" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Vert. Justify - 1 - - 0 - - - 0 - - 1 - m_FieldVJustifyCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - Pick the graphical transformation to be used when displaying the component, if any - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND|wxTOP - 1 - - - bSizerAspect - wxHORIZONTAL - none - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - wxID_ANY - Visibility - - visibilitySizer - wxVERTICAL - 1 - none - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show - - 0 - - - 0 - - 1 - showCheckBox - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Check if you want this field visible - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Rotate - - 0 - - - 0 - - 1 - rotateCheckBox - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Check if you want this field's text rotated 90 degrees - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Normal" "Italic" "Bold" "Bold Italic" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Style: - 1 - - 0 - - - 0 - - 1 - m_StyleRadioBox - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - - fieldNameBoxSizer - wxVERTICAL - none - - 5 - - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Field Name - - 0 - - - 0 - - 1 - fieldNameLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - fieldNameTextCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The text (or value) of the currently selected field - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Field Value - - 0 - - - 0 - - 1 - fieldValueLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - fieldValueTextCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The text (or value) of the currently selected field - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show in Browser - - 0 - - - 0 - - 1 - m_show_datasheet_button - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - If your datasheet is given as an http:// link, then pressing this button should bring it up in your webbrowser. - - wxFILTER_NONE - wxDefaultValidator - - - - - showButtonHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 1 - - 3 - wxBOTH - 1 - - 5 - - fgSizerPosSize - wxFLEX_GROWMODE_SPECIFIED - none - 3 - 5 - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Size - - 0 - - - 0 - - 1 - textSizeLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - textSizeTextCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The vertical height of the currently selected field's text in the schematic - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - - 0 - - - 0 - - 1 - m_staticTextUnitSize - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - X Position - - 0 - - - 0 - - 1 - posXLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - posXTextCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - - 0 - - - 0 - - 1 - m_staticTextUnitPosX - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Y Position - - 0 - - - 0 - - 1 - posYLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - posYTextCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The Y coordinate of the text relative to the component - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - unit - - 0 - - - 0 - - 1 - m_staticTextUnitPosY - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6 - wxALL|wxEXPAND - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - stdDialogButtonSizer - protected - - OnCancelButtonClick - - - - OnOKButtonClick - - - - - - - - + + + + + ; + C++ + 1 + source_name + 0 + 0 + res + ANSI + connect + dialog_edit_libentry_fields_in_lib_base + 1000 + none + 1 + DialogEditLibentryFields_in_lib_base + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE + + -1,-1 + wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU + DIALOG_SHIM; dialog_shim.h + Field Properties + + + + + + + + + + + + + + OnCloseDialog + + + + + + OnInitDialog + + + + + + + + + + + + + + + + + + + + + + + mainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizerFieldsSetup + wxHORIZONTAL + none + + 5 + wxEXPAND + 3 + + + bSizerFiledsList + wxVERTICAL + none + + 6 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + fieldListCtrl + 1 + + + protected + 1 + + Resizable + 1 + + wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnListItemDeselected + + + + OnListItemSelected + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + + bSizer8 + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + MyButton + + 0 + + + 0 + + 1 + moveUpButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + + 0 + Move the selected optional field up one position + + wxFILTER_NONE + wxDefaultValidator + + + + + moveUpButtonHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + MyButton + + 0 + + + 0 + + 1 + moveDownButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + + 0 + Move the selected optional field down one position + + wxFILTER_NONE + wxDefaultValidator + + + + + moveDownButtonHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + MyButton + + 0 + + + 0 + + 1 + deleteFieldButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + + 0 + Delete one of the optional fields + + wxFILTER_NONE + wxDefaultValidator + + + + + deleteFieldButtonHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + + Dock + 0 + Left + 1 + + 1 + + + 0 + 0 + + wxID_ANY + MyButton + + 0 + + + 0 + + 1 + addFieldButton + 1 + + + protected + 1 + + Resizable + + 1 + + wxBU_AUTODRAW + + 0 + Add a new custom field + + wxFILTER_NONE + wxDefaultValidator + + + + + addFieldButtonHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Edit Spice model + + 0 + + + 0 + + 1 + m_spiceFieldsButton + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + EditSpiceModel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 2 + + + fieldEditBoxSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + + bSizerJustify + wxHORIZONTAL + none + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Left" "Center" "Right" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Horiz. Justify + 1 + + 0 + + + 0 + + 1 + m_FieldHJustifyCtrl + 1 + + + protected + 1 + + Resizable + 1 + 1 + + wxRA_SPECIFY_COLS + + 0 + Select if the symbol is to be rotated when drawn + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Bottom" "Center" "Top" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Vert. Justify + 1 + + 0 + + + 0 + + 1 + m_FieldVJustifyCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + Pick the graphical transformation to be used when displaying the symbol + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND|wxTOP + 1 + + + bSizerAspect + wxHORIZONTAL + none + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + wxID_ANY + Visibility + + visibilitySizer + wxVERTICAL + 1 + none + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show + + 0 + + + 0 + + 1 + showCheckBox + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Check if you want this field visible + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Rotate + + 0 + + + 0 + + 1 + rotateCheckBox + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Check if you want this field's text rotated 90 degrees + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Normal" "Italic" "Bold" "Bold Italic" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Style + 1 + + 0 + + + 0 + + 1 + m_StyleRadioBox + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxRA_SPECIFY_COLS + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + fieldNameBoxSizer + wxVERTICAL + none + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Field Name + + 0 + + + 0 + + 1 + fieldNameLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + fieldNameTextCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + The text (or value) of the currently selected field + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Field Value + + 0 + + + 0 + + 1 + fieldValueLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + fieldValueTextCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + The text (or value) of the currently selected field + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND|wxTOP + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show in Browser + + 0 + + + 0 + + 1 + m_show_datasheet_button + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + If your datasheet is given as an http:// link, then pressing this button should bring it up in your webbrowser. + + wxFILTER_NONE + wxDefaultValidator + + + + + showButtonHandler + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + 3 + wxBOTH + 1 + + 5 + + fgSizerPosSize + wxFLEX_GROWMODE_SPECIFIED + none + 3 + 5 + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Size + + 0 + + + 0 + + 1 + textSizeLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + textSizeTextCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + The vertical height of the currently selected field's text in the schematic + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + unit + + 0 + + + 0 + + 1 + m_staticTextUnitSize + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + X Position + + 0 + + + 0 + + 1 + posXLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + posXTextCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + unit + + 0 + + + 0 + + 1 + m_staticTextUnitPosX + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Y Position + + 0 + + + 0 + + 1 + posYLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + posYTextCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + The Y coordinate of the text relative to the symbol anchor position + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + unit + + 0 + + + 0 + + 1 + m_staticTextUnitPosY + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + wxALL|wxEXPAND + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + stdDialogButtonSizer + protected + + OnCancelButtonClick + + + + OnOKButtonClick + + + + + + + + diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h index e8fc80a57a..745505deeb 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.h @@ -1,100 +1,98 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 4 2017) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ -#define __DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ - -#include -#include -#include -class DIALOG_SHIM; - -#include "dialog_shim.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxListCtrl* fieldListCtrl; - wxBitmapButton* moveUpButton; - wxBitmapButton* moveDownButton; - wxBitmapButton* deleteFieldButton; - wxBitmapButton* addFieldButton; - wxButton* m_spiceFieldsButton; - wxRadioBox* m_FieldHJustifyCtrl; - wxRadioBox* m_FieldVJustifyCtrl; - wxCheckBox* showCheckBox; - wxCheckBox* rotateCheckBox; - wxRadioBox* m_StyleRadioBox; - wxStaticText* fieldNameLabel; - wxTextCtrl* fieldNameTextCtrl; - wxStaticText* fieldValueLabel; - wxTextCtrl* fieldValueTextCtrl; - wxButton* m_show_datasheet_button; - wxStaticText* textSizeLabel; - wxTextCtrl* textSizeTextCtrl; - wxStaticText* m_staticTextUnitSize; - wxStaticText* posXLabel; - wxTextCtrl* posXTextCtrl; - wxStaticText* m_staticTextUnitPosX; - wxStaticText* posYLabel; - wxTextCtrl* posYTextCtrl; - wxStaticText* m_staticTextUnitPosY; - wxStaticLine* m_staticline1; - wxStdDialogButtonSizer* stdDialogButtonSizer; - wxButton* stdDialogButtonSizerOK; - wxButton* stdDialogButtonSizerCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); } - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); } - virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } - virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); } - virtual void moveDownButtonHandler( wxCommandEvent& event ) { event.Skip(); } - virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); } - virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); } - virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); } - virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Field Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); - ~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE(); - -}; - -#endif //__DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Nov 22 2017) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ +#define __DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ + +#include +#include +#include +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxListCtrl* fieldListCtrl; + wxBitmapButton* moveUpButton; + wxBitmapButton* moveDownButton; + wxBitmapButton* deleteFieldButton; + wxBitmapButton* addFieldButton; + wxButton* m_spiceFieldsButton; + wxRadioBox* m_FieldHJustifyCtrl; + wxRadioBox* m_FieldVJustifyCtrl; + wxCheckBox* showCheckBox; + wxCheckBox* rotateCheckBox; + wxRadioBox* m_StyleRadioBox; + wxStaticText* fieldNameLabel; + wxTextCtrl* fieldNameTextCtrl; + wxStaticText* fieldValueLabel; + wxTextCtrl* fieldValueTextCtrl; + wxButton* m_show_datasheet_button; + wxStaticText* textSizeLabel; + wxTextCtrl* textSizeTextCtrl; + wxStaticText* m_staticTextUnitSize; + wxStaticText* posXLabel; + wxTextCtrl* posXTextCtrl; + wxStaticText* m_staticTextUnitPosX; + wxStaticText* posYLabel; + wxTextCtrl* posYTextCtrl; + wxStaticText* m_staticTextUnitPosY; + wxStaticLine* m_staticline1; + wxStdDialogButtonSizer* stdDialogButtonSizer; + wxButton* stdDialogButtonSizerOK; + wxButton* stdDialogButtonSizerCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnCloseDialog( wxCloseEvent& event ) { event.Skip(); } + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); } + virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } + virtual void moveUpButtonHandler( wxCommandEvent& event ) { event.Skip(); } + virtual void moveDownButtonHandler( wxCommandEvent& event ) { event.Skip(); } + virtual void deleteFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); } + virtual void addFieldButtonHandler( wxCommandEvent& event ) { event.Skip(); } + virtual void EditSpiceModel( wxCommandEvent& event ) { event.Skip(); } + virtual void showButtonHandler( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Field Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU ); + ~DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE(); + +}; + +#endif //__DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE_H__ diff --git a/eeschema/dialogs/dialog_eeschema_options_base.cpp b/eeschema/dialogs/dialog_eeschema_options_base.cpp index 3ae4121c28..905ec93c85 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.cpp +++ b/eeschema/dialogs/dialog_eeschema_options_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_eeschema_options_base.h" @@ -116,7 +116,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx m_panel5->SetSizer( bSizer82 ); m_panel5->Layout(); bSizer82->Fit( m_panel5 ); - m_notebook->AddPage( m_panel5, _("Display"), true ); + m_notebook->AddPage( m_panel5, _("Display"), false ); m_panel3 = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxVERTICAL ); @@ -206,7 +206,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx m_staticline2 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer9->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - m_checkAutoplaceFields = new wxCheckBox( m_panel3, wxID_ANY, _("A&utomatically place component fields"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkAutoplaceFields = new wxCheckBox( m_panel3, wxID_ANY, _("A&utomatically place symbol fields"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer9->Add( m_checkAutoplaceFields, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 3 ); m_checkAutoplaceJustify = new wxCheckBox( m_panel3, wxID_ANY, _("A&llow field autoplace to change justification"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -355,7 +355,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx m_panel2->SetSizer( bSizer6 ); m_panel2->Layout(); bSizer6->Fit( m_panel2 ); - m_notebook->AddPage( m_panel2, _("Default Fields"), false ); + m_notebook->AddPage( m_panel2, _("Default Fields"), true ); bOptionsSizer->Add( m_notebook, 1, wxALL|wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_eeschema_options_base.fbp b/eeschema/dialogs/dialog_eeschema_options_base.fbp index a9c261438a..7046789393 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.fbp +++ b/eeschema/dialogs/dialog_eeschema_options_base.fbp @@ -187,8 +187,8 @@ Display - 1 - + 0 + 1 1 1 @@ -262,16 +262,16 @@ - + bSizer82 wxVERTICAL none - + 5 wxALL|wxEXPAND 0 - + 3 wxBOTH 0,1,2 @@ -1675,11 +1675,11 @@ - + Editing 0 - + 1 1 1 @@ -1753,7 +1753,7 @@ - + bSizer8 wxVERTICAL @@ -3154,11 +3154,11 @@ - + 5 wxALL|wxEXPAND 0 - + bSizer9 wxVERTICAL @@ -3277,7 +3277,7 @@ 0 0 wxID_ANY - A&utomatically place component fields + A&utomatically place symbol fields 0 @@ -3517,7 +3517,7 @@ Controls 0 - + 1 1 1 @@ -3591,7 +3591,7 @@ - + bSizer81 wxVERTICAL @@ -3614,11 +3614,11 @@ 0 - + 5 wxALL|wxEXPAND 1 - + m_controlsSizer wxVERTICAL @@ -4318,7 +4318,7 @@ Default Fields - 0 + 1 1 1 diff --git a/eeschema/dialogs/dialog_eeschema_options_base.h b/eeschema/dialogs/dialog_eeschema_options_base.h index 1e084b1d8d..d8d6da01aa 100644 --- a/eeschema/dialogs/dialog_eeschema_options_base.h +++ b/eeschema/dialogs/dialog_eeschema_options_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_EESCHEMA_OPTIONS_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include diff --git a/eeschema/dialogs/dialog_lib_new_component.fbp b/eeschema/dialogs/dialog_lib_new_component.fbp index d88db4eab7..418de0656c 100644 --- a/eeschema/dialogs/dialog_lib_new_component.fbp +++ b/eeschema/dialogs/dialog_lib_new_component.fbp @@ -47,7 +47,7 @@ wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h - Component Properties + Symbol Properties @@ -186,7 +186,7 @@ - 20 + 5 wxEXPAND|wxLEFT|wxRIGHT 1 @@ -233,7 +233,7 @@ 0 0 wxID_ANY - Component &name: + Symbol &name: 0 @@ -254,7 +254,7 @@ 0 - This is the component name in library, and also the default component value when loaded in the schematic. + This is the symbol name in library, and also the default component value when loaded in the schematic. @@ -286,7 +286,7 @@ 3 - wxALL|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 1 1 @@ -377,7 +377,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -459,8 +459,8 @@ - 5 - wxALL|wxEXPAND + 3 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -551,7 +551,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -633,8 +633,8 @@ - 5 - wxALL + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -722,11 +722,11 @@ - - 15 + + 5 wxEXPAND|wxLEFT|wxRIGHT - 1 - + 0 + bSizer17 wxVERTICAL @@ -764,7 +764,7 @@ 0 0 wxID_ANY - Create component with alternate body style (DeMorgan) + Create symbol with alternate body style (DeMorgan) 0 @@ -852,7 +852,7 @@ 0 0 wxID_ANY - Create component as power symbol + Create symbol as power symbol 0 @@ -1008,16 +1008,6 @@ bSizer18 wxVERTICAL none - - 5 - wxEXPAND - 0 - - 10 - protected - 0 - - 5 wxALL @@ -1102,7 +1092,7 @@ - 20 + 5 wxLEFT|wxRIGHT 0 @@ -1119,7 +1109,7 @@ 0 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1202,7 +1192,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 0 1 @@ -1291,7 +1281,7 @@ - 15 + 5 wxEXPAND|wxLEFT|wxRIGHT 0 @@ -1389,7 +1379,7 @@ 5 - wxALL + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -1477,7 +1467,7 @@ 5 - wxALL + wxBOTTOM|wxLEFT|wxRIGHT 0 1 @@ -1565,10 +1555,20 @@ + + 5 + wxEXPAND + 0 + + 10 + protected + 0 + + - 10 + 5 wxALL|wxEXPAND 0 diff --git a/eeschema/dialogs/dialog_lib_new_component_base.cpp b/eeschema/dialogs/dialog_lib_new_component_base.cpp index c99bda0898..0c7fe256eb 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.cpp +++ b/eeschema/dialogs/dialog_lib_new_component_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version May 6 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_lib_new_component_base.h" @@ -31,46 +31,46 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, fgSizer31->SetFlexibleDirection( wxBOTH ); fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText2 = new wxStaticText( this, wxID_ANY, _("Component &name:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText2 = new wxStaticText( this, wxID_ANY, _("Symbol &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.") ); + m_staticText2->SetToolTip( _("This is the symbol name in library,\nand also the default component value when loaded in the schematic.") ); fgSizer31->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_textName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 100,-1 ), 0 ); - fgSizer31->Add( m_textName, 1, wxALL|wxEXPAND, 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 ); + fgSizer31->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_textReference = new wxTextCtrl( this, wxID_ANY, _("U"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer31->Add( m_textReference, 0, wxALL|wxEXPAND, 5 ); + fgSizer31->Add( m_textReference, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 3 ); 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 ); + fgSizer31->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_spinPartCount = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 26, 0 ); - fgSizer31->Add( m_spinPartCount, 0, wxALL, 5 ); + fgSizer31->Add( m_spinPartCount, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - bSizer16->Add( fgSizer31, 1, wxEXPAND|wxLEFT|wxRIGHT, 20 ); + bSizer16->Add( fgSizer31, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer17; bSizer17 = new wxBoxSizer( wxVERTICAL ); - m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create component with alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkHasConversion = new wxCheckBox( this, wxID_ANY, _("Create symbol with alternate body style (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer17->Add( m_checkHasConversion, 0, wxALL, 5 ); - m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create component as power symbol"), wxDefaultPosition, wxDefaultSize, 0 ); + m_checkIsPowerSymbol = new wxCheckBox( this, wxID_ANY, _("Create symbol 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 ); - bSizer16->Add( bSizer17, 1, wxEXPAND|wxLEFT|wxRIGHT, 15 ); + bSizer16->Add( bSizer17, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizer7->Add( bSizer16, 0, wxALL|wxEXPAND, 5 ); @@ -78,9 +78,6 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, wxBoxSizer* bSizer18; bSizer18 = new wxBoxSizer( wxVERTICAL ); - - 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(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); @@ -94,13 +91,13 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, 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 ); + fgSizer4->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_spinPinTextPosition = new wxSpinCtrl( this, wxID_ANY, wxT("40"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 100, 40 ); - fgSizer4->Add( m_spinPinTextPosition, 0, wxALL, 5 ); + fgSizer4->Add( m_spinPinTextPosition, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); - bSizer18->Add( fgSizer4, 0, wxLEFT|wxRIGHT, 20 ); + bSizer18->Add( fgSizer4, 0, wxLEFT|wxRIGHT, 5 ); wxBoxSizer* bSizer19; bSizer19 = new wxBoxSizer( wxVERTICAL ); @@ -111,14 +108,17 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, m_checkShowPinName = new wxCheckBox( this, wxID_ANY, _("Show pin name text"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkShowPinName->SetValue(true); - bSizer19->Add( m_checkShowPinName, 0, wxALL, 5 ); + bSizer19->Add( m_checkShowPinName, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); m_checkShowPinNameInside = new wxCheckBox( this, wxID_ANY, _("Pin name inside"), wxDefaultPosition, wxDefaultSize, 0 ); m_checkShowPinNameInside->SetValue(true); - bSizer19->Add( m_checkShowPinNameInside, 0, wxALL, 5 ); + bSizer19->Add( m_checkShowPinNameInside, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - bSizer18->Add( bSizer19, 0, wxEXPAND|wxLEFT|wxRIGHT, 15 ); + bSizer18->Add( bSizer19, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + + + bSizer18->Add( 0, 10, 0, wxEXPAND, 5 ); bSizer7->Add( bSizer18, 1, wxALL|wxEXPAND, 5 ); @@ -130,7 +130,7 @@ DIALOG_LIB_NEW_COMPONENT_BASE::DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bSizer7->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 10 ); + bSizer7->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bSizer7 ); diff --git a/eeschema/dialogs/dialog_lib_new_component_base.h b/eeschema/dialogs/dialog_lib_new_component_base.h index ef33652e51..3b2580f4bb 100644 --- a/eeschema/dialogs/dialog_lib_new_component_base.h +++ b/eeschema/dialogs/dialog_lib_new_component_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version May 6 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_LIB_NEW_COMPONENT_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -59,7 +57,7 @@ class DIALOG_LIB_NEW_COMPONENT_BASE : public DIALOG_SHIM public: - DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_LIB_NEW_COMPONENT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Symbol Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_LIB_NEW_COMPONENT_BASE(); }; diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp index a78ec84c00..3b64785c36 100644 --- a/eeschema/dialogs/dialog_netlist.cpp +++ b/eeschema/dialogs/dialog_netlist.cpp @@ -395,9 +395,9 @@ void NETLIST_DIALOG::InstallPageSpice() new NETLIST_PAGE_DIALOG( m_NoteBook, title, NET_TYPE_SPICE ); page->m_SpiceAjustPassiveValues = new wxCheckBox( page, ID_USE_NETCODE_AS_NETNAME, - _( "Reformat passive component values" ) ); + _( "Reformat passive symbol values" ) ); page->m_SpiceAjustPassiveValues->SetToolTip( - _( "Reformat passive component values e.g. 1M -> 1Meg" ) ); + _( "Reformat passive symbol values e.g. 1M -> 1Meg" ) ); page->m_SpiceAjustPassiveValues->SetValue( m_Parent->GetSpiceAjustPassiveValues() ); page->m_LeftBoxSizer->Add( page->m_SpiceAjustPassiveValues, 0, wxGROW | wxALL, 5 ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.cpp b/eeschema/dialogs/dialog_sim_settings_base.cpp index 3f67853940..fdf45ab7d0 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.cpp +++ b/eeschema/dialogs/dialog_sim_settings_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 31 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_sim_settings_base.h" @@ -385,7 +385,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID bSizer1->Add( m_simPages, 1, wxEXPAND | wxALL, 5 ); - m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, _("Adjust passive component values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_fixPassiveVals = new wxCheckBox( this, wxID_ANY, _("Adjust passive symbol values (e.g. M -> Meg; 100 nF -> 100n)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( m_fixPassiveVals, 0, wxALL, 5 ); m_fixIncludePaths = new wxCheckBox( this, wxID_ANY, _("Add full path for .include library directives"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -404,6 +404,7 @@ DIALOG_SIM_SETTINGS_BASE::DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID this->SetSizer( bSizer1 ); this->Layout(); + bSizer1->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/dialogs/dialog_sim_settings_base.fbp b/eeschema/dialogs/dialog_sim_settings_base.fbp index 5f5c2ae6f8..18d12db179 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.fbp +++ b/eeschema/dialogs/dialog_sim_settings_base.fbp @@ -44,7 +44,7 @@ DIALOG_SIM_SETTINGS_BASE - 685,518 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Simulation settings @@ -1269,6 +1269,8 @@ + + @@ -2086,6 +2088,8 @@ + + @@ -2814,11 +2818,11 @@ 0 - + 5 wxALIGN_CENTER_HORIZONTAL 0 - + 3 wxBOTH @@ -2978,6 +2982,8 @@ + + @@ -3162,6 +3168,8 @@ + + @@ -3419,6 +3427,8 @@ + + @@ -5681,7 +5691,7 @@ 0 0 wxID_ANY - Adjust passive component values (e.g. M -> Meg; 100 nF -> 100n) + Adjust passive symbol values (e.g. M -> Meg; 100 nF -> 100n) 0 diff --git a/eeschema/dialogs/dialog_sim_settings_base.h b/eeschema/dialogs/dialog_sim_settings_base.h index 64747b5617..9da247dfdd 100644 --- a/eeschema/dialogs/dialog_sim_settings_base.h +++ b/eeschema/dialogs/dialog_sim_settings_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 31 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_SIM_SETTINGS_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -120,7 +118,7 @@ class DIALOG_SIM_SETTINGS_BASE : public DIALOG_SHIM public: - DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 685,518 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_SIM_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SIM_SETTINGS_BASE(); }; diff --git a/eeschema/dialogs/dialog_spice_model_base.cpp b/eeschema/dialogs/dialog_spice_model_base.cpp index 60417c34ca..00ae7c3a64 100644 --- a/eeschema/dialogs/dialog_spice_model_base.cpp +++ b/eeschema/dialogs/dialog_spice_model_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "dialog_spice_model_base.h" @@ -40,7 +40,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_staticText62 = new wxStaticText( m_passive, wxID_ANY, _("Passive type"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText62->Wrap( -1 ); - fgSizer1->Add( m_staticText62, 0, wxALL, 5 ); + fgSizer1->Add( m_staticText62, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_staticText3 = new wxStaticText( m_passive, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); @@ -53,7 +53,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_staticText63 = new wxStaticText( m_passive, wxID_ANY, _("Spice value in simulation"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText63->Wrap( -1 ); - fgSizer1->Add( m_staticText63, 0, wxALL, 5 ); + fgSizer1->Add( m_staticText63, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer41->Add( fgSizer1, 0, wxEXPAND|wxALL, 5 ); @@ -253,7 +253,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_model->SetSizer( bSizer6 ); m_model->Layout(); bSizer6->Fit( m_model ); - m_notebook->AddPage( m_model, _("Model"), true ); + m_notebook->AddPage( m_model, _("Model"), false ); m_power = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_power->SetMinSize( wxSize( 650,-1 ) ); @@ -568,14 +568,14 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i m_power->SetSizer( bSizer4 ); m_power->Layout(); bSizer4->Fit( m_power ); - m_notebook->AddPage( m_power, _("Source"), false ); + m_notebook->AddPage( m_power, _("Source"), true ); bSizer1->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer1->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 ); - m_disabled = new wxCheckBox( this, wxID_ANY, _("Disable component for simulation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_disabled = new wxCheckBox( this, wxID_ANY, _("Disable symbol for simulation"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer1->Add( m_disabled, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxBoxSizer* bSizer2; @@ -607,6 +607,7 @@ DIALOG_SPICE_MODEL_BASE::DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID i this->SetSizer( bSizer1 ); this->Layout(); + bSizer1->Fit( this ); this->Centre( wxBOTH ); diff --git a/eeschema/dialogs/dialog_spice_model_base.fbp b/eeschema/dialogs/dialog_spice_model_base.fbp index 8e01069e32..57f2ac92c5 100644 --- a/eeschema/dialogs/dialog_spice_model_base.fbp +++ b/eeschema/dialogs/dialog_spice_model_base.fbp @@ -44,7 +44,7 @@ -1,-1 DIALOG_SPICE_MODEL_BASE - 640,582 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Spice Model Editor @@ -262,7 +262,7 @@ 5 wxEXPAND|wxALL 0 - + 3 wxBOTH 1 @@ -422,6 +422,8 @@ + + @@ -450,7 +452,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -707,7 +709,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -875,7 +877,7 @@ 5 wxALIGN_CENTER_HORIZONTAL 0 - + bSizer5 wxVERTICAL @@ -1046,11 +1048,11 @@ - + 5 wxEXPAND 1 - + 3 wxBOTH 1 @@ -3313,7 +3315,7 @@ Model - 1 + 0 1 1 @@ -3397,7 +3399,7 @@ 5 wxEXPAND 0 - + 2 wxBOTH 1 @@ -3492,11 +3494,11 @@ - + 5 wxEXPAND 1 - + bSizer7 wxHORIZONTAL @@ -3830,6 +3832,8 @@ onModelSelected + + @@ -4004,6 +4008,8 @@ + + @@ -4129,7 +4135,7 @@ Source - 0 + 1 1 1 @@ -9643,7 +9649,7 @@ 0 0 wxID_ANY - Disable component for simulation + Disable symbol for simulation 0 diff --git a/eeschema/dialogs/dialog_spice_model_base.h b/eeschema/dialogs/dialog_spice_model_base.h index c4c7a34a8b..c585264f99 100644 --- a/eeschema/dialogs/dialog_spice_model_base.h +++ b/eeschema/dialogs/dialog_spice_model_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_SPICE_MODEL_BASE_H__ @@ -11,8 +11,6 @@ #include #include #include -class DIALOG_SHIM; - #include "dialog_shim.h" #include #include @@ -174,7 +172,7 @@ class DIALOG_SPICE_MODEL_BASE : public DIALOG_SHIM public: - DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Spice Model Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,582 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_SPICE_MODEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Spice Model Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_SPICE_MODEL_BASE(); }; diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index f0d62a642d..4e8f954a82 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -147,7 +147,7 @@ static EDA_HOTKEY HkAddHierarchicalLabel( _HKI( "Add Hierarchical Label" ), HK_A static EDA_HOTKEY HkAddGlobalLabel( _HKI( "Add Global Label" ), HK_ADD_GLABEL, GR_KB_CTRL + 'H', ID_GLABEL_BUTT ); static EDA_HOTKEY HkAddJunction( _HKI( "Add Junction" ), HK_ADD_JUNCTION, 'J', ID_JUNCTION_BUTT ); -static EDA_HOTKEY HkAddComponent( _HKI( "Add Component" ), HK_ADD_NEW_COMPONENT, 'A', +static EDA_HOTKEY HkAddComponent( _HKI( "Add Symbol" ), HK_ADD_NEW_COMPONENT, 'A', ID_SCH_PLACE_COMPONENT ); static EDA_HOTKEY HkAddPower( _HKI( "Add Power" ), HK_ADD_NEW_POWER, 'P', ID_PLACE_POWER_BUTT ); @@ -171,16 +171,16 @@ static EDA_HOTKEY HkOrientNormalComponent( _HKI( "Orient Normal Component" ), HK_ORIENT_NORMAL_COMPONENT, 'N', ID_SCH_ORIENT_NORMAL ); static EDA_HOTKEY HkRotate( _HKI( "Rotate Item" ), HK_ROTATE, 'R', ID_SCH_ROTATE_CLOCKWISE ); static EDA_HOTKEY HkEdit( _HKI( "Edit Item" ), HK_EDIT, 'E', ID_SCH_EDIT_ITEM ); -static EDA_HOTKEY HkEditComponentValue( _HKI( "Edit Component Value" ), +static EDA_HOTKEY HkEditComponentValue( _HKI( "Edit Symbol Value" ), HK_EDIT_COMPONENT_VALUE, 'V', ID_SCH_EDIT_COMPONENT_VALUE ); -static EDA_HOTKEY HkEditComponentReference( _HKI( "Edit Component Reference" ), +static EDA_HOTKEY HkEditComponentReference( _HKI( "Edit Symbol Reference" ), HK_EDIT_COMPONENT_REFERENCE, 'U', ID_SCH_EDIT_COMPONENT_REFERENCE ); -static EDA_HOTKEY HkEditComponentFootprint( _HKI( "Edit Component Footprint" ), +static EDA_HOTKEY HkEditComponentFootprint( _HKI( "Edit Symbol Footprint" ), HK_EDIT_COMPONENT_FOOTPRINT, 'F', ID_SCH_EDIT_COMPONENT_FOOTPRINT ); -static EDA_HOTKEY HkEditComponentWithLibedit( _HKI( "Edit with Component Editor" ), +static EDA_HOTKEY HkEditComponentWithLibedit( _HKI( "Edit with Symbol Editor" ), HK_EDIT_COMPONENT_WITH_LIBEDIT, 'E' + GR_KB_CTRL, ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP ); @@ -188,7 +188,7 @@ static EDA_HOTKEY HkMove( _HKI( "Move Schematic Item" ), HK_MOVE_COMPONENT_OR_ITEM, 'M', ID_SCH_MOVE_ITEM ); -static EDA_HOTKEY HkDuplicateItem( _HKI( "Duplicate Component or Label" ), +static EDA_HOTKEY HkDuplicateItem( _HKI( "Duplicate Symbol or Label" ), HK_DUPLICATE_ITEM, 'C', ID_POPUP_SCH_DUPLICATE_ITEM ); diff --git a/eeschema/libfield.cpp b/eeschema/libfield.cpp index 852158d647..c4fdb2ecc0 100644 --- a/eeschema/libfield.cpp +++ b/eeschema/libfield.cpp @@ -89,8 +89,8 @@ void LIB_EDIT_FRAME::EditField( LIB_FIELD* aField ) if( !lib.empty() && m_libMgr->PartExists( newFieldValue, lib ) ) { msg.Printf( _( - "The name \"%s\" conflicts with an existing entry in the component library \"%s\".\n\n" - "Do you wish to replace the current component in the library with this one?" ), + "The name \"%s\" conflicts with an existing entry in the symbol library \"%s\".\n\n" + "Do you wish to replace the current symbol in the library with this one?" ), newFieldValue, lib ); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 305c1d5120..624f5a6016 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -190,7 +190,7 @@ void preparePlaceMenu( wxMenu* aParentMenu ) { wxString text; - text = AddHotkeyName( _( "&Component" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Symbol" ), g_Schematic_Hokeys_Descr, HK_ADD_NEW_COMPONENT, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_SCH_PLACE_COMPONENT, text, HELP_PLACE_COMPONENTS, @@ -257,7 +257,7 @@ void preparePlaceMenu( wxMenu* aParentMenu ) KiBitmap( add_hierarchical_label_xpm ) ); - text = AddHotkeyName( _( "Hierarchical &Sheet" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "Hierar&chical Sheet" ), g_Schematic_Hokeys_Descr, HK_ADD_HIER_SHEET, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( aParentMenu, ID_SHEET_SYMBOL_BUTT, text, HELP_PLACE_SHEET, @@ -452,14 +452,14 @@ void prepareEditMenu( wxMenu* aParentMenu ) // Update field values AddMenuItem( aParentMenu, ID_UPDATE_FIELDS, _( "Update Field Values" ), - _( "Sets component fields to original library values" ), + _( "Sets symbol fields to original library values" ), KiBitmap( update_fields_xpm ) ); // Edit components to symbols library links (change LIB_ID values) aParentMenu->AppendSeparator(); AddMenuItem( aParentMenu, ID_EDIT_COMPONENTS_TO_SYMBOLS_LIB_ID, - _( "Edit Components to Symbol Library Links" ), - _( "Edit components to symbols library links to switch to an other library link (library IDs)" ), + _( "Edit Symbol Library Links" ), + _( "Edit schematic symbol's symbol library links" ), KiBitmap( edit_cmp_symb_links_xpm ) ); } @@ -468,7 +468,8 @@ void prepareToolsMenu( wxMenu* aParentMenu ) { wxString text; - text = AddHotkeyName( _( "Update PCB from Schematic" ), g_Schematic_Hokeys_Descr, HK_UPDATE_PCB_FROM_SCH ); + text = AddHotkeyName( _( "Update PCB from Schematic" ), g_Schematic_Hokeys_Descr, + HK_UPDATE_PCB_FROM_SCH ); AddMenuItem( aParentMenu, ID_UPDATE_PCB_FROM_SCH, @@ -523,12 +524,12 @@ void prepareToolsMenu( wxMenu* aParentMenu ) AddMenuItem( aParentMenu, ID_GET_NETLIST, _( "Generate &Netlist File" ), - _( "Generate component netlist file" ), + _( "Generate netlist file" ), KiBitmap( netlist_xpm ) ); AddMenuItem( aParentMenu, ID_OPEN_CMP_TABLE, - _( "Component Table &View" ), + _( "Symbol Table &View" ), KiBitmap( spreadsheet_xpm ) ); AddMenuItem( aParentMenu, diff --git a/eeschema/sch_field.cpp b/eeschema/sch_field.cpp index e05854cee7..5a2a08daf2 100644 --- a/eeschema/sch_field.cpp +++ b/eeschema/sch_field.cpp @@ -345,8 +345,7 @@ bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint { SCH_COMPONENT* component = (SCH_COMPONENT*) m_Parent; - wxCHECK_MSG( component != NULL, false, - wxT( "No component associated with field" ) + text ); + wxCHECK_MSG( component != NULL, false, wxT( "No symbol associated with field" ) + text ); text = component->GetRef( (SCH_SHEET_PATH*) aAuxData ); @@ -379,12 +378,12 @@ bool SCH_FIELD::Replace( wxFindReplaceData& aSearchData, void* aAuxData ) wxT( "Cannot replace reference designator without valid sheet path." ) ); wxCHECK_MSG( aSearchData.GetFlags() & FR_REPLACE_REFERENCES, false, - wxT( "Invalid replace component reference field call." ) ) ; + wxT( "Invalid replace symbol reference field call." ) ) ; SCH_COMPONENT* component = (SCH_COMPONENT*) m_Parent; wxCHECK_MSG( component != NULL, false, - wxT( "No component associated with field" ) + text ); + wxT( "No symbol associated with field" ) + text ); text = component->GetRef( (SCH_SHEET_PATH*) aAuxData ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 45d3fea06b..c9d7307827 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -1201,7 +1201,7 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event ) if( !item || (item->GetFlags() != 0) || ( item->Type() != SCH_COMPONENT_T ) ) { - wxMessageBox( _( "Error: not a component or no component" ) ); + wxMessageBox( _( "Error: not a symbol or no symbol." ) ); return; } diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index 0ede8eead5..b40238424c 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -152,13 +152,13 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() _( "Perform electrical rules check" ) ); m_mainToolBar->AddTool( ID_RUN_CVPCB, wxEmptyString, KiBitmap( cvpcb_xpm ), - _( "Run CvPcb to associate footprints to components" ) ); + _( "Run CvPcb to associate footprints to symbols" ) ); m_mainToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, KiBitmap( netlist_xpm ), _( "Generate netlist" ) ); m_mainToolBar->AddTool( ID_OPEN_CMP_TABLE, wxEmptyString, KiBitmap( spreadsheet_xpm ), - _( "Edit Components Fields" ) ); + _( "Edit symbol fields" ) ); m_mainToolBar->AddTool( ID_GET_TOOLS, wxEmptyString, KiBitmap( bom_xpm ), diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index 2bb39bbf55..ebe385df8b 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -54,16 +54,16 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() m_mainToolBar->AddTool( ID_LIBVIEW_SELECT_PART, wxEmptyString, KiBitmap( add_component_xpm ), - _( "Select component to browse" ) ); + _( "Select symbol to browse" ) ); m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_LIBVIEW_PREVIOUS, wxEmptyString, KiBitmap( lib_previous_xpm ), - _( "Display previous component" ) ); + _( "Display previous symbol" ) ); m_mainToolBar->AddTool( ID_LIBVIEW_NEXT, wxEmptyString, KiBitmap( lib_next_xpm ), - _( "Display next component" ) ); + _( "Display next symbol" ) ); m_mainToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), g_Viewlib_Hokeys_Descr, @@ -107,7 +107,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_LIBVIEW_VIEWDOC, wxEmptyString, KiBitmap( datasheet_xpm ), - _( "View component documents" ) ); + _( "View symbol documents" ) ); m_mainToolBar->EnableTool( ID_LIBVIEW_VIEWDOC, false ); if( IsModal() ) @@ -115,7 +115,7 @@ void LIB_VIEW_FRAME::ReCreateHToolbar() m_mainToolBar->AddSeparator(); m_mainToolBar->AddTool( ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, wxEmptyString, KiBitmap( export_xpm ), - _( "Insert component in schematic" ) ); + _( "Insert symbol in schematic" ) ); } // after adding the buttons to the toolbar, must call Realize() to @@ -183,7 +183,7 @@ void LIB_VIEW_FRAME::ReCreateMenuBar( void ) AddMenuItem( fileMenu, wxID_EXIT, _( "Cl&ose" ), - _( "Close schematic component viewer" ), + _( "Close schematic symbol viewer" ), KiBitmap( exit_xpm ) ); // View menu diff --git a/pcbnew/board_netlist_updater.cpp b/pcbnew/board_netlist_updater.cpp index 2e40bf6e1d..37ea7ce990 100644 --- a/pcbnew/board_netlist_updater.cpp +++ b/pcbnew/board_netlist_updater.cpp @@ -105,13 +105,13 @@ MODULE* BOARD_NETLIST_UPDATER::addNewComponent( COMPONENT* aComponent ) if( aComponent->GetModule() != NULL ) { - msg.Printf( _( "Adding new component \"%s:%s\" footprint \"%s\".\n" ), + msg.Printf( _( "Adding new symbol \"%s:%s\" footprint \"%s\".\n" ), GetChars( aComponent->GetReference() ), GetChars( aComponent->GetTimeStamp() ), GetChars( aComponent->GetFPID().Format() ) ); m_reporter->Report( msg, REPORTER::RPT_INFO ); - msg.Printf( _( "Add component %s, footprint: %s.\n" ), + msg.Printf( _( "Add symbol %s, footprint: %s.\n" ), GetChars( aComponent->GetReference() ), GetChars( aComponent->GetFPID().Format() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); @@ -133,13 +133,13 @@ MODULE* BOARD_NETLIST_UPDATER::addNewComponent( COMPONENT* aComponent ) } else { - msg.Printf( _( "Cannot add component %s due to missing footprint %s.\n" ), + msg.Printf( _( "Cannot add symbol %s due to missing footprint %s.\n" ), GetChars( aComponent->GetReference() ), GetChars( aComponent->GetFPID().Format() ) ); m_reporter->Report( msg, REPORTER::RPT_ERROR ); - msg.Printf( _( "Cannot add new component \"%s:%s\" due to missing " + msg.Printf( _( "Cannot add new symbol \"%s:%s\" due to missing " "footprint \"%s\".\n" ), GetChars( aComponent->GetReference() ), GetChars( aComponent->GetTimeStamp() ), @@ -166,14 +166,14 @@ MODULE* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, MODULE* aPcb if( aNewComponent->GetModule() != NULL ) { - msg.Printf( _( "Change component %s footprint from %s to %s.\n"), + msg.Printf( _( "Change symbol %s footprint from %s to %s.\n"), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetFPID().Format() ), GetChars( aNewComponent->GetFPID().Format() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Replacing component \"%s:%s\" footprint \"%s\" with " + msg.Printf( _( "Replacing symbol \"%s:%s\" footprint \"%s\" with " "\"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), @@ -203,14 +203,14 @@ MODULE* BOARD_NETLIST_UPDATER::replaceComponent( NETLIST& aNetlist, MODULE* aPcb } else { - msg.Printf( _( "Cannot change component %s footprint due to missing " + msg.Printf( _( "Cannot change symbol %s footprint due to missing " "footprint %s.\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aNewComponent->GetFPID().Format() ) ); m_reporter->Report( msg, REPORTER::RPT_ERROR ); - msg.Printf( _( "Cannot replace component \"%s:%s\" due to missing " + msg.Printf( _( "Cannot replace symbol \"%s:%s\" due to missing " "footprint \"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), @@ -239,13 +239,13 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO // Test for reference designator field change. if( aPcbComponent->GetReference() != aNewComponent->GetReference() ) { - msg.Printf( _( "Change component %s reference to %s.\n" ), + msg.Printf( _( "Change symbol %s reference to %s.\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aNewComponent->GetReference() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Changing component \"%s:%s\" reference to \"%s\".\n" ), + msg.Printf( _( "Changing symbol \"%s:%s\" reference to \"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), GetChars( aNewComponent->GetReference() ) ); @@ -262,14 +262,14 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO // Test for value field change. if( aPcbComponent->GetValue() != aNewComponent->GetValue() ) { - msg.Printf( _( "Change component %s value from %s to %s.\n" ), + msg.Printf( _( "Change symbol %s value from %s to %s.\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetValue() ), GetChars( aNewComponent->GetValue() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Changing component \"%s:%s\" value from \"%s\" to \"%s\".\n" ), + msg.Printf( _( "Changing symbol \"%s:%s\" value from \"%s\" to \"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), GetChars( aPcbComponent->GetValue() ), @@ -287,7 +287,7 @@ bool BOARD_NETLIST_UPDATER::updateComponentParameters( MODULE* aPcbComponent, CO // Test for time stamp change. if( aPcbComponent->GetPath() != aNewComponent->GetTimeStamp() ) { - msg.Printf( _( "Changing component path \"%s:%s\" to \"%s\".\n" ), + msg.Printf( _( "Changing symbol path \"%s:%s\" to \"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), GetChars( aNewComponent->GetTimeStamp() ) ); @@ -327,12 +327,12 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( MODULE* aPcbComponent { if( !pad->GetNetname().IsEmpty() ) { - msg.Printf( _( "Disconnect component %s pin %s.\n" ), + msg.Printf( _( "Disconnect symbol %s pin %s.\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( pad->GetName() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Clearing component \"%s:%s\" pin \"%s\" net name.\n" ), + msg.Printf( _( "Clearing symbol \"%s:%s\" pin \"%s\" net name.\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), GetChars( pad->GetName() ) ); @@ -378,14 +378,14 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( MODULE* aPcbComponent if( !pad->GetNetname().IsEmpty() ) { - msg.Printf( _( "Reconnect component %s pin %s from net %s to net %s.\n"), + msg.Printf( _( "Reconnect symbol %s pin %s from net %s to net %s.\n"), GetChars( aPcbComponent->GetReference() ), GetChars( pad->GetName() ), GetChars( pad->GetNetname() ), GetChars( netName ) ); } else { - msg.Printf( _( "Connect component %s pin %s to net %s.\n"), + msg.Printf( _( "Connect symbol %s pin %s to net %s.\n"), GetChars( aPcbComponent->GetReference() ), GetChars( pad->GetName() ), GetChars( netName ) ); @@ -393,7 +393,7 @@ bool BOARD_NETLIST_UPDATER::updateComponentPadConnections( MODULE* aPcbComponent m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Changing component \"%s:%s\" pin \"%s\" net name from " + msg.Printf( _( "Changing symbol \"%s:%s\" pin \"%s\" net name from " "\"%s\" to \"%s\".\n" ), GetChars( aPcbComponent->GetReference() ), GetChars( aPcbComponent->GetPath() ), @@ -439,17 +439,17 @@ bool BOARD_NETLIST_UPDATER::deleteUnusedComponents( NETLIST& aNetlist ) { if( module->IsLocked() ) { - msg.Printf( _( "Component %s is locked, skipping removal.\n" ), + msg.Printf( _( "Footprint %s is locked, skipping removal.\n" ), GetChars( module->GetReference() ) ); m_reporter->Report( msg, REPORTER::RPT_INFO ); continue; } - msg.Printf( _( "Remove component %s." ), + msg.Printf( _( "Remove footprint %s." ), GetChars( module->GetReference() ) ); m_reporter->Report( msg, REPORTER::RPT_ACTION ); - msg.Printf( _( "Removing unused component \"%s:%s\".\n" ), + msg.Printf( _( "Removing unused footprint \"%s:%s\".\n" ), GetChars( module->GetReference() ), GetChars( module->GetPath() ) ); m_reporter->Report( msg, REPORTER::RPT_INFO ); diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp index da674a64f6..b9f7e07e00 100644 --- a/pcbnew/class_board.cpp +++ b/pcbnew/class_board.cpp @@ -2408,7 +2408,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, if( aReporter ) { - msg.Printf( _( "Checking netlist component footprint \"%s:%s:%s\".\n" ), + msg.Printf( _( "Checking netlist symbol footprint \"%s:%s:%s\".\n" ), GetChars( component->GetReference() ), GetChars( component->GetTimeStamp() ), GetChars( component->GetFPID().Format() ) ); @@ -2426,7 +2426,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( component->GetModule() != NULL ) { - msg.Printf( _( "Adding new component \"%s:%s\" footprint \"%s\".\n" ), + msg.Printf( _( "Adding new symbol \"%s:%s\" footprint \"%s\".\n" ), GetChars( component->GetReference() ), GetChars( component->GetTimeStamp() ), GetChars( component->GetFPID().Format() ) ); @@ -2435,7 +2435,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, } else { - msg.Printf( _( "Cannot add new component \"%s:%s\" due to missing " + msg.Printf( _( "Cannot add new symbol \"%s:%s\" due to missing " "footprint \"%s\".\n" ), GetChars( component->GetReference() ), GetChars( component->GetTimeStamp() ), @@ -2469,7 +2469,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( component->GetModule() != NULL ) { - msg.Printf( _( "Replacing component \"%s:%s\" footprint \"%s\" with " + msg.Printf( _( "Replacing symbol \"%s:%s\" footprint \"%s\" with " "\"%s\".\n" ), GetChars( footprint->GetReference() ), GetChars( footprint->GetPath() ), @@ -2480,7 +2480,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, } else { - msg.Printf( _( "Cannot replace component \"%s:%s\" due to missing " + msg.Printf( _( "Cannot replace symbol \"%s:%s\" due to missing " "footprint \"%s\".\n" ), GetChars( footprint->GetReference() ), GetChars( footprint->GetPath() ), @@ -2533,7 +2533,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( aReporter ) { - msg.Printf( _( "Changing component \"%s:%s\" reference to \"%s\".\n" ), + msg.Printf( _( "Changing footprint \"%s:%s\" reference to \"%s\".\n" ), GetChars( footprint->GetReference() ), GetChars( footprint->GetPath() ), GetChars( component->GetReference() ) ); @@ -2549,7 +2549,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( aReporter ) { - msg.Printf( _( "Changing component \"%s:%s\" value from \"%s\" to \"%s\".\n" ), + msg.Printf( _( "Changing footprint \"%s:%s\" value from \"%s\" to \"%s\".\n" ), GetChars( footprint->GetReference() ), GetChars( footprint->GetPath() ), GetChars( footprint->GetValue() ), @@ -2609,7 +2609,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( aReporter ) { - msg.Printf( _( "Changing component \"%s:%s\" pin \"%s\" net name from " + msg.Printf( _( "Changing footprint \"%s:%s\" pad \"%s\" net name from " "\"%s\" to \"%s\".\n" ), GetChars( footprint->GetReference() ), GetChars( footprint->GetPath() ), @@ -2661,7 +2661,7 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, { if( aReporter ) { - msg.Printf( _( "Removing unused component \"%s:%s\".\n" ), + msg.Printf( _( "Removing unused footprint \"%s:%s\".\n" ), GetChars( module->GetReference() ), GetChars( module->GetPath() ) ); aReporter->Report( msg, REPORTER::RPT_ACTION ); diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp index c0e83fd75a..24b8016d66 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp @@ -327,14 +327,14 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() m_textCtrlSheetPath->SetValue( m_CurrentModule->GetPath() ); m_AttributsCtrl->SetItemToolTip( 0, - _( "Use this attribute for most non SMD components\n" - "Components with this option are not put in the footprint position list file" ) ); + _( "Use this attribute for most non SMD footprints\n" + "Footprints with this option are not put in the footprint position list file" ) ); m_AttributsCtrl->SetItemToolTip( 1, - _( "Use this attribute for SMD components.\n" - "Only components with this option are put in the footprint position list file" ) ); + _( "Use this attribute for SMD footprints.\n" + "Only footprints with this option are put in the footprint position list file" ) ); m_AttributsCtrl->SetItemToolTip( 2, - _( "Use this attribute for \"virtual\" components drawn on board\n" - "like an edge connector (old ISA PC bus for instance)" ) ); + _( "Use this attribute for \"virtual\" footprints drawn on board\n" + "such as an edge connector (old ISA PC bus for instance)" ) ); // Controls on right side of the dialog switch( m_CurrentModule->GetAttributes() & 255 ) diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp index a467dc188c..f4e931eae5 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp @@ -179,12 +179,12 @@ void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties() m_FootprintNameCtrl->SetValue( m_currentFPID.GetLibItemName() ); m_LibraryNicknameCtrl->SetValue( m_currentFPID.GetLibNickname() ); - m_AttributsCtrl->SetItemToolTip( 0, _( "Use this attribute for most non SMD components" ) ); + m_AttributsCtrl->SetItemToolTip( 0, _( "Use this attribute for most non SMD footprints" ) ); m_AttributsCtrl->SetItemToolTip( 1, - _( "Use this attribute for SMD components.\n" - "Only components with this option are put in the footprint position list file" ) ); + _( "Use this attribute for SMD footprints.\n" + "Only footprints with this option are put in the footprint position list file" ) ); m_AttributsCtrl->SetItemToolTip( 2, - _( "Use this attribute for \"virtual\" components drawn on board\n" + _( "Use this attribute for \"virtual\" footprints drawn on board\n" "like an edge connector (old ISA PC bus for instance)" ) ); // Controls on right side of the dialog diff --git a/pcbnew/dialogs/dialog_gencad_export_options.cpp b/pcbnew/dialogs/dialog_gencad_export_options.cpp index b86afffa1e..2a5842a6f0 100644 --- a/pcbnew/dialogs/dialog_gencad_export_options.cpp +++ b/pcbnew/dialogs/dialog_gencad_export_options.cpp @@ -128,9 +128,9 @@ void DIALOG_GENCAD_EXPORT_OPTIONS::createOptCheckboxes() { std::map opts = { - { FLIP_BOTTOM_PADS, _( "Flip bottom components padstacks" ) }, + { FLIP_BOTTOM_PADS, _( "Flip bottom footprint padstacks" ) }, { UNIQUE_PIN_NAMES, _( "Generate unique pin names" ) }, - { INDIVIDUAL_SHAPES, _( "Generate a new shape for each component instance (do not reuse shapes)" ) }, + { INDIVIDUAL_SHAPES, _( "Generate a new shape for each footprint instance (do not reuse shapes)" ) }, { USE_AUX_ORIGIN, _( "Use auxiliary axis as origin" ) }, { STORE_ORIGIN_COORDS, _( "Save the origin coordinates in the file" ) } }; diff --git a/pcbnew/dialogs/dialog_move_exact_base.cpp b/pcbnew/dialogs/dialog_move_exact_base.cpp index 5e43f9d179..22d2d3b028 100644 --- a/pcbnew/dialogs/dialog_move_exact_base.cpp +++ b/pcbnew/dialogs/dialog_move_exact_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "widgets/text_ctrl_eval.h" @@ -85,7 +85,7 @@ DIALOG_MOVE_EXACT_BASE::DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id, bAnchorSizer = new wxBoxSizer( wxHORIZONTAL ); - m_cbOverride = new wxCheckBox( this, wxID_ANY, _("Override default component anchor with:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbOverride = new wxCheckBox( this, wxID_ANY, _("Override default footprint anchor with:"), wxDefaultPosition, wxDefaultSize, 0 ); bAnchorSizer->Add( m_cbOverride, 1, wxALL, 5 ); wxString m_anchorChoiceChoices[] = { _("Top left pad"), _("Footprint center") }; @@ -112,6 +112,7 @@ DIALOG_MOVE_EXACT_BASE::DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id, this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_MOVE_EXACT_BASE::OnClose ) ); diff --git a/pcbnew/dialogs/dialog_move_exact_base.fbp b/pcbnew/dialogs/dialog_move_exact_base.fbp index ee223b323b..a929fd960c 100644 --- a/pcbnew/dialogs/dialog_move_exact_base.fbp +++ b/pcbnew/dialogs/dialog_move_exact_base.fbp @@ -44,7 +44,7 @@ -1,-1 DIALOG_MOVE_EXACT_BASE - 509,277 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Move Item @@ -1377,7 +1377,7 @@ 0 0 wxID_ANY - Override default component anchor with: + Override default footprint anchor with: 0 diff --git a/pcbnew/dialogs/dialog_move_exact_base.h b/pcbnew/dialogs/dialog_move_exact_base.h index df3b741f28..a799d9fab7 100644 --- a/pcbnew/dialogs/dialog_move_exact_base.h +++ b/pcbnew/dialogs/dialog_move_exact_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 17 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_MOVE_EXACT_BASE_H__ @@ -11,7 +11,6 @@ #include #include #include -class DIALOG_SHIM; class TEXT_CTRL_EVAL; #include "dialog_shim.h" @@ -76,7 +75,7 @@ class DIALOG_MOVE_EXACT_BASE : public DIALOG_SHIM public: - DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Move Item"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 509,277 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_MOVE_EXACT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Move Item"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_MOVE_EXACT_BASE(); }; diff --git a/pcbnew/dialogs/dialog_update_pcb.fbp b/pcbnew/dialogs/dialog_update_pcb.fbp index ef8f755f20..6d9e5451f1 100644 --- a/pcbnew/dialogs/dialog_update_pcb.fbp +++ b/pcbnew/dialogs/dialog_update_pcb.fbp @@ -141,7 +141,7 @@ 0 0 wxID_ANY - Match components by: + Match footprints by: 0 diff --git a/pcbnew/dialogs/dialog_update_pcb_base.cpp b/pcbnew/dialogs/dialog_update_pcb_base.cpp index 0df32b0f1e..400323b3a3 100644 --- a/pcbnew/dialogs/dialog_update_pcb_base.cpp +++ b/pcbnew/dialogs/dialog_update_pcb_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 21 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "wx_html_report_panel.h" @@ -23,7 +23,7 @@ DIALOG_UPDATE_PCB_BASE::DIALOG_UPDATE_PCB_BASE( wxWindow* parent, wxWindowID id, fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText1 = new wxStaticText( this, wxID_ANY, _("Match components by:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1 = new wxStaticText( this, wxID_ANY, _("Match footprints by:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); fgSizer2->Add( m_staticText1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/pcbnew/dialogs/dialog_update_pcb_base.h b/pcbnew/dialogs/dialog_update_pcb_base.h index f9b3ba6482..86e1957f14 100644 --- a/pcbnew/dialogs/dialog_update_pcb_base.h +++ b/pcbnew/dialogs/dialog_update_pcb_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 21 2016) +// C++ code generated with wxFormBuilder (version Nov 22 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO "NOT" EDIT THIS FILE! +// PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __DIALOG_UPDATE_PCB_BASE_H__ @@ -11,7 +11,6 @@ #include #include #include -class DIALOG_SHIM; class WX_HTML_REPORT_PANEL; #include "dialog_shim.h" diff --git a/pcbnew/legacy_netlist_reader.cpp b/pcbnew/legacy_netlist_reader.cpp index 1788e6473b..ac901eb81d 100644 --- a/pcbnew/legacy_netlist_reader.cpp +++ b/pcbnew/legacy_netlist_reader.cpp @@ -117,7 +117,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText ) // Read time stamp (first word) if( ( text = strtok( line, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse time stamp in component section of netlist." ); + msg = _( "Cannot parse time stamp in symbol section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), line, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -127,7 +127,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText ) // Read footprint name (second word) if( ( text = strtok( NULL, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse footprint name in component section of netlist." ); + msg = _( "Cannot parse footprint name in symbol section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), aText, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -141,7 +141,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText ) // Read schematic reference designator (third word) if( ( text = strtok( NULL, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse reference designator in component section of netlist." ); + msg = _( "Cannot parse reference designator in symbol section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), aText, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -151,7 +151,7 @@ COMPONENT* LEGACY_NETLIST_READER::loadComponent( char* aText ) // Read schematic value (forth word) if( ( text = strtok( NULL, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse value in component section of netlist." ); + msg = _( "Cannot parse value in symbol section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), aText, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -188,7 +188,7 @@ void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent ) if( ( p = strtok( line, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse pin name in component net section of netlist." ); + msg = _( "Cannot parse pin name in symbol net section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), line, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -197,7 +197,7 @@ void LEGACY_NETLIST_READER::loadNet( char* aText, COMPONENT* aComponent ) if( ( p = strtok( NULL, " ()\t\n" ) ) == NULL ) { - msg = _( "Cannot parse net name in component net section of netlist." ); + msg = _( "Cannot parse net name in symbol net section of netlist." ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), line, m_lineReader->LineNumber(), m_lineReader->Length() ); } @@ -245,7 +245,7 @@ void LEGACY_NETLIST_READER::loadFootprintFilters() if( component == NULL ) { wxString msg; - msg.Printf( _( "Cannot find component \"%s\" in footprint filter section " + msg.Printf( _( "Cannot find symbol \"%s\" in footprint filter section " "of netlist." ), GetChars( cmpRef ) ); THROW_PARSE_ERROR( msg, m_lineReader->GetSource(), line, m_lineReader->LineNumber(), m_lineReader->Length() ); diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index ca2780b7c1..3085d5a4d3 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -838,7 +838,7 @@ void prepareExportMenu( wxMenu* aParentMenu ) KiBitmap( three_d_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_IDF3, - _( "I&DFv3" ), _( "IDFv3 board and component export" ), + _( "I&DFv3" ), _( "IDFv3 board and symbol export" ), KiBitmap( export_idf_xpm ) ); AddMenuItem( aParentMenu, ID_GEN_EXPORT_FILE_STEP, @@ -846,7 +846,7 @@ void prepareExportMenu( wxMenu* aParentMenu ) KiBitmap( export_idf_xpm ) ); AddMenuItem( aParentMenu, ID_PCB_GEN_CMP_FILE, - _( "&Component (.cmp) File" ), - _( "Export component file (*.cmp) for Eeschema footprint field back-annotation" ), + _( "&Footprint Association (.cmp) File" ), + _( "Export footprint association file (*.cmp) for schematic back annotation" ), KiBitmap( create_cmp_file_xpm ) ); } diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp index 65e027edfd..22976ba51f 100644 --- a/pcbnew/netlist.cpp +++ b/pcbnew/netlist.cpp @@ -247,7 +247,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter ) { if( aReporter ) { - msg.Printf( _( "No footprint defined for component \"%s\".\n" ), + msg.Printf( _( "No footprint defined for symbol \"%s\".\n" ), GetChars( component->GetReference() ) ); aReporter->Report( msg, REPORTER::RPT_ERROR ); } @@ -269,7 +269,7 @@ void PCB_EDIT_FRAME::LoadFootprints( NETLIST& aNetlist, REPORTER* aReporter ) { if( aReporter ) { - msg.Printf( _( "Footprint of component \"%s\" changed: board footprint \"%s\", netlist footprint \"%s\"\n" ), + msg.Printf( _( "Footprint of symbol \"%s\" changed: board footprint \"%s\", netlist footprint \"%s\"\n" ), GetChars( component->GetReference() ), GetChars( fpOnBoard->GetFPID().Format() ), GetChars( component->GetFPID().Format() ) ); diff --git a/pcbnew/specctra_export.cpp b/pcbnew/specctra_export.cpp index efab47ed44..587fc3a0e9 100644 --- a/pcbnew/specctra_export.cpp +++ b/pcbnew/specctra_export.cpp @@ -803,7 +803,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) if( module->GetReference() == wxEmptyString ) { - THROW_IO_ERROR( wxString::Format( _( "Component with value of \"%s\" has empty reference id." ), + THROW_IO_ERROR( wxString::Format( _( "Symbol with value of \"%s\" has empty reference id." ), GetChars( module->GetValue() ) ) ); } @@ -811,7 +811,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard ) STRINGSET_PAIR refpair = refs.insert( TO_UTF8( module->GetReference() ) ); if( !refpair.second ) // insert failed { - THROW_IO_ERROR( wxString::Format( _( "Multiple components have identical reference IDs of \"%s\"." ), + THROW_IO_ERROR( wxString::Format( _( "Multiple symbols have identical reference IDs of \"%s\"." ), GetChars( module->GetReference() ) ) ); } } diff --git a/pcbnew/specctra_import.cpp b/pcbnew/specctra_import.cpp index 6220f1eaae..9e0bd786a1 100644 --- a/pcbnew/specctra_import.cpp +++ b/pcbnew/specctra_import.cpp @@ -404,7 +404,7 @@ void SPECCTRA_DB::FromSESSION( BOARD* aBoard ) MODULE* module = aBoard->FindModuleByReference( reference ); if( !module ) { - THROW_IO_ERROR( wxString::Format( _("Session file has 'reference' to non-existent component \"%s\""), + THROW_IO_ERROR( wxString::Format( _("Session file has 'reference' to non-existent symbol \"%s\""), GetChars( reference ) ) ); }