diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp index 6bd2324dac..b22810821c 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp @@ -116,8 +116,6 @@ DIALOG_FOOTPRINT_BOARD_EDITOR::DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aP infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); m_allow90Label->SetFont( infoFont ); m_allow180Label->SetFont( infoFont ); - m_libraryIDLabel->SetFont( infoFont ); - m_staticLibraryID->SetFont( infoFont ); m_staticTextInfoCopper->SetFont( infoFont ); m_staticTextInfoPaste->SetFont( infoFont ); @@ -377,7 +375,7 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataToWindow() m_PreviewPane->UpdateDummyModule(); // Show the footprint's ID. - m_staticLibraryID->SetLabel( m_footprint->GetFPID().Format() ); + m_tcLibraryID->SetValue( m_footprint->GetFPID().Format() ); for( int col = 0; col < m_itemsGrid->GetNumberCols(); col++ ) { diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 9e30a2610f..c9402d0e11 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -500,24 +500,22 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); wxFlexGridSizer* fgSizerSymbolRef; - fgSizerSymbolRef = new wxFlexGridSizer( 2, 2, 1, 0 ); + fgSizerSymbolRef = new wxFlexGridSizer( 0, 2, 1, 0 ); + fgSizerSymbolRef->AddGrowableCol( 1 ); fgSizerSymbolRef->SetFlexibleDirection( wxBOTH ); fgSizerSymbolRef->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_libraryIDLabel = new wxStaticText( this, wxID_ANY, _("Library reference:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_libraryIDLabel = new wxStaticText( this, wxID_ANY, _("Library Id:"), wxDefaultPosition, wxDefaultSize, 0 ); m_libraryIDLabel->Wrap( -1 ); - m_libraryIDLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_libraryIDLabel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxBOTTOM|wxRIGHT|wxLEFT, 3 ); + fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 3 ); - m_staticLibraryID = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticLibraryID->Wrap( -1 ); - m_staticLibraryID->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - fgSizerSymbolRef->Add( m_staticLibraryID, 0, wxBOTTOM, 3 ); + m_tcLibraryID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + fgSizerSymbolRef->Add( m_tcLibraryID, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); - bSizerButtons->Add( fgSizerSymbolRef, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); + bSizerButtons->Add( fgSizerSymbolRef, 1, wxALIGN_CENTER_VERTICAL, 10 ); m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 3c4364fa1d..7e19a94eaf 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -14,6 +14,7 @@ dialog_edit_footprint_for_BoardEditor_base 1000 none + 1 dialog_edit_footprint_for_BoardEditor_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -4029,23 +4031,23 @@ none 10 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL 1 2 wxBOTH - + 1 0 fgSizerSymbolRef wxFLEX_GROWMODE_SPECIFIED none - 2 + 0 1 3 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM 0 1 @@ -4071,11 +4073,11 @@ 1 1 - ,90,90,11,70,0 + ,90,90,-1,70,0 0 0 wxID_ANY - Library reference: + Library Id: 0 0 @@ -4105,10 +4107,10 @@ - 3 - wxBOTTOM + 5 + wxEXPAND|wxTOP|wxBOTTOM 0 - + 1 1 1 @@ -4132,20 +4134,19 @@ 1 1 - ,90,90,11,70,0 + 0 0 wxID_ANY - MyLabel - 0 0 + 0 1 - m_staticLibraryID + m_tcLibraryID 1 @@ -4155,14 +4156,18 @@ Resizable 1 - - ; forward_declare + wxTE_READONLY + ; ; forward_declare 0 + + wxFILTER_NONE + wxDefaultValidator + + - -1 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index 0e3996a6f5..fec087c172 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -113,7 +113,7 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM wxButton* m_button8; wxBoxSizer* bLowerSizer3D; wxStaticText* m_libraryIDLabel; - wxStaticText* m_staticLibraryID; + wxTextCtrl* m_tcLibraryID; wxStdDialogButtonSizer* m_sdbSizerStdButtons; wxButton* m_sdbSizerStdButtonsOK; wxButton* m_sdbSizerStdButtonsCancel;