From 82ede1d767c567db44fb671547e2fa6d655591e1 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Thu, 22 Oct 2020 22:30:37 +0100 Subject: [PATCH] Fix a couple more instances of "auxilary origin". Fixes https://gitlab.com/kicad/code/kicad/issues/5394 --- pcbnew/dialogs/dialog_gencad_export_options.cpp | 6 +++--- pcbnew/dialogs/dialog_gendrill_base.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/dialogs/dialog_gencad_export_options.cpp b/pcbnew/dialogs/dialog_gencad_export_options.cpp index 8d4e29518f..65f62feb57 100644 --- a/pcbnew/dialogs/dialog_gencad_export_options.cpp +++ b/pcbnew/dialogs/dialog_gencad_export_options.cpp @@ -49,11 +49,11 @@ DIALOG_GENCAD_EXPORT_OPTIONS::DIALOG_GENCAD_EXPORT_OPTIONS( PCB_EDIT_FRAME* aPar GencadFileWildcard(), wxDefaultPosition, wxSize( -1,-1 ), wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); - m_mainSizer->Add( m_filePicker, 0, wxEXPAND | wxRIGHT, 5 ); + m_mainSizer->Add( m_filePicker, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5 ); m_optsSizer = new wxGridSizer( 0, 1, 3, 3 ); createOptCheckboxes(); - m_mainSizer->Add( m_optsSizer, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5 ); + m_mainSizer->Add( m_optsSizer, 1, wxEXPAND | wxALL, 10 ); wxSizer* stdButtons = CreateSeparatedButtonSizer( wxOK | wxCANCEL ); m_mainSizer->Add( stdButtons, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5 ); @@ -135,7 +135,7 @@ void DIALOG_GENCAD_EXPORT_OPTIONS::createOptCheckboxes() { FLIP_BOTTOM_PADS, _( "Flip bottom footprint padstacks" ) }, { UNIQUE_PIN_NAMES, _( "Generate unique pin names" ) }, { INDIVIDUAL_SHAPES, _( "Generate a new shape for each footprint instance (do not reuse shapes)" ) }, - { USE_AUX_ORIGIN, _( "Use auxiliary axis as origin" ) }, + { USE_AUX_ORIGIN, _( "Use drill/place file origin as origin" ) }, { STORE_ORIGIN_COORDS, _( "Save the origin coordinates in the file" ) } }; diff --git a/pcbnew/dialogs/dialog_gendrill_base.cpp b/pcbnew/dialogs/dialog_gendrill_base.cpp index d502ee4822..3b0d30b3d8 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.cpp +++ b/pcbnew/dialogs/dialog_gendrill_base.cpp @@ -97,11 +97,11 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con wxBoxSizer* bLeftSizer; bLeftSizer = new wxBoxSizer( wxVERTICAL ); - wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") }; + wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Drill/place file origin") }; int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString ); m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS ); - m_Choice_Drill_Offset->SetSelection( 0 ); - m_Choice_Drill_Offset->SetToolTip( _("Choose the coordinate origin: absolute or relative to the auxiliray axis") ); + m_Choice_Drill_Offset->SetSelection( 1 ); + m_Choice_Drill_Offset->SetToolTip( _("Choose the coordinate origin: absolute or relative to the drill/place file origin") ); bLeftSizer->Add( m_Choice_Drill_Offset, 0, wxALL|wxEXPAND, 5 );