diff --git a/pcbnew/dialogs/dialog_board_reannotate.cpp b/pcbnew/dialogs/dialog_board_reannotate.cpp
index 8eb65f0997..cf4515925e 100644
--- a/pcbnew/dialogs/dialog_board_reannotate.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate.cpp
@@ -76,22 +76,14 @@ int BackDirectionsArray[] = {
SORTXFIRST + ASCENDINGFIRST + DESCENDINGSECOND // "Right to left, bottom to top", // 001
};
-#define SetSortCodes( DirArray, Code ) \
- { \
- g_SortYFirst = ( ( DirArray[Code] & SORTYFIRST ) != 0 ); \
+#define SetSortCodes( DirArray, Code ) \
+ { \
+ g_SortYFirst = ( ( DirArray[Code] & SORTYFIRST ) != 0 ); \
g_DescendingFirst = ( ( DirArray[Code] & DESCENDINGFIRST ) != 0 ); \
g_DescendingSecond = ( ( DirArray[Code] & DESCENDINGSECOND ) != 0 ); \
}
-wxString AnnotateString[] = {
- _( "All" ), // ANNOTATE_ALL
- _( "Only front" ), // AnnotateFront
- _( "Only back" ), // AnnotateBack
- _( "Only selected" ) // ANNOTATE_SELECTED
-};
-
-
wxString ActionMessage[] = {
"", // UPDATE_REFDES
_( "Empty" ), // EMPTY_REFDES
diff --git a/pcbnew/dialogs/dialog_board_reannotate_base.cpp b/pcbnew/dialogs/dialog_board_reannotate_base.cpp
index 5b4bf49f5b..eac65a678d 100644
--- a/pcbnew/dialogs/dialog_board_reannotate_base.cpp
+++ b/pcbnew/dialogs/dialog_board_reannotate_base.cpp
@@ -18,292 +18,286 @@ DIALOG_BOARD_REANNOTATE_BASE::DIALOG_BOARD_REANNOTATE_BASE( wxWindow* parent, wx
wxBoxSizer* bmainSizer;
bmainSizer = new wxBoxSizer( wxVERTICAL );
- wxBoxSizer* bupperSizer;
- bupperSizer = new wxBoxSizer( wxVERTICAL );
-
- 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* bSizerOpts;
bSizerOpts = new wxBoxSizer( wxVERTICAL );
wxStaticText* stOrderLabel;
- stOrderLabel = new wxStaticText( m_StandardOptions, wxID_ANY, _("Footprint Order"), wxDefaultPosition, wxDefaultSize, 0 );
+ stOrderLabel = new wxStaticText( this, wxID_ANY, _("Footprint Order"), wxDefaultPosition, wxDefaultSize, 0 );
stOrderLabel->Wrap( -1 );
- bSizerOpts->Add( stOrderLabel, 0, wxRIGHT|wxLEFT, 5 );
+ bSizerOpts->Add( stOrderLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 );
- m_staticline1 = new wxStaticLine( m_StandardOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bSizerOpts->Add( m_staticline1, 0, wxEXPAND|wxBOTTOM, 8 );
+ m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bSizerOpts->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 );
wxFlexGridSizer* fgSizerButtons;
- fgSizerButtons = new wxFlexGridSizer( 2, 11, 0, 0 );
+ fgSizerButtons = new wxFlexGridSizer( 2, 23, 0, 0 );
fgSizerButtons->AddGrowableCol( 2 );
fgSizerButtons->AddGrowableCol( 5 );
fgSizerButtons->AddGrowableCol( 8 );
+ fgSizerButtons->AddGrowableCol( 11 );
+ fgSizerButtons->AddGrowableCol( 14 );
+ fgSizerButtons->AddGrowableCol( 17 );
+ fgSizerButtons->AddGrowableCol( 20 );
fgSizerButtons->SetFlexibleDirection( wxBOTH );
fgSizerButtons->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
- m_Down_Right = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ m_Down_Right = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
m_Down_Right->SetValue( true );
- fgSizerButtons->Add( m_Down_Right, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ fgSizerButtons->Add( m_Down_Right, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
- reannotate_down_right_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_down_right_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_down_right_bitmap->SetToolTip( _("Horizontally: top left to bottom right") );
fgSizerButtons->Add( reannotate_down_right_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Right_Down = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Right_Down, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Right_Down = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Right_Down, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_right_down_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_right_down_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_right_down_bitmap->SetToolTip( _("Horizontally: top right to bottom left") );
fgSizerButtons->Add( reannotate_right_down_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Down_Left = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Down_Left, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Down_Left = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Down_Left, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_down_left_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_down_left_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_down_left_bitmap->SetToolTip( _("Horizontally: bottom left to top right") );
fgSizerButtons->Add( reannotate_down_left_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Left_Down = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Left_Down, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Left_Down = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Left_Down, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_left_down_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_left_down_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_left_down_bitmap->SetToolTip( _("Horizontally:: bottom right to top left") );
fgSizerButtons->Add( reannotate_left_down_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- m_Up_Right = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Up_Right, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- reannotate_up_right_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
+
+ m_Up_Right = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Up_Right, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+ reannotate_up_right_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_up_right_bitmap->SetToolTip( _("Vertically: top left to bottom right") );
fgSizerButtons->Add( reannotate_up_right_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Right_Up = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Right_Up, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Right_Up = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Right_Up, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_right_up_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_right_up_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_right_up_bitmap->SetToolTip( _("Vertically: bottom left to top right") );
fgSizerButtons->Add( reannotate_right_up_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Up_Left = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Up_Left, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Up_Left = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Up_Left, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_up_left_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_up_left_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_up_left_bitmap->SetToolTip( _("Vertically: top right to bottom left") );
fgSizerButtons->Add( reannotate_up_left_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- fgSizerButtons->Add( 20, 0, 1, wxEXPAND, 5 );
+ fgSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
- m_Left_Up = new wxRadioButton( m_StandardOptions, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizerButtons->Add( m_Left_Up, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ m_Left_Up = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ fgSizerButtons->Add( m_Left_Up, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- reannotate_left_up_bitmap = new wxStaticBitmap( m_StandardOptions, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+ reannotate_left_up_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
reannotate_left_up_bitmap->SetToolTip( _("Vertically: bottom right to top left") );
fgSizerButtons->Add( reannotate_left_up_bitmap, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- bSizerOpts->Add( fgSizerButtons, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
+ bSizerOpts->Add( fgSizerButtons, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
wxFlexGridSizer* fgSizerLocations;
- fgSizerLocations = new wxFlexGridSizer( 0, 2, 0, 0 );
- fgSizerLocations->AddGrowableCol( 1 );
+ fgSizerLocations = new wxFlexGridSizer( 0, 4, 0, 0 );
fgSizerLocations->SetFlexibleDirection( wxBOTH );
fgSizerLocations->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
- m_staticText9 = new wxStaticText( m_StandardOptions, wxID_ANY, _("Based on location of:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText9 = new wxStaticText( this, wxID_ANY, _("Based on location of:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText9->Wrap( -1 );
- fgSizerLocations->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+ fgSizerLocations->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL, 5 );
- wxString m_locationChoiceChoices[] = { _("Footprint"), _("Reference Designator") };
+ wxString m_locationChoiceChoices[] = { _("Footprint"), _("Reference") };
int m_locationChoiceNChoices = sizeof( m_locationChoiceChoices ) / sizeof( wxString );
- m_locationChoice = new wxChoice( m_StandardOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_locationChoiceNChoices, m_locationChoiceChoices, 0 );
+ m_locationChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_locationChoiceNChoices, m_locationChoiceChoices, 0 );
m_locationChoice->SetSelection( 0 );
- fgSizerLocations->Add( m_locationChoice, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
+ fgSizerLocations->Add( m_locationChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
- m_SortGridText = new wxStaticText( m_StandardOptions, wxID_ANY, _("Round locations to:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_SortGridText = new wxStaticText( this, wxID_ANY, _("Round locations to:"), wxDefaultPosition, wxDefaultSize, 0 );
m_SortGridText->Wrap( -1 );
m_SortGridText->SetToolTip( _("Component position will be rounded\nto this grid before sorting.\nThis helps with misaligned parts.") );
- fgSizerLocations->Add( m_SortGridText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+ fgSizerLocations->Add( m_SortGridText, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
wxArrayString m_GridChoiceChoices;
- m_GridChoice = new wxChoice( m_StandardOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridChoiceChoices, 0 );
+ m_GridChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_GridChoiceChoices, 0 );
m_GridChoice->SetSelection( 0 );
m_GridChoice->SetToolTip( _("Component position will be rounded\nto this grid before sorting.\nThis helps with misaligned parts.") );
- m_GridChoice->SetMinSize( wxSize( 150,-1 ) );
- fgSizerLocations->Add( m_GridChoice, 0, wxEXPAND|wxBOTTOM|wxLEFT, 5 );
+ fgSizerLocations->Add( m_GridChoice, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
bSizerOpts->Add( fgSizerLocations, 0, wxEXPAND|wxALL, 10 );
wxStaticText* stScopeLabel;
- stScopeLabel = new wxStaticText( m_StandardOptions, wxID_ANY, _("Reannotation Scope"), wxDefaultPosition, wxDefaultSize, 0 );
+ stScopeLabel = new wxStaticText( this, wxID_ANY, _("Reannotation Scope"), wxDefaultPosition, wxDefaultSize, 0 );
stScopeLabel->Wrap( -1 );
- bSizerOpts->Add( stScopeLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+ bSizerOpts->Add( stScopeLabel, 0, wxTOP|wxRIGHT|wxLEFT, 13 );
- m_staticline2 = new wxStaticLine( m_StandardOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
- bSizerOpts->Add( m_staticline2, 0, wxEXPAND|wxBOTTOM, 8 );
+ m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bSizerOpts->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 );
wxFlexGridSizer* fgSizer6111;
fgSizer6111 = new wxFlexGridSizer( 0, 5, 0, 0 );
fgSizer6111->SetFlexibleDirection( wxVERTICAL );
fgSizer6111->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );
- m_AnnotateAll = new wxRadioButton( m_StandardOptions, wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+ m_AnnotateAll = new wxRadioButton( this, wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
m_AnnotateAll->SetValue( true );
fgSizer6111->Add( m_AnnotateAll, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
- m_AnnotateFront = new wxRadioButton( m_StandardOptions, wxID_ANY, _("Front"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_AnnotateFront = new wxRadioButton( this, wxID_ANY, _("Front"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer6111->Add( m_AnnotateFront, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
- m_AnnotateBack = new wxRadioButton( m_StandardOptions, wxID_ANY, _("Back"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_AnnotateBack = new wxRadioButton( this, wxID_ANY, _("Back"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer6111->Add( m_AnnotateBack, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
- m_AnnotateSelection = new wxRadioButton( m_StandardOptions, wxID_ANY, _("Selection"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_AnnotateSelection = new wxRadioButton( this, wxID_ANY, _("Selection"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer6111->Add( m_AnnotateSelection, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
- bSizerOpts->Add( fgSizer6111, 0, wxBOTTOM|wxLEFT|wxEXPAND, 10 );
+ bSizerOpts->Add( fgSizer6111, 0, wxBOTTOM|wxLEFT, 5 );
+
+ m_ExcludeLocked = new wxCheckBox( this, wxID_ANY, _("Exclude locked footprints"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_ExcludeLocked->SetToolTip( _("Locked footprints will not be reannotated") );
+
+ bSizerOpts->Add( m_ExcludeLocked, 0, wxTOP|wxRIGHT|wxLEFT, 10 );
+
+ wxBoxSizer* bSizerExclusions;
+ bSizerExclusions = new wxBoxSizer( wxHORIZONTAL );
+
+ m_ExcludeListText = new wxStaticText( this, 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*)") );
+
+ bSizerExclusions->Add( m_ExcludeListText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+ m_ExcludeList = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ bSizerExclusions->Add( m_ExcludeList, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- m_StandardOptions->SetSizer( bSizerOpts );
- m_StandardOptions->Layout();
- bSizerOpts->Fit( m_StandardOptions );
- m_notebook->AddPage( m_StandardOptions, _("Options"), true );
- m_Advanced = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bSizerDesignatorOpts;
- bSizerDesignatorOpts = new wxBoxSizer( wxHORIZONTAL );
+ bSizerOpts->Add( bSizerExclusions, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+ m_staticText10 = new wxStaticText( this, wxID_ANY, _("Reference Designators"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_staticText10->Wrap( -1 );
+ bSizerOpts->Add( m_staticText10, 0, wxTOP|wxRIGHT|wxLEFT, 13 );
+
+ m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+ bSizerOpts->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 );
wxGridBagSizer* gbSizer1;
gbSizer1 = new wxGridBagSizer( 0, 0 );
gbSizer1->SetFlexibleDirection( wxBOTH );
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
- gbSizer1->SetEmptyCellSize( wxSize( 20,10 ) );
+ gbSizer1->SetEmptyCellSize( wxSize( 40,10 ) );
- m_FrontRefDesStartText = new wxStaticText( m_Advanced, wxID_ANY, _("Front reference start:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_FrontRefDesStartText = new wxStaticText( this, wxID_ANY, _("Front reference start:"), wxDefaultPosition, wxDefaultSize, 0 );
m_FrontRefDesStartText->Wrap( -1 );
m_FrontRefDesStartText->SetToolTip( _("Starting reference designation for front.") );
gbSizer1->Add( m_FrontRefDesStartText, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- m_FrontRefDesStart = new wxTextCtrl( m_Advanced, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_FrontRefDesStart = new wxTextCtrl( this, wxID_ANY, _("1"), wxDefaultPosition, wxDefaultSize, 0 );
m_FrontRefDesStart->SetToolTip( _("Default is 1") );
m_FrontRefDesStart->SetMinSize( wxSize( 100,-1 ) );
gbSizer1->Add( m_FrontRefDesStart, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
- m_BottomRefDesStartText = new wxStaticText( m_Advanced, wxID_ANY, _("Back reference start:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_BottomRefDesStartText = new wxStaticText( this, 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.") );
gbSizer1->Add( m_BottomRefDesStartText, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
- m_BackRefDesStart = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_BackRefDesStart = new wxTextCtrl( this, 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.") );
m_BackRefDesStart->SetMinSize( wxSize( 100,-1 ) );
gbSizer1->Add( m_BackRefDesStart, wxGBPosition( 0, 4 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
- m_FrontPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Front prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_FrontPrefixText = new wxStaticText( this, wxID_ANY, _("Front prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
m_FrontPrefixText->Wrap( -1 );
m_FrontPrefixText->SetToolTip( _("Optional prefix for component side reference designations (e.g. F_)") );
gbSizer1->Add( m_FrontPrefixText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
- m_FrontPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_FrontPrefix = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_FrontPrefix->SetToolTip( _("Optional prefix for component side reference designations (e.g. F_)") );
gbSizer1->Add( m_FrontPrefix, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
- m_BackPrefixText = new wxStaticText( m_Advanced, wxID_ANY, _("Back prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_BackPrefixText = new wxStaticText( this, wxID_ANY, _("Back prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
m_BackPrefixText->Wrap( -1 );
m_BackPrefixText->SetToolTip( _("Optional prefix for solder side reference designations (e.g. B_)") );
gbSizer1->Add( m_BackPrefixText, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
- m_BackPrefix = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+ m_BackPrefix = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_BackPrefix->SetToolTip( _("Optional prefix for solder side reference designations (e.g. B_)") );
gbSizer1->Add( m_BackPrefix, wxGBPosition( 1, 4 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
- m_RemoveFrontPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove front prefix"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_RemoveFrontPrefix = new wxCheckBox( this, 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") );
gbSizer1->Add( m_RemoveFrontPrefix, wxGBPosition( 2, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
- m_RemoveBackPrefix = new wxCheckBox( m_Advanced, wxID_ANY, _("Remove back prefix"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_RemoveBackPrefix = new wxCheckBox( this, 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, 3 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|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") );
-
- gbSizer1->Add( m_ExcludeLocked, wxGBPosition( 5, 0 ), wxGBSpan( 1, 5 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|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*)") );
-
- gbSizer1->Add( m_ExcludeListText, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
- m_ExcludeList = new wxTextCtrl( m_Advanced, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- gbSizer1->Add( m_ExcludeList, wxGBPosition( 6, 1 ), wxGBSpan( 1, 4 ), wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
gbSizer1->AddGrowableCol( 1 );
- gbSizer1->AddGrowableCol( 2 );
- gbSizer1->AddGrowableCol( 3 );
gbSizer1->AddGrowableCol( 4 );
- bSizerDesignatorOpts->Add( gbSizer1, 1, wxALL|wxEXPAND, 5 );
+ bSizerOpts->Add( gbSizer1, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
- m_Advanced->SetSizer( bSizerDesignatorOpts );
- m_Advanced->Layout();
- bSizerDesignatorOpts->Fit( m_Advanced );
- m_notebook->AddPage( m_Advanced, _("Reference Designators"), false );
-
- bupperSizer->Add( m_notebook, 0, wxALL|wxEXPAND|wxLEFT|wxRIGHT, 5 );
+ bmainSizer->Add( bSizerOpts, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizerMessages;
bSizerMessages = new wxBoxSizer( wxVERTICAL );
m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- m_MessageWindow->SetMinSize( wxSize( -1,150 ) );
+ m_MessageWindow->SetMinSize( wxSize( -1,300 ) );
bSizerMessages->Add( m_MessageWindow, 1, wxEXPAND|wxLEFT|wxRIGHT, 5 );
- bupperSizer->Add( bSizerMessages, 1, wxEXPAND|wxTOP, 15 );
-
-
- bmainSizer->Add( bupperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 );
+ bmainSizer->Add( bSizerMessages, 1, wxEXPAND|wxTOP, 15 );
wxBoxSizer* m_buttonsSizer;
m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
diff --git a/pcbnew/dialogs/dialog_board_reannotate_base.fbp b/pcbnew/dialogs/dialog_board_reannotate_base.fbp
index 2aeed17dab..24305074b5 100644
--- a/pcbnew/dialogs/dialog_board_reannotate_base.fbp
+++ b/pcbnew/dialogs/dialog_board_reannotate_base.fbp
@@ -66,19 +66,81 @@
wxVERTICAL
none