diff --git a/pcbnew/dialogs/dialog_board_reannotate_base.cpp b/pcbnew/dialogs/dialog_board_reannotate_base.cpp index da828a6b31..a2dd3faa02 100644 --- a/pcbnew/dialogs/dialog_board_reannotate_base.cpp +++ b/pcbnew/dialogs/dialog_board_reannotate_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 21 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -9,12 +9,11 @@ #include "dialog_board_reannotate_base.h" - /////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_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 ); - this->SetToolTip( _("OK saves change or log files and exits.\nCancel exits without saving change or log files.") ); wxBoxSizer* bmainSizer; bmainSizer = new wxBoxSizer( wxVERTICAL ); @@ -22,16 +21,6 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx wxBoxSizer* bupperSizer; bupperSizer = new wxBoxSizer( wxVERTICAL ); - wxFlexGridSizer* fgSizer31; - fgSizer31 = new wxFlexGridSizer( 2, 2, 0, 0 ); - fgSizer31->AddGrowableCol( 0 ); - fgSizer31->AddGrowableCol( 1 ); - fgSizer31->SetFlexibleDirection( wxBOTH ); - fgSizer31->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - bupperSizer->Add( fgSizer31, 0, wxBOTTOM|wxEXPAND, 0 ); - m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_StandardOptions = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTAB_TRAVERSAL ); wxBoxSizer* bSizer4; @@ -47,7 +36,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx m_Down_Right = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_Down_Right->SetValue( true ); - fgSizer5->Add( m_Down_Right, 0, wxALL, 5 ); + fgSizer5->Add( m_Down_Right, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_down_right_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_down_right_bitmap->SetToolTip( _("Horizontally: top left to bottom right") ); @@ -58,7 +47,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 80, 0, 1, wxEXPAND, 5 ); m_Right_Down = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Right_Down, 0, wxALL, 5 ); + fgSizer5->Add( m_Right_Down, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_right_down_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_right_down_bitmap->SetToolTip( _("Horizontally: top right to bottom left") ); @@ -69,7 +58,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 80, 0, 1, wxEXPAND, 5 ); m_Down_Left = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Down_Left, 0, wxALL, 5 ); + fgSizer5->Add( m_Down_Left, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_down_left_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_down_left_bitmap->SetToolTip( _("Horizontally: bottom left to top right") ); @@ -80,7 +69,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 80, 0, 1, wxEXPAND, 5 ); m_Left_Down = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Left_Down, 0, wxALL, 5 ); + fgSizer5->Add( m_Left_Down, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_left_down_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_left_down_bitmap->SetToolTip( _("Horizontally:: bottom right to top left") ); @@ -88,7 +77,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( reannotate_left_down_bitmap, 0, wxALL, 5 ); m_Up_Right = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Up_Right, 0, wxALL, 5 ); + fgSizer5->Add( m_Up_Right, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_up_right_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_up_right_bitmap->SetToolTip( _("Vertically: top left to bottom right") ); @@ -99,7 +88,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 50, 0, 1, wxEXPAND, 5 ); m_Right_Up = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Right_Up, 0, wxALL, 5 ); + fgSizer5->Add( m_Right_Up, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_right_up_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_right_up_bitmap->SetToolTip( _("Vertically: top right to bottom left") ); @@ -110,7 +99,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 50, 0, 1, wxEXPAND, 5 ); m_Up_Left = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Up_Left, 0, wxALL, 5 ); + fgSizer5->Add( m_Up_Left, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_up_left_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_up_left_bitmap->SetToolTip( _("Vertically: bottom left to top right") ); @@ -121,7 +110,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer5->Add( 50, 0, 1, wxEXPAND, 5 ); m_Left_Up = new wxRadioButton( sbSizer3->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_Left_Up, 0, wxALL, 5 ); + fgSizer5->Add( m_Left_Up, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); reannotate_left_up_bitmap = new wxStaticBitmap( sbSizer3->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 ); reannotate_left_up_bitmap->SetToolTip( _("Vertically: bottom right to top left") ); @@ -132,7 +121,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx sbSizer3->Add( fgSizer5, 1, wxEXPAND, 5 ); - bSizer4->Add( sbSizer3, 0, wxALL|wxEXPAND, 0 ); + bSizer4->Add( sbSizer3, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer4; sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_StandardOptions, wxID_ANY, wxEmptyString ), wxVERTICAL ); @@ -171,7 +160,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer331->SetFlexibleDirection( wxBOTH ); fgSizer331->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_SortOn = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("Sort on: "), wxDefaultPosition, wxDefaultSize, 0 ); + m_SortOn = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("Sort by:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SortOn->Wrap( -1 ); m_SortOn->SetMinSize( wxSize( 100,-1 ) ); @@ -184,16 +173,16 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer331->Add( m_SortOnModules, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_SortOnReference = new wxRadioButton( sbSizer4->GetStaticBox(), wxID_ANY, _("References"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); - m_SortOnReference->SetToolTip( _("Annotation based on reference coordinates") ); + m_SortOnReference->SetToolTip( _("Annotation based on reference designator coordinates") ); m_SortOnReference->SetMinSize( wxSize( 130,-1 ) ); fgSizer331->Add( m_SortOnReference, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - sbSizer4->Add( fgSizer331, 1, wxEXPAND, 0 ); + sbSizer4->Add( fgSizer331, 1, wxALL|wxEXPAND, 5 ); - bSizer4->Add( sbSizer4, 0, wxEXPAND, 0 ); + bSizer4->Add( sbSizer4, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer31; sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( m_StandardOptions, wxID_ANY, wxEmptyString ), wxVERTICAL ); @@ -211,7 +200,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx m_AnnotateAll = new wxRadioButton( sbSizer31->GetStaticBox(), wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, 0 ); m_AnnotateAll->SetValue( true ); - fgSizer6111->Add( m_AnnotateAll, 0, wxALL, 5 ); + fgSizer6111->Add( m_AnnotateAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_AnnotateFront = new wxRadioButton( sbSizer31->GetStaticBox(), wxID_ANY, _("Front"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer6111->Add( m_AnnotateFront, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -226,7 +215,7 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx sbSizer31->Add( fgSizer6111, 1, wxEXPAND, 5 ); - bSizer4->Add( sbSizer31, 0, wxEXPAND, 0 ); + bSizer4->Add( sbSizer31, 0, wxALL|wxEXPAND, 5 ); m_StandardOptions->SetSizer( bSizer4 ); @@ -242,108 +231,105 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + fgSizer3->Add( 48, 0, 1, wxEXPAND, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + + + fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + + + bSizer5->Add( fgSizer3, 0, wxEXPAND, 0 ); + + wxGridBagSizer* gbSizer1; + gbSizer1 = new wxGridBagSizer( 5, 5 ); + gbSizer1->SetFlexibleDirection( wxBOTH ); + gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_FrontRefDesStartText = new wxStaticText( m_Advanced, wxID_ANY, _("Front reference start:"), wxDefaultPosition, wxDefaultSize, 0 ); m_FrontRefDesStartText->Wrap( -1 ); m_FrontRefDesStartText->SetToolTip( _("Starting reference designation for front.") ); - fgSizer3->Add( m_FrontRefDesStartText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_FrontRefDesStartText, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_FrontRefDesStart = new wxTextCtrl( m_Advanced, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, 0 ); m_FrontRefDesStart->SetToolTip( _("Default is 1") ); - fgSizer3->Add( m_FrontRefDesStart, 0, wxALL|wxLEFT, 5 ); - - - fgSizer3->Add( 48, 0, 1, wxEXPAND, 5 ); + gbSizer1->Add( m_FrontRefDesStart, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); m_BottomRefDesStartText = new wxStaticText( m_Advanced, wxID_ANY, _("Back reference start:"), wxDefaultPosition, wxDefaultSize, 0 ); m_BottomRefDesStartText->Wrap( -1 ); m_BottomRefDesStartText->SetToolTip( _("Blank continues from front or enter a number greater than the highest reference designation on the front.") ); - fgSizer3->Add( m_BottomRefDesStartText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_BottomRefDesStartText, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_BackRefDesStart = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_BackRefDesStart->SetToolTip( _("Leave blank or zero, or enter a number greater than the highest reference designation on the front.") ); - fgSizer3->Add( m_BackRefDesStart, 0, wxALL, 5 ); + gbSizer1->Add( m_BackRefDesStart, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + m_RemoveFrontPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove front prefix"), wxDefaultPosition, wxDefaultSize, 0 ); + m_RemoveFrontPrefix->SetToolTip( _("If checked will remove the front side prefix\nin the front prefix box if present") ); - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + gbSizer1->Add( m_RemoveFrontPrefix, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxALL, 5 ); + + m_RemoveBackPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove back prefix"), wxDefaultPosition, wxDefaultSize, 0 ); + m_RemoveBackPrefix->SetToolTip( _("If checked will remove the Back side prefix\nin the back prefix box if present") ); + + gbSizer1->Add( m_RemoveBackPrefix, wxGBPosition( 2, 2 ), wxGBSpan( 1, 2 ), wxALL, 5 ); m_FrontPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Front prefix:"), wxDefaultPosition, wxDefaultSize, 0 ); m_FrontPrefixText->Wrap( -1 ); m_FrontPrefixText->SetToolTip( _("Optional prefix for component side reference designations (i.e. F_)") ); - fgSizer3->Add( m_FrontPrefixText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_FrontPrefixText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_FrontPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_FrontPrefix->SetToolTip( _("Optional prefix for component side reference designations (i.e. F_)") ); - fgSizer3->Add( m_FrontPrefix, 0, wxALL, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); + gbSizer1->Add( m_FrontPrefix, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); m_BackPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Back prefix:"), wxDefaultPosition, wxDefaultSize, 0 ); m_BackPrefixText->Wrap( -1 ); m_BackPrefixText->SetToolTip( _("Optional prefix for solder side reference designations (i.e. B_)") ); - fgSizer3->Add( m_BackPrefixText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_BackPrefixText, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_BackPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_BackPrefix->SetToolTip( _("Optional prefix for solder side reference designations (i.e. B_)") ); - fgSizer3->Add( m_BackPrefix, 0, wxALL, 5 ); + gbSizer1->Add( m_BackPrefix, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + m_ExcludeLocked = new wxCheckBox( m_Advanced, wxID_ANY, _("Exclude locked footprints"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ExcludeLocked->SetToolTip( _("Locked footprints will not be reannotated") ); - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_RemoveFrontPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove front prefix"), wxDefaultPosition, wxDefaultSize, 0 ); - m_RemoveFrontPrefix->SetToolTip( _("If checked will remove the front side prefix\nin the front prefix box if present") ); - - fgSizer3->Add( m_RemoveFrontPrefix, 0, wxALL, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - - fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_RemoveBackPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove back prefix"), wxDefaultPosition, wxDefaultSize, 0 ); - m_RemoveBackPrefix->SetToolTip( _("If checked will remove the Back side prefix\nin the back prefix box if present") ); - - fgSizer3->Add( m_RemoveBackPrefix, 0, wxALL, 5 ); - - - bSizer5->Add( fgSizer3, 0, wxEXPAND, 0 ); - - wxFlexGridSizer* fgSizer351; - fgSizer351 = new wxFlexGridSizer( 0, 4, 0, 0 ); - fgSizer351->SetFlexibleDirection( wxBOTH ); - fgSizer351->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + gbSizer1->Add( m_ExcludeLocked, wxGBPosition( 3, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_ExcludeListText = new wxStaticText( m_Advanced, wxID_ANY, _("Exclude references:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExcludeListText->Wrap( -1 ); m_ExcludeListText->SetToolTip( _("Do not re-annotate this type \nof reference (R means R*)") ); m_ExcludeListText->SetMinSize( wxSize( 150,-1 ) ); - fgSizer351->Add( m_ExcludeListText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer1->Add( m_ExcludeListText, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_ExcludeList = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ExcludeList->SetMinSize( wxSize( 153,-1 ) ); - fgSizer351->Add( m_ExcludeList, 0, wxALL, 5 ); + gbSizer1->Add( m_ExcludeList, wxGBPosition( 3, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 ); - fgSizer351->Add( 50, 0, 1, wxEXPAND, 5 ); - - m_ExcludeLocked = new wxCheckBox( m_Advanced, wxID_ANY, _("Exclude locked footprints"), wxDefaultPosition, wxDefaultSize, 0 ); - m_ExcludeLocked->SetToolTip( _("Locked footprints will not be reannotated") ); - - fgSizer351->Add( m_ExcludeLocked, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - - bSizer5->Add( fgSizer351, 1, wxEXPAND, 5 ); + bSizer5->Add( gbSizer1, 1, wxALL|wxEXPAND, 5 ); m_Advanced->SetSizer( bSizer5 ); @@ -353,18 +339,16 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx bupperSizer->Add( m_notebook, 1, wxALL|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - wxFlexGridSizer* fgSizer36; - fgSizer36 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer36->SetFlexibleDirection( wxBOTH ); - fgSizer36->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - bupperSizer->Add( fgSizer36, 0, wxEXPAND, 5 ); + wxBoxSizer* bSizer6; + bSizer6 = new wxBoxSizer( wxVERTICAL ); m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL ); m_MessageWindow->SetMinSize( wxSize( -1,150 ) ); - bupperSizer->Add( m_MessageWindow, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + bSizer6->Add( m_MessageWindow, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 ); + + + bupperSizer->Add( bSizer6, 1, wxALL|wxEXPAND, 5 ); bmainSizer->Add( bupperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); diff --git a/pcbnew/dialogs/dialog_board_reannotate_base.fbp b/pcbnew/dialogs/dialog_board_reannotate_base.fbp index ae785642a6..257a331acf 100644 --- a/pcbnew/dialogs/dialog_board_reannotate_base.fbp +++ b/pcbnew/dialogs/dialog_board_reannotate_base.fbp @@ -1,3167 +1,3168 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_board_reannotate_base - 1000 - none - - - 1 - dialog_board_reannotate_base - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_BOARD_REANNOTATE_BASE - - 745,760 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Annotate PCB Geographically - OK saves change or log files and exits. Cancel exits without saving change or log files. - - - - OnClose - - - bmainSizer - wxVERTICAL - none - - 6 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 1 - - - bupperSizer - wxVERTICAL - none - - 0 - wxBOTTOM|wxEXPAND - 0 - - 2 - wxBOTH - 0,1 - - 0 - - fgSizer31 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - - - 5 - wxALL|wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_notebook - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - - - Standard Options - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - -1,-1 - - 0 - -1,-1 - 1 - m_StandardOptions - 1 - - - protected - 0 - - Resizable - 1 - -1,-1 - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer4 - wxVERTICAL - none - - 0 - wxALL|wxEXPAND - 0 - - wxID_ANY - Sorting - - sbSizer3 - wxHORIZONTAL - 1 - none - - 5 - wxEXPAND - 1 - - 11 - wxBOTH - - - 0 - - fgSizer5 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Down_Right - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_down_right_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Horizontally: top left to bottom right - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 80 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Right_Down - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_right_down_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Horizontally: top right to bottom left - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 80 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Down_Left - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_down_left_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Horizontally: bottom left to top right - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 80 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Left_Down - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_left_down_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Horizontally:: bottom right to top left - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Up_Right - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_up_right_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Vertically: top left to bottom right - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 50 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Right_Up - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_right_up_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Vertically: top right to bottom left - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 50 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Up_Left - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_up_left_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Vertically: bottom left to top right - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 50 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_Left_Up - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - reannotate_left_up_bitmap - 1 - - - protected - 1 - - Resizable - 1 - 48,48 - ; ; forward_declare - 0 - Vertically: bottom right to top left - - - - - - - - - - - 0 - wxEXPAND - 0 - - wxID_ANY - - - sbSizer4 - wxVERTICAL - 1 - none - - 0 - wxEXPAND|wxALL - 0 - - 4 - wxBOTH - - - 0 - - fgSizer11 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Update schematic - - 0 - - - 0 - - 1 - m_UpdateSchematic - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 100 - - - - 5 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Round to: - 0 - - 0 - - - 0 - - 1 - m_SortGridText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Component position will be rounded to this grid before sorting. This helps with misaligned parts. - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 300,-1 - 1 - m_GridChoice - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - Component position will be rounded to this grid before sorting. This helps with misaligned parts. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 0 - wxEXPAND - 1 - - 3 - wxBOTH - - - 0 - - fgSizer331 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 0 - wxALIGN_BOTTOM|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Sort on: - 0 - - 0 - - - 0 - 100,-1 - 1 - m_SortOn - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Footprints - - 0 - - - 0 - - 1 - m_SortOnModules - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - ; ; forward_declare - 0 - Annotation based on footprint coordinates - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - References - - 0 - - - 0 - 130,-1 - 1 - m_SortOnReference - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - ; ; forward_declare - 0 - Annotation based on reference coordinates - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - 0 - wxEXPAND - 0 - - wxID_ANY - - - sbSizer31 - wxVERTICAL - 1 - none - - 5 - wxEXPAND - 1 - - 7 - wxHORIZONTAL - - - 0 - -1,-1 - fgSizer6111 - wxFLEX_GROWMODE_NONE - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Annotate: - 0 - - 0 - - - 0 - 100,-1 - 1 - AnnotateLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - All - - 0 - - - 0 - - 1 - m_AnnotateAll - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Front - - 0 - - - 0 - - 1 - m_AnnotateFront - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Back - - 0 - - - 0 - - 1 - m_AnnotateBack - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Selection - - 0 - - - 0 - - 1 - m_AnnotateSelection - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - Reference Designators - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_Advanced - 1 - - - protected - 1 - - Resizable - 1 - - ; ; forward_declare - 0 - - - - wxTAB_TRAVERSAL - - - bSizer5 - wxVERTICAL - none - - 0 - wxEXPAND - 0 - - 6 - wxBOTH - - - 0 - -1,-1 - fgSizer3 - wxFLEX_GROWMODE_SPECIFIED - none - 3 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Front reference start: - 0 - - 0 - - - 0 - - 1 - m_FrontRefDesStartText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Starting reference designation for front. - - - - -1 - - - - 5 - wxALL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_FrontRefDesStart - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Default is 1 - - wxFILTER_NUMERIC - wxDefaultValidator - - 1 - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 48 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Back reference start: - 0 - - 0 - - - 0 - - 1 - m_BottomRefDesStartText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Blank continues from front or enter a number greater than the highest reference designation on the front. - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_BackRefDesStart - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Leave blank or zero, or enter a number greater than the highest reference designation on the front. - - wxFILTER_NUMERIC - wxGenericValidator - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Front prefix: - 0 - - 0 - - - 0 - - 1 - m_FrontPrefixText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Optional prefix for component side reference designations (i.e. F_) - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_FrontPrefix - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Optional prefix for component side reference designations (i.e. F_) - - wxFILTER_ALPHA - wxGenericValidator - - - - - - FilterFrontPrefix - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Back prefix: - 0 - - 0 - - - 0 - - 1 - m_BackPrefixText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Optional prefix for solder side reference designations (i.e. B_) - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_BackPrefix - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Optional prefix for solder side reference designations (i.e. B_) - - wxFILTER_ALPHA|wxFILTER_NONE - wxGenericValidator - - - - - - FilterBackPrefix - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Remove front prefix - - 0 - - - 0 - - 1 - m_RemoveFrontPrefix - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - If checked will remove the front side prefix in the front prefix box if present - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Remove back prefix - - 0 - - - 0 - - 1 - m_RemoveBackPrefix - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - If checked will remove the Back side prefix in the back prefix box if present - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxEXPAND - 1 - - 4 - wxBOTH - - - 0 - - fgSizer351 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Exclude references: - 0 - - 0 - - - 0 - 150,-1 - 1 - m_ExcludeListText - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Do not re-annotate this type of reference (R means R*) - - - - -1 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 153,-1 - 1 - m_ExcludeList - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_ALPHA - wxDefaultValidator - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 50 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Exclude locked footprints - - 0 - - - 0 - - 1 - m_ExcludeLocked - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Locked footprints will not be reannotated - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - 3 - wxBOTH - - - 0 - - fgSizer36 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - - - 5 - wxEXPAND|wxLEFT|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,150 - 1 - m_MessageWindow - 1 - - - protected - 1 - - Resizable - 1 - - WX_HTML_REPORT_PANEL; wx_html_report_panel.h; forward_declare - 0 - - - - wxTAB_TRAVERSAL|wxVSCROLL - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - m_buttonsSizer - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 1 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer - protected - OnCloseClick - OnApplyClick - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_board_reannotate_base + 1000 + none + + 1 + dialog_board_reannotate_base + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_BOARD_REANNOTATE_BASE + + 745,760 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Annotate PCB Geographically + + + + + OnClose + + + bmainSizer + wxVERTICAL + none + + 6 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 1 + + + bupperSizer + wxVERTICAL + none + + 5 + wxALL|wxEXPAND|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_notebook + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + + + Standard Options + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + 0 + -1,-1 + 1 + m_StandardOptions + 1 + + + protected + 0 + + Resizable + 1 + -1,-1 + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer4 + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + Sorting + + sbSizer3 + wxHORIZONTAL + 1 + none + + 5 + wxEXPAND + 1 + + 11 + wxBOTH + + + 0 + + fgSizer5 + wxFLEX_GROWMODE_SPECIFIED + none + 2 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Down_Right + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_down_right_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Horizontally: top left to bottom right + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 80 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Right_Down + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_right_down_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Horizontally: top right to bottom left + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 80 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Down_Left + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_down_left_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Horizontally: bottom left to top right + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 80 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Left_Down + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_left_down_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Horizontally:: bottom right to top left + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Up_Right + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_up_right_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Vertically: top left to bottom right + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 50 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Right_Up + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_right_up_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Vertically: top right to bottom left + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 50 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Up_Left + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_up_left_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Vertically: bottom left to top right + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 50 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_Left_Up + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + reannotate_left_up_bitmap + 1 + + + protected + 1 + + Resizable + 1 + 48,48 + ; ; forward_declare + 0 + Vertically: bottom right to top left + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + + + sbSizer4 + wxVERTICAL + 1 + none + + 0 + wxEXPAND|wxALL + 0 + + 4 + wxBOTH + + + 0 + + fgSizer11 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Update schematic + + 0 + + + 0 + + 1 + m_UpdateSchematic + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 100 + + + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Round to: + 0 + + 0 + + + 0 + + 1 + m_SortGridText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Component position will be rounded to this grid before sorting. This helps with misaligned parts. + + + + -1 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 300,-1 + 1 + m_GridChoice + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + Component position will be rounded to this grid before sorting. This helps with misaligned parts. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + 3 + wxBOTH + + + 0 + + fgSizer331 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 0 + wxALIGN_BOTTOM|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Sort by: + 0 + + 0 + + + 0 + 100,-1 + 1 + m_SortOn + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Footprints + + 0 + + + 0 + + 1 + m_SortOnModules + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + ; ; forward_declare + 0 + Annotation based on footprint coordinates + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + References + + 0 + + + 0 + 130,-1 + 1 + m_SortOnReference + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + ; ; forward_declare + 0 + Annotation based on reference designator coordinates + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + + + sbSizer31 + wxVERTICAL + 1 + none + + 5 + wxEXPAND + 1 + + 7 + wxHORIZONTAL + + + 0 + -1,-1 + fgSizer6111 + wxFLEX_GROWMODE_NONE + none + 0 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Annotate: + 0 + + 0 + + + 0 + 100,-1 + 1 + AnnotateLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + All + + 0 + + + 0 + + 1 + m_AnnotateAll + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Front + + 0 + + + 0 + + 1 + m_AnnotateFront + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Back + + 0 + + + 0 + + 1 + m_AnnotateBack + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Selection + + 0 + + + 0 + + 1 + m_AnnotateSelection + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + Reference Designators + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_Advanced + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + wxTAB_TRAVERSAL + + + bSizer5 + wxVERTICAL + none + + 0 + wxEXPAND + 0 + + 6 + wxBOTH + + + 0 + -1,-1 + fgSizer3 + wxFLEX_GROWMODE_SPECIFIED + none + 3 + 0 + + 5 + wxEXPAND + 1 + + 0 + protected + 48 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + + + 5 + wxALL|wxEXPAND + 1 + + + wxBOTH + + + 5 + + gbSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 5 + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Front reference start: + 0 + + 0 + + + 0 + + 1 + m_FrontRefDesStartText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Starting reference designation for front. + + + + -1 + + + + 5 + 1 + 1 + wxALL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_FrontRefDesStart + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Default is 1 + + wxFILTER_NUMERIC + wxDefaultValidator + + 1 + + + + + + + 5 + 1 + 2 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Back reference start: + 0 + + 0 + + + 0 + + 1 + m_BottomRefDesStartText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Blank continues from front or enter a number greater than the highest reference designation on the front. + + + + -1 + + + + 5 + 1 + 3 + wxALL + 0 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_BackRefDesStart + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Leave blank or zero, or enter a number greater than the highest reference designation on the front. + + wxFILTER_NUMERIC + wxGenericValidator + + + + + + + + + 5 + 2 + 0 + wxALL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Remove front prefix + + 0 + + + 0 + + 1 + m_RemoveFrontPrefix + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + If checked will remove the front side prefix in the front prefix box if present + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 2 + 2 + wxALL + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Remove back prefix + + 0 + + + 0 + + 1 + m_RemoveBackPrefix + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + If checked will remove the Back side prefix in the back prefix box if present + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Front prefix: + 0 + + 0 + + + 0 + + 1 + m_FrontPrefixText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Optional prefix for component side reference designations (i.e. F_) + + + + -1 + + + + 5 + 1 + 1 + wxALL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_FrontPrefix + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Optional prefix for component side reference designations (i.e. F_) + + wxFILTER_ALPHA + wxGenericValidator + + + + + + FilterFrontPrefix + + + + 5 + 1 + 2 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Back prefix: + 0 + + 0 + + + 0 + + 1 + m_BackPrefixText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Optional prefix for solder side reference designations (i.e. B_) + + + + -1 + + + + 5 + 1 + 3 + wxALL + 1 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_BackPrefix + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Optional prefix for solder side reference designations (i.e. B_) + + wxFILTER_ALPHA|wxFILTER_NONE + wxGenericValidator + + + + + + FilterBackPrefix + + + + 5 + 2 + 0 + wxALIGN_CENTER_VERTICAL|wxALL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Exclude locked footprints + + 0 + + + 0 + + 1 + m_ExcludeLocked + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Locked footprints will not be reannotated + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 1 + 2 + wxALIGN_CENTER_VERTICAL|wxALL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Exclude references: + 0 + + 0 + + + 0 + 150,-1 + 1 + m_ExcludeListText + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Do not re-annotate this type of reference (R means R*) + + + + -1 + + + + 5 + 1 + 3 + wxALL + 3 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + 153,-1 + 1 + m_ExcludeList + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_ALPHA + wxDefaultValidator + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 1 + + + bSizer6 + wxVERTICAL + none + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,150 + 1 + m_MessageWindow + 1 + + + protected + 1 + + Resizable + 1 + + WX_HTML_REPORT_PANEL; wx_html_report_panel.h; forward_declare + 0 + + + + wxTAB_TRAVERSAL|wxVSCROLL + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + m_buttonsSizer + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 1 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer + protected + OnCloseClick + OnApplyClick + + + + + + + + diff --git a/pcbnew/dialogs/dialog_board_reannotate_base.h b/pcbnew/dialogs/dialog_board_reannotate_base.h index bd72095215..0d1b9f2781 100644 --- a/pcbnew/dialogs/dialog_board_reannotate_base.h +++ b/pcbnew/dialogs/dialog_board_reannotate_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 21 2019) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -13,10 +13,9 @@ class WX_HTML_REPORT_PANEL; #include "dialog_shim.h" -#include -#include #include #include +#include #include #include #include @@ -24,6 +23,7 @@ class WX_HTML_REPORT_PANEL; #include #include #include +#include #include #include #include @@ -31,6 +31,7 @@ class WX_HTML_REPORT_PANEL; #include #include #include +#include #include #include #include @@ -80,15 +81,15 @@ class DIALOG_BOARD_REANNOTATE_BASE : public DIALOG_SHIM wxTextCtrl* m_FrontRefDesStart; wxStaticText* m_BottomRefDesStartText; wxTextCtrl* m_BackRefDesStart; + wxCheckBox* m_RemoveFrontPrefix; + wxCheckBox* m_RemoveBackPrefix; wxStaticText* m_FrontPrefixText; wxTextCtrl* m_FrontPrefix; wxStaticText* m_BackPrefixText; wxTextCtrl* m_BackPrefix; - wxCheckBox* m_RemoveFrontPrefix; - wxCheckBox* m_RemoveBackPrefix; + wxCheckBox* m_ExcludeLocked; wxStaticText* m_ExcludeListText; wxTextCtrl* m_ExcludeList; - wxCheckBox* m_ExcludeLocked; WX_HTML_REPORT_PANEL* m_MessageWindow; wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK;