diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp
index 7e3f8e4ec8..d7a005b43e 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties.cpp
@@ -376,42 +376,39 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
m_netSelector->Disable();
}
- m_DesignRuleViasUnit->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
-
if( viasMatchNetclassValues )
{
m_viaDesignRules->SetValue( true );
- m_DesignRuleVias->Enable( false );
- m_DesignRuleViasCtrl->Enable( false );
- m_DesignRuleViasUnit->Enable( false );
+ m_predefinedViaSizesLabel->Enable( false );
+ m_predefinedViaSizesCtrl->Enable( false );
+ m_predefinedViaSizesUnits->Enable( false );
m_viaDiameter.Enable( false );
m_viaDrill.Enable( false );
}
- else
+
+ int viaSelection = wxNOT_FOUND;
+
+ // 0 is the netclass place-holder
+ for( unsigned ii = 1; ii < aParent->GetDesignSettings().m_ViasDimensionsList.size(); ii++ )
{
- int viaSelection = wxNOT_FOUND;
+ VIA_DIMENSION* viaDimension = &aParent->GetDesignSettings().m_ViasDimensionsList[ii];
+ wxString msg = m_frame->StringFromValue( viaDimension->m_Diameter )
+ + wxT( " / " )
+ + m_frame->StringFromValue( viaDimension->m_Drill );
+ m_predefinedViaSizesCtrl->Append( msg, viaDimension );
- // 0 is the netclass place-holder
- for( unsigned ii = 1; ii < aParent->GetDesignSettings().m_ViasDimensionsList.size(); ii++ )
+ if( viaSelection == wxNOT_FOUND
+ && m_viaDiameter.GetValue() == viaDimension->m_Diameter
+ && m_viaDrill.GetValue() == viaDimension->m_Drill )
{
- VIA_DIMENSION* viaDimension = &aParent->GetDesignSettings().m_ViasDimensionsList[ii];
- wxString msg = m_frame->StringFromValue( viaDimension->m_Diameter )
- + wxT( " / " )
- + m_frame->StringFromValue( viaDimension->m_Drill );
- m_DesignRuleViasCtrl->Append( msg, viaDimension );
-
- if( viaSelection == wxNOT_FOUND
- && m_viaDiameter.GetValue() == viaDimension->m_Diameter
- && m_viaDrill.GetValue() == viaDimension->m_Drill )
- {
- viaSelection = ii - 1;
- }
+ viaSelection = ii - 1;
}
-
- m_DesignRuleViasCtrl->SetSelection( viaSelection );
}
+ m_predefinedViaSizesCtrl->SetSelection( viaSelection );
+ m_predefinedViaSizesUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
+
m_ViaTypeChoice->Enable();
switch( viaType )
@@ -436,34 +433,31 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
if( m_tracks )
{
- m_DesignRuleWidthsUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
-
if( tracksMatchNetclassValues )
{
m_trackDesignRules->SetValue( true );
- m_DesignRuleWidths->Enable( false );
- m_DesignRuleWidthsCtrl->Enable( false );
- m_DesignRuleWidthsUnits->Enable( false );
+ m_predefinedTrackWidthsLabel->Enable( false );
+ m_predefinedTrackWidthsCtrl->Enable( false );
+ m_predefinedTrackWidthsUnits->Enable( false );
m_trackWidth.Enable( false );
}
- else
+
+ int widthSelection = wxNOT_FOUND;
+
+ // 0 is the netclass place-holder
+ for( unsigned ii = 1; ii < aParent->GetDesignSettings().m_TrackWidthList.size(); ii++ )
{
- int widthSelection = wxNOT_FOUND;
+ int width = aParent->GetDesignSettings().m_TrackWidthList[ii];
+ wxString msg = m_frame->StringFromValue( width );
+ m_predefinedTrackWidthsCtrl->Append( msg );
- // 0 is the netclass place-holder
- for( unsigned ii = 1; ii < aParent->GetDesignSettings().m_TrackWidthList.size(); ii++ )
- {
- int width = aParent->GetDesignSettings().m_TrackWidthList[ii];
- wxString msg = m_frame->StringFromValue( width );
- m_DesignRuleWidthsCtrl->Append( msg );
-
- if( widthSelection == wxNOT_FOUND && m_trackWidth.GetValue() == width )
- widthSelection = ii - 1;
- }
-
- m_DesignRuleWidthsCtrl->SetSelection( widthSelection );
+ if( widthSelection == wxNOT_FOUND && m_trackWidth.GetValue() == width )
+ widthSelection = ii - 1;
}
+
+ m_predefinedTrackWidthsCtrl->SetSelection( widthSelection );
+ m_predefinedTrackWidthsUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
}
else
{
@@ -504,9 +498,9 @@ void DIALOG_TRACK_VIA_PROPERTIES::onUnitsChanged( wxCommandEvent& aEvent )
{
if( m_vias )
{
- int viaSel = m_DesignRuleViasCtrl->GetSelection();
+ int viaSel = m_predefinedViaSizesCtrl->GetSelection();
- m_DesignRuleViasCtrl->Clear();
+ m_predefinedViaSizesCtrl->Clear();
// 0 is the netclass place-holder
for( unsigned ii = 1; ii < m_frame->GetDesignSettings().m_ViasDimensionsList.size(); ii++ )
@@ -515,29 +509,29 @@ void DIALOG_TRACK_VIA_PROPERTIES::onUnitsChanged( wxCommandEvent& aEvent )
wxString msg = m_frame->StringFromValue( viaDimension->m_Diameter )
+ wxT( " / " )
+ m_frame->StringFromValue( viaDimension->m_Drill );
- m_DesignRuleViasCtrl->Append( msg, viaDimension );
+ m_predefinedViaSizesCtrl->Append( msg, viaDimension );
}
- m_DesignRuleViasCtrl->SetSelection( viaSel );
- m_DesignRuleViasUnit->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
+ m_predefinedViaSizesCtrl->SetSelection( viaSel );
+ m_predefinedViaSizesUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
}
if( m_tracks )
{
- int trackSel = m_DesignRuleWidthsCtrl->GetSelection();
+ int trackSel = m_predefinedTrackWidthsCtrl->GetSelection();
- m_DesignRuleWidthsCtrl->Clear();
+ m_predefinedTrackWidthsCtrl->Clear();
// 0 is the netclass place-holder
for( unsigned ii = 1; ii < m_frame->GetDesignSettings().m_TrackWidthList.size(); ii++ )
{
int width = m_frame->GetDesignSettings().m_TrackWidthList[ii];
wxString msg = m_frame->StringFromValue( width );
- m_DesignRuleWidthsCtrl->Append( msg );
+ m_predefinedTrackWidthsCtrl->Append( msg );
}
- m_DesignRuleWidthsCtrl->SetSelection( trackSel );
- m_DesignRuleWidthsUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
+ m_predefinedTrackWidthsCtrl->SetSelection( trackSel );
+ m_predefinedTrackWidthsUnits->SetLabel( EDA_UNIT_UTILS::GetLabel( m_frame->GetUserUnits() ) );
}
aEvent.Skip();
@@ -894,9 +888,9 @@ void DIALOG_TRACK_VIA_PROPERTIES::onTrackNetclassCheck( wxCommandEvent& aEvent )
{
bool enableNC = aEvent.IsChecked();
- m_DesignRuleWidths->Enable( !enableNC );
- m_DesignRuleWidthsCtrl->Enable( !enableNC );
- m_DesignRuleWidthsUnits->Enable( !enableNC );
+ m_predefinedTrackWidthsLabel->Enable( !enableNC );
+ m_predefinedTrackWidthsCtrl->Enable( !enableNC );
+ m_predefinedTrackWidthsUnits->Enable( !enableNC );
m_trackWidth.Enable( !enableNC );
}
@@ -904,14 +898,14 @@ void DIALOG_TRACK_VIA_PROPERTIES::onTrackNetclassCheck( wxCommandEvent& aEvent )
void DIALOG_TRACK_VIA_PROPERTIES::onWidthSelect( wxCommandEvent& aEvent )
{
- m_TrackWidthCtrl->ChangeValue( m_DesignRuleWidthsCtrl->GetStringSelection() );
+ m_TrackWidthCtrl->ChangeValue( m_predefinedTrackWidthsCtrl->GetStringSelection() );
m_TrackWidthCtrl->SelectAll();
}
void DIALOG_TRACK_VIA_PROPERTIES::onWidthEdit( wxCommandEvent& aEvent )
{
- m_DesignRuleWidthsCtrl->SetStringSelection( m_TrackWidthCtrl->GetValue() );
+ m_predefinedTrackWidthsCtrl->SetStringSelection( m_TrackWidthCtrl->GetValue() );
}
@@ -919,9 +913,9 @@ void DIALOG_TRACK_VIA_PROPERTIES::onViaNetclassCheck( wxCommandEvent& aEvent )
{
bool enableNC = aEvent.IsChecked();
- m_DesignRuleVias->Enable( !enableNC );
- m_DesignRuleViasCtrl->Enable( !enableNC );
- m_DesignRuleViasUnit->Enable( !enableNC );
+ m_predefinedViaSizesLabel->Enable( !enableNC );
+ m_predefinedViaSizesCtrl->Enable( !enableNC );
+ m_predefinedViaSizesUnits->Enable( !enableNC );
m_viaDiameter.Enable( !enableNC );
m_viaDrill.Enable( !enableNC );
@@ -956,7 +950,7 @@ int DIALOG_TRACK_VIA_PROPERTIES::getLayerDepth()
void DIALOG_TRACK_VIA_PROPERTIES::onViaEdit( wxCommandEvent& aEvent )
{
- m_DesignRuleViasCtrl->SetSelection( wxNOT_FOUND );
+ m_predefinedViaSizesCtrl->SetSelection( wxNOT_FOUND );
if( m_vias )
{
diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.cpp b/pcbnew/dialogs/dialog_track_via_properties_base.cpp
index eae8597d06..e648980ab2 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.cpp
@@ -121,18 +121,18 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
m_trackDesignRules->SetValue(true);
gbSizer1->Add( m_trackDesignRules, wxGBPosition( 0, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
- m_DesignRuleWidths = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_DesignRuleWidths->Wrap( -1 );
- gbSizer1->Add( m_DesignRuleWidths, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 1 );
+ m_predefinedTrackWidthsLabel = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_predefinedTrackWidthsLabel->Wrap( -1 );
+ gbSizer1->Add( m_predefinedTrackWidthsLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 1 );
- wxArrayString m_DesignRuleWidthsCtrlChoices;
- m_DesignRuleWidthsCtrl = new wxChoice( m_sbTrackSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DesignRuleWidthsCtrlChoices, 0 );
- m_DesignRuleWidthsCtrl->SetSelection( 0 );
- gbSizer1->Add( m_DesignRuleWidthsCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 );
+ wxArrayString m_predefinedTrackWidthsCtrlChoices;
+ m_predefinedTrackWidthsCtrl = new wxChoice( m_sbTrackSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_predefinedTrackWidthsCtrlChoices, 0 );
+ m_predefinedTrackWidthsCtrl->SetSelection( 0 );
+ gbSizer1->Add( m_predefinedTrackWidthsCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 );
- m_DesignRuleWidthsUnits = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
- m_DesignRuleWidthsUnits->Wrap( -1 );
- gbSizer1->Add( m_DesignRuleWidthsUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ m_predefinedTrackWidthsUnits = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_predefinedTrackWidthsUnits->Wrap( -1 );
+ gbSizer1->Add( m_predefinedTrackWidthsUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_TrackWidthLabel = new wxStaticText( m_sbTrackSizer->GetStaticBox(), wxID_ANY, _("Track width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TrackWidthLabel->Wrap( -1 );
@@ -222,18 +222,18 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
m_viaDesignRules = new wxCheckBox( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Use net class / custom rule sizes"), wxDefaultPosition, wxDefaultSize, 0 );
gbSizer3->Add( m_viaDesignRules, wxGBPosition( 0, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
- m_DesignRuleVias = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_DesignRuleVias->Wrap( -1 );
- gbSizer3->Add( m_DesignRuleVias, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 1 );
+ m_predefinedViaSizesLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Pre-defined sizes:"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_predefinedViaSizesLabel->Wrap( -1 );
+ gbSizer3->Add( m_predefinedViaSizesLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 1 );
- wxArrayString m_DesignRuleViasCtrlChoices;
- m_DesignRuleViasCtrl = new wxChoice( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DesignRuleViasCtrlChoices, 0 );
- m_DesignRuleViasCtrl->SetSelection( 0 );
- gbSizer3->Add( m_DesignRuleViasCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 );
+ wxArrayString m_predefinedViaSizesCtrlChoices;
+ m_predefinedViaSizesCtrl = new wxChoice( m_sbViaSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_predefinedViaSizesCtrlChoices, 0 );
+ m_predefinedViaSizesCtrl->SetSelection( 0 );
+ gbSizer3->Add( m_predefinedViaSizesCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 3 );
- m_DesignRuleViasUnit = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
- m_DesignRuleViasUnit->Wrap( -1 );
- gbSizer3->Add( m_DesignRuleViasUnit, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
+ m_predefinedViaSizesUnits = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_predefinedViaSizesUnits->Wrap( -1 );
+ gbSizer3->Add( m_predefinedViaSizesUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_ViaDiameterLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via diameter:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaDiameterLabel->Wrap( -1 );
@@ -561,10 +561,10 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
// Connect Events
m_viaNotFree->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNotFreeClicked ), NULL, this );
m_trackDesignRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onTrackNetclassCheck ), NULL, this );
- m_DesignRuleWidthsCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
+ m_predefinedTrackWidthsCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
m_TrackWidthCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthEdit ), NULL, this );
m_viaDesignRules->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNetclassCheck ), NULL, this );
- m_DesignRuleViasCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
+ m_predefinedViaSizesCtrl->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
m_ViaDiameterCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
m_ViaDrillCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
m_ViaTypeChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
@@ -598,10 +598,10 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::~DIALOG_TRACK_VIA_PROPERTIES_BASE()
// Disconnect Events
m_viaNotFree->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNotFreeClicked ), NULL, this );
m_trackDesignRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onTrackNetclassCheck ), NULL, this );
- m_DesignRuleWidthsCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
+ m_predefinedTrackWidthsCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthSelect ), NULL, this );
m_TrackWidthCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onWidthEdit ), NULL, this );
m_viaDesignRules->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaNetclassCheck ), NULL, this );
- m_DesignRuleViasCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
+ m_predefinedViaSizesCtrl->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaSelect ), NULL, this );
m_ViaDiameterCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
m_ViaDrillCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
m_ViaTypeChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES_BASE::onViaEdit ), NULL, this );
diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.fbp b/pcbnew/dialogs/dialog_track_via_properties_base.fbp
index 2bda4a23d0..0e33297989 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.fbp
@@ -1216,7 +1216,7 @@
0
1
- m_DesignRuleWidths
+ m_predefinedTrackWidthsLabel
1
@@ -1279,7 +1279,7 @@
0
1
- m_DesignRuleWidthsCtrl
+ m_predefinedTrackWidthsCtrl
1
@@ -1348,7 +1348,7 @@
0
1
- m_DesignRuleWidthsUnits
+ m_predefinedTrackWidthsUnits
1
@@ -2220,7 +2220,7 @@
0
1
- m_DesignRuleVias
+ m_predefinedViaSizesLabel
1
@@ -2283,7 +2283,7 @@
0
1
- m_DesignRuleViasCtrl
+ m_predefinedViaSizesCtrl
1
@@ -2352,7 +2352,7 @@
0
1
- m_DesignRuleViasUnit
+ m_predefinedViaSizesUnits
1
diff --git a/pcbnew/dialogs/dialog_track_via_properties_base.h b/pcbnew/dialogs/dialog_track_via_properties_base.h
index d3b60e5ef2..a8c2c5dfb0 100644
--- a/pcbnew/dialogs/dialog_track_via_properties_base.h
+++ b/pcbnew/dialogs/dialog_track_via_properties_base.h
@@ -66,9 +66,9 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
wxTextCtrl* m_TrackEndYCtrl;
wxStaticText* m_TrackEndYUnit;
wxCheckBox* m_trackDesignRules;
- wxStaticText* m_DesignRuleWidths;
- wxChoice* m_DesignRuleWidthsCtrl;
- wxStaticText* m_DesignRuleWidthsUnits;
+ wxStaticText* m_predefinedTrackWidthsLabel;
+ wxChoice* m_predefinedTrackWidthsCtrl;
+ wxStaticText* m_predefinedTrackWidthsUnits;
wxStaticText* m_TrackWidthLabel;
wxTextCtrl* m_TrackWidthCtrl;
wxStaticText* m_TrackWidthUnit;
@@ -81,9 +81,9 @@ class DIALOG_TRACK_VIA_PROPERTIES_BASE : public DIALOG_SHIM
wxTextCtrl* m_ViaYCtrl;
wxStaticText* m_ViaYUnit;
wxCheckBox* m_viaDesignRules;
- wxStaticText* m_DesignRuleVias;
- wxChoice* m_DesignRuleViasCtrl;
- wxStaticText* m_DesignRuleViasUnit;
+ wxStaticText* m_predefinedViaSizesLabel;
+ wxChoice* m_predefinedViaSizesCtrl;
+ wxStaticText* m_predefinedViaSizesUnits;
wxStaticText* m_ViaDiameterLabel;
wxTextCtrl* m_ViaDiameterCtrl;
wxStaticText* m_ViaDiameterUnit;