haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of "drill" terminology when talking about finish hole size. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7044
This commit is contained in:
Jeff Young 2021-01-11 13:46:00 +00:00
parent 493a784b62
commit a4d417f5c0
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/dialogs/panel_setup_netclasses_base.cpp
View File

@ -41,9 +41,9 @@ PANEL_SETUP_NETCLASSES_BASE::PANEL_SETUP_NETCLASSES_BASE( wxWindow* parent, wxWi
m_netclassGrid->SetColLabelValue( 1, _("Clearance") );
m_netclassGrid->SetColLabelValue( 2, _("Track Width") );
m_netclassGrid->SetColLabelValue( 3, _("Via Size") );
m_netclassGrid->SetColLabelValue( 4, _("Via Drill") );
m_netclassGrid->SetColLabelValue( 4, _("Via Hole") );
m_netclassGrid->SetColLabelValue( 5, _("uVia Size") );
m_netclassGrid->SetColLabelValue( 6, _("uVia Drill") );
m_netclassGrid->SetColLabelValue( 6, _("uVia Hole") );
m_netclassGrid->SetColLabelValue( 7, _("DP Width") );
m_netclassGrid->SetColLabelValue( 8, _("DP Gap") );
m_netclassGrid->SetColLabelValue( 9, _("Wire Thickness") );

2
common/dialogs/panel_setup_netclasses_base.fbp
View File

@ -155,7 +155,7 @@
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Name&quot; &quot;Clearance&quot; &quot;Track Width&quot; &quot;Via Size&quot; &quot;Via Drill&quot; &quot;uVia Size&quot; &quot;uVia Drill&quot; &quot;DP Width&quot; &quot;DP Gap&quot; &quot;Wire Thickness&quot; &quot;Bus Thickness&quot; &quot;Color&quot; &quot;Line Style&quot;</property>
<property name="col_label_values">&quot;Name&quot; &quot;Clearance&quot; &quot;Track Width&quot; &quot;Via Size&quot; &quot;Via Hole&quot; &quot;uVia Size&quot; &quot;uVia Hole&quot; &quot;DP Width&quot; &quot;DP Gap&quot; &quot;Wire Thickness&quot; &quot;Bus Thickness&quot; &quot;Color&quot; &quot;Line Style&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">13</property>
<property name="column_sizes"></property>

2
pcbnew/dialogs/dialog_track_via_properties.cpp
View File

@ -385,7 +385,7 @@ bool DIALOG_TRACK_VIA_PROPERTIES::TransferDataFromWindow()
&& m_ViaDrillCtrl->IsEnabled() && !m_viaDrill.IsIndeterminate()
&& m_viaDiameter.GetValue() <= m_viaDrill.GetValue() )
{
DisplayError( GetParent(), _( "Via drill size must be smaller than via diameter" ) );
DisplayError( GetParent(), _( "Via hole size must be smaller than via diameter" ) );
m_ViaDrillCtrl->SelectAll();
m_ViaDrillCtrl->SetFocus();
return false;

2
pcbnew/dialogs/dialog_track_via_properties_base.cpp
View File

@ -213,7 +213,7 @@ DIALOG_TRACK_VIA_PROPERTIES_BASE::DIALOG_TRACK_VIA_PROPERTIES_BASE( wxWindow* pa
m_ViaDiameterUnit->Wrap( -1 );
fgViaLeftSizer->Add( m_ViaDiameterUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via drill:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaDrillLabel = new wxStaticText( m_sbViaSizer->GetStaticBox(), wxID_ANY, _("Via hole:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ViaDrillLabel->Wrap( -1 );
fgViaLeftSizer->Add( m_ViaDrillLabel, 0, wxALIGN_CENTER_VERTICAL, 5 );

2
pcbnew/dialogs/dialog_track_via_properties_base.fbp
View File

@ -2598,7 +2598,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Via drill:</property>
<property name="label">Via hole:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

2
pcbnew/dialogs/panel_setup_feature_constraints_base.cpp
View File

@ -359,7 +359,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi
m_bitmapMinuViaDrill = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgFeatureConstraints->Add( m_bitmapMinuViaDrill, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_uviaMinDrillLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
m_uviaMinDrillLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia hole:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
m_uviaMinDrillLabel->Wrap( -1 );
fgFeatureConstraints->Add( m_uviaMinDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5 );

2
pcbnew/dialogs/panel_setup_feature_constraints_base.fbp
View File

@ -4403,7 +4403,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Minimum uVia drill:</property>
<property name="label">Minimum uVia hole:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

2
pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
View File

@ -99,7 +99,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
m_viaSizesGrid->EnableDragColSize( false );
m_viaSizesGrid->SetColLabelSize( 24 );
m_viaSizesGrid->SetColLabelValue( 0, _("Size") );
m_viaSizesGrid->SetColLabelValue( 1, _("Drill") );
m_viaSizesGrid->SetColLabelValue( 1, _("Hole") );
m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Rows

2
pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
View File

@ -433,7 +433,7 @@
<property name="close_button">1</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="col_label_size">24</property>
<property name="col_label_values">&quot;Size&quot; &quot;Drill&quot;</property>
<property name="col_label_values">&quot;Size&quot; &quot;Hole&quot;</property>
<property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="cols">2</property>
<property name="column_sizes">125,125</property>

4
pcbnew/pad.cpp
View File

@ -925,13 +925,13 @@ void PAD::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>&
{
if( GetDrillShape() == PAD_DRILL_SHAPE_CIRCLE )
{
aList.emplace_back( _( "Drill" ),
aList.emplace_back( _( "Hole" ),
wxString::Format( "%s",
MessageTextFromValue( units, m_drill.x ) ) );
}
else
{
aList.emplace_back( _( "Drill X / Y" ),
aList.emplace_back( _( "Hole X / Y" ),
wxString::Format( "%s / %s",
MessageTextFromValue( units, m_drill.x ),
MessageTextFromValue( units, m_drill.y ) ) );