From 90db12df2e13d0521cf4cb405cd58ab6828a562a Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 22 Nov 2020 22:13:13 -0500 Subject: [PATCH] Rename the dxf units option to Default Units The reality is the DXF file can still override the selected unit option which is totally fine. In fact, per specification, there is a way to change units mid-file with block records :/ --- pcbnew/import_gfx/dialog_import_gfx.cpp | 1 - pcbnew/import_gfx/dialog_import_gfx_base.cpp | 2 +- pcbnew/import_gfx/dialog_import_gfx_base.fbp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp index 8a6a7c64fe..ff16e64894 100644 --- a/pcbnew/import_gfx/dialog_import_gfx.cpp +++ b/pcbnew/import_gfx/dialog_import_gfx.cpp @@ -46,7 +46,6 @@ int DIALOG_IMPORT_GFX::m_lineWidthUnits = 0; // millimeter int DIALOG_IMPORT_GFX::m_dxfUnits = 0; // first entry in the dxfUnits map below const std::map dxfUnitsMap = { - { DXF_IMPORT_UNITS::DEFAULT, _( "Auto" ) }, { DXF_IMPORT_UNITS::INCHES, _( "Inches" ) }, { DXF_IMPORT_UNITS::MILLIMETERS, _( "Millimeters" ) }, { DXF_IMPORT_UNITS::MILS, _( "Mils" ) }, diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.cpp b/pcbnew/import_gfx/dialog_import_gfx_base.cpp index 64925fe088..3ac696b599 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.cpp +++ b/pcbnew/import_gfx/dialog_import_gfx_base.cpp @@ -204,7 +204,7 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, m_choiceUnitLineWidth->SetSelection( 0 ); fgDxfImportSettings->Add( m_choiceUnitLineWidth, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - m_staticTextLineWidth1 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Units"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextLineWidth1 = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Default units"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLineWidth1->Wrap( -1 ); fgDxfImportSettings->Add( m_staticTextLineWidth1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.fbp b/pcbnew/import_gfx/dialog_import_gfx_base.fbp index 416359b8d2..6b534c45b9 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.fbp +++ b/pcbnew/import_gfx/dialog_import_gfx_base.fbp @@ -1549,7 +1549,7 @@ 0 0 wxID_ANY - Units + Default units 0 0