diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp index 3e28f1a5b5..11bc1648fd 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp @@ -282,6 +282,8 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataToWindow() m_BoardSideCtrl->SetSelection( (m_footprint->GetLayer() == B_Cu) ? 1 : 0 ); + m_tcUniqueID->SetValue( m_footprint->GetPath() ); + if( m_footprint->IsLocked() ) m_AutoPlaceCtrl->SetSelection( 2 ); else if( m_footprint->PadsLocked() ) diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 2ef162af05..019f5470c7 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 v3.8.0) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -179,21 +179,31 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerLeft->Add( sbOrientationSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bSizerBoardSize; - bSizerBoardSize = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizerFpInfo; + fgSizerFpInfo = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizerFpInfo->AddGrowableCol( 1 ); + fgSizerFpInfo->SetFlexibleDirection( wxBOTH ); + fgSizerFpInfo->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_BoardSideLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Board side:"), wxDefaultPosition, wxDefaultSize, 0 ); m_BoardSideLabel->Wrap( -1 ); - bSizerBoardSize->Add( m_BoardSideLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerFpInfo->Add( m_BoardSideLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxString m_BoardSideCtrlChoices[] = { _("Front"), _("Back") }; int m_BoardSideCtrlNChoices = sizeof( m_BoardSideCtrlChoices ) / sizeof( wxString ); m_BoardSideCtrl = new wxChoice( m_PanelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_BoardSideCtrlNChoices, m_BoardSideCtrlChoices, 0 ); m_BoardSideCtrl->SetSelection( 0 ); - bSizerBoardSize->Add( m_BoardSideCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerFpInfo->Add( m_BoardSideCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + m_BoardUniqueIDlabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Sheet path:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_BoardUniqueIDlabel->Wrap( -1 ); + fgSizerFpInfo->Add( m_BoardUniqueIDlabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + m_tcUniqueID = new wxTextCtrl( m_PanelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + fgSizerFpInfo->Add( m_tcUniqueID, 0, wxALL|wxEXPAND, 5 ); - bSizerLeft->Add( bSizerBoardSize, 0, wxEXPAND|wxALL, 5 ); + bSizerLeft->Add( fgSizerFpInfo, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizerProperties->Add( bSizerLeft, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index eb845e329a..bc0e9fcffc 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 @@ -879,7 +881,7 @@ 5 wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 - + wxID_ANY Orientation @@ -887,11 +889,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND 1 - + wxBOTH 1 @@ -902,14 +904,14 @@ wxFLEX_GROWMODE_SPECIFIED none 4 - + 5 2 0 0 1 - + 1 1 1 @@ -970,14 +972,14 @@ ModuleOrientEvent - + 5 2 0 1 1 - + 1 1 1 @@ -1038,14 +1040,14 @@ ModuleOrientEvent - + 5 2 0 2 1 - + 1 1 1 @@ -1106,14 +1108,14 @@ ModuleOrientEvent - + 5 2 0 3 1 - + 1 1 1 @@ -1174,14 +1176,14 @@ ModuleOrientEvent - + 5 1 0 wxALIGN_CENTER_VERTICAL 4 1 - + 1 1 1 @@ -1242,14 +1244,14 @@ ModuleOrientEvent - + 5 1 1 wxRIGHT|wxLEFT|wxEXPAND 4 1 - + 1 1 1 @@ -1316,13 +1318,20 @@ 5 - wxEXPAND|wxALL + wxEXPAND|wxRIGHT|wxLEFT 0 - + + 2 + wxBOTH + 1 + + 0 - bSizerBoardSize - wxHORIZONTAL + fgSizerFpInfo + wxFLEX_GROWMODE_SPECIFIED none + 0 + 0 5 wxALIGN_CENTER_VERTICAL|wxALL @@ -1386,8 +1395,8 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL - 1 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 1 1 @@ -1448,6 +1457,131 @@ + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Sheet path: + 0 + + 0 + + + 0 + + 1 + m_BoardUniqueIDlabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_tcUniqueID + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index 4c0a18aa11..e0f21b27e9 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 v3.8.0) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -71,6 +71,8 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM wxTextCtrl* m_OrientValueCtrl; wxStaticText* m_BoardSideLabel; wxChoice* m_BoardSideCtrl; + wxStaticText* m_BoardUniqueIDlabel; + wxTextCtrl* m_tcUniqueID; wxRadioBox* m_AutoPlaceCtrl; wxStaticBoxSizer* m_sizerAP; wxBoxSizer* m_sizerAllow90;